diff --git a/.blueprint/code-workspace/generator.mjs b/.blueprint/code-workspace/generator.mjs
index dd22ce81a2b1..cab998ae28c8 100644
--- a/.blueprint/code-workspace/generator.mjs
+++ b/.blueprint/code-workspace/generator.mjs
@@ -1,5 +1,5 @@
 import { join } from 'path';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import BaseGenerator from '../../generators/base/index.mjs';
 import { getPackageRoot } from '../../lib/index.mjs';
 import command from './command.mjs';
diff --git a/.github/workflows/generator.yml b/.github/workflows/generator.yml
index d1c3d55b427e..fdb69ecd77b0 100644
--- a/.github/workflows/generator.yml
+++ b/.github/workflows/generator.yml
@@ -46,7 +46,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
-          node-version: 18.17.1
+          node-version: 18.18.2
       - name: 'SETUP: load npm cache'
         uses: actions/cache@v3
         with:
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 88aecc3ba36d..8a172b89c64f 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -28,9 +28,10 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@b69b346013879cedbf50c69f572cd85439a41936
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
+          ascending: true
           stale-issue-label: 'area: stale'
           stale-issue-message: |
             This issue is stale because it has been open for too long without any activity.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 039d23fb0f94..31481fdc369e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -224,7 +224,7 @@ Go to the [generator-jhipster project](https://github.com/jhipster/generator-jhi
 Since v8 `generator-jhipster` is written in typescript.
 To run it you need to compile to javascript or use a just-in-time compilation.
 
-#### Runnning jit executable
+#### Running jit executable
 
 The executable is located at `bin/jhipster.cjs`.
 You can alias it to `jhipster` command:
@@ -339,7 +339,7 @@ Daily builds samples are prefixed with `daily-`.
 #### Samples folder
 
 A common samples folder will be used if `--global` option is used like `jhipster generate-sample ng-default --global`.
-At first execution a prompt will ask for the samples folder, the choosen value will be reused at next executions.
+At first execution a prompt will ask for the samples folder, the chosen value will be reused at next executions.
 At samples folder, a `jhipster-samples.code-workspace` is generated. It provides a single vscode workspace for `generator-jhipster` and samples generated at the samples folder. It's very used for quick looks.
 
 ### Testing samples
@@ -418,7 +418,7 @@ Sub templates should be named with the `ejs` extension because it's the default
 
     <%- include('../common/field_validators', {field, reactive}); -%>
 
-This statement means that [_PersistClass_.java.jhi.jakarta_validation.ejs](generators/server/templates/entity/src/main/java/package/domain/_PersistClass_.java.jhi.jakarta_validation.ejs) template includes [field_validators.ejs](generators/server/templates/entity/src/main/java/package/common/field_validators.ejs) sub template.
+This statement means that [_persistClass_.java.jhi.jakarta_validation.ejs](generators/server/templates/entity/src/main/java/package/domain/_persistClass_.java.jhi.jakarta_validation.ejs) template includes [field_validators.ejs](generators/server/templates/entity/src/main/java/package/common/field_validators.ejs) sub template.
 
 Sub templates can be unit tested.
 
diff --git a/cli/cli.spec.mts b/cli/cli.spec.mts
index fccf7a9b109f..eb5c0924e659 100644
--- a/cli/cli.spec.mts
+++ b/cli/cli.spec.mts
@@ -586,7 +586,7 @@ describe('cli', () => {
           expect(stdout).toMatch('Usage: jhipster run jhipster:app [options]');
         });
         it('should print options', () => {
-          expect(stdout).toMatch('--application-type <value>');
+          expect(stdout).toMatch('--defaults');
         });
         it('should exit with code 0', () => {
           expect(exitCode).toBe(0);
diff --git a/cli/commands.mjs b/cli/commands.mjs
index 2fd9b4aaedea..e854dbbda156 100644
--- a/cli/commands.mjs
+++ b/cli/commands.mjs
@@ -69,6 +69,7 @@ const defaultCommands = {
   },
   gae: {
     desc: 'Deploy the current application to Google App Engine',
+    removed: removedV8,
   },
   'generate-blueprint': {
     desc: 'Generate a blueprint',
@@ -143,18 +144,18 @@ const defaultCommands = {
     desc: 'Run a module or custom generator',
     argument: ['[generator]'],
   },
-  'spring-boot': {
-    desc: 'Create a Spring Boot application (alpha)',
-  },
   'spring-service': {
     alias: 'service',
     desc: 'Create a new Spring service bean',
+    removed: removedV8,
   },
   'spring-controller': {
     desc: 'Create a new Spring controller',
+    removed: removedV8,
   },
   'openapi-client': {
     desc: 'Generates java client code from an OpenAPI/Swagger definition',
+    removed: removedV8,
   },
   upgrade: {
     desc: 'Upgrade the JHipster version, and upgrade the generated application',
diff --git a/cli/environment-builder.mjs b/cli/environment-builder.mjs
index 291a0378dee8..987b16a5135d 100644
--- a/cli/environment-builder.mjs
+++ b/cli/environment-builder.mjs
@@ -21,7 +21,7 @@ import { existsSync, readFileSync } from 'fs';
 import path, { dirname, resolve } from 'path';
 import { fileURLToPath, pathToFileURL } from 'url';
 import chalk from 'chalk';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import Environment from 'yeoman-environment';
 import { QueuedAdapter } from '@yeoman/adapter';
 
diff --git a/cli/jhipster-command.mjs b/cli/jhipster-command.mjs
index 72b8fcc861df..d05134082177 100644
--- a/cli/jhipster-command.mjs
+++ b/cli/jhipster-command.mjs
@@ -20,6 +20,7 @@
 import chalk from 'chalk';
 import { Command, Option } from 'commander';
 import lodash from 'lodash';
+import { convertConfigToOption } from '../lib/internal/index.mjs';
 
 const { kebabCase } = lodash;
 
@@ -177,6 +178,16 @@ export default class JHipsterCommand extends Command {
     return this;
   }
 
+  addJHipsterConfigs(configs = {}, blueprintOptionDescription) {
+    Object.entries(configs).forEach(([name, config]) => {
+      const option = convertConfigToOption(name, config);
+      if (option) {
+        this._addGeneratorOption(kebabCase(option.name), option, blueprintOptionDescription);
+      }
+    });
+    return this;
+  }
+
   _addGeneratorOption(optionName, optionDefinition, additionalDescription = '') {
     if (optionName === 'help') {
       return undefined;
@@ -197,9 +208,15 @@ export default class JHipsterCommand extends Command {
     } else if (optionDefinition.type && optionDefinition.type !== Boolean) {
       cmdString = optionDefinition.required !== false ? `${cmdString} <value>` : `${cmdString} [value]`;
     }
-    const option = new Option(cmdString, optionDefinition.description + additionalDescription)
-      .default(optionDefinition.default)
-      .hideHelp(optionDefinition.hide ?? false);
+    // Passing default to `commander` (`.default(optionDefinition.default)`), will set at options passed to initial generator, so it's used in entire generation process.
+    // We want default value to be set on jhipster options parsing so ignore default at commander.
+    let defaultDescription = '';
+    if (optionDefinition.default !== undefined && (!Array.isArray(optionDefinition.default) || optionDefinition.default.length !== 0)) {
+      defaultDescription = ` (default: ${optionDefinition.default})`;
+    }
+    const option = new Option(cmdString, optionDefinition.description + defaultDescription + additionalDescription).hideHelp(
+      optionDefinition.hide ?? false,
+    );
     if (optionDefinition.env) {
       option.env(optionDefinition.env);
     }
diff --git a/cli/program.mjs b/cli/program.mjs
index 12501defbfee..8083c0fd8867 100644
--- a/cli/program.mjs
+++ b/cli/program.mjs
@@ -98,6 +98,7 @@ const addCommandGeneratorOptions = async (command, generatorMeta, { root, bluepr
   const generatorModule = await generatorMeta.importModule();
   if (generatorModule.command) {
     command.addJHipsterOptions(generatorModule.command.options, blueprintOptionDescription);
+    command.addJHipsterConfigs(generatorModule.command.configs, blueprintOptionDescription);
   }
   try {
     if (root || !generatorModule.command || generatorModule.command.loadGeneratorOptions) {
@@ -152,6 +153,7 @@ export const createProgram = ({ executableName = CLI_NAME, executableVersion } =
       .option('--skip-regenerate', "Don't regenerate identical files", false)
       .option('--skip-yo-resolve', 'Ignore .yo-resolve files', false)
       .addJHipsterOptions(command.options)
+      .addJHipsterConfigs(command.configs)
   );
 };
 
@@ -243,7 +245,7 @@ export const buildCommands = async ({
           const boostrapGen = ['bootstrap', generator];
           const allDependencies = await buildAllDependencies(boostrapGen, {
             env,
-            blueprintNamespaces: blueprint ? [] : envBuilder.getBlueprintsNamespaces(),
+            blueprintNamespaces: envBuilder.getBlueprintsNamespaces(),
           });
           for (const [metaName, { meta: generatorMeta, blueprintNamespace }] of Object.entries(allDependencies)) {
             if (blueprintNamespace) {
diff --git a/generators/angular/__snapshots__/generator.spec.mts.snap b/generators/angular/__snapshots__/generator.spec.mts.snap
index 433c6e69828e..1cb70467df4b 100644
--- a/generators/angular/__snapshots__/generator.spec.mts.snap
+++ b/generators/angular/__snapshots__/generator.spec.mts.snap
@@ -1,13 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`generator - angular gateway-jwt-skipUserManagement(true)-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-src/-websocket(true) should match generated files snapshot 1`] = `
+exports[`generator - angular gateway-jwt-skipUserManagement(true)-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-clientRoot/-websocket(true) should match generated files snapshot 1`] = `
 {
-  ".eslintignore": {
-    "stateCleared": "modified",
-  },
-  ".eslintrc.json": {
-    "stateCleared": "modified",
-  },
   ".jhipster/EntityWithCustomId.json": {
     "stateCleared": "modified",
   },
@@ -23,668 +17,668 @@ exports[`generator - angular gateway-jwt-skipUserManagement(true)-withAdminUi(fa
   ".yo-rc.json": {
     "stateCleared": "modified",
   },
-  "angular.json": {
+  "clientRoot/.eslintignore": {
     "stateCleared": "modified",
   },
-  "jest.conf.js": {
+  "clientRoot/.eslintrc.json": {
     "stateCleared": "modified",
   },
-  "ngsw-config.json": {
+  "clientRoot/angular.json": {
     "stateCleared": "modified",
   },
-  "package.json": {
+  "clientRoot/jest.conf.js": {
     "stateCleared": "modified",
   },
-  "src/404.html": {
+  "clientRoot/ngsw-config.json": {
     "stateCleared": "modified",
   },
-  "src/WEB-INF/web.xml": {
+  "clientRoot/package.json": {
     "stateCleared": "modified",
   },
-  "src/app/admin/admin-routing.module.ts": {
+  "clientRoot/src/main/webapp/404.html": {
     "stateCleared": "modified",
   },
-  "src/app/admin/docs/docs.component.html": {
+  "clientRoot/src/main/webapp/WEB-INF/web.xml": {
     "stateCleared": "modified",
   },
-  "src/app/admin/docs/docs.component.scss": {
+  "clientRoot/src/main/webapp/app/admin/admin-routing.module.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/docs/docs.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/docs/docs.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/admin/gateway/gateway-route.model.ts": {
+  "clientRoot/src/main/webapp/app/admin/docs/docs.component.scss": {
     "stateCleared": "modified",
   },
-  "src/app/admin/gateway/gateway-routes.service.ts": {
+  "clientRoot/src/main/webapp/app/admin/docs/docs.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/gateway/gateway.component.html": {
+  "clientRoot/src/main/webapp/app/admin/gateway/gateway-route.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/gateway/gateway.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/gateway/gateway-routes.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/app-page-title-strategy.ts": {
+  "clientRoot/src/main/webapp/app/admin/gateway/gateway.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/app-routing.module.ts": {
+  "clientRoot/src/main/webapp/app/admin/gateway/gateway.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/app.constants.ts": {
+  "clientRoot/src/main/webapp/app/app-page-title-strategy.ts": {
     "stateCleared": "modified",
   },
-  "src/app/app.module.ts": {
+  "clientRoot/src/main/webapp/app/app-routing.module.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/authority.constants.ts": {
+  "clientRoot/src/main/webapp/app/app.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/datepicker-adapter.ts": {
+  "clientRoot/src/main/webapp/app/app.module.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/dayjs.ts": {
+  "clientRoot/src/main/webapp/app/config/authority.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/error.constants.ts": {
+  "clientRoot/src/main/webapp/app/config/datepicker-adapter.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/font-awesome-icons.ts": {
+  "clientRoot/src/main/webapp/app/config/dayjs.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/input.constants.ts": {
+  "clientRoot/src/main/webapp/app/config/error.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/navigation.constants.ts": {
+  "clientRoot/src/main/webapp/app/config/font-awesome-icons.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/pagination.constants.ts": {
+  "clientRoot/src/main/webapp/app/config/input.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/uib-pagination.config.ts": {
+  "clientRoot/src/main/webapp/app/config/navigation.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/auth/account.model.ts": {
+  "clientRoot/src/main/webapp/app/config/pagination.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/auth/account.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/config/uib-pagination.config.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/auth/account.service.ts": {
+  "clientRoot/src/main/webapp/app/core/auth/account.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/auth/auth-jwt.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/auth/account.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/auth/auth-jwt.service.ts": {
+  "clientRoot/src/main/webapp/app/core/auth/account.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/auth/state-storage.service.ts": {
+  "clientRoot/src/main/webapp/app/core/auth/auth-jwt.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/auth/user-route-access.service.ts": {
+  "clientRoot/src/main/webapp/app/core/auth/auth-jwt.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/config/application-config.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/auth/state-storage.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/config/application-config.service.ts": {
+  "clientRoot/src/main/webapp/app/core/auth/user-route-access.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/interceptor/auth-expired.interceptor.ts": {
+  "clientRoot/src/main/webapp/app/core/config/application-config.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/interceptor/auth.interceptor.ts": {
+  "clientRoot/src/main/webapp/app/core/config/application-config.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/interceptor/error-handler.interceptor.ts": {
+  "clientRoot/src/main/webapp/app/core/interceptor/auth-expired.interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/interceptor/index.ts": {
+  "clientRoot/src/main/webapp/app/core/interceptor/auth.interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/interceptor/notification.interceptor.ts": {
+  "clientRoot/src/main/webapp/app/core/interceptor/error-handler.interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/request/request-util.ts": {
+  "clientRoot/src/main/webapp/app/core/interceptor/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/request/request.model.ts": {
+  "clientRoot/src/main/webapp/app/core/interceptor/notification.interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/alert.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/request/request-util.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/alert.service.ts": {
+  "clientRoot/src/main/webapp/app/core/request/request.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/data-util.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/util/alert.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/data-util.service.ts": {
+  "clientRoot/src/main/webapp/app/core/util/alert.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/event-manager.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/util/data-util.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/event-manager.service.ts": {
+  "clientRoot/src/main/webapp/app/core/util/data-util.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/operators.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/util/event-manager.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/operators.ts": {
+  "clientRoot/src/main/webapp/app/core/util/event-manager.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/parse-links.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/util/operators.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/parse-links.service.ts": {
+  "clientRoot/src/main/webapp/app/core/util/operators.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-navbar-items.ts": {
+  "clientRoot/src/main/webapp/app/core/util/parse-links.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-routing.module.ts": {
+  "clientRoot/src/main/webapp/app/core/util/parse-links.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.html": {
+  "clientRoot/src/main/webapp/app/entities/entity-navbar-items.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-routing.module.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.html": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.model.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.routes.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.test-samples.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.html": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.routes.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.test-samples.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/route/entity-with-custom-id-routing-resolve.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/route/entity-with-custom-id-routing-resolve.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/service/entity-with-custom-id.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/route/entity-with-custom-id-routing-resolve.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/service/entity-with-custom-id.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/route/entity-with-custom-id-routing-resolve.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/update/entity-with-custom-id-form.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/service/entity-with-custom-id.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/update/entity-with-custom-id-form.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/service/entity-with-custom-id.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.html": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/update/entity-with-custom-id-form.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/update/entity-with-custom-id-form.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/delete/microservice-delete-dialog.component.html": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/delete/microservice-delete-dialog.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/delete/microservice-delete-dialog.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/delete/microservice-delete-dialog.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/detail/microservice-detail.component.html": {
+  "clientRoot/src/main/webapp/app/entities/microservice/delete/microservice-delete-dialog.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/detail/microservice-detail.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/delete/microservice-delete-dialog.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/detail/microservice-detail.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/detail/microservice-detail.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/list/microservice.component.html": {
+  "clientRoot/src/main/webapp/app/entities/microservice/detail/microservice-detail.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/list/microservice.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/detail/microservice-detail.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/list/microservice.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/list/microservice.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.model.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/list/microservice.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.routes.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/list/microservice.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.test-samples.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/route/microservice-routing-resolve.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.routes.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/route/microservice-routing-resolve.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.test-samples.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/service/microservice.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/route/microservice-routing-resolve.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/service/microservice.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/route/microservice-routing-resolve.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/update/microservice-form.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/service/microservice.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/update/microservice-form.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/service/microservice.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/update/microservice-update.component.html": {
+  "clientRoot/src/main/webapp/app/entities/microservice/update/microservice-form.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/update/microservice-update.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/update/microservice-form.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/update/microservice-update.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/update/microservice-update.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/delete/simple-delete-dialog.component.html": {
+  "clientRoot/src/main/webapp/app/entities/microservice/update/microservice-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/delete/simple-delete-dialog.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/update/microservice-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/delete/simple-delete-dialog.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/delete/simple-delete-dialog.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/detail/simple-detail.component.html": {
+  "clientRoot/src/main/webapp/app/entities/simple/delete/simple-delete-dialog.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/detail/simple-detail.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/delete/simple-delete-dialog.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/detail/simple-detail.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/detail/simple-detail.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/list/simple.component.html": {
+  "clientRoot/src/main/webapp/app/entities/simple/detail/simple-detail.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/list/simple.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/detail/simple-detail.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/list/simple.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/list/simple.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/route/simple-routing-resolve.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/list/simple.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/route/simple-routing-resolve.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/list/simple.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/service/simple.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/route/simple-routing-resolve.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/service/simple.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/route/simple-routing-resolve.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.model.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/service/simple.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.routes.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/service/simple.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.test-samples.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/update/simple-form.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.routes.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/update/simple-form.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.test-samples.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/update/simple-update.component.html": {
+  "clientRoot/src/main/webapp/app/entities/simple/update/simple-form.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/update/simple-update.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/update/simple-form.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/update/simple-update.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/update/simple-update.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/home/home.component.html": {
+  "clientRoot/src/main/webapp/app/entities/simple/update/simple-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/home/home.component.scss": {
+  "clientRoot/src/main/webapp/app/entities/simple/update/simple-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/home/home.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/home/home.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/home/home.component.ts": {
+  "clientRoot/src/main/webapp/app/home/home.component.scss": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/error/error.component.html": {
+  "clientRoot/src/main/webapp/app/home/home.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/error/error.component.ts": {
+  "clientRoot/src/main/webapp/app/home/home.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/error/error.route.ts": {
+  "clientRoot/src/main/webapp/app/layouts/error/error.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/footer/footer.component.html": {
+  "clientRoot/src/main/webapp/app/layouts/error/error.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/footer/footer.component.ts": {
+  "clientRoot/src/main/webapp/app/layouts/error/error.route.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/main/main.component.html": {
+  "clientRoot/src/main/webapp/app/layouts/footer/footer.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/main/main.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/layouts/footer/footer.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/main/main.component.ts": {
+  "clientRoot/src/main/webapp/app/layouts/main/main.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/main/main.module.ts": {
+  "clientRoot/src/main/webapp/app/layouts/main/main.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/navbar/navbar-item.model.d.ts": {
+  "clientRoot/src/main/webapp/app/layouts/main/main.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/navbar/navbar.component.html": {
+  "clientRoot/src/main/webapp/app/layouts/main/main.module.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/navbar/navbar.component.scss": {
+  "clientRoot/src/main/webapp/app/layouts/navbar/navbar-item.model.d.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/navbar/navbar.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/layouts/navbar/navbar.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/navbar/navbar.component.ts": {
+  "clientRoot/src/main/webapp/app/layouts/navbar/navbar.component.scss": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/profiles/page-ribbon.component.scss": {
+  "clientRoot/src/main/webapp/app/layouts/navbar/navbar.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/profiles/page-ribbon.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/layouts/navbar/navbar.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/profiles/page-ribbon.component.ts": {
+  "clientRoot/src/main/webapp/app/layouts/profiles/page-ribbon.component.scss": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/profiles/profile-info.model.ts": {
+  "clientRoot/src/main/webapp/app/layouts/profiles/page-ribbon.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/profiles/profile.service.ts": {
+  "clientRoot/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/login/login.component.html": {
+  "clientRoot/src/main/webapp/app/layouts/profiles/profile-info.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/login/login.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/layouts/profiles/profile.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/login/login.component.ts": {
+  "clientRoot/src/main/webapp/app/login/login.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/login/login.model.ts": {
+  "clientRoot/src/main/webapp/app/login/login.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/login/login.service.ts": {
+  "clientRoot/src/main/webapp/app/login/login.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert-error.component.html": {
+  "clientRoot/src/main/webapp/app/login/login.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert-error.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/login/login.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert-error.component.ts": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert-error.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert-error.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert-error.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert.component.html": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert-error.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert-error.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert.component.ts": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/shared/auth/has-any-authority.directive.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/auth/has-any-authority.directive.ts": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/date/duration.pipe.ts": {
+  "clientRoot/src/main/webapp/app/shared/auth/has-any-authority.directive.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/date/format-medium-date.pipe.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/auth/has-any-authority.directive.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/date/format-medium-date.pipe.ts": {
+  "clientRoot/src/main/webapp/app/shared/date/duration.pipe.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/date/format-medium-datetime.pipe.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/date/format-medium-date.pipe.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/date/format-medium-datetime.pipe.ts": {
+  "clientRoot/src/main/webapp/app/shared/date/format-medium-date.pipe.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/date/index.ts": {
+  "clientRoot/src/main/webapp/app/shared/date/format-medium-datetime.pipe.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/filter/filter.component.html": {
+  "clientRoot/src/main/webapp/app/shared/date/format-medium-datetime.pipe.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/filter/filter.component.ts": {
+  "clientRoot/src/main/webapp/app/shared/date/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/filter/filter.model.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/filter/filter.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/shared/filter/filter.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/filter/filter.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/filter/index.ts": {
+  "clientRoot/src/main/webapp/app/shared/filter/filter.model.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/pagination/index.ts": {
+  "clientRoot/src/main/webapp/app/shared/filter/filter.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/pagination/item-count.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/filter/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/pagination/item-count.component.ts": {
+  "clientRoot/src/main/webapp/app/shared/pagination/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/shared.module.ts": {
+  "clientRoot/src/main/webapp/app/shared/pagination/item-count.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/index.ts": {
+  "clientRoot/src/main/webapp/app/shared/pagination/item-count.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/sort-by.directive.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/shared.module.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/sort-by.directive.ts": {
+  "clientRoot/src/main/webapp/app/shared/sort/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/sort.directive.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/sort/sort-by.directive.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/sort.directive.ts": {
+  "clientRoot/src/main/webapp/app/shared/sort/sort-by.directive.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/sort.service.ts": {
+  "clientRoot/src/main/webapp/app/shared/sort/sort.directive.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/bootstrap.ts": {
+  "clientRoot/src/main/webapp/app/shared/sort/sort.directive.ts": {
     "stateCleared": "modified",
   },
-  "src/content/css/loading.css": {
+  "clientRoot/src/main/webapp/app/shared/sort/sort.service.ts": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0.svg": {
+  "clientRoot/src/main/webapp/bootstrap.ts": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-192.png": {
+  "clientRoot/src/main/webapp/content/css/loading.css": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/logo-jhipster.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/scss/_bootstrap-variables.scss": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/scss/global.scss": {
+  "clientRoot/src/main/webapp/content/images/logo-jhipster.png": {
     "stateCleared": "modified",
   },
-  "src/content/scss/vendor.scss": {
+  "clientRoot/src/main/webapp/content/scss/_bootstrap-variables.scss": {
     "stateCleared": "modified",
   },
-  "src/declarations.d.ts": {
+  "clientRoot/src/main/webapp/content/scss/global.scss": {
     "stateCleared": "modified",
   },
-  "src/favicon.ico": {
+  "clientRoot/src/main/webapp/content/scss/vendor.scss": {
     "stateCleared": "modified",
   },
-  "src/index.html": {
+  "clientRoot/src/main/webapp/declarations.d.ts": {
     "stateCleared": "modified",
   },
-  "src/main.ts": {
+  "clientRoot/src/main/webapp/favicon.ico": {
     "stateCleared": "modified",
   },
-  "src/manifest.webapp": {
+  "clientRoot/src/main/webapp/index.html": {
     "stateCleared": "modified",
   },
-  "src/robots.txt": {
+  "clientRoot/src/main/webapp/main.ts": {
     "stateCleared": "modified",
   },
-  "src/swagger-ui/dist/images/throbber.gif": {
+  "clientRoot/src/main/webapp/manifest.webapp": {
     "stateCleared": "modified",
   },
-  "src/swagger-ui/index.html": {
+  "clientRoot/src/main/webapp/robots.txt": {
     "stateCleared": "modified",
   },
-  "tsconfig.app.json": {
+  "clientRoot/src/main/webapp/swagger-ui/dist/images/throbber.gif": {
     "stateCleared": "modified",
   },
-  "tsconfig.json": {
+  "clientRoot/src/main/webapp/swagger-ui/index.html": {
     "stateCleared": "modified",
   },
-  "tsconfig.spec.json": {
+  "clientRoot/tsconfig.app.json": {
     "stateCleared": "modified",
   },
-  "webpack/environment.js": {
+  "clientRoot/tsconfig.json": {
     "stateCleared": "modified",
   },
-  "webpack/logo-jhipster.png": {
+  "clientRoot/tsconfig.spec.json": {
     "stateCleared": "modified",
   },
-  "webpack/proxy.conf.js": {
+  "clientRoot/webpack/environment.js": {
     "stateCleared": "modified",
   },
-  "webpack/webpack.custom.js": {
+  "clientRoot/webpack/logo-jhipster.png": {
     "stateCleared": "modified",
   },
-}
-`;
-
-exports[`generator - angular gateway-oauth2-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)-src/-websocket(true) should match generated files snapshot 1`] = `
-{
-  ".eslintignore": {
+  "clientRoot/webpack/proxy.conf.js": {
     "stateCleared": "modified",
   },
-  ".eslintrc.json": {
+  "clientRoot/webpack/webpack.custom.js": {
     "stateCleared": "modified",
   },
+}
+`;
+
+exports[`generator - angular gateway-oauth2-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)-clientRoot/-websocket(true) should match generated files snapshot 1`] = `
+{
   ".jhipster/EntityWithCustomId.json": {
     "stateCleared": "modified",
   },
@@ -700,821 +694,824 @@ exports[`generator - angular gateway-oauth2-withAdminUi(true)-skipJhipsterDepend
   ".yo-rc.json": {
     "stateCleared": "modified",
   },
-  "angular.json": {
+  "clientRoot/.eslintignore": {
     "stateCleared": "modified",
   },
-  "jest.conf.js": {
+  "clientRoot/.eslintrc.json": {
     "stateCleared": "modified",
   },
-  "ngsw-config.json": {
+  "clientRoot/angular.json": {
     "stateCleared": "modified",
   },
-  "package.json": {
+  "clientRoot/jest.conf.js": {
     "stateCleared": "modified",
   },
-  "src/404.html": {
+  "clientRoot/ngsw-config.json": {
     "stateCleared": "modified",
   },
-  "src/WEB-INF/web.xml": {
+  "clientRoot/package.json": {
     "stateCleared": "modified",
   },
-  "src/app/admin/admin-routing.module.ts": {
+  "clientRoot/src/main/webapp/404.html": {
     "stateCleared": "modified",
   },
-  "src/app/admin/configuration/configuration.component.html": {
+  "clientRoot/src/main/webapp/WEB-INF/web.xml": {
     "stateCleared": "modified",
   },
-  "src/app/admin/configuration/configuration.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/admin/admin-routing.module.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/configuration/configuration.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/configuration/configuration.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/admin/configuration/configuration.model.ts": {
+  "clientRoot/src/main/webapp/app/admin/configuration/configuration.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/configuration/configuration.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/admin/configuration/configuration.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/configuration/configuration.service.ts": {
+  "clientRoot/src/main/webapp/app/admin/configuration/configuration.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/docs/docs.component.html": {
+  "clientRoot/src/main/webapp/app/admin/configuration/configuration.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/docs/docs.component.scss": {
+  "clientRoot/src/main/webapp/app/admin/configuration/configuration.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/docs/docs.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/docs/docs.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/admin/gateway/gateway-route.model.ts": {
+  "clientRoot/src/main/webapp/app/admin/docs/docs.component.scss": {
     "stateCleared": "modified",
   },
-  "src/app/admin/gateway/gateway-routes.service.ts": {
+  "clientRoot/src/main/webapp/app/admin/docs/docs.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/gateway/gateway.component.html": {
+  "clientRoot/src/main/webapp/app/admin/gateway/gateway-route.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/gateway/gateway.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/gateway/gateway-routes.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/health/health.component.html": {
+  "clientRoot/src/main/webapp/app/admin/gateway/gateway.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/admin/health/health.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/admin/gateway/gateway.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/health/health.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/health/health.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/admin/health/health.model.ts": {
+  "clientRoot/src/main/webapp/app/admin/health/health.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/health/health.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/admin/health/health.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/health/health.service.ts": {
+  "clientRoot/src/main/webapp/app/admin/health/health.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/health/modal/health-modal.component.html": {
+  "clientRoot/src/main/webapp/app/admin/health/health.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/health/modal/health-modal.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/admin/health/health.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/health/modal/health-modal.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/health/modal/health-modal.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/admin/logs/log.model.ts": {
+  "clientRoot/src/main/webapp/app/admin/health/modal/health-modal.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/logs/logs.component.html": {
+  "clientRoot/src/main/webapp/app/admin/health/modal/health-modal.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/logs/logs.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/admin/logs/log.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/logs/logs.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/logs/logs.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/admin/logs/logs.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/admin/logs/logs.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/logs/logs.service.ts": {
+  "clientRoot/src/main/webapp/app/admin/logs/logs.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html": {
+  "clientRoot/src/main/webapp/app/admin/logs/logs.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/logs/logs.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.html": {
+  "clientRoot/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html": {
+  "clientRoot/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html": {
+  "clientRoot/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html": {
+  "clientRoot/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html": {
+  "clientRoot/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html": {
+  "clientRoot/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/blocks/metrics-request/metrics-request.component.html": {
+  "clientRoot/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/blocks/metrics-request/metrics-request.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/blocks/metrics-system/metrics-system.component.html": {
+  "clientRoot/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/blocks/metrics-system/metrics-system.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/metrics.component.html": {
+  "clientRoot/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/metrics.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/metrics.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/metrics.model.ts": {
+  "clientRoot/src/main/webapp/app/admin/metrics/metrics.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/metrics.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/admin/metrics/metrics.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/metrics.service.ts": {
+  "clientRoot/src/main/webapp/app/admin/metrics/metrics.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/app-page-title-strategy.ts": {
+  "clientRoot/src/main/webapp/app/admin/metrics/metrics.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/app-routing.module.ts": {
+  "clientRoot/src/main/webapp/app/admin/metrics/metrics.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/app.constants.ts": {
+  "clientRoot/src/main/webapp/app/admin/metrics/metrics.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/app.module.ts": {
+  "clientRoot/src/main/webapp/app/app-page-title-strategy.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/authority.constants.ts": {
+  "clientRoot/src/main/webapp/app/app-routing.module.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/datepicker-adapter.ts": {
+  "clientRoot/src/main/webapp/app/app.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/dayjs.ts": {
+  "clientRoot/src/main/webapp/app/app.module.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/error.constants.ts": {
+  "clientRoot/src/main/webapp/app/config/authority.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/font-awesome-icons.ts": {
+  "clientRoot/src/main/webapp/app/config/datepicker-adapter.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/input.constants.ts": {
+  "clientRoot/src/main/webapp/app/config/dayjs.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/language.constants.ts": {
+  "clientRoot/src/main/webapp/app/config/error.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/navigation.constants.ts": {
+  "clientRoot/src/main/webapp/app/config/font-awesome-icons.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/pagination.constants.ts": {
+  "clientRoot/src/main/webapp/app/config/input.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/translation.config.ts": {
+  "clientRoot/src/main/webapp/app/config/language.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/uib-pagination.config.ts": {
+  "clientRoot/src/main/webapp/app/config/navigation.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/auth/account.model.ts": {
+  "clientRoot/src/main/webapp/app/config/pagination.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/auth/account.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/config/translation.config.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/auth/account.service.ts": {
+  "clientRoot/src/main/webapp/app/config/uib-pagination.config.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/auth/auth-session.service.ts": {
+  "clientRoot/src/main/webapp/app/core/auth/account.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/auth/state-storage.service.ts": {
+  "clientRoot/src/main/webapp/app/core/auth/account.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/auth/user-route-access.service.ts": {
+  "clientRoot/src/main/webapp/app/core/auth/account.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/config/application-config.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/auth/auth-session.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/config/application-config.service.ts": {
+  "clientRoot/src/main/webapp/app/core/auth/state-storage.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/interceptor/auth-expired.interceptor.ts": {
+  "clientRoot/src/main/webapp/app/core/auth/user-route-access.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/interceptor/error-handler.interceptor.ts": {
+  "clientRoot/src/main/webapp/app/core/config/application-config.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/interceptor/index.ts": {
+  "clientRoot/src/main/webapp/app/core/config/application-config.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/interceptor/notification.interceptor.ts": {
+  "clientRoot/src/main/webapp/app/core/interceptor/auth-expired.interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/request/request-util.ts": {
+  "clientRoot/src/main/webapp/app/core/interceptor/error-handler.interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/request/request.model.ts": {
+  "clientRoot/src/main/webapp/app/core/interceptor/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/alert.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/interceptor/notification.interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/alert.service.ts": {
+  "clientRoot/src/main/webapp/app/core/request/request-util.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/data-util.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/request/request.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/data-util.service.ts": {
+  "clientRoot/src/main/webapp/app/core/util/alert.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/event-manager.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/util/alert.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/event-manager.service.ts": {
+  "clientRoot/src/main/webapp/app/core/util/data-util.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/operators.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/util/data-util.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/operators.ts": {
+  "clientRoot/src/main/webapp/app/core/util/event-manager.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/parse-links.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/util/event-manager.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/parse-links.service.ts": {
+  "clientRoot/src/main/webapp/app/core/util/operators.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-navbar-items.ts": {
+  "clientRoot/src/main/webapp/app/core/util/operators.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-routing.module.ts": {
+  "clientRoot/src/main/webapp/app/core/util/parse-links.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.html": {
+  "clientRoot/src/main/webapp/app/core/util/parse-links.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-navbar-items.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-routing.module.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.html": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.model.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.routes.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.test-samples.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.html": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.routes.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.test-samples.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/route/entity-with-custom-id-routing-resolve.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/route/entity-with-custom-id-routing-resolve.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/service/entity-with-custom-id.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/service/entity-with-custom-id.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/route/entity-with-custom-id-routing-resolve.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/update/entity-with-custom-id-form.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/route/entity-with-custom-id-routing-resolve.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/update/entity-with-custom-id-form.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/service/entity-with-custom-id.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.html": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/service/entity-with-custom-id.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/update/entity-with-custom-id-form.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/update/entity-with-custom-id-form.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/delete/microservice-delete-dialog.component.html": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/delete/microservice-delete-dialog.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/delete/microservice-delete-dialog.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/detail/microservice-detail.component.html": {
+  "clientRoot/src/main/webapp/app/entities/microservice/delete/microservice-delete-dialog.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/detail/microservice-detail.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/delete/microservice-delete-dialog.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/detail/microservice-detail.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/delete/microservice-delete-dialog.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/list/microservice.component.html": {
+  "clientRoot/src/main/webapp/app/entities/microservice/detail/microservice-detail.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/list/microservice.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/detail/microservice-detail.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/list/microservice.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/detail/microservice-detail.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.model.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/list/microservice.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.routes.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/list/microservice.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.test-samples.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/list/microservice.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/route/microservice-routing-resolve.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/route/microservice-routing-resolve.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.routes.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/service/microservice.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.test-samples.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/service/microservice.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/route/microservice-routing-resolve.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/update/microservice-form.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/route/microservice-routing-resolve.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/update/microservice-form.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/service/microservice.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/update/microservice-update.component.html": {
+  "clientRoot/src/main/webapp/app/entities/microservice/service/microservice.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/update/microservice-update.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/update/microservice-form.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/update/microservice-update.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/update/microservice-form.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/delete/simple-delete-dialog.component.html": {
+  "clientRoot/src/main/webapp/app/entities/microservice/update/microservice-update.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/delete/simple-delete-dialog.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/update/microservice-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/delete/simple-delete-dialog.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/update/microservice-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/detail/simple-detail.component.html": {
+  "clientRoot/src/main/webapp/app/entities/simple/delete/simple-delete-dialog.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/detail/simple-detail.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/delete/simple-delete-dialog.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/detail/simple-detail.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/delete/simple-delete-dialog.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/list/simple.component.html": {
+  "clientRoot/src/main/webapp/app/entities/simple/detail/simple-detail.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/list/simple.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/detail/simple-detail.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/list/simple.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/detail/simple-detail.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/route/simple-routing-resolve.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/list/simple.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/route/simple-routing-resolve.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/list/simple.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/service/simple.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/list/simple.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/service/simple.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/route/simple-routing-resolve.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.model.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/route/simple-routing-resolve.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.routes.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/service/simple.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.test-samples.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/service/simple.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/update/simple-form.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/update/simple-form.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.routes.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/update/simple-update.component.html": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.test-samples.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/update/simple-update.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/update/simple-form.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/update/simple-update.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/update/simple-form.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/user/user.model.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/update/simple-update.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/user/user.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/update/simple-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/user/user.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/update/simple-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/home/home.component.html": {
+  "clientRoot/src/main/webapp/app/entities/user/user.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/home/home.component.scss": {
+  "clientRoot/src/main/webapp/app/entities/user/user.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/home/home.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/user/user.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/home/home.component.ts": {
+  "clientRoot/src/main/webapp/app/home/home.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/error/error.component.html": {
+  "clientRoot/src/main/webapp/app/home/home.component.scss": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/error/error.component.ts": {
+  "clientRoot/src/main/webapp/app/home/home.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/error/error.route.ts": {
+  "clientRoot/src/main/webapp/app/home/home.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/footer/footer.component.html": {
+  "clientRoot/src/main/webapp/app/layouts/error/error.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/footer/footer.component.ts": {
+  "clientRoot/src/main/webapp/app/layouts/error/error.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/main/main.component.html": {
+  "clientRoot/src/main/webapp/app/layouts/error/error.route.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/main/main.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/layouts/footer/footer.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/main/main.component.ts": {
+  "clientRoot/src/main/webapp/app/layouts/footer/footer.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/main/main.module.ts": {
+  "clientRoot/src/main/webapp/app/layouts/main/main.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/navbar/active-menu.directive.ts": {
+  "clientRoot/src/main/webapp/app/layouts/main/main.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/navbar/navbar-item.model.d.ts": {
+  "clientRoot/src/main/webapp/app/layouts/main/main.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/navbar/navbar.component.html": {
+  "clientRoot/src/main/webapp/app/layouts/main/main.module.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/navbar/navbar.component.scss": {
+  "clientRoot/src/main/webapp/app/layouts/navbar/active-menu.directive.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/navbar/navbar.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/layouts/navbar/navbar-item.model.d.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/navbar/navbar.component.ts": {
+  "clientRoot/src/main/webapp/app/layouts/navbar/navbar.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/profiles/page-ribbon.component.scss": {
+  "clientRoot/src/main/webapp/app/layouts/navbar/navbar.component.scss": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/profiles/page-ribbon.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/layouts/navbar/navbar.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/profiles/page-ribbon.component.ts": {
+  "clientRoot/src/main/webapp/app/layouts/navbar/navbar.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/profiles/profile-info.model.ts": {
+  "clientRoot/src/main/webapp/app/layouts/profiles/page-ribbon.component.scss": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/profiles/profile.service.ts": {
+  "clientRoot/src/main/webapp/app/layouts/profiles/page-ribbon.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/login/login.service.ts": {
+  "clientRoot/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/login/logout.model.ts": {
+  "clientRoot/src/main/webapp/app/layouts/profiles/profile-info.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert-error.component.html": {
+  "clientRoot/src/main/webapp/app/layouts/profiles/profile.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert-error.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/login/login.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert-error.component.ts": {
+  "clientRoot/src/main/webapp/app/login/logout.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert-error.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert-error.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert.component.html": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert-error.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert-error.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert.component.ts": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert-error.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/auth/has-any-authority.directive.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/shared/auth/has-any-authority.directive.ts": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/date/duration.pipe.ts": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/date/format-medium-date.pipe.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/auth/has-any-authority.directive.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/date/format-medium-date.pipe.ts": {
+  "clientRoot/src/main/webapp/app/shared/auth/has-any-authority.directive.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/date/format-medium-datetime.pipe.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/date/duration.pipe.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/date/format-medium-datetime.pipe.ts": {
+  "clientRoot/src/main/webapp/app/shared/date/format-medium-date.pipe.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/date/index.ts": {
+  "clientRoot/src/main/webapp/app/shared/date/format-medium-date.pipe.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/filter/filter.component.html": {
+  "clientRoot/src/main/webapp/app/shared/date/format-medium-datetime.pipe.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/filter/filter.component.ts": {
+  "clientRoot/src/main/webapp/app/shared/date/format-medium-datetime.pipe.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/filter/filter.model.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/date/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/filter/filter.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/filter/filter.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/shared/filter/index.ts": {
+  "clientRoot/src/main/webapp/app/shared/filter/filter.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/language/find-language-from-key.pipe.ts": {
+  "clientRoot/src/main/webapp/app/shared/filter/filter.model.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/language/index.ts": {
+  "clientRoot/src/main/webapp/app/shared/filter/filter.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/language/translate.directive.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/filter/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/language/translate.directive.ts": {
+  "clientRoot/src/main/webapp/app/shared/language/find-language-from-key.pipe.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/language/translation.module.ts": {
+  "clientRoot/src/main/webapp/app/shared/language/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/pagination/index.ts": {
+  "clientRoot/src/main/webapp/app/shared/language/translate.directive.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/pagination/item-count.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/language/translate.directive.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/pagination/item-count.component.ts": {
+  "clientRoot/src/main/webapp/app/shared/language/translation.module.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/shared.module.ts": {
+  "clientRoot/src/main/webapp/app/shared/pagination/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/index.ts": {
+  "clientRoot/src/main/webapp/app/shared/pagination/item-count.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/sort-by.directive.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/pagination/item-count.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/sort-by.directive.ts": {
+  "clientRoot/src/main/webapp/app/shared/shared.module.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/sort.directive.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/sort/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/sort.directive.ts": {
+  "clientRoot/src/main/webapp/app/shared/sort/sort-by.directive.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/sort.service.ts": {
+  "clientRoot/src/main/webapp/app/shared/sort/sort-by.directive.ts": {
     "stateCleared": "modified",
   },
-  "src/bootstrap.ts": {
+  "clientRoot/src/main/webapp/app/shared/sort/sort.directive.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/content/css/loading.css": {
+  "clientRoot/src/main/webapp/app/shared/sort/sort.directive.ts": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0.svg": {
+  "clientRoot/src/main/webapp/app/shared/sort/sort.service.ts": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-192.png": {
+  "clientRoot/src/main/webapp/bootstrap.ts": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-256.png": {
+  "clientRoot/src/main/webapp/content/css/loading.css": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/logo-jhipster.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/scss/_bootstrap-variables.scss": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/scss/global.scss": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/scss/vendor.scss": {
+  "clientRoot/src/main/webapp/content/images/logo-jhipster.png": {
     "stateCleared": "modified",
   },
-  "src/declarations.d.ts": {
+  "clientRoot/src/main/webapp/content/scss/_bootstrap-variables.scss": {
     "stateCleared": "modified",
   },
-  "src/favicon.ico": {
+  "clientRoot/src/main/webapp/content/scss/global.scss": {
     "stateCleared": "modified",
   },
-  "src/index.html": {
+  "clientRoot/src/main/webapp/content/scss/vendor.scss": {
     "stateCleared": "modified",
   },
-  "src/main.ts": {
+  "clientRoot/src/main/webapp/declarations.d.ts": {
     "stateCleared": "modified",
   },
-  "src/manifest.webapp": {
+  "clientRoot/src/main/webapp/favicon.ico": {
     "stateCleared": "modified",
   },
-  "src/robots.txt": {
+  "clientRoot/src/main/webapp/index.html": {
     "stateCleared": "modified",
   },
-  "src/swagger-ui/dist/images/throbber.gif": {
+  "clientRoot/src/main/webapp/main.ts": {
     "stateCleared": "modified",
   },
-  "src/swagger-ui/index.html": {
+  "clientRoot/src/main/webapp/manifest.webapp": {
     "stateCleared": "modified",
   },
-  "tsconfig.app.json": {
+  "clientRoot/src/main/webapp/robots.txt": {
     "stateCleared": "modified",
   },
-  "tsconfig.json": {
+  "clientRoot/src/main/webapp/swagger-ui/dist/images/throbber.gif": {
     "stateCleared": "modified",
   },
-  "tsconfig.spec.json": {
+  "clientRoot/src/main/webapp/swagger-ui/index.html": {
     "stateCleared": "modified",
   },
-  "webpack/environment.js": {
+  "clientRoot/tsconfig.app.json": {
     "stateCleared": "modified",
   },
-  "webpack/logo-jhipster.png": {
+  "clientRoot/tsconfig.json": {
     "stateCleared": "modified",
   },
-  "webpack/proxy.conf.js": {
+  "clientRoot/tsconfig.spec.json": {
     "stateCleared": "modified",
   },
-  "webpack/webpack.custom.js": {
+  "clientRoot/webpack/environment.js": {
     "stateCleared": "modified",
   },
-}
-`;
-
-exports[`generator - angular microservice-jwt-skipUserManagement(false)-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-src/-websocket(false) should match generated files snapshot 1`] = `
-{
-  ".eslintignore": {
+  "clientRoot/webpack/logo-jhipster.png": {
     "stateCleared": "modified",
   },
-  ".eslintrc.json": {
+  "clientRoot/webpack/proxy.conf.js": {
     "stateCleared": "modified",
   },
+  "clientRoot/webpack/webpack.custom.js": {
+    "stateCleared": "modified",
+  },
+}
+`;
+
+exports[`generator - angular microservice-jwt-skipUserManagement(false)-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-clientRoot/-websocket(false) should match generated files snapshot 1`] = `
+{
   ".jhipster/EntityWithCustomId.json": {
     "stateCleared": "modified",
   },
@@ -1530,640 +1527,646 @@ exports[`generator - angular microservice-jwt-skipUserManagement(false)-withAdmi
   ".yo-rc.json": {
     "stateCleared": "modified",
   },
-  "angular.json": {
+  "clientRoot/.eslintignore": {
     "stateCleared": "modified",
   },
-  "jest.conf.js": {
+  "clientRoot/.eslintrc.json": {
     "stateCleared": "modified",
   },
-  "ngsw-config.json": {
+  "clientRoot/angular.json": {
     "stateCleared": "modified",
   },
-  "package.json": {
+  "clientRoot/jest.conf.js": {
     "stateCleared": "modified",
   },
-  "src/404.html": {
+  "clientRoot/ngsw-config.json": {
     "stateCleared": "modified",
   },
-  "src/WEB-INF/web.xml": {
+  "clientRoot/package.json": {
     "stateCleared": "modified",
   },
-  "src/app/app-page-title-strategy.ts": {
+  "clientRoot/src/main/webapp/404.html": {
     "stateCleared": "modified",
   },
-  "src/app/app-routing.module.ts": {
+  "clientRoot/src/main/webapp/WEB-INF/web.xml": {
     "stateCleared": "modified",
   },
-  "src/app/app.constants.ts": {
+  "clientRoot/src/main/webapp/app/app-page-title-strategy.ts": {
     "stateCleared": "modified",
   },
-  "src/app/app.module.ts": {
+  "clientRoot/src/main/webapp/app/app-routing.module.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/authority.constants.ts": {
+  "clientRoot/src/main/webapp/app/app.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/datepicker-adapter.ts": {
+  "clientRoot/src/main/webapp/app/app.module.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/dayjs.ts": {
+  "clientRoot/src/main/webapp/app/config/authority.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/error.constants.ts": {
+  "clientRoot/src/main/webapp/app/config/datepicker-adapter.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/font-awesome-icons.ts": {
+  "clientRoot/src/main/webapp/app/config/dayjs.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/input.constants.ts": {
+  "clientRoot/src/main/webapp/app/config/error.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/navigation.constants.ts": {
+  "clientRoot/src/main/webapp/app/config/font-awesome-icons.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/pagination.constants.ts": {
+  "clientRoot/src/main/webapp/app/config/input.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/uib-pagination.config.ts": {
+  "clientRoot/src/main/webapp/app/config/navigation.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/auth/account.model.ts": {
+  "clientRoot/src/main/webapp/app/config/pagination.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/auth/account.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/config/uib-pagination.config.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/auth/account.service.ts": {
+  "clientRoot/src/main/webapp/app/core/auth/account.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/auth/auth-jwt.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/auth/account.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/auth/auth-jwt.service.ts": {
+  "clientRoot/src/main/webapp/app/core/auth/account.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/auth/state-storage.service.ts": {
+  "clientRoot/src/main/webapp/app/core/auth/auth-jwt.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/auth/user-route-access.service.ts": {
+  "clientRoot/src/main/webapp/app/core/auth/auth-jwt.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/config/application-config.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/auth/state-storage.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/config/application-config.service.ts": {
+  "clientRoot/src/main/webapp/app/core/auth/user-route-access.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/interceptor/auth-expired.interceptor.ts": {
+  "clientRoot/src/main/webapp/app/core/config/application-config.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/interceptor/auth.interceptor.ts": {
+  "clientRoot/src/main/webapp/app/core/config/application-config.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/interceptor/error-handler.interceptor.ts": {
+  "clientRoot/src/main/webapp/app/core/interceptor/auth-expired.interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/interceptor/index.ts": {
+  "clientRoot/src/main/webapp/app/core/interceptor/auth.interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/interceptor/notification.interceptor.ts": {
+  "clientRoot/src/main/webapp/app/core/interceptor/error-handler.interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/request/request-util.ts": {
+  "clientRoot/src/main/webapp/app/core/interceptor/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/request/request.model.ts": {
+  "clientRoot/src/main/webapp/app/core/interceptor/notification.interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/alert.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/request/request-util.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/alert.service.ts": {
+  "clientRoot/src/main/webapp/app/core/request/request.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/data-util.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/util/alert.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/data-util.service.ts": {
+  "clientRoot/src/main/webapp/app/core/util/alert.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/event-manager.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/util/data-util.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/event-manager.service.ts": {
+  "clientRoot/src/main/webapp/app/core/util/data-util.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/operators.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/util/event-manager.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/operators.ts": {
+  "clientRoot/src/main/webapp/app/core/util/event-manager.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/parse-links.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/util/operators.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/util/parse-links.service.ts": {
+  "clientRoot/src/main/webapp/app/core/util/operators.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-navbar-items.ts": {
+  "clientRoot/src/main/webapp/app/core/util/parse-links.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-routing.module.ts": {
+  "clientRoot/src/main/webapp/app/core/util/parse-links.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.html": {
+  "clientRoot/src/main/webapp/app/entities/entity-navbar-items.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-routing.module.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.html": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.model.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.routes.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.test-samples.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.html": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.routes.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.test-samples.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/route/entity-with-custom-id-routing-resolve.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/route/entity-with-custom-id-routing-resolve.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/service/entity-with-custom-id.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/route/entity-with-custom-id-routing-resolve.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/service/entity-with-custom-id.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/route/entity-with-custom-id-routing-resolve.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/update/entity-with-custom-id-form.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/service/entity-with-custom-id.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/update/entity-with-custom-id-form.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/service/entity-with-custom-id.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.html": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/update/entity-with-custom-id-form.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/update/entity-with-custom-id-form.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/delete/microservice-delete-dialog.component.html": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/delete/microservice-delete-dialog.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/delete/microservice-delete-dialog.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/delete/microservice-delete-dialog.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/detail/microservice-detail.component.html": {
+  "clientRoot/src/main/webapp/app/entities/microservice/delete/microservice-delete-dialog.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/detail/microservice-detail.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/delete/microservice-delete-dialog.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/detail/microservice-detail.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/detail/microservice-detail.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/list/microservice.component.html": {
+  "clientRoot/src/main/webapp/app/entities/microservice/detail/microservice-detail.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/list/microservice.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/detail/microservice-detail.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/list/microservice.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/list/microservice.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.model.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/list/microservice.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.routes.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/list/microservice.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.test-samples.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/route/microservice-routing-resolve.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.routes.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/route/microservice-routing-resolve.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.test-samples.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/service/microservice.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/route/microservice-routing-resolve.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/service/microservice.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/route/microservice-routing-resolve.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/update/microservice-form.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/service/microservice.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/update/microservice-form.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/service/microservice.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/update/microservice-update.component.html": {
+  "clientRoot/src/main/webapp/app/entities/microservice/update/microservice-form.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/update/microservice-update.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/update/microservice-form.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/update/microservice-update.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/update/microservice-update.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/delete/simple-delete-dialog.component.html": {
+  "clientRoot/src/main/webapp/app/entities/microservice/update/microservice-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/delete/simple-delete-dialog.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/update/microservice-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/delete/simple-delete-dialog.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/delete/simple-delete-dialog.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/detail/simple-detail.component.html": {
+  "clientRoot/src/main/webapp/app/entities/simple/delete/simple-delete-dialog.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/detail/simple-detail.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/delete/simple-delete-dialog.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/detail/simple-detail.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/detail/simple-detail.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/list/simple.component.html": {
+  "clientRoot/src/main/webapp/app/entities/simple/detail/simple-detail.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/list/simple.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/detail/simple-detail.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/list/simple.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/list/simple.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/route/simple-routing-resolve.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/list/simple.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/route/simple-routing-resolve.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/list/simple.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/service/simple.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/route/simple-routing-resolve.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/service/simple.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/route/simple-routing-resolve.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.model.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/service/simple.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.routes.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/service/simple.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.test-samples.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/update/simple-form.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.routes.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/update/simple-form.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.test-samples.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/update/simple-update.component.html": {
+  "clientRoot/src/main/webapp/app/entities/simple/update/simple-form.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/update/simple-update.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/update/simple-form.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/update/simple-update.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/update/simple-update.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/home/home.component.html": {
+  "clientRoot/src/main/webapp/app/entities/simple/update/simple-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/home/home.component.scss": {
+  "clientRoot/src/main/webapp/app/entities/simple/update/simple-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/home/home.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/home/home.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/home/home.component.ts": {
+  "clientRoot/src/main/webapp/app/home/home.component.scss": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/error/error.component.html": {
+  "clientRoot/src/main/webapp/app/home/home.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/error/error.component.ts": {
+  "clientRoot/src/main/webapp/app/home/home.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/error/error.route.ts": {
+  "clientRoot/src/main/webapp/app/layouts/error/error.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/footer/footer.component.html": {
+  "clientRoot/src/main/webapp/app/layouts/error/error.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/footer/footer.component.ts": {
+  "clientRoot/src/main/webapp/app/layouts/error/error.route.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/main/main.component.html": {
+  "clientRoot/src/main/webapp/app/layouts/footer/footer.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/main/main.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/layouts/footer/footer.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/main/main.component.ts": {
+  "clientRoot/src/main/webapp/app/layouts/main/main.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/main/main.module.ts": {
+  "clientRoot/src/main/webapp/app/layouts/main/main.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/navbar/navbar-item.model.d.ts": {
+  "clientRoot/src/main/webapp/app/layouts/main/main.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/navbar/navbar.component.html": {
+  "clientRoot/src/main/webapp/app/layouts/main/main.module.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/navbar/navbar.component.scss": {
+  "clientRoot/src/main/webapp/app/layouts/navbar/navbar-item.model.d.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/navbar/navbar.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/layouts/navbar/navbar.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/navbar/navbar.component.ts": {
+  "clientRoot/src/main/webapp/app/layouts/navbar/navbar.component.scss": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/profiles/page-ribbon.component.scss": {
+  "clientRoot/src/main/webapp/app/layouts/navbar/navbar.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/profiles/page-ribbon.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/layouts/navbar/navbar.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/profiles/page-ribbon.component.ts": {
+  "clientRoot/src/main/webapp/app/layouts/profiles/page-ribbon.component.scss": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/profiles/profile-info.model.ts": {
+  "clientRoot/src/main/webapp/app/layouts/profiles/page-ribbon.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/layouts/profiles/profile.service.ts": {
+  "clientRoot/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/login/login.component.html": {
+  "clientRoot/src/main/webapp/app/layouts/profiles/profile-info.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/login/login.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/layouts/profiles/profile.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/login/login.component.ts": {
+  "clientRoot/src/main/webapp/app/login/login.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/login/login.model.ts": {
+  "clientRoot/src/main/webapp/app/login/login.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/login/login.service.ts": {
+  "clientRoot/src/main/webapp/app/login/login.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert-error.component.html": {
+  "clientRoot/src/main/webapp/app/login/login.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert-error.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/login/login.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert-error.component.ts": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert-error.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert-error.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert-error.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert.component.html": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert-error.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert-error.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert.component.ts": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/shared/auth/has-any-authority.directive.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/auth/has-any-authority.directive.ts": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/date/duration.pipe.ts": {
+  "clientRoot/src/main/webapp/app/shared/auth/has-any-authority.directive.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/date/format-medium-date.pipe.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/auth/has-any-authority.directive.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/date/format-medium-date.pipe.ts": {
+  "clientRoot/src/main/webapp/app/shared/date/duration.pipe.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/date/format-medium-datetime.pipe.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/date/format-medium-date.pipe.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/date/format-medium-datetime.pipe.ts": {
+  "clientRoot/src/main/webapp/app/shared/date/format-medium-date.pipe.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/date/index.ts": {
+  "clientRoot/src/main/webapp/app/shared/date/format-medium-datetime.pipe.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/filter/filter.component.html": {
+  "clientRoot/src/main/webapp/app/shared/date/format-medium-datetime.pipe.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/filter/filter.component.ts": {
+  "clientRoot/src/main/webapp/app/shared/date/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/filter/filter.model.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/filter/filter.component.html": {
     "stateCleared": "modified",
   },
-  "src/app/shared/filter/filter.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/filter/filter.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/filter/index.ts": {
+  "clientRoot/src/main/webapp/app/shared/filter/filter.model.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/pagination/index.ts": {
+  "clientRoot/src/main/webapp/app/shared/filter/filter.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/pagination/item-count.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/filter/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/pagination/item-count.component.ts": {
+  "clientRoot/src/main/webapp/app/shared/pagination/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/shared.module.ts": {
+  "clientRoot/src/main/webapp/app/shared/pagination/item-count.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/index.ts": {
+  "clientRoot/src/main/webapp/app/shared/pagination/item-count.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/sort-by.directive.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/shared.module.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/sort-by.directive.ts": {
+  "clientRoot/src/main/webapp/app/shared/sort/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/sort.directive.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/sort/sort-by.directive.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/sort.directive.ts": {
+  "clientRoot/src/main/webapp/app/shared/sort/sort-by.directive.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/sort.service.ts": {
+  "clientRoot/src/main/webapp/app/shared/sort/sort.directive.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/bootstrap.ts": {
+  "clientRoot/src/main/webapp/app/shared/sort/sort.directive.ts": {
     "stateCleared": "modified",
   },
-  "src/content/css/loading.css": {
+  "clientRoot/src/main/webapp/app/shared/sort/sort.service.ts": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0.svg": {
+  "clientRoot/src/main/webapp/bootstrap.ts": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-192.png": {
+  "clientRoot/src/main/webapp/content/css/loading.css": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/logo-jhipster.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/scss/_bootstrap-variables.scss": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/scss/global.scss": {
+  "clientRoot/src/main/webapp/content/images/logo-jhipster.png": {
     "stateCleared": "modified",
   },
-  "src/content/scss/vendor.scss": {
+  "clientRoot/src/main/webapp/content/scss/_bootstrap-variables.scss": {
     "stateCleared": "modified",
   },
-  "src/declarations.d.ts": {
+  "clientRoot/src/main/webapp/content/scss/global.scss": {
     "stateCleared": "modified",
   },
-  "src/favicon.ico": {
+  "clientRoot/src/main/webapp/content/scss/vendor.scss": {
     "stateCleared": "modified",
   },
-  "src/index.html": {
+  "clientRoot/src/main/webapp/declarations.d.ts": {
     "stateCleared": "modified",
   },
-  "src/main.ts": {
+  "clientRoot/src/main/webapp/favicon.ico": {
     "stateCleared": "modified",
   },
-  "src/manifest.webapp": {
+  "clientRoot/src/main/webapp/index.html": {
     "stateCleared": "modified",
   },
-  "src/robots.txt": {
+  "clientRoot/src/main/webapp/main.ts": {
     "stateCleared": "modified",
   },
-  "src/swagger-ui/dist/images/throbber.gif": {
+  "clientRoot/src/main/webapp/manifest.webapp": {
     "stateCleared": "modified",
   },
-  "src/swagger-ui/index.html": {
+  "clientRoot/src/main/webapp/robots.txt": {
     "stateCleared": "modified",
   },
-  "tsconfig.app.json": {
+  "clientRoot/src/main/webapp/swagger-ui/dist/images/throbber.gif": {
     "stateCleared": "modified",
   },
-  "tsconfig.json": {
+  "clientRoot/src/main/webapp/swagger-ui/index.html": {
     "stateCleared": "modified",
   },
-  "tsconfig.spec.json": {
+  "clientRoot/tsconfig.app.json": {
     "stateCleared": "modified",
   },
-  "webpack/environment.js": {
+  "clientRoot/tsconfig.json": {
     "stateCleared": "modified",
   },
-  "webpack/logo-jhipster.png": {
+  "clientRoot/tsconfig.spec.json": {
     "stateCleared": "modified",
   },
-  "webpack/proxy.conf.js": {
+  "clientRoot/webpack/environment.js": {
     "stateCleared": "modified",
   },
-  "webpack/webpack.custom.js": {
+  "clientRoot/webpack/logo-jhipster.png": {
     "stateCleared": "modified",
   },
-  "webpack/webpack.microfrontend.js": {
+  "clientRoot/webpack/proxy.conf.js": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/webpack/webpack.custom.js": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/webpack/webpack.microfrontend.js": {
     "stateCleared": "modified",
   },
 }
 `;
 
-exports[`generator - angular microservice-oauth2-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)-src/main/webapp2/-websocket(false) should match generated files snapshot 1`] = `
+exports[`generator - angular microservice-oauth2-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)--websocket(false) should match generated files snapshot 1`] = `
 {
   ".eslintignore": {
     "stateCleared": "modified",
@@ -2198,616 +2201,616 @@ exports[`generator - angular microservice-oauth2-withAdminUi(true)-skipJhipsterD
   "package.json": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/404.html": {
+  "src/main/webapp/404.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/WEB-INF/web.xml": {
+  "src/main/webapp/WEB-INF/web.xml": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/app-page-title-strategy.ts": {
+  "src/main/webapp/app/app-page-title-strategy.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/app-routing.module.ts": {
+  "src/main/webapp/app/app-routing.module.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/app.constants.ts": {
+  "src/main/webapp/app/app.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/app.module.ts": {
+  "src/main/webapp/app/app.module.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/authority.constants.ts": {
+  "src/main/webapp/app/config/authority.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/datepicker-adapter.ts": {
+  "src/main/webapp/app/config/datepicker-adapter.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/dayjs.ts": {
+  "src/main/webapp/app/config/dayjs.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/error.constants.ts": {
+  "src/main/webapp/app/config/error.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/font-awesome-icons.ts": {
+  "src/main/webapp/app/config/font-awesome-icons.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/input.constants.ts": {
+  "src/main/webapp/app/config/input.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/language.constants.ts": {
+  "src/main/webapp/app/config/language.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/navigation.constants.ts": {
+  "src/main/webapp/app/config/navigation.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/pagination.constants.ts": {
+  "src/main/webapp/app/config/pagination.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/translation.config.ts": {
+  "src/main/webapp/app/config/translation.config.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/uib-pagination.config.ts": {
+  "src/main/webapp/app/config/uib-pagination.config.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/auth/account.model.ts": {
+  "src/main/webapp/app/core/auth/account.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/auth/account.service.spec.ts": {
+  "src/main/webapp/app/core/auth/account.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/auth/account.service.ts": {
+  "src/main/webapp/app/core/auth/account.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/auth/auth-session.service.ts": {
+  "src/main/webapp/app/core/auth/auth-session.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/auth/state-storage.service.ts": {
+  "src/main/webapp/app/core/auth/state-storage.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/auth/user-route-access.service.ts": {
+  "src/main/webapp/app/core/auth/user-route-access.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/config/application-config.service.spec.ts": {
+  "src/main/webapp/app/core/config/application-config.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/config/application-config.service.ts": {
+  "src/main/webapp/app/core/config/application-config.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/interceptor/auth-expired.interceptor.ts": {
+  "src/main/webapp/app/core/interceptor/auth-expired.interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/interceptor/error-handler.interceptor.ts": {
+  "src/main/webapp/app/core/interceptor/error-handler.interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/interceptor/index.ts": {
+  "src/main/webapp/app/core/interceptor/index.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/interceptor/notification.interceptor.ts": {
+  "src/main/webapp/app/core/interceptor/notification.interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/request/request-util.ts": {
+  "src/main/webapp/app/core/request/request-util.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/request/request.model.ts": {
+  "src/main/webapp/app/core/request/request.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/util/alert.service.spec.ts": {
+  "src/main/webapp/app/core/util/alert.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/util/alert.service.ts": {
+  "src/main/webapp/app/core/util/alert.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/util/data-util.service.spec.ts": {
+  "src/main/webapp/app/core/util/data-util.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/util/data-util.service.ts": {
+  "src/main/webapp/app/core/util/data-util.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/util/event-manager.service.spec.ts": {
+  "src/main/webapp/app/core/util/event-manager.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/util/event-manager.service.ts": {
+  "src/main/webapp/app/core/util/event-manager.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/util/operators.spec.ts": {
+  "src/main/webapp/app/core/util/operators.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/util/operators.ts": {
+  "src/main/webapp/app/core/util/operators.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/util/parse-links.service.spec.ts": {
+  "src/main/webapp/app/core/util/parse-links.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/util/parse-links.service.ts": {
+  "src/main/webapp/app/core/util/parse-links.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-navbar-items.ts": {
+  "src/main/webapp/app/entities/entity-navbar-items.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-routing.module.ts": {
+  "src/main/webapp/app/entities/entity-routing.module.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.html": {
+  "src/main/webapp/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.spec.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.html": {
+  "src/main/webapp/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.spec.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id.model.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id.routes.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.routes.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id.test-samples.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.test-samples.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.html": {
+  "src/main/webapp/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.spec.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/route/entity-with-custom-id-routing-resolve.service.spec.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/route/entity-with-custom-id-routing-resolve.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/route/entity-with-custom-id-routing-resolve.service.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/route/entity-with-custom-id-routing-resolve.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/service/entity-with-custom-id.service.spec.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/service/entity-with-custom-id.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/service/entity-with-custom-id.service.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/service/entity-with-custom-id.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/update/entity-with-custom-id-form.service.spec.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/update/entity-with-custom-id-form.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/update/entity-with-custom-id-form.service.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/update/entity-with-custom-id-form.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.html": {
+  "src/main/webapp/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.spec.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/delete/microservice-delete-dialog.component.html": {
+  "src/main/webapp/app/entities/microservice/delete/microservice-delete-dialog.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/delete/microservice-delete-dialog.component.spec.ts": {
+  "src/main/webapp/app/entities/microservice/delete/microservice-delete-dialog.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/delete/microservice-delete-dialog.component.ts": {
+  "src/main/webapp/app/entities/microservice/delete/microservice-delete-dialog.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/detail/microservice-detail.component.html": {
+  "src/main/webapp/app/entities/microservice/detail/microservice-detail.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/detail/microservice-detail.component.spec.ts": {
+  "src/main/webapp/app/entities/microservice/detail/microservice-detail.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/detail/microservice-detail.component.ts": {
+  "src/main/webapp/app/entities/microservice/detail/microservice-detail.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/list/microservice.component.html": {
+  "src/main/webapp/app/entities/microservice/list/microservice.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/list/microservice.component.spec.ts": {
+  "src/main/webapp/app/entities/microservice/list/microservice.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/list/microservice.component.ts": {
+  "src/main/webapp/app/entities/microservice/list/microservice.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice.model.ts": {
+  "src/main/webapp/app/entities/microservice/microservice.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice.routes.ts": {
+  "src/main/webapp/app/entities/microservice/microservice.routes.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice.test-samples.ts": {
+  "src/main/webapp/app/entities/microservice/microservice.test-samples.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/route/microservice-routing-resolve.service.spec.ts": {
+  "src/main/webapp/app/entities/microservice/route/microservice-routing-resolve.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/route/microservice-routing-resolve.service.ts": {
+  "src/main/webapp/app/entities/microservice/route/microservice-routing-resolve.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/service/microservice.service.spec.ts": {
+  "src/main/webapp/app/entities/microservice/service/microservice.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/service/microservice.service.ts": {
+  "src/main/webapp/app/entities/microservice/service/microservice.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/update/microservice-form.service.spec.ts": {
+  "src/main/webapp/app/entities/microservice/update/microservice-form.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/update/microservice-form.service.ts": {
+  "src/main/webapp/app/entities/microservice/update/microservice-form.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/update/microservice-update.component.html": {
+  "src/main/webapp/app/entities/microservice/update/microservice-update.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/update/microservice-update.component.spec.ts": {
+  "src/main/webapp/app/entities/microservice/update/microservice-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/update/microservice-update.component.ts": {
+  "src/main/webapp/app/entities/microservice/update/microservice-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/delete/simple-delete-dialog.component.html": {
+  "src/main/webapp/app/entities/simple/delete/simple-delete-dialog.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/delete/simple-delete-dialog.component.spec.ts": {
+  "src/main/webapp/app/entities/simple/delete/simple-delete-dialog.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/delete/simple-delete-dialog.component.ts": {
+  "src/main/webapp/app/entities/simple/delete/simple-delete-dialog.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/detail/simple-detail.component.html": {
+  "src/main/webapp/app/entities/simple/detail/simple-detail.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/detail/simple-detail.component.spec.ts": {
+  "src/main/webapp/app/entities/simple/detail/simple-detail.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/detail/simple-detail.component.ts": {
+  "src/main/webapp/app/entities/simple/detail/simple-detail.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/list/simple.component.html": {
+  "src/main/webapp/app/entities/simple/list/simple.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/list/simple.component.spec.ts": {
+  "src/main/webapp/app/entities/simple/list/simple.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/list/simple.component.ts": {
+  "src/main/webapp/app/entities/simple/list/simple.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/route/simple-routing-resolve.service.spec.ts": {
+  "src/main/webapp/app/entities/simple/route/simple-routing-resolve.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/route/simple-routing-resolve.service.ts": {
+  "src/main/webapp/app/entities/simple/route/simple-routing-resolve.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/service/simple.service.spec.ts": {
+  "src/main/webapp/app/entities/simple/service/simple.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/service/simple.service.ts": {
+  "src/main/webapp/app/entities/simple/service/simple.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple.model.ts": {
+  "src/main/webapp/app/entities/simple/simple.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple.routes.ts": {
+  "src/main/webapp/app/entities/simple/simple.routes.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple.test-samples.ts": {
+  "src/main/webapp/app/entities/simple/simple.test-samples.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/update/simple-form.service.spec.ts": {
+  "src/main/webapp/app/entities/simple/update/simple-form.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/update/simple-form.service.ts": {
+  "src/main/webapp/app/entities/simple/update/simple-form.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/update/simple-update.component.html": {
+  "src/main/webapp/app/entities/simple/update/simple-update.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/update/simple-update.component.spec.ts": {
+  "src/main/webapp/app/entities/simple/update/simple-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/update/simple-update.component.ts": {
+  "src/main/webapp/app/entities/simple/update/simple-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/user/user.model.ts": {
+  "src/main/webapp/app/entities/user/user.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/user/user.service.spec.ts": {
+  "src/main/webapp/app/entities/user/user.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/user/user.service.ts": {
+  "src/main/webapp/app/entities/user/user.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/home/home.component.html": {
+  "src/main/webapp/app/home/home.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/home/home.component.scss": {
+  "src/main/webapp/app/home/home.component.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/home/home.component.spec.ts": {
+  "src/main/webapp/app/home/home.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/home/home.component.ts": {
+  "src/main/webapp/app/home/home.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/error/error.component.html": {
+  "src/main/webapp/app/layouts/error/error.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/error/error.component.ts": {
+  "src/main/webapp/app/layouts/error/error.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/error/error.route.ts": {
+  "src/main/webapp/app/layouts/error/error.route.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/footer/footer.component.html": {
+  "src/main/webapp/app/layouts/footer/footer.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/footer/footer.component.ts": {
+  "src/main/webapp/app/layouts/footer/footer.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/main/main.component.html": {
+  "src/main/webapp/app/layouts/main/main.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/main/main.component.spec.ts": {
+  "src/main/webapp/app/layouts/main/main.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/main/main.component.ts": {
+  "src/main/webapp/app/layouts/main/main.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/main/main.module.ts": {
+  "src/main/webapp/app/layouts/main/main.module.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/navbar/active-menu.directive.ts": {
+  "src/main/webapp/app/layouts/navbar/active-menu.directive.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/navbar/navbar-item.model.d.ts": {
+  "src/main/webapp/app/layouts/navbar/navbar-item.model.d.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/navbar/navbar.component.html": {
+  "src/main/webapp/app/layouts/navbar/navbar.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/navbar/navbar.component.scss": {
+  "src/main/webapp/app/layouts/navbar/navbar.component.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/navbar/navbar.component.spec.ts": {
+  "src/main/webapp/app/layouts/navbar/navbar.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/navbar/navbar.component.ts": {
+  "src/main/webapp/app/layouts/navbar/navbar.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/profiles/page-ribbon.component.scss": {
+  "src/main/webapp/app/layouts/profiles/page-ribbon.component.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/profiles/page-ribbon.component.spec.ts": {
+  "src/main/webapp/app/layouts/profiles/page-ribbon.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/profiles/page-ribbon.component.ts": {
+  "src/main/webapp/app/layouts/profiles/page-ribbon.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/profiles/profile-info.model.ts": {
+  "src/main/webapp/app/layouts/profiles/profile-info.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/profiles/profile.service.ts": {
+  "src/main/webapp/app/layouts/profiles/profile.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/login/login.service.ts": {
+  "src/main/webapp/app/login/login.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/login/logout.model.ts": {
+  "src/main/webapp/app/login/logout.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/alert/alert-error.component.html": {
+  "src/main/webapp/app/shared/alert/alert-error.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/alert/alert-error.component.spec.ts": {
+  "src/main/webapp/app/shared/alert/alert-error.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/alert/alert-error.component.ts": {
+  "src/main/webapp/app/shared/alert/alert-error.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/alert/alert-error.model.ts": {
+  "src/main/webapp/app/shared/alert/alert-error.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/alert/alert.component.html": {
+  "src/main/webapp/app/shared/alert/alert.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/alert/alert.component.spec.ts": {
+  "src/main/webapp/app/shared/alert/alert.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/alert/alert.component.ts": {
+  "src/main/webapp/app/shared/alert/alert.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/auth/has-any-authority.directive.spec.ts": {
+  "src/main/webapp/app/shared/auth/has-any-authority.directive.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/auth/has-any-authority.directive.ts": {
+  "src/main/webapp/app/shared/auth/has-any-authority.directive.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/date/duration.pipe.ts": {
+  "src/main/webapp/app/shared/date/duration.pipe.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/date/format-medium-date.pipe.spec.ts": {
+  "src/main/webapp/app/shared/date/format-medium-date.pipe.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/date/format-medium-date.pipe.ts": {
+  "src/main/webapp/app/shared/date/format-medium-date.pipe.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/date/format-medium-datetime.pipe.spec.ts": {
+  "src/main/webapp/app/shared/date/format-medium-datetime.pipe.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/date/format-medium-datetime.pipe.ts": {
+  "src/main/webapp/app/shared/date/format-medium-datetime.pipe.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/date/index.ts": {
+  "src/main/webapp/app/shared/date/index.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/filter/filter.component.html": {
+  "src/main/webapp/app/shared/filter/filter.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/filter/filter.component.ts": {
+  "src/main/webapp/app/shared/filter/filter.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/filter/filter.model.spec.ts": {
+  "src/main/webapp/app/shared/filter/filter.model.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/filter/filter.model.ts": {
+  "src/main/webapp/app/shared/filter/filter.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/filter/index.ts": {
+  "src/main/webapp/app/shared/filter/index.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/language/find-language-from-key.pipe.ts": {
+  "src/main/webapp/app/shared/language/find-language-from-key.pipe.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/language/index.ts": {
+  "src/main/webapp/app/shared/language/index.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/language/translate.directive.spec.ts": {
+  "src/main/webapp/app/shared/language/translate.directive.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/language/translate.directive.ts": {
+  "src/main/webapp/app/shared/language/translate.directive.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/language/translation.module.ts": {
+  "src/main/webapp/app/shared/language/translation.module.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/pagination/index.ts": {
+  "src/main/webapp/app/shared/pagination/index.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/pagination/item-count.component.spec.ts": {
+  "src/main/webapp/app/shared/pagination/item-count.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/pagination/item-count.component.ts": {
+  "src/main/webapp/app/shared/pagination/item-count.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/shared.module.ts": {
+  "src/main/webapp/app/shared/shared.module.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/sort/index.ts": {
+  "src/main/webapp/app/shared/sort/index.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/sort/sort-by.directive.spec.ts": {
+  "src/main/webapp/app/shared/sort/sort-by.directive.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/sort/sort-by.directive.ts": {
+  "src/main/webapp/app/shared/sort/sort-by.directive.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/sort/sort.directive.spec.ts": {
+  "src/main/webapp/app/shared/sort/sort.directive.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/sort/sort.directive.ts": {
+  "src/main/webapp/app/shared/sort/sort.directive.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/sort/sort.service.ts": {
+  "src/main/webapp/app/shared/sort/sort.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/bootstrap.ts": {
+  "src/main/webapp/bootstrap.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/css/loading.css": {
+  "src/main/webapp/content/css/loading.css": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0.svg": {
+  "src/main/webapp/content/images/jhipster_family_member_0.svg": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0_head-192.png": {
+  "src/main/webapp/content/images/jhipster_family_member_0_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0_head-256.png": {
+  "src/main/webapp/content/images/jhipster_family_member_0_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0_head-384.png": {
+  "src/main/webapp/content/images/jhipster_family_member_0_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0_head-512.png": {
+  "src/main/webapp/content/images/jhipster_family_member_0_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1.svg": {
+  "src/main/webapp/content/images/jhipster_family_member_1.svg": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1_head-192.png": {
+  "src/main/webapp/content/images/jhipster_family_member_1_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1_head-256.png": {
+  "src/main/webapp/content/images/jhipster_family_member_1_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1_head-384.png": {
+  "src/main/webapp/content/images/jhipster_family_member_1_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1_head-512.png": {
+  "src/main/webapp/content/images/jhipster_family_member_1_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2.svg": {
+  "src/main/webapp/content/images/jhipster_family_member_2.svg": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2_head-192.png": {
+  "src/main/webapp/content/images/jhipster_family_member_2_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2_head-256.png": {
+  "src/main/webapp/content/images/jhipster_family_member_2_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2_head-384.png": {
+  "src/main/webapp/content/images/jhipster_family_member_2_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2_head-512.png": {
+  "src/main/webapp/content/images/jhipster_family_member_2_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3.svg": {
+  "src/main/webapp/content/images/jhipster_family_member_3.svg": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3_head-192.png": {
+  "src/main/webapp/content/images/jhipster_family_member_3_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3_head-256.png": {
+  "src/main/webapp/content/images/jhipster_family_member_3_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3_head-384.png": {
+  "src/main/webapp/content/images/jhipster_family_member_3_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3_head-512.png": {
+  "src/main/webapp/content/images/jhipster_family_member_3_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/logo-jhipster.png": {
+  "src/main/webapp/content/images/logo-jhipster.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/scss/_bootstrap-variables.scss": {
+  "src/main/webapp/content/scss/_bootstrap-variables.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/scss/global.scss": {
+  "src/main/webapp/content/scss/global.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/scss/vendor.scss": {
+  "src/main/webapp/content/scss/vendor.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/declarations.d.ts": {
+  "src/main/webapp/declarations.d.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/favicon.ico": {
+  "src/main/webapp/favicon.ico": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/index.html": {
+  "src/main/webapp/index.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/main.ts": {
+  "src/main/webapp/main.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/manifest.webapp": {
+  "src/main/webapp/manifest.webapp": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/robots.txt": {
+  "src/main/webapp/robots.txt": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/swagger-ui/dist/images/throbber.gif": {
+  "src/main/webapp/swagger-ui/dist/images/throbber.gif": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/swagger-ui/index.html": {
+  "src/main/webapp/swagger-ui/index.html": {
     "stateCleared": "modified",
   },
   "tsconfig.app.json": {
@@ -2837,7 +2840,7 @@ exports[`generator - angular microservice-oauth2-withAdminUi(true)-skipJhipsterD
 }
 `;
 
-exports[`generator - angular monolith-jwt-skipUserManagement(false)-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)-src/main/webapp2/-websocket(true) should match generated files snapshot 1`] = `
+exports[`generator - angular monolith-jwt-skipUserManagement(false)-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)--websocket(true) should match generated files snapshot 1`] = `
 {
   ".eslintignore": {
     "stateCleared": "modified",
@@ -2872,946 +2875,949 @@ exports[`generator - angular monolith-jwt-skipUserManagement(false)-withAdminUi(
   "package.json": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/404.html": {
+  "src/main/webapp/404.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/WEB-INF/web.xml": {
+  "src/main/webapp/WEB-INF/web.xml": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/account.route.ts": {
+  "src/main/webapp/app/account/account.route.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/activate/activate.component.html": {
+  "src/main/webapp/app/account/activate/activate.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/activate/activate.component.spec.ts": {
+  "src/main/webapp/app/account/activate/activate.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/activate/activate.component.ts": {
+  "src/main/webapp/app/account/activate/activate.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/activate/activate.route.ts": {
+  "src/main/webapp/app/account/activate/activate.route.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/activate/activate.service.spec.ts": {
+  "src/main/webapp/app/account/activate/activate.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/activate/activate.service.ts": {
+  "src/main/webapp/app/account/activate/activate.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/password-reset/finish/password-reset-finish.component.html": {
+  "src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/password-reset/finish/password-reset-finish.component.spec.ts": {
+  "src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/password-reset/finish/password-reset-finish.component.ts": {
+  "src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/password-reset/finish/password-reset-finish.route.ts": {
+  "src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/password-reset/finish/password-reset-finish.service.spec.ts": {
+  "src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/password-reset/finish/password-reset-finish.service.ts": {
+  "src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/password-reset/init/password-reset-init.component.html": {
+  "src/main/webapp/app/account/password-reset/init/password-reset-init.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/password-reset/init/password-reset-init.component.spec.ts": {
+  "src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/password-reset/init/password-reset-init.component.ts": {
+  "src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/password-reset/init/password-reset-init.route.ts": {
+  "src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/password-reset/init/password-reset-init.service.spec.ts": {
+  "src/main/webapp/app/account/password-reset/init/password-reset-init.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/password-reset/init/password-reset-init.service.ts": {
+  "src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/password/password-strength-bar/password-strength-bar.component.html": {
+  "src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/password/password-strength-bar/password-strength-bar.component.scss": {
+  "src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts": {
+  "src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/password/password-strength-bar/password-strength-bar.component.ts": {
+  "src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/password/password.component.html": {
+  "src/main/webapp/app/account/password/password.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/password/password.component.spec.ts": {
+  "src/main/webapp/app/account/password/password.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/password/password.component.ts": {
+  "src/main/webapp/app/account/password/password.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/password/password.route.ts": {
+  "src/main/webapp/app/account/password/password.route.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/password/password.service.spec.ts": {
+  "src/main/webapp/app/account/password/password.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/password/password.service.ts": {
+  "src/main/webapp/app/account/password/password.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/register/register.component.html": {
+  "src/main/webapp/app/account/register/register.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/register/register.component.spec.ts": {
+  "src/main/webapp/app/account/register/register.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/register/register.component.ts": {
+  "src/main/webapp/app/account/register/register.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/register/register.model.ts": {
+  "src/main/webapp/app/account/register/register.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/register/register.route.ts": {
+  "src/main/webapp/app/account/register/register.route.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/register/register.service.spec.ts": {
+  "src/main/webapp/app/account/register/register.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/register/register.service.ts": {
+  "src/main/webapp/app/account/register/register.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/settings/settings.component.html": {
+  "src/main/webapp/app/account/settings/settings.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/settings/settings.component.spec.ts": {
+  "src/main/webapp/app/account/settings/settings.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/settings/settings.component.ts": {
+  "src/main/webapp/app/account/settings/settings.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/settings/settings.route.ts": {
+  "src/main/webapp/app/account/settings/settings.route.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/admin-routing.module.ts": {
+  "src/main/webapp/app/admin/admin-routing.module.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/configuration/configuration.component.html": {
+  "src/main/webapp/app/admin/configuration/configuration.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/configuration/configuration.component.spec.ts": {
+  "src/main/webapp/app/admin/configuration/configuration.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/configuration/configuration.component.ts": {
+  "src/main/webapp/app/admin/configuration/configuration.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/configuration/configuration.model.ts": {
+  "src/main/webapp/app/admin/configuration/configuration.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/configuration/configuration.service.spec.ts": {
+  "src/main/webapp/app/admin/configuration/configuration.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/configuration/configuration.service.ts": {
+  "src/main/webapp/app/admin/configuration/configuration.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/docs/docs.component.html": {
+  "src/main/webapp/app/admin/docs/docs.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/docs/docs.component.scss": {
+  "src/main/webapp/app/admin/docs/docs.component.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/docs/docs.component.ts": {
+  "src/main/webapp/app/admin/docs/docs.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/health/health.component.html": {
+  "src/main/webapp/app/admin/health/health.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/health/health.component.spec.ts": {
+  "src/main/webapp/app/admin/health/health.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/health/health.component.ts": {
+  "src/main/webapp/app/admin/health/health.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/health/health.model.ts": {
+  "src/main/webapp/app/admin/health/health.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/health/health.service.spec.ts": {
+  "src/main/webapp/app/admin/health/health.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/health/health.service.ts": {
+  "src/main/webapp/app/admin/health/health.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/health/modal/health-modal.component.html": {
+  "src/main/webapp/app/admin/health/modal/health-modal.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/health/modal/health-modal.component.spec.ts": {
+  "src/main/webapp/app/admin/health/modal/health-modal.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/health/modal/health-modal.component.ts": {
+  "src/main/webapp/app/admin/health/modal/health-modal.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/logs/log.model.ts": {
+  "src/main/webapp/app/admin/logs/log.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/logs/logs.component.html": {
+  "src/main/webapp/app/admin/logs/logs.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/logs/logs.component.spec.ts": {
+  "src/main/webapp/app/admin/logs/logs.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/logs/logs.component.ts": {
+  "src/main/webapp/app/admin/logs/logs.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/logs/logs.service.spec.ts": {
+  "src/main/webapp/app/admin/logs/logs.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/logs/logs.service.ts": {
+  "src/main/webapp/app/admin/logs/logs.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html": {
+  "src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts": {
+  "src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.html": {
+  "src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.ts": {
+  "src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html": {
+  "src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts": {
+  "src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html": {
+  "src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.ts": {
+  "src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html": {
+  "src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.ts": {
+  "src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html": {
+  "src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.ts": {
+  "src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html": {
+  "src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.ts": {
+  "src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/blocks/metrics-request/metrics-request.component.html": {
+  "src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/blocks/metrics-request/metrics-request.component.ts": {
+  "src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/blocks/metrics-system/metrics-system.component.html": {
+  "src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/blocks/metrics-system/metrics-system.component.ts": {
+  "src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/metrics.component.html": {
+  "src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/metrics.component.spec.ts": {
+  "src/main/webapp/app/admin/metrics/metrics.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/metrics.component.ts": {
+  "src/main/webapp/app/admin/metrics/metrics.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/metrics.model.ts": {
+  "src/main/webapp/app/admin/metrics/metrics.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/metrics.service.spec.ts": {
+  "src/main/webapp/app/admin/metrics/metrics.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/metrics.service.ts": {
+  "src/main/webapp/app/admin/metrics/metrics.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/user-management/delete/user-management-delete-dialog.component.html": {
+  "src/main/webapp/app/admin/metrics/metrics.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts": {
+  "src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/user-management/delete/user-management-delete-dialog.component.ts": {
+  "src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/user-management/detail/user-management-detail.component.html": {
+  "src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/user-management/detail/user-management-detail.component.spec.ts": {
+  "src/main/webapp/app/admin/user-management/detail/user-management-detail.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/user-management/detail/user-management-detail.component.ts": {
+  "src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/user-management/list/user-management.component.html": {
+  "src/main/webapp/app/admin/user-management/detail/user-management-detail.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/user-management/list/user-management.component.spec.ts": {
+  "src/main/webapp/app/admin/user-management/list/user-management.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/user-management/list/user-management.component.ts": {
+  "src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/user-management/service/user-management.service.spec.ts": {
+  "src/main/webapp/app/admin/user-management/list/user-management.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/user-management/service/user-management.service.ts": {
+  "src/main/webapp/app/admin/user-management/service/user-management.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/user-management/update/user-management-update.component.html": {
+  "src/main/webapp/app/admin/user-management/service/user-management.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/user-management/update/user-management-update.component.spec.ts": {
+  "src/main/webapp/app/admin/user-management/update/user-management-update.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/user-management/update/user-management-update.component.ts": {
+  "src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/user-management/user-management.model.ts": {
+  "src/main/webapp/app/admin/user-management/update/user-management-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/user-management/user-management.route.ts": {
+  "src/main/webapp/app/admin/user-management/user-management.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/app-page-title-strategy.ts": {
+  "src/main/webapp/app/admin/user-management/user-management.route.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/app-routing.module.ts": {
+  "src/main/webapp/app/app-page-title-strategy.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/app.constants.ts": {
+  "src/main/webapp/app/app-routing.module.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/app.module.ts": {
+  "src/main/webapp/app/app.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/authority.constants.ts": {
+  "src/main/webapp/app/app.module.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/datepicker-adapter.ts": {
+  "src/main/webapp/app/config/authority.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/dayjs.ts": {
+  "src/main/webapp/app/config/datepicker-adapter.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/error.constants.ts": {
+  "src/main/webapp/app/config/dayjs.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/font-awesome-icons.ts": {
+  "src/main/webapp/app/config/error.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/input.constants.ts": {
+  "src/main/webapp/app/config/font-awesome-icons.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/language.constants.ts": {
+  "src/main/webapp/app/config/input.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/navigation.constants.ts": {
+  "src/main/webapp/app/config/language.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/pagination.constants.ts": {
+  "src/main/webapp/app/config/navigation.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/translation.config.ts": {
+  "src/main/webapp/app/config/pagination.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/uib-pagination.config.ts": {
+  "src/main/webapp/app/config/translation.config.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/auth/account.model.ts": {
+  "src/main/webapp/app/config/uib-pagination.config.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/auth/account.service.spec.ts": {
+  "src/main/webapp/app/core/auth/account.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/auth/account.service.ts": {
+  "src/main/webapp/app/core/auth/account.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/auth/auth-jwt.service.spec.ts": {
+  "src/main/webapp/app/core/auth/account.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/auth/auth-jwt.service.ts": {
+  "src/main/webapp/app/core/auth/auth-jwt.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/auth/state-storage.service.ts": {
+  "src/main/webapp/app/core/auth/auth-jwt.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/auth/user-route-access.service.ts": {
+  "src/main/webapp/app/core/auth/state-storage.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/config/application-config.service.spec.ts": {
+  "src/main/webapp/app/core/auth/user-route-access.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/config/application-config.service.ts": {
+  "src/main/webapp/app/core/config/application-config.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/interceptor/auth-expired.interceptor.ts": {
+  "src/main/webapp/app/core/config/application-config.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/interceptor/auth.interceptor.ts": {
+  "src/main/webapp/app/core/interceptor/auth-expired.interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/interceptor/error-handler.interceptor.ts": {
+  "src/main/webapp/app/core/interceptor/auth.interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/interceptor/index.ts": {
+  "src/main/webapp/app/core/interceptor/error-handler.interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/interceptor/notification.interceptor.ts": {
+  "src/main/webapp/app/core/interceptor/index.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/request/request-util.ts": {
+  "src/main/webapp/app/core/interceptor/notification.interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/request/request.model.ts": {
+  "src/main/webapp/app/core/request/request-util.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/util/alert.service.spec.ts": {
+  "src/main/webapp/app/core/request/request.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/util/alert.service.ts": {
+  "src/main/webapp/app/core/util/alert.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/util/data-util.service.spec.ts": {
+  "src/main/webapp/app/core/util/alert.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/util/data-util.service.ts": {
+  "src/main/webapp/app/core/util/data-util.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/util/event-manager.service.spec.ts": {
+  "src/main/webapp/app/core/util/data-util.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/util/event-manager.service.ts": {
+  "src/main/webapp/app/core/util/event-manager.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/util/operators.spec.ts": {
+  "src/main/webapp/app/core/util/event-manager.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/util/operators.ts": {
+  "src/main/webapp/app/core/util/operators.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/util/parse-links.service.spec.ts": {
+  "src/main/webapp/app/core/util/operators.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/util/parse-links.service.ts": {
+  "src/main/webapp/app/core/util/parse-links.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-navbar-items.ts": {
+  "src/main/webapp/app/core/util/parse-links.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-routing.module.ts": {
+  "src/main/webapp/app/entities/entity-navbar-items.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.html": {
+  "src/main/webapp/app/entities/entity-routing.module.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.spec.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.html": {
+  "src/main/webapp/app/entities/entity-with-custom-id/delete/entity-with-custom-id-delete-dialog.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.spec.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id.model.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/detail/entity-with-custom-id-detail.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id.routes.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id.test-samples.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.routes.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.html": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.test-samples.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.spec.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/route/entity-with-custom-id-routing-resolve.service.spec.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/list/entity-with-custom-id.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/route/entity-with-custom-id-routing-resolve.service.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/route/entity-with-custom-id-routing-resolve.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/service/entity-with-custom-id.service.spec.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/route/entity-with-custom-id-routing-resolve.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/service/entity-with-custom-id.service.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/service/entity-with-custom-id.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/update/entity-with-custom-id-form.service.spec.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/service/entity-with-custom-id.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/update/entity-with-custom-id-form.service.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/update/entity-with-custom-id-form.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.html": {
+  "src/main/webapp/app/entities/entity-with-custom-id/update/entity-with-custom-id-form.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.spec.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/delete/microservice-delete-dialog.component.html": {
+  "src/main/webapp/app/entities/entity-with-custom-id/update/entity-with-custom-id-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/delete/microservice-delete-dialog.component.spec.ts": {
+  "src/main/webapp/app/entities/microservice/delete/microservice-delete-dialog.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/delete/microservice-delete-dialog.component.ts": {
+  "src/main/webapp/app/entities/microservice/delete/microservice-delete-dialog.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/detail/microservice-detail.component.html": {
+  "src/main/webapp/app/entities/microservice/delete/microservice-delete-dialog.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/detail/microservice-detail.component.spec.ts": {
+  "src/main/webapp/app/entities/microservice/detail/microservice-detail.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/detail/microservice-detail.component.ts": {
+  "src/main/webapp/app/entities/microservice/detail/microservice-detail.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/list/microservice.component.html": {
+  "src/main/webapp/app/entities/microservice/detail/microservice-detail.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/list/microservice.component.spec.ts": {
+  "src/main/webapp/app/entities/microservice/list/microservice.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/list/microservice.component.ts": {
+  "src/main/webapp/app/entities/microservice/list/microservice.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice.model.ts": {
+  "src/main/webapp/app/entities/microservice/list/microservice.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice.routes.ts": {
+  "src/main/webapp/app/entities/microservice/microservice.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice.test-samples.ts": {
+  "src/main/webapp/app/entities/microservice/microservice.routes.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/route/microservice-routing-resolve.service.spec.ts": {
+  "src/main/webapp/app/entities/microservice/microservice.test-samples.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/route/microservice-routing-resolve.service.ts": {
+  "src/main/webapp/app/entities/microservice/route/microservice-routing-resolve.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/service/microservice.service.spec.ts": {
+  "src/main/webapp/app/entities/microservice/route/microservice-routing-resolve.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/service/microservice.service.ts": {
+  "src/main/webapp/app/entities/microservice/service/microservice.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/update/microservice-form.service.spec.ts": {
+  "src/main/webapp/app/entities/microservice/service/microservice.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/update/microservice-form.service.ts": {
+  "src/main/webapp/app/entities/microservice/update/microservice-form.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/update/microservice-update.component.html": {
+  "src/main/webapp/app/entities/microservice/update/microservice-form.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/update/microservice-update.component.spec.ts": {
+  "src/main/webapp/app/entities/microservice/update/microservice-update.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/update/microservice-update.component.ts": {
+  "src/main/webapp/app/entities/microservice/update/microservice-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/delete/simple-delete-dialog.component.html": {
+  "src/main/webapp/app/entities/microservice/update/microservice-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/delete/simple-delete-dialog.component.spec.ts": {
+  "src/main/webapp/app/entities/simple/delete/simple-delete-dialog.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/delete/simple-delete-dialog.component.ts": {
+  "src/main/webapp/app/entities/simple/delete/simple-delete-dialog.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/detail/simple-detail.component.html": {
+  "src/main/webapp/app/entities/simple/delete/simple-delete-dialog.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/detail/simple-detail.component.spec.ts": {
+  "src/main/webapp/app/entities/simple/detail/simple-detail.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/detail/simple-detail.component.ts": {
+  "src/main/webapp/app/entities/simple/detail/simple-detail.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/list/simple.component.html": {
+  "src/main/webapp/app/entities/simple/detail/simple-detail.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/list/simple.component.spec.ts": {
+  "src/main/webapp/app/entities/simple/list/simple.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/list/simple.component.ts": {
+  "src/main/webapp/app/entities/simple/list/simple.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/route/simple-routing-resolve.service.spec.ts": {
+  "src/main/webapp/app/entities/simple/list/simple.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/route/simple-routing-resolve.service.ts": {
+  "src/main/webapp/app/entities/simple/route/simple-routing-resolve.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/service/simple.service.spec.ts": {
+  "src/main/webapp/app/entities/simple/route/simple-routing-resolve.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/service/simple.service.ts": {
+  "src/main/webapp/app/entities/simple/service/simple.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple.model.ts": {
+  "src/main/webapp/app/entities/simple/service/simple.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple.routes.ts": {
+  "src/main/webapp/app/entities/simple/simple.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple.test-samples.ts": {
+  "src/main/webapp/app/entities/simple/simple.routes.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/update/simple-form.service.spec.ts": {
+  "src/main/webapp/app/entities/simple/simple.test-samples.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/update/simple-form.service.ts": {
+  "src/main/webapp/app/entities/simple/update/simple-form.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/update/simple-update.component.html": {
+  "src/main/webapp/app/entities/simple/update/simple-form.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/update/simple-update.component.spec.ts": {
+  "src/main/webapp/app/entities/simple/update/simple-update.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/update/simple-update.component.ts": {
+  "src/main/webapp/app/entities/simple/update/simple-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/user/user.model.ts": {
+  "src/main/webapp/app/entities/simple/update/simple-update.component.ts": {
+    "stateCleared": "modified",
+  },
+  "src/main/webapp/app/entities/user/user.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/user/user.service.spec.ts": {
+  "src/main/webapp/app/entities/user/user.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/user/user.service.ts": {
+  "src/main/webapp/app/entities/user/user.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/home/home.component.html": {
+  "src/main/webapp/app/home/home.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/home/home.component.scss": {
+  "src/main/webapp/app/home/home.component.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/home/home.component.spec.ts": {
+  "src/main/webapp/app/home/home.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/home/home.component.ts": {
+  "src/main/webapp/app/home/home.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/error/error.component.html": {
+  "src/main/webapp/app/layouts/error/error.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/error/error.component.ts": {
+  "src/main/webapp/app/layouts/error/error.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/error/error.route.ts": {
+  "src/main/webapp/app/layouts/error/error.route.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/footer/footer.component.html": {
+  "src/main/webapp/app/layouts/footer/footer.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/footer/footer.component.ts": {
+  "src/main/webapp/app/layouts/footer/footer.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/main/main.component.html": {
+  "src/main/webapp/app/layouts/main/main.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/main/main.component.spec.ts": {
+  "src/main/webapp/app/layouts/main/main.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/main/main.component.ts": {
+  "src/main/webapp/app/layouts/main/main.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/main/main.module.ts": {
+  "src/main/webapp/app/layouts/main/main.module.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/navbar/active-menu.directive.ts": {
+  "src/main/webapp/app/layouts/navbar/active-menu.directive.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/navbar/navbar-item.model.d.ts": {
+  "src/main/webapp/app/layouts/navbar/navbar-item.model.d.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/navbar/navbar.component.html": {
+  "src/main/webapp/app/layouts/navbar/navbar.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/navbar/navbar.component.scss": {
+  "src/main/webapp/app/layouts/navbar/navbar.component.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/navbar/navbar.component.spec.ts": {
+  "src/main/webapp/app/layouts/navbar/navbar.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/navbar/navbar.component.ts": {
+  "src/main/webapp/app/layouts/navbar/navbar.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/profiles/page-ribbon.component.scss": {
+  "src/main/webapp/app/layouts/profiles/page-ribbon.component.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/profiles/page-ribbon.component.spec.ts": {
+  "src/main/webapp/app/layouts/profiles/page-ribbon.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/profiles/page-ribbon.component.ts": {
+  "src/main/webapp/app/layouts/profiles/page-ribbon.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/profiles/profile-info.model.ts": {
+  "src/main/webapp/app/layouts/profiles/profile-info.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/layouts/profiles/profile.service.ts": {
+  "src/main/webapp/app/layouts/profiles/profile.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/login/login.component.html": {
+  "src/main/webapp/app/login/login.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/login/login.component.spec.ts": {
+  "src/main/webapp/app/login/login.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/login/login.component.ts": {
+  "src/main/webapp/app/login/login.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/login/login.model.ts": {
+  "src/main/webapp/app/login/login.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/login/login.service.ts": {
+  "src/main/webapp/app/login/login.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/alert/alert-error.component.html": {
+  "src/main/webapp/app/shared/alert/alert-error.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/alert/alert-error.component.spec.ts": {
+  "src/main/webapp/app/shared/alert/alert-error.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/alert/alert-error.component.ts": {
+  "src/main/webapp/app/shared/alert/alert-error.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/alert/alert-error.model.ts": {
+  "src/main/webapp/app/shared/alert/alert-error.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/alert/alert.component.html": {
+  "src/main/webapp/app/shared/alert/alert.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/alert/alert.component.spec.ts": {
+  "src/main/webapp/app/shared/alert/alert.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/alert/alert.component.ts": {
+  "src/main/webapp/app/shared/alert/alert.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/auth/has-any-authority.directive.spec.ts": {
+  "src/main/webapp/app/shared/auth/has-any-authority.directive.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/auth/has-any-authority.directive.ts": {
+  "src/main/webapp/app/shared/auth/has-any-authority.directive.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/date/duration.pipe.ts": {
+  "src/main/webapp/app/shared/date/duration.pipe.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/date/format-medium-date.pipe.spec.ts": {
+  "src/main/webapp/app/shared/date/format-medium-date.pipe.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/date/format-medium-date.pipe.ts": {
+  "src/main/webapp/app/shared/date/format-medium-date.pipe.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/date/format-medium-datetime.pipe.spec.ts": {
+  "src/main/webapp/app/shared/date/format-medium-datetime.pipe.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/date/format-medium-datetime.pipe.ts": {
+  "src/main/webapp/app/shared/date/format-medium-datetime.pipe.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/date/index.ts": {
+  "src/main/webapp/app/shared/date/index.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/filter/filter.component.html": {
+  "src/main/webapp/app/shared/filter/filter.component.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/filter/filter.component.ts": {
+  "src/main/webapp/app/shared/filter/filter.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/filter/filter.model.spec.ts": {
+  "src/main/webapp/app/shared/filter/filter.model.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/filter/filter.model.ts": {
+  "src/main/webapp/app/shared/filter/filter.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/filter/index.ts": {
+  "src/main/webapp/app/shared/filter/index.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/language/find-language-from-key.pipe.ts": {
+  "src/main/webapp/app/shared/language/find-language-from-key.pipe.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/language/index.ts": {
+  "src/main/webapp/app/shared/language/index.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/language/translate.directive.spec.ts": {
+  "src/main/webapp/app/shared/language/translate.directive.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/language/translate.directive.ts": {
+  "src/main/webapp/app/shared/language/translate.directive.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/language/translation.module.ts": {
+  "src/main/webapp/app/shared/language/translation.module.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/pagination/index.ts": {
+  "src/main/webapp/app/shared/pagination/index.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/pagination/item-count.component.spec.ts": {
+  "src/main/webapp/app/shared/pagination/item-count.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/pagination/item-count.component.ts": {
+  "src/main/webapp/app/shared/pagination/item-count.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/shared.module.ts": {
+  "src/main/webapp/app/shared/shared.module.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/sort/index.ts": {
+  "src/main/webapp/app/shared/sort/index.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/sort/sort-by.directive.spec.ts": {
+  "src/main/webapp/app/shared/sort/sort-by.directive.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/sort/sort-by.directive.ts": {
+  "src/main/webapp/app/shared/sort/sort-by.directive.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/sort/sort.directive.spec.ts": {
+  "src/main/webapp/app/shared/sort/sort.directive.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/sort/sort.directive.ts": {
+  "src/main/webapp/app/shared/sort/sort.directive.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/sort/sort.service.ts": {
+  "src/main/webapp/app/shared/sort/sort.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/bootstrap.ts": {
+  "src/main/webapp/bootstrap.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/css/loading.css": {
+  "src/main/webapp/content/css/loading.css": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0.svg": {
+  "src/main/webapp/content/images/jhipster_family_member_0.svg": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0_head-192.png": {
+  "src/main/webapp/content/images/jhipster_family_member_0_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0_head-256.png": {
+  "src/main/webapp/content/images/jhipster_family_member_0_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0_head-384.png": {
+  "src/main/webapp/content/images/jhipster_family_member_0_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0_head-512.png": {
+  "src/main/webapp/content/images/jhipster_family_member_0_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1.svg": {
+  "src/main/webapp/content/images/jhipster_family_member_1.svg": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1_head-192.png": {
+  "src/main/webapp/content/images/jhipster_family_member_1_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1_head-256.png": {
+  "src/main/webapp/content/images/jhipster_family_member_1_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1_head-384.png": {
+  "src/main/webapp/content/images/jhipster_family_member_1_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1_head-512.png": {
+  "src/main/webapp/content/images/jhipster_family_member_1_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2.svg": {
+  "src/main/webapp/content/images/jhipster_family_member_2.svg": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2_head-192.png": {
+  "src/main/webapp/content/images/jhipster_family_member_2_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2_head-256.png": {
+  "src/main/webapp/content/images/jhipster_family_member_2_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2_head-384.png": {
+  "src/main/webapp/content/images/jhipster_family_member_2_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2_head-512.png": {
+  "src/main/webapp/content/images/jhipster_family_member_2_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3.svg": {
+  "src/main/webapp/content/images/jhipster_family_member_3.svg": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3_head-192.png": {
+  "src/main/webapp/content/images/jhipster_family_member_3_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3_head-256.png": {
+  "src/main/webapp/content/images/jhipster_family_member_3_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3_head-384.png": {
+  "src/main/webapp/content/images/jhipster_family_member_3_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3_head-512.png": {
+  "src/main/webapp/content/images/jhipster_family_member_3_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/logo-jhipster.png": {
+  "src/main/webapp/content/images/logo-jhipster.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/scss/_bootstrap-variables.scss": {
+  "src/main/webapp/content/scss/_bootstrap-variables.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/scss/global.scss": {
+  "src/main/webapp/content/scss/global.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/scss/vendor.scss": {
+  "src/main/webapp/content/scss/vendor.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/declarations.d.ts": {
+  "src/main/webapp/declarations.d.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/favicon.ico": {
+  "src/main/webapp/favicon.ico": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/index.html": {
+  "src/main/webapp/index.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/main.ts": {
+  "src/main/webapp/main.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/manifest.webapp": {
+  "src/main/webapp/manifest.webapp": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/robots.txt": {
+  "src/main/webapp/robots.txt": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/swagger-ui/dist/images/throbber.gif": {
+  "src/main/webapp/swagger-ui/dist/images/throbber.gif": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/swagger-ui/index.html": {
+  "src/main/webapp/swagger-ui/index.html": {
     "stateCleared": "modified",
   },
   "tsconfig.app.json": {
@@ -5158,12 +5164,11 @@ exports[`generator - angular monolith-session-skipUserManagement(true)-withAdmin
 
 exports[`generator - angular samples matrix should match snapshot 1`] = `
 {
-  "gateway-jwt-skipUserManagement(true)-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-src/-websocket(true)": {
+  "gateway-jwt-skipUserManagement(true)-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-clientRoot/-websocket(true)": {
     "applicationType": "gateway",
     "authenticationType": "jwt",
     "clientFramework": "angular",
-    "clientSrcDir": "src/",
-    "clientTestDir": "test/",
+    "clientRootDir": "clientRoot/",
     "enableTranslation": false,
     "languages": [
       "fr",
@@ -5175,12 +5180,11 @@ exports[`generator - angular samples matrix should match snapshot 1`] = `
     "websocket": true,
     "withAdminUi": false,
   },
-  "gateway-oauth2-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)-src/-websocket(true)": {
+  "gateway-oauth2-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)-clientRoot/-websocket(true)": {
     "applicationType": "gateway",
     "authenticationType": "oauth2",
     "clientFramework": "angular",
-    "clientSrcDir": "src/",
-    "clientTestDir": "test/",
+    "clientRootDir": "clientRoot/",
     "enableTranslation": true,
     "languages": [
       "fr",
@@ -5191,12 +5195,11 @@ exports[`generator - angular samples matrix should match snapshot 1`] = `
     "websocket": true,
     "withAdminUi": true,
   },
-  "microservice-jwt-skipUserManagement(false)-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-src/-websocket(false)": {
+  "microservice-jwt-skipUserManagement(false)-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-clientRoot/-websocket(false)": {
     "applicationType": "microservice",
     "authenticationType": "jwt",
     "clientFramework": "angular",
-    "clientSrcDir": "src/",
-    "clientTestDir": "test/",
+    "clientRootDir": "clientRoot/",
     "enableTranslation": false,
     "languages": [
       "fr",
@@ -5208,12 +5211,11 @@ exports[`generator - angular samples matrix should match snapshot 1`] = `
     "websocket": false,
     "withAdminUi": false,
   },
-  "microservice-oauth2-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)-src/main/webapp2/-websocket(false)": {
+  "microservice-oauth2-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)--websocket(false)": {
     "applicationType": "microservice",
     "authenticationType": "oauth2",
     "clientFramework": "angular",
-    "clientSrcDir": "src/main/webapp2/",
-    "clientTestDir": "src/test/javascript2/",
+    "clientRootDir": "",
     "enableTranslation": true,
     "languages": [
       "fr",
@@ -5224,12 +5226,11 @@ exports[`generator - angular samples matrix should match snapshot 1`] = `
     "websocket": false,
     "withAdminUi": true,
   },
-  "monolith-jwt-skipUserManagement(false)-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)-src/main/webapp2/-websocket(true)": {
+  "monolith-jwt-skipUserManagement(false)-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)--websocket(true)": {
     "applicationType": "monolith",
     "authenticationType": "jwt",
     "clientFramework": "angular",
-    "clientSrcDir": "src/main/webapp2/",
-    "clientTestDir": "src/test/javascript2/",
+    "clientRootDir": "",
     "enableTranslation": true,
     "languages": [
       "fr",
@@ -5245,7 +5246,7 @@ exports[`generator - angular samples matrix should match snapshot 1`] = `
     "applicationType": "monolith",
     "authenticationType": "oauth2",
     "clientFramework": "angular",
-    "clientSrcDir": undefined,
+    "clientRootDir": undefined,
     "enableTranslation": false,
     "languages": [
       "fr",
@@ -5260,7 +5261,7 @@ exports[`generator - angular samples matrix should match snapshot 1`] = `
     "applicationType": "monolith",
     "authenticationType": "session",
     "clientFramework": "angular",
-    "clientSrcDir": undefined,
+    "clientRootDir": undefined,
     "enableTranslation": false,
     "languages": [
       "fr",
diff --git a/generators/angular/entity-files-angular.mts b/generators/angular/entity-files-angular.mts
index 85255713efad..15bcbce498b3 100644
--- a/generators/angular/entity-files-angular.mts
+++ b/generators/angular/entity-files-angular.mts
@@ -24,37 +24,37 @@ export const angularFiles = {
   client: [
     {
       ...clientApplicationTemplatesBlock(),
-      templates: ['entities/_entityFolder/_entityFile.model.ts', 'entities/_entityFolder/_entityFile.test-samples.ts'],
+      templates: ['entities/_entityFolder_/_entityFile_.model.ts', 'entities/_entityFolder_/_entityFile_.test-samples.ts'],
     },
     {
       condition: generator => !generator.embedded,
       ...clientApplicationTemplatesBlock(),
       templates: [
-        'entities/_entityFolder/_entityFile.routes.ts',
-        'entities/_entityFolder/detail/_entityFile-detail.component.html',
-        'entities/_entityFolder/detail/_entityFile-detail.component.ts',
-        'entities/_entityFolder/detail/_entityFile-detail.component.spec.ts',
-        'entities/_entityFolder/list/_entityFile.component.html',
-        'entities/_entityFolder/list/_entityFile.component.ts',
-        'entities/_entityFolder/list/_entityFile.component.spec.ts',
-        'entities/_entityFolder/route/_entityFile-routing-resolve.service.ts',
-        'entities/_entityFolder/route/_entityFile-routing-resolve.service.spec.ts',
-        'entities/_entityFolder/service/_entityFile.service.ts',
-        'entities/_entityFolder/service/_entityFile.service.spec.ts',
+        'entities/_entityFolder_/_entityFile_.routes.ts',
+        'entities/_entityFolder_/detail/_entityFile_-detail.component.html',
+        'entities/_entityFolder_/detail/_entityFile_-detail.component.ts',
+        'entities/_entityFolder_/detail/_entityFile_-detail.component.spec.ts',
+        'entities/_entityFolder_/list/_entityFile_.component.html',
+        'entities/_entityFolder_/list/_entityFile_.component.ts',
+        'entities/_entityFolder_/list/_entityFile_.component.spec.ts',
+        'entities/_entityFolder_/route/_entityFile_-routing-resolve.service.ts',
+        'entities/_entityFolder_/route/_entityFile_-routing-resolve.service.spec.ts',
+        'entities/_entityFolder_/service/_entityFile_.service.ts',
+        'entities/_entityFolder_/service/_entityFile_.service.spec.ts',
       ],
     },
     {
       condition: generator => !generator.readOnly && !generator.embedded,
       ...clientApplicationTemplatesBlock(),
       templates: [
-        'entities/_entityFolder/update/_entityFile-form.service.ts',
-        'entities/_entityFolder/update/_entityFile-form.service.spec.ts',
-        'entities/_entityFolder/update/_entityFile-update.component.html',
-        'entities/_entityFolder/update/_entityFile-update.component.spec.ts',
-        'entities/_entityFolder/delete/_entityFile-delete-dialog.component.html',
-        'entities/_entityFolder/update/_entityFile-update.component.ts',
-        'entities/_entityFolder/delete/_entityFile-delete-dialog.component.ts',
-        'entities/_entityFolder/delete/_entityFile-delete-dialog.component.spec.ts',
+        'entities/_entityFolder_/update/_entityFile_-form.service.ts',
+        'entities/_entityFolder_/update/_entityFile_-form.service.spec.ts',
+        'entities/_entityFolder_/update/_entityFile_-update.component.html',
+        'entities/_entityFolder_/update/_entityFile_-update.component.spec.ts',
+        'entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.html',
+        'entities/_entityFolder_/update/_entityFile_-update.component.ts',
+        'entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.ts',
+        'entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.spec.ts',
       ],
     },
   ],
diff --git a/generators/angular/files-angular.mjs b/generators/angular/files-angular.mjs
index 325da262da98..b770b3be551d 100644
--- a/generators/angular/files-angular.mjs
+++ b/generators/angular/files-angular.mjs
@@ -17,27 +17,31 @@
  * limitations under the License.
  */
 
-import { clientApplicationTemplatesBlock, clientSrcTemplatesBlock } from '../client/support/files.mjs';
+import { clientApplicationTemplatesBlock, clientRootTemplatesBlock, clientSrcTemplatesBlock } from '../client/support/files.mjs';
 
 export const files = {
-  common: [
+  jhipsterProject: [
     {
+      templates: ['README.md.jhi.client.angular'],
+    },
+  ],
+  common: [
+    clientRootTemplatesBlock({
       templates: [
+        '.eslintrc.json',
+        'angular.json',
+        'ngsw-config.json',
         'package.json',
         'tsconfig.json',
         'tsconfig.app.json',
         'tsconfig.spec.json',
         'jest.conf.js',
-        '.eslintrc.json',
-        'angular.json',
-        'ngsw-config.json',
-        'README.md.jhi.client.angular',
         'webpack/environment.js',
         'webpack/proxy.conf.js',
         'webpack/webpack.custom.js',
         'webpack/logo-jhipster.png',
       ],
-    },
+    }),
   ],
   sass: [
     {
@@ -56,10 +60,10 @@ export const files = {
     },
   ],
   microfrontend: [
-    {
+    clientRootTemplatesBlock({
       condition: generator => generator.microfrontend,
       templates: ['webpack/webpack.microfrontend.js'],
-    },
+    }),
     {
       condition: generator => generator.microfrontend && generator.applicationTypeGateway,
       ...clientApplicationTemplatesBlock(),
@@ -394,6 +398,7 @@ export const files = {
         'admin/logs/logs.service.spec.ts',
         'admin/metrics/metrics.component.spec.ts',
         'admin/metrics/metrics.service.spec.ts',
+        'admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.spec.ts',
       ],
     },
     {
diff --git a/generators/angular/generator.mts b/generators/angular/generator.mts
index 00f855ee61b3..d6e0734de28c 100644
--- a/generators/angular/generator.mts
+++ b/generators/angular/generator.mts
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import chalk from 'chalk';
 import { isFilePending } from 'mem-fs-editor/state';
 
@@ -54,22 +54,14 @@ export default class AngularGenerator extends BaseApplicationGenerator {
   localEntities?: any[];
 
   async beforeQueue() {
-    await this.dependsOnJHipster(GENERATOR_CLIENT);
     if (!this.fromBlueprint) {
       await this.composeWithBlueprints(GENERATOR_ANGULAR);
     }
-  }
-
-  get composing() {
-    return this.asComposingTaskGroup({
-      async composing() {
-        await this.composeWithJHipster(GENERATOR_LANGUAGES);
-      },
-    });
-  }
 
-  get [BaseApplicationGenerator.COMPOSING]() {
-    return this.asComposingTaskGroup(this.delegateTasksToBlueprint(() => this.composing));
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_CLIENT);
+      await this.dependsOnJHipster(GENERATOR_LANGUAGES);
+    }
   }
 
   get loading() {
@@ -130,7 +122,7 @@ export default class AngularGenerator extends BaseApplicationGenerator {
         };
 
         source.addWebpackConfig = args => {
-          const webpackPath = 'webpack/webpack.custom.js';
+          const webpackPath = `${application.clientRootDir}webpack/webpack.custom.js`;
           const ignoreNonExisting = this.sharedData.getControl().ignoreNeedlesError && 'Webpack configuration file not found';
           this.editFile(
             webpackPath,
diff --git a/generators/angular/generator.spec.mts b/generators/angular/generator.spec.mts
index fc257775a446..c079f917ffe7 100644
--- a/generators/angular/generator.spec.mts
+++ b/generators/angular/generator.spec.mts
@@ -90,6 +90,8 @@ describe(`generator - ${clientFramework}`, () => {
   });
 
   Object.entries(testSamples).forEach(([name, sampleConfig]) => {
+    const { clientRootDir = '' } = sampleConfig;
+
     describe(name, () => {
       let runResult;
 
@@ -110,26 +112,15 @@ describe(`generator - ${clientFramework}`, () => {
         runResult.assertFileContent('.yo-rc.json', new RegExp(`"clientFramework": "${clientFramework}"`));
       });
       it('should not contain version placeholders at package.json', () => {
-        runResult.assertNoFileContent('package.json', /VERSION_MANAGED_BY_CLIENT_COMMON/);
-        runResult.assertNoFileContent('package.json', /VERSION_MANAGED_BY_CLIENT_ANGULAR/);
-        runResult.assertNoFileContent('package.json', /VERSION_MANAGED_BY_CLIENT_REACT/);
-        runResult.assertNoFileContent('package.json', /VERSION_MANAGED_BY_CLIENT_VUE/);
-      });
-
-      describe('skipJhipsterDependencies', () => {
-        const { skipJhipsterDependencies } = sampleConfig;
-        const skipJhipsterDependenciesTitle = skipJhipsterDependencies
-          ? 'should not add generator-jhipster to package.json'
-          : 'should add generator-jhipster to package.json';
-        it(skipJhipsterDependenciesTitle, () => {
-          const assertion = (...args) =>
-            skipJhipsterDependencies ? runResult.assertNoFileContent(...args) : runResult.assertFileContent(...args);
-          assertion('package.json', 'generator-jhipster');
-        });
+        runResult.assertNoFileContent(`${clientRootDir}package.json`, /VERSION_MANAGED_BY_CLIENT_COMMON/);
+        runResult.assertNoFileContent(`${clientRootDir}package.json`, /VERSION_MANAGED_BY_CLIENT_ANGULAR/);
+        runResult.assertNoFileContent(`${clientRootDir}package.json`, /VERSION_MANAGED_BY_CLIENT_REACT/);
+        runResult.assertNoFileContent(`${clientRootDir}package.json`, /VERSION_MANAGED_BY_CLIENT_VUE/);
       });
 
       describe('withAdminUi', () => {
-        const { applicationType, withAdminUi, clientSrcDir = CLIENT_MAIN_SRC_DIR } = sampleConfig;
+        const { applicationType, withAdminUi, clientRootDir = '' } = sampleConfig;
+        const clientSrcDir = `${clientRootDir}${CLIENT_MAIN_SRC_DIR}`;
         const generateAdminUi = applicationType !== 'microservice' && withAdminUi;
         const adminUiComponents = generateAdminUi ? 'should generate admin ui components' : 'should not generate admin ui components';
 
diff --git a/generators/angular/needle-api/needle-client-angular.mts b/generators/angular/needle-api/needle-client-angular.mts
index 58c6e51cdf1e..be61323c1230 100644
--- a/generators/angular/needle-api/needle-client-angular.mts
+++ b/generators/angular/needle-api/needle-client-angular.mts
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import chalk from 'chalk';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 
 import needleClientBase from '../../client/needle-api/needle-client.mjs';
 import { LINE_LENGTH } from '../../generator-constants.mjs';
diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json
index 78ed15ca1fc2..94a6bce1c7c1 100644
--- a/generators/angular/resources/package.json
+++ b/generators/angular/resources/package.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "@angular/common": "16.2.5",
+    "@angular/common": "16.2.10",
     "@fortawesome/angular-fontawesome": "0.13.0",
     "@fortawesome/fontawesome-svg-core": "6.4.2",
     "@fortawesome/free-solid-svg-icons": "6.4.2",
@@ -9,7 +9,7 @@
     "@ngx-translate/http-loader": "8.0.0",
     "@popperjs/core": "2.11.8",
     "bootstrap": "5.3.2",
-    "bootswatch": "5.3.1",
+    "bootswatch": "5.3.2",
     "ngx-cookie-service": "16.0.1",
     "ngx-infinite-scroll": "16.0.0",
     "rxjs": "7.8.1",
@@ -21,31 +21,31 @@
     "@angular-builders/custom-webpack": "16.0.1",
     "@angular-builders/jest": "16.0.1",
     "@angular-eslint/eslint-plugin": "16.2.0",
-    "@angular/cli": "16.2.2",
-    "@types/jest": "29.5.5",
-    "@types/node": "18.17.17",
-    "@typescript-eslint/eslint-plugin": "6.7.0",
+    "@angular/cli": "16.2.7",
+    "@types/jest": "29.5.6",
+    "@types/node": "18.18.6",
+    "@typescript-eslint/eslint-plugin": "6.8.0",
     "browser-sync": "2.29.3",
     "browser-sync-webpack-plugin": "2.3.0",
     "buffer": "6.0.3",
     "copy-webpack-plugin": "11.0.0",
-    "eslint": "8.49.0",
+    "eslint": "8.51.0",
     "eslint-config-prettier": "9.0.0",
     "eslint-webpack-plugin": "4.0.1",
     "folder-hash": "4.0.4",
     "jest": "29.7.0",
     "jest-date-mock": "1.0.8",
     "jest-junit": "16.0.0",
-    "jest-preset-angular": "13.1.1",
+    "jest-preset-angular": "13.1.2",
     "jest-sonar": "0.2.16",
     "merge-jsons-webpack-plugin": "2.0.1",
     "postcss-rtlcss": "4.0.8",
-    "rimraf": "5.0.1",
+    "rimraf": "5.0.5",
     "ts-jest": "29.1.1",
     "typescript": "5.1.6",
-    "webpack": "5.88.2",
+    "webpack": "5.89.0",
     "webpack-bundle-analyzer": "4.9.1",
-    "webpack-merge": "5.9.0",
+    "webpack-merge": "5.10.0",
     "webpack-notifier": "1.15.0"
   }
 }
diff --git a/generators/angular/support/translate-angular.mjs b/generators/angular/support/translate-angular.mjs
index e2c4226af01f..ae6ea7f6c098 100644
--- a/generators/angular/support/translate-angular.mjs
+++ b/generators/angular/support/translate-angular.mjs
@@ -44,8 +44,8 @@ function getTranslationValue(getWebappTranslation, key, data) {
  */
 function replaceTranslationKeysWithText(getWebappTranslation, content, regexSource, { keyIndex = 1, replacementIndex = 1, escape } = {}) {
   const regex = new RegExp(regexSource, 'g');
-  let match = regex.exec(content);
-  while (match !== null) {
+  const allMatches = content.matchAll(regex);
+  for (const match of allMatches) {
     // match is now the next match, in array form and our key is at index 1, index 1 is replace target.
     const key = match[keyIndex];
     const target = match[replacementIndex];
@@ -54,7 +54,6 @@ function replaceTranslationKeysWithText(getWebappTranslation, content, regexSour
       translation = escape(translation, match);
     }
     content = content.replace(target, translation);
-    match = regex.exec(content);
   }
   return content;
 }
@@ -67,9 +66,14 @@ function replaceTranslationKeysWithText(getWebappTranslation, content, regexSour
  * @returns string with jsKey value replaced
  */
 function replaceJSTranslation(getWebappTranslation, content, jsKey) {
-  return replaceTranslationKeysWithText(getWebappTranslation, content, `${jsKey}\\s?:\\s?['|"]([a-zA-Z0-9.\\-_]+)['|"]`, {
-    escape: (translation, match) => translation.replaceAll(match[0].slice(-1), `\\${match[0].slice(-1)}`),
-  });
+  return replaceTranslationKeysWithText(
+    getWebappTranslation,
+    content,
+    `${jsKey}\\s?:\\s?['|"]([a-zA-Z0-9.\\-_]+\\.[a-zA-Z0-9.\\-_]+)['|"]`,
+    {
+      escape: (translation, match) => translation.replaceAll(match[0].slice(-1), `\\${match[0].slice(-1)}`),
+    },
+  );
 }
 
 /**
@@ -113,10 +117,9 @@ export const createTranslationReplacer = (getWebappTranslation, enableTranslatio
         content = content.replace(new RegExp(TRANSLATE_REGEX, 'g'), '');
         content = replacePlaceholders(getWebappTranslation, content);
       }
-      content = htmlJhiTranslateReplacer(content);
-      content = htmlJhiTranslateStringifyReplacer(content);
     }
-    if (/\.ts$/.test(filePath)) {
+    // Translate html files and inline templates.
+    if (/(:?\.html|component\.ts)$/.test(filePath)) {
       content = htmlJhiTranslateReplacer(content);
       content = htmlJhiTranslateStringifyReplacer(content);
     }
diff --git a/generators/angular/support/update-languages.mts b/generators/angular/support/update-languages.mts
index 275657f75dc3..a8ac51a6c8ca 100644
--- a/generators/angular/support/update-languages.mts
+++ b/generators/angular/support/update-languages.mts
@@ -48,17 +48,18 @@ function updateLanguagesInConstantsTask(this: BaseGenerator, { application, cont
 }
 
 function updateLanguagesInWebpackTask(this: BaseGenerator, { application, control = {} }: UpdateClientLanguagesTaskParam) {
-  const { clientSrcDir, languages } = application;
+  const { clientSrcDir, clientRootDir, languages } = application;
   const { ignoreNeedlesError: ignoreNonExisting } = control;
   let newContent = 'groupBy: [\n';
+  const srcRelativePath = this.relativeDir(clientRootDir, clientSrcDir);
   languages?.forEach(language => {
-    newContent += `                    { pattern: "./${clientSrcDir}i18n/${language}/*.json", fileName: "./i18n/${language}.json" },\n`;
+    newContent += `                    { pattern: "./${srcRelativePath}i18n/${language}/*.json", fileName: "./i18n/${language}.json" },\n`;
   });
   newContent +=
     '                    // jhipster-needle-i18n-language-webpack - JHipster will add/remove languages in this array\n' +
     '                ]';
 
-  this.editFile('webpack/webpack.custom.js', { ignoreNonExisting }, content =>
+  this.editFile(`${clientRootDir}webpack/webpack.custom.js`, { ignoreNonExisting }, content =>
     content.replace(/groupBy:.*\[([^\]]*jhipster-needle-i18n-language-webpack[^\]]*)\]/g, newContent),
   );
 }
diff --git a/generators/angular/templates/.eslintrc.json.ejs b/generators/angular/templates/.eslintrc.json.ejs
index af75661c41b1..89b1594f4075 100644
--- a/generators/angular/templates/.eslintrc.json.ejs
+++ b/generators/angular/templates/.eslintrc.json.ejs
@@ -38,7 +38,7 @@
     "project": [
       "./tsconfig.app.json",
 <%_ if (cypressTests) { _%>
-      "./<%= clientTestDir %>cypress/tsconfig.json",
+      "./<%= this.relativeDir(clientRootDir, cypressDir) %>tsconfig.json",
 <%_ } _%>
       "./tsconfig.spec.json"
     ]
diff --git a/generators/angular/templates/angular.json.ejs b/generators/angular/templates/angular.json.ejs
index df0d32bdc5c4..1adc343fea49 100644
--- a/generators/angular/templates/angular.json.ejs
+++ b/generators/angular/templates/angular.json.ejs
@@ -32,7 +32,7 @@
         }
       },
       "root": "",
-      "sourceRoot": "<%= clientSrcDir.replace(/\/$/, "") %>",
+      "sourceRoot": "<%= this.relativeDir(clientRootDir, clientSrcDir).replace(/\/$/, "") %>",
       "prefix": "<%= jhiPrefixDashed %>",
       "architect": {
         "build": {
@@ -41,12 +41,12 @@
             "customWebpackConfig": {
               "path": "./webpack/webpack.custom.js"
             },
-            "outputPath": "<%= clientDistDir %>",
-            "index": "<%= clientSrcDir %>index.html",
-            "main": "<%= clientSrcDir %>main.ts",
+            "outputPath": "<%= this.relativeDir(clientRootDir, clientDistDir) %>",
+            "index": "<%= this.relativeDir(clientRootDir, clientSrcDir) %>index.html",
+            "main": "<%= this.relativeDir(clientRootDir, clientSrcDir) %>main.ts",
             "polyfills": [
 <%_ if (communicationSpringWebsocket) { _%>
-              "./<%= clientSrcDir %>sockjs-client.polyfill",
+              "./<%= this.relativeDir(clientRootDir, clientSrcDir) %>sockjs-client.polyfill",
 <%_ } _%>
 <%_ if (microfrontend) { _%>
               "zone.js/dist/zone"
@@ -57,12 +57,15 @@
             "tsConfig": "tsconfig.app.json",
             "inlineStyleLanguage": "scss",
             "assets": [
-              "<%= clientSrcDir %>content",
-              "<%= clientSrcDir %>favicon.ico",
-              "<%= clientSrcDir %>manifest.webapp",
-              "<%= clientSrcDir %>robots.txt"
+              "<%= this.relativeDir(clientRootDir, clientSrcDir) %>content",
+              "<%= this.relativeDir(clientRootDir, clientSrcDir) %>favicon.ico",
+              "<%= this.relativeDir(clientRootDir, clientSrcDir) %>manifest.webapp",
+              "<%= this.relativeDir(clientRootDir, clientSrcDir) %>robots.txt"
+            ],
+            "styles": [
+              "<%= this.relativeDir(clientRootDir, clientSrcDir) %>content/scss/vendor.scss",
+              "<%= this.relativeDir(clientRootDir, clientSrcDir) %>content/scss/global.scss"
             ],
-            "styles": ["<%= clientSrcDir %>content/scss/vendor.scss", "<%= clientSrcDir %>content/scss/global.scss"],
             "scripts": []
           },
           "configurations": {
@@ -119,7 +122,8 @@
         "test": {
           "builder": "@angular-builders/jest:run",
           "options": {
-            "configPath": "jest.conf.js"
+            "configPath": "jest.conf.js",
+            "tsConfig": "tsconfig.spec.json"
           }
         }
       }
@@ -128,7 +132,7 @@
   "cli": {
     "cache": {
       "enabled": true,
-      "path": "./<%= temporaryDir %>angular/",
+      "path": "./<%= this.relativeDir(clientRootDir, temporaryDir) %>angular/",
       "environment": "all"
     },
     "packageManager": "<%= clientPackageManager %>"
diff --git a/generators/angular/templates/jest.conf.js.ejs b/generators/angular/templates/jest.conf.js.ejs
index 3e7a25fb3a2d..949a1c3b01fb 100644
--- a/generators/angular/templates/jest.conf.js.ejs
+++ b/generators/angular/templates/jest.conf.js.ejs
@@ -30,15 +30,15 @@ module.exports = {
   roots: ['<rootDir>', `<rootDir>/${baseUrl}`],
   modulePaths: [`<rootDir>/${baseUrl}`],
   setupFiles: ['jest-date-mock'],
-  cacheDirectory: '<rootDir>/<%= temporaryDir %>jest-cache',
-  coverageDirectory: '<rootDir>/<%= temporaryDir %>test-results/',
+  cacheDirectory: '<rootDir>/<%= this.relativeDir(clientRootDir, temporaryDir) %>jest-cache',
+  coverageDirectory: '<rootDir>/<%= this.relativeDir(clientRootDir, temporaryDir) %>test-results/',
   moduleNameMapper: pathsToModuleNameMapper(paths, { prefix: `<rootDir>/${baseUrl}/` }),
   reporters: [
     'default',
-    ['jest-junit', { outputDirectory: '<rootDir>/<%= temporaryDir %>test-results/', outputName: 'TESTS-results-jest.xml' }],
-    ['jest-sonar', { outputDirectory: './<%= temporaryDir %>test-results/jest', outputName: 'TESTS-results-sonar.xml' }],
+    ['jest-junit', { outputDirectory: '<rootDir>/<%= this.relativeDir(clientRootDir, temporaryDir) %>test-results/', outputName: 'TESTS-results-jest.xml' }],
+    ['jest-sonar', { outputDirectory: './<%= this.relativeDir(clientRootDir, temporaryDir) %>test-results/jest', outputName: 'TESTS-results-sonar.xml' }],
   ],
-  testMatch: ['<rootDir>/<%= clientSrcDir %>app/**/@(*.)@(spec.ts)'],
+  testMatch: ['<rootDir>/<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/**/@(*.)@(spec.ts)'],
   testEnvironmentOptions: {
     url: 'https://jhipster.tech',
   },
diff --git a/generators/angular/templates/package.json.ejs b/generators/angular/templates/package.json.ejs
index a991bbb702f8..c178132e0771 100644
--- a/generators/angular/templates/package.json.ejs
+++ b/generators/angular/templates/package.json.ejs
@@ -77,9 +77,6 @@
 <%_ if (enableTranslation) { _%>
     "folder-hash": "<%= nodeDependencies['folder-hash'] %>",
     "merge-jsons-webpack-plugin": "<%= nodeDependencies['merge-jsons-webpack-plugin'] %>",
-<%_ } _%>
-<%_ if (!skipServer) { _%>
-    "prettier-plugin-java": "<%= nodeDependencies['prettier-plugin-java'] %>",
 <%_ } _%>
     "@angular/cli": "<%= nodeDependencies['@angular/cli'] %>",
     "@angular/compiler-cli": "<%= nodeDependencies['@angular/common'] %>",
@@ -99,20 +96,12 @@
     "eslint": "<%= nodeDependencies['eslint'] %>",
     "eslint-config-prettier": "<%= nodeDependencies['eslint-config-prettier'] %>",
     "eslint-webpack-plugin": "<%= nodeDependencies['eslint-webpack-plugin'] %>",
-<%_ if (!skipJhipsterDependencies) { _%>
-    "generator-jhipster": "<%= jhipsterVersion %>",
-  <%_ blueprints.forEach(blueprint => { _%>
-    "<%= blueprint.name %>": "<%= blueprint.version %>",
-  <%_ }); _%>
-<%_ } _%>
     "jest": "<%= nodeDependencies['jest'] %>",
     "jest-environment-jsdom": "<%= nodeDependencies['jest'] %>",
     "jest-preset-angular": "<%= nodeDependencies['jest-preset-angular'] %>",
     "jest-date-mock": "<%= nodeDependencies['jest-date-mock'] %>",
     "jest-junit": "<%= nodeDependencies['jest-junit'] %>",
     "jest-sonar": "<%= nodeDependencies['jest-sonar'] %>",
-    "prettier": "<%= nodeDependencies['prettier'] %>",
-    "prettier-plugin-packagejson": "<%= nodeDependencies['prettier-plugin-packagejson'] %>",
 <%_ if (enableI18nRTL) { _%>
     "postcss-rtlcss": "<%= nodeDependencies['postcss-rtlcss'] %>",
 <%_ } _%>
@@ -138,8 +127,8 @@
     "prettier:format": "prettier --write \"{,src/**/,webpack/,.blueprint/**/}*.{<%= prettierExtensions %>}\"",
     "lint": "eslint . --ext .js,.ts",
     "lint:fix": "<%= clientPackageManager %> run lint -- --fix",
-    "cleanup": "rimraf <%= clientDistDir %>",
-    "clean-www": "rimraf <%= clientDistDir %>app/{src,<%= temporaryDir %>}",
+    "cleanup": "rimraf <%= this.relativeDir(clientRootDir, temporaryDir) %>",
+    "clean-www": "rimraf <%= this.relativeDir(clientRootDir, clientDistDir) %>",
     "jest": "jest --coverage --logHeapUsage --maxWorkers=2 --config jest.conf.js",
     "start": "ng serve<% if (!microfrontend) { %> --hmr<% } %>",
     "start-tls": "<%= clientPackageManager %> run webapp:dev-ssl",
diff --git a/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.spec.ts.ejs
new file mode 100644
index 000000000000..cb76228b9857
--- /dev/null
+++ b/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.spec.ts.ejs
@@ -0,0 +1,350 @@
+<%#
+ Copyright 2013-2023 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+
+import { MetricsModalThreadsComponent } from './metrics-modal-threads.component';
+import { ThreadState } from '../../metrics.model';
+
+describe('MetricsModalThreadsComponent', () => {
+  let comp: MetricsModalThreadsComponent;
+  let fixture: ComponentFixture<MetricsModalThreadsComponent>;
+  let mockActiveModal: NgbActiveModal;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule, MetricsModalThreadsComponent],
+      providers: [NgbActiveModal],
+    })
+      .overrideTemplate(MetricsModalThreadsComponent, '')
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(MetricsModalThreadsComponent);
+    comp = fixture.componentInstance;
+    mockActiveModal = TestBed.inject(NgbActiveModal);
+  });
+
+  describe('ngOnInit', () => {
+    it('should count threads on init', () => {
+      // GIVEN
+      comp.threads = [
+        { 
+            threadName: '',
+            threadId: 1,
+            blockedTime: 1,
+            blockedCount: 1,
+            waitedTime: 1,
+            waitedCount: 1,
+            lockName: 'lock1',
+            lockOwnerId: 1,
+            lockOwnerName: 'lock1',
+            daemon: true,
+            inNative: true,
+            suspended: true,
+            threadState: ThreadState.Blocked,
+            priority: 1,
+            stackTrace: [],
+            lockedMonitors: [],
+            lockedSynchronizers: [],
+            lockInfo: null
+        },
+        { 
+            threadName: '',
+            threadId: 2,
+            blockedTime: 2,
+            blockedCount: 2,
+            waitedTime: 2,
+            waitedCount: 2,
+            lockName: 'lock2',
+            lockOwnerId: 2,
+            lockOwnerName: 'lock2',
+            daemon: false,
+            inNative: false,
+            suspended: false,
+            threadState: ThreadState.Runnable,
+            priority: 2,
+            stackTrace: [],
+            lockedMonitors: [],
+            lockedSynchronizers: [],
+            lockInfo: null
+        },
+        { 
+            threadName: '',
+            threadId: 3,
+            blockedTime: 3,
+            blockedCount: 3,
+            waitedTime: 3,
+            waitedCount: 3,
+            lockName: 'lock3',
+            lockOwnerId: 3,
+            lockOwnerName: 'lock3',
+            daemon: false,
+            inNative: false,
+            suspended: false,
+            threadState: ThreadState.TimedWaiting,
+            priority: 3,
+            stackTrace: [],
+            lockedMonitors: [],
+            lockedSynchronizers: [],
+            lockInfo: null
+        },
+        { 
+            threadName: '',
+            threadId: 4,
+            blockedTime: 4,
+            blockedCount: 4,
+            waitedTime: 4,
+            waitedCount: 4,
+            lockName: 'lock4',
+            lockOwnerId: 4,
+            lockOwnerName: 'lock4',
+            daemon: false,
+            inNative: false,
+            suspended: false,
+            threadState: ThreadState.Waiting,
+            priority: 4,
+            stackTrace: [],
+            lockedMonitors: [],
+            lockedSynchronizers: [],
+            lockInfo: null
+        }
+      ];
+
+      // WHEN
+      comp.ngOnInit();
+
+      // THEN
+      expect(comp.threadDumpRunnable).toEqual(1);
+      expect(comp.threadDumpWaiting).toEqual(1);
+      expect(comp.threadDumpTimedWaiting).toEqual(1);
+      expect(comp.threadDumpBlocked).toEqual(1);
+      expect(comp.threadDumpAll).toEqual(4);
+    });
+  });
+
+  describe('getBadgeClass', () => {
+    it('should return a success badge class for runnable thread state', () => {
+      // GIVEN
+      const threadState = ThreadState.Runnable;
+
+      // WHEN
+      const badgeClass = comp.getBadgeClass(threadState);
+
+      // THEN
+      expect(badgeClass).toEqual('bg-success');
+    });
+
+    it('should return an info badge class for waiting thread state', () => {
+      // GIVEN
+      const threadState = ThreadState.Waiting;
+
+      // WHEN
+      const badgeClass = comp.getBadgeClass(threadState);
+
+      // THEN
+      expect(badgeClass).toEqual('bg-info');
+    });
+
+    it('should return a warning badge class for time waiting thread state', () => {
+      // GIVEN
+      const threadState = ThreadState.TimedWaiting;
+
+      // WHEN
+      const badgeClass = comp.getBadgeClass(threadState);
+
+      // THEN
+      expect(badgeClass).toEqual('bg-warning');
+    });
+
+    it('should return a danger badge class for blocked thread state', () => {
+      // GIVEN
+      const threadState = ThreadState.Blocked;
+
+      // WHEN
+      const badgeClass = comp.getBadgeClass(threadState);
+
+      // THEN
+      expect(badgeClass).toEqual('bg-danger');
+    });
+
+    it('should return an empty string for others threads', () => {
+      // GIVEN
+      const threadState = ThreadState.New;
+
+      // WHEN
+      const badgeClass = comp.getBadgeClass(threadState);
+
+      // THEN
+      expect(badgeClass).toEqual('');
+    });
+  });
+
+  describe('getThreads', () => {
+    it('should return blocked threads', () => {
+      // GIVEN
+      const thread1 = { 
+        threadName: '',
+        threadId: 1,
+        blockedTime: 1,
+        blockedCount: 1,
+        waitedTime: 1,
+        waitedCount: 1,
+        lockName: 'lock1',
+        lockOwnerId: 1,
+        lockOwnerName: 'lock1',
+        daemon: true,
+        inNative: true,
+        suspended: true,
+        threadState: ThreadState.Blocked,
+        priority: 1,
+        stackTrace: [],
+        lockedMonitors: [],
+        lockedSynchronizers: [],
+        lockInfo: null
+      };
+      const thread2 = { 
+        threadName: '',
+        threadId: 2,
+        blockedTime: 2,
+        blockedCount: 2,
+        waitedTime: 2,
+        waitedCount: 2,
+        lockName: 'lock2',
+        lockOwnerId: 1,
+        lockOwnerName: 'lock2',
+        daemon: false,
+        inNative: false,
+        suspended: false,
+        threadState: ThreadState.Runnable,
+        priority: 2,
+        stackTrace: [],
+        lockedMonitors: [],
+        lockedSynchronizers: [],
+        lockInfo: null
+      };
+      comp.threads = [
+        thread1,
+        thread2
+      ];
+      comp.threadStateFilter = ThreadState.Blocked;
+
+      // WHEN
+      const threadsFiltered = comp.getThreads();
+
+      // THEN
+      expect(threadsFiltered).toEqual([thread1]);
+    });
+
+    it('should return an empty array of threads', () => {
+      // GIVEN
+      comp.threads = [];
+      comp.threadStateFilter = ThreadState.Blocked;
+
+      // WHEN
+      const threadsFiltered = comp.getThreads();
+
+      // THEN
+      expect(threadsFiltered).toEqual([]);
+    });
+
+    it('should return all threads if there is no filter', () => {
+      // GIVEN
+      const thread1 = { 
+        threadName: '',
+        threadId: 1,
+        blockedTime: 1,
+        blockedCount: 1,
+        waitedTime: 1,
+        waitedCount: 1,
+        lockName: 'lock1',
+        lockOwnerId: 1,
+        lockOwnerName: 'lock1',
+        daemon: true,
+        inNative: true,
+        suspended: true,
+        threadState: ThreadState.Blocked,
+        priority: 1,
+        stackTrace: [],
+        lockedMonitors: [],
+        lockedSynchronizers: [],
+        lockInfo: null
+      };
+      const thread2 = { 
+        threadName: '',
+        threadId: 2,
+        blockedTime: 2,
+        blockedCount: 2,
+        waitedTime: 2,
+        waitedCount: 2,
+        lockName: 'lock2',
+        lockOwnerId: 1,
+        lockOwnerName: 'lock2',
+        daemon: false,
+        inNative: false,
+        suspended: false,
+        threadState: ThreadState.Runnable,
+        priority: 2,
+        stackTrace: [],
+        lockedMonitors: [],
+        lockedSynchronizers: [],
+        lockInfo: null
+      };
+      comp.threads = [
+        thread1,
+        thread2
+      ];
+      comp.threadStateFilter = undefined;
+
+      // WHEN
+      const threadsFiltered = comp.getThreads();
+
+      // THEN
+      expect(threadsFiltered).toEqual(comp.threads);
+    });
+
+    it('should return an empty array if there are no threads to filter', () => {
+      // GIVEN
+      comp.threads = undefined
+      comp.threadStateFilter = ThreadState.Blocked;
+
+      // WHEN
+      const threadsFiltered = comp.getThreads();
+
+      // THEN
+      expect(threadsFiltered).toEqual([]);
+    });
+  });
+
+  describe('dismiss', () => {
+    it('should call dismiss function for modal on dismiss', () => {
+      // GIVEN
+      jest.spyOn(mockActiveModal, 'dismiss').mockReturnValue(undefined);
+
+      // WHEN
+      comp.dismiss();
+
+      // THEN
+      expect(mockActiveModal.dismiss).toHaveBeenCalled();
+    });
+  });
+
+});
diff --git a/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs
index 65c21947ff98..1dfb2c8c689e 100644
--- a/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs
+++ b/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs
@@ -16,18 +16,20 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
+import { ChangeDetectorRef } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { of } from 'rxjs';
 
 import MetricsComponent from './metrics.component';
 import { MetricsService } from './metrics.service';
-import { Metrics } from './metrics.model';
+import { Metrics, Thread, ThreadDump } from './metrics.model';
 
 describe('MetricsComponent', () => {
   let comp: MetricsComponent;
   let fixture: ComponentFixture<MetricsComponent>;
   let service: MetricsService;
+  let changeDetector: ChangeDetectorRef;
 
   beforeEach(
     waitForAsync(() => {
@@ -43,18 +45,122 @@ describe('MetricsComponent', () => {
     fixture = TestBed.createComponent(MetricsComponent);
     comp = fixture.componentInstance;
     service = TestBed.inject(MetricsService);
+    changeDetector = fixture.debugElement.injector.get(ChangeDetectorRef);
   });
 
   describe('refresh', () => {
     it('should call refresh on init', () => {
       // GIVEN
-      jest.spyOn(service, 'getMetrics').mockReturnValue(of({} as Metrics));
+      const metrics = {
+        garbageCollector: {
+          'PS Scavenge': {
+            collectionCount: 0,
+            collectionTime: 0,
+          },
+          'PS MarkSweep': {
+            collectionCount: 0,
+            collectionTime: 0,
+          },
+        },
+      } as unknown as Metrics;
+      const threadDump = { threads: [ { threadName: 'thread 1' } as Thread] } as ThreadDump;
+      
+      jest.spyOn(service, 'getMetrics').mockReturnValue(of(metrics));
+      jest.spyOn(service, 'threadDump').mockReturnValue(of(threadDump));
+      jest.spyOn(changeDetector.constructor.prototype, 'markForCheck');
 
       // WHEN
       comp.ngOnInit();
 
       // THEN
       expect(service.getMetrics).toHaveBeenCalled();
+      expect(comp.metrics).toEqual(metrics);
+      expect(comp.threads).toEqual(threadDump.threads);
+      expect(comp.updatingMetrics).toBeFalsy();
+      expect(changeDetector.constructor.prototype.markForCheck).toHaveBeenCalled();
+    });
+  });
+
+  describe('metricsKeyExists', () => {
+    it('should check that metrics key exists', () => {
+      // GIVEN
+      comp.metrics = {
+        garbageCollector: {
+          'PS Scavenge': {
+            collectionCount: 0,
+            collectionTime: 0,
+          },
+          'PS MarkSweep': {
+            collectionCount: 0,
+            collectionTime: 0,
+          },
+        },
+      } as unknown as Metrics;
+
+      // WHEN
+      const garbageCollectorKeyExists = comp.metricsKeyExists('garbageCollector');
+
+      // THEN
+      expect(garbageCollectorKeyExists).toBeTruthy();
+    });
+
+    it('should check that metrics key does not exist', () => {
+      // GIVEN
+      comp.metrics = {
+        garbageCollector: {
+          'PS Scavenge': {
+            collectionCount: 0,
+            collectionTime: 0,
+          },
+          'PS MarkSweep': {
+            collectionCount: 0,
+            collectionTime: 0,
+          },
+        },
+      } as unknown as Metrics;
+
+      // WHEN
+      const databasesCollectorKeyExists = comp.metricsKeyExists('databases');
+
+      // THEN
+      expect(databasesCollectorKeyExists).toBeFalsy();
+    });
+  });
+
+  describe('metricsKeyExistsAndObjectNotEmpty', () => {
+    it('should check that metrics key exists and is not empty', () => {
+      // GIVEN
+      comp.metrics = {
+        garbageCollector: {
+          'PS Scavenge': {
+            collectionCount: 0,
+            collectionTime: 0,
+          },
+          'PS MarkSweep': {
+            collectionCount: 0,
+            collectionTime: 0,
+          },
+        },
+      } as unknown as Metrics;
+
+      // WHEN
+      const garbageCollectorKeyExistsAndNotEmpty = comp.metricsKeyExistsAndObjectNotEmpty('garbageCollector');
+
+      // THEN
+      expect(garbageCollectorKeyExistsAndNotEmpty).toBeTruthy();
+    });
+
+    it('should check that metrics key is empty', () => {
+      // GIVEN
+      comp.metrics = {
+        garbageCollector: {},
+      } as Metrics;
+
+      // WHEN
+      const garbageCollectorKeyEmpty = comp.metricsKeyExistsAndObjectNotEmpty('garbageCollector');
+
+      // THEN
+      expect(garbageCollectorKeyEmpty).toBeFalsy();
     });
   });
 });
diff --git a/generators/angular/templates/src/main/webapp/app/core/util/event-manager.service.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/core/util/event-manager.service.spec.ts.ejs
index a0d1373b49bf..2f2268005d48 100644
--- a/generators/angular/templates/src/main/webapp/app/core/util/event-manager.service.spec.ts.ejs
+++ b/generators/angular/templates/src/main/webapp/app/core/util/event-manager.service.spec.ts.ejs
@@ -53,7 +53,7 @@ describe('Event Manager tests', () => {
         eventManager.subscribe('modifier', (event: EventWithContent<unknown> | string) => (recievedEvent = event));
 
         // WHEN
-        eventManager.broadcast({ name: 'unrelatedModifier', content: 'unreleated modification' });
+        eventManager.broadcast({ name: 'unrelatedModifier', content: 'unrelated modification' });
         // THEN
         expect(recievedEvent).toBeNull();
 
diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/_entityFile.model.ts.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.model.ts.ejs
similarity index 100%
rename from generators/angular/templates/src/main/webapp/app/entities/_entityFolder/_entityFile.model.ts.ejs
rename to generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.model.ts.ejs
diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/_entityFile.routes.ts.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.routes.ts.ejs
similarity index 100%
rename from generators/angular/templates/src/main/webapp/app/entities/_entityFolder/_entityFile.routes.ts.ejs
rename to generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.routes.ts.ejs
diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/_entityFile.test-samples.ts.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.test-samples.ts.ejs
similarity index 100%
rename from generators/angular/templates/src/main/webapp/app/entities/_entityFolder/_entityFile.test-samples.ts.ejs
rename to generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.test-samples.ts.ejs
diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/delete/_entityFile-delete-dialog.component.html.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.html.ejs
similarity index 100%
rename from generators/angular/templates/src/main/webapp/app/entities/_entityFolder/delete/_entityFile-delete-dialog.component.html.ejs
rename to generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.html.ejs
diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/delete/_entityFile-delete-dialog.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.spec.ts.ejs
similarity index 100%
rename from generators/angular/templates/src/main/webapp/app/entities/_entityFolder/delete/_entityFile-delete-dialog.component.spec.ts.ejs
rename to generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.spec.ts.ejs
diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/delete/_entityFile-delete-dialog.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.ts.ejs
similarity index 100%
rename from generators/angular/templates/src/main/webapp/app/entities/_entityFolder/delete/_entityFile-delete-dialog.component.ts.ejs
rename to generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.ts.ejs
diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/detail/_entityFile-detail.component.html.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.html.ejs
similarity index 95%
rename from generators/angular/templates/src/main/webapp/app/entities/_entityFolder/detail/_entityFile-detail.component.html.ejs
rename to generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.html.ejs
index 7b82a687d5ab..04a01a9e7bf7 100644
--- a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/detail/_entityFile-detail.component.html.ejs
+++ b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.html.ejs
@@ -32,7 +32,7 @@
     const fieldName = field.fieldName;
     const fieldType = field.fieldType;
 _%>
-        <dt><span <%= jhiPrefix %>Translate="<%= field.fieldTranslationKey %>"<% if (field.javadoc) { if (enableTranslation) { %> [ngbTooltip]="'<%= i18nKeyPrefix %>.help.<%= fieldName %>' | translate"<% } else { %> ngbTooltip="<%= field.javadoc %>"<% } } %>>__jhiTransformTranslate__('<%- field.fieldTranslationKey %>')</span></dt>
+        <dt><span <%= jhiPrefix %>Translate="<%= field.fieldTranslationKey %>"<% if (field.documentation) { if (enableTranslation) { %> [ngbTooltip]="'<%= i18nKeyPrefix %>.help.<%= fieldName %>' | translate"<% } else { %> ngbTooltip="<%= field.documentation %>"<% } } %>>__jhiTransformTranslate__('<%- field.fieldTranslationKey %>')</span></dt>
         <dd>
     <%_ if (field.fieldIsEnum) { _%>
           <%# TODO: import enum and use its key as label _%>
diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/detail/_entityFile-detail.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.spec.ts.ejs
similarity index 100%
rename from generators/angular/templates/src/main/webapp/app/entities/_entityFolder/detail/_entityFile-detail.component.spec.ts.ejs
rename to generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.spec.ts.ejs
diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/detail/_entityFile-detail.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.ts.ejs
similarity index 100%
rename from generators/angular/templates/src/main/webapp/app/entities/_entityFolder/detail/_entityFile-detail.component.ts.ejs
rename to generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.ts.ejs
diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/list/_entityFile.component.html.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.html.ejs
similarity index 100%
rename from generators/angular/templates/src/main/webapp/app/entities/_entityFolder/list/_entityFile.component.html.ejs
rename to generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.html.ejs
diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/list/_entityFile.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.spec.ts.ejs
similarity index 100%
rename from generators/angular/templates/src/main/webapp/app/entities/_entityFolder/list/_entityFile.component.spec.ts.ejs
rename to generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.spec.ts.ejs
diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/list/_entityFile.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.ts.ejs
similarity index 100%
rename from generators/angular/templates/src/main/webapp/app/entities/_entityFolder/list/_entityFile.component.ts.ejs
rename to generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.ts.ejs
diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/list/infinite-scroll-template.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/infinite-scroll-template.ejs
similarity index 100%
rename from generators/angular/templates/src/main/webapp/app/entities/_entityFolder/list/infinite-scroll-template.ejs
rename to generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/infinite-scroll-template.ejs
diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/list/pagination-template.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/pagination-template.ejs
similarity index 100%
rename from generators/angular/templates/src/main/webapp/app/entities/_entityFolder/list/pagination-template.ejs
rename to generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/pagination-template.ejs
diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/route/_entityFile-routing-resolve.service.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/route/_entityFile_-routing-resolve.service.spec.ts.ejs
similarity index 100%
rename from generators/angular/templates/src/main/webapp/app/entities/_entityFolder/route/_entityFile-routing-resolve.service.spec.ts.ejs
rename to generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/route/_entityFile_-routing-resolve.service.spec.ts.ejs
diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/route/_entityFile-routing-resolve.service.ts.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/route/_entityFile_-routing-resolve.service.ts.ejs
similarity index 100%
rename from generators/angular/templates/src/main/webapp/app/entities/_entityFolder/route/_entityFile-routing-resolve.service.ts.ejs
rename to generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/route/_entityFile_-routing-resolve.service.ts.ejs
diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/service/_entityFile.service.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/service/_entityFile_.service.spec.ts.ejs
similarity index 100%
rename from generators/angular/templates/src/main/webapp/app/entities/_entityFolder/service/_entityFile.service.spec.ts.ejs
rename to generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/service/_entityFile_.service.spec.ts.ejs
diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/service/_entityFile.service.ts.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/service/_entityFile_.service.ts.ejs
similarity index 100%
rename from generators/angular/templates/src/main/webapp/app/entities/_entityFolder/service/_entityFile.service.ts.ejs
rename to generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/service/_entityFile_.service.ts.ejs
diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/update/_entityFile-form.service.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-form.service.spec.ts.ejs
similarity index 100%
rename from generators/angular/templates/src/main/webapp/app/entities/_entityFolder/update/_entityFile-form.service.spec.ts.ejs
rename to generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-form.service.spec.ts.ejs
diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/update/_entityFile-form.service.ts.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-form.service.ts.ejs
similarity index 100%
rename from generators/angular/templates/src/main/webapp/app/entities/_entityFolder/update/_entityFile-form.service.ts.ejs
rename to generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-form.service.ts.ejs
diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/update/_entityFile-update.component.html.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.html.ejs
similarity index 98%
rename from generators/angular/templates/src/main/webapp/app/entities/_entityFolder/update/_entityFile-update.component.html.ejs
rename to generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.html.ejs
index cde67345c198..ddb13b25bcf8 100644
--- a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/update/_entityFile-update.component.html.ejs
+++ b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.html.ejs
@@ -45,7 +45,7 @@
 _%>
 
                 <div class="mb-3"<% if (field.autoGenerate) { %> *ngIf="editForm.controls.<%= field.fieldName %>.value !== null"<% } %>>
-                    <label class="form-label" <%= jhiPrefix %>Translate="<%= translationKey %>" for="field_<%= fieldName %>"<% if (field.javadoc) { if (enableTranslation) { %> [ngbTooltip]="'<%= i18nKeyPrefix %>.help.<%= fieldName %>' | translate"<% } else { %> ngbTooltip="<%= field.javadoc %>"<% } } %>><%= fieldNameHumanized %></label>
+                    <label class="form-label" <%= jhiPrefix %>Translate="<%= translationKey %>" for="field_<%= fieldName %>"<% if (field.documentation) { if (enableTranslation) { %> [ngbTooltip]="'<%= i18nKeyPrefix %>.help.<%= fieldName %>' | translate"<% } else { %> ngbTooltip="<%= field.documentation %>"<% } } %>><%= fieldNameHumanized %></label>
   <%_ if (field.fieldIsEnum) { _%>
                     <select class="form-control" name="<%= fieldName %>" formControlName="<%= fieldName %>" id="field_<%= fieldName %>" data-cy="<%= fieldName %>">
     <%_ const enumPrefix = frontendAppName + '.'+ fieldType; _%>
diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/update/_entityFile-update.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.spec.ts.ejs
similarity index 100%
rename from generators/angular/templates/src/main/webapp/app/entities/_entityFolder/update/_entityFile-update.component.spec.ts.ejs
rename to generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.spec.ts.ejs
diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/update/_entityFile-update.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.ts.ejs
similarity index 100%
rename from generators/angular/templates/src/main/webapp/app/entities/_entityFolder/update/_entityFile-update.component.ts.ejs
rename to generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.ts.ejs
diff --git a/generators/angular/templates/src/main/webapp/app/entities/user/user.service.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/entities/user/user.service.spec.ts.ejs
index 61015b8fc3ce..fef91db1c99e 100644
--- a/generators/angular/templates/src/main/webapp/app/entities/user/user.service.spec.ts.ejs
+++ b/generators/angular/templates/src/main/webapp/app/entities/user/user.service.spec.ts.ejs
@@ -66,7 +66,7 @@ describe('User Service', () => {
       const req = httpMock.expectOne({ method: 'GET' });
       req.flush('Internal Server Error', {
         status: 500,
-        statusText: 'Inernal Server Error',
+        statusText: 'Internal Server Error',
       });
       expect(expectedResult).toEqual(500);
     });
diff --git a/generators/angular/templates/src/main/webapp/app/login/login.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/login/login.component.spec.ts.ejs
index 182b6bf4f83f..79278114fdea 100644
--- a/generators/angular/templates/src/main/webapp/app/login/login.component.spec.ts.ejs
+++ b/generators/angular/templates/src/main/webapp/app/login/login.component.spec.ts.ejs
@@ -106,7 +106,7 @@ describe('LoginComponent', () => {
   });
 
   describe('ngAfterViewInit', () => {
-    it('shoult set focus to username input after the view has been initialized', () => {
+    it('should set focus to username input after the view has been initialized', () => {
       // GIVEN
       const node = {
         focus: jest.fn(),
diff --git a/generators/angular/templates/src/main/webapp/app/shared/filter/filter.model.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/shared/filter/filter.model.spec.ts.ejs
index 6c42c911d781..92bb207b6b2d 100644
--- a/generators/angular/templates/src/main/webapp/app/shared/filter/filter.model.spec.ts.ejs
+++ b/generators/angular/templates/src/main/webapp/app/shared/filter/filter.model.spec.ts.ejs
@@ -211,7 +211,7 @@ describe('FilterModel Tests', () => {
         expect(filters.filterOptions).toMatchObject([]);
       });
 
-      it('should parse from Params and have a parameter with 2 values and one aditional value', () => {
+      it('should parse from Params and have a parameter with 2 values and one additional value', () => {
         const filters: FilterOptions = new FilterOptions([new FilterOption('hello.in', ['world'])]);
         jest.spyOn(filters.filterChanges, 'next');
 
diff --git a/generators/angular/templates/tsconfig.app.json.ejs b/generators/angular/templates/tsconfig.app.json.ejs
index 629c85ec51d4..d284c3229af9 100644
--- a/generators/angular/templates/tsconfig.app.json.ejs
+++ b/generators/angular/templates/tsconfig.app.json.ejs
@@ -19,14 +19,14 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "./<%= clientDistDir %>app",
+    "outDir": "./<%= this.relativeDir(clientRootDir, temporaryDir) %>out-tsc/app",
     "types": ["@angular/localize"]
   },
   "files": [
 <%_ if (communicationSpringWebsocket) { _%>
-    "<%= clientSrcDir %>sockjs-client.polyfill.ts",
+    "<%= this.relativeDir(clientRootDir, clientSrcDir) %>sockjs-client.polyfill.ts",
 <%_ } _%>
-    "<%= clientSrcDir %>main.ts"
+    "<%= this.relativeDir(clientRootDir, clientSrcDir) %>main.ts"
   ],
-  "include": ["<%= clientSrcDir %>**/*.d.ts"]
+  "include": ["<%= this.relativeDir(clientRootDir, clientSrcDir) %>**/*.d.ts"]
 }
diff --git a/generators/angular/templates/tsconfig.json.ejs b/generators/angular/templates/tsconfig.json.ejs
index e787a304f83e..f4240c61dd46 100644
--- a/generators/angular/templates/tsconfig.json.ejs
+++ b/generators/angular/templates/tsconfig.json.ejs
@@ -18,8 +18,8 @@
 -%>
 {
   "compilerOptions": {
-    "baseUrl": "<%= clientSrcDir %>",
-    "outDir": "./<%= clientDistDir %>",
+    "baseUrl": "<%- this.relativeDir(clientRootDir, clientSrcDir) %>",
+    "outDir": "./<%- this.relativeDir(clientRootDir, temporaryDir) %>out-tsc/root",
     "forceConsistentCasingInFileNames": true,
     "strict": true,
     "strictNullChecks": true,
diff --git a/generators/angular/templates/tsconfig.spec.json.ejs b/generators/angular/templates/tsconfig.spec.json.ejs
index c162a0d3632d..4b4133f0bc9d 100644
--- a/generators/angular/templates/tsconfig.spec.json.ejs
+++ b/generators/angular/templates/tsconfig.spec.json.ejs
@@ -18,10 +18,10 @@
 -%>
 {
   "extends": "./tsconfig.json",
-  "include": ["<%= clientSrcDir %>**/*.ts"],
+  "include": ["<%= this.relativeDir(clientRootDir, clientSrcDir) %>**/*.ts"],
   "compilerOptions": {
     "composite": true,
-    "outDir": "<%= temporaryDir %>out-tsc/spec",
+    "outDir": "<%= this.relativeDir(clientRootDir, temporaryDir) %>out-tsc/spec",
     "types": ["jest", "node"]
   }
 }
diff --git a/generators/angular/templates/webpack/webpack.custom.js.ejs b/generators/angular/templates/webpack/webpack.custom.js.ejs
index 7c5f0fffd604..1563e782c340 100644
--- a/generators/angular/templates/webpack/webpack.custom.js.ejs
+++ b/generators/angular/templates/webpack/webpack.custom.js.ejs
@@ -37,7 +37,7 @@ const proxyConfig = require('./proxy.conf');
 
 module.exports = async (config, options, targetOptions) => {
 <%_ if (enableTranslation) { _%>
-  const languagesHash = await hashElement(path.resolve(__dirname, '../<%= clientSrcDir %>i18n'), {
+  const languagesHash = await hashElement(path.resolve(__dirname, '<%= this.relativeDir(clientRootDir + 'webpack/', clientSrcDir) %>i18n'), {
     algo: 'md5',
     encoding: 'hex',
     files: { include: ['*.json'] },
@@ -107,8 +107,8 @@ module.exports = async (config, options, targetOptions) => {
       new BundleAnalyzerPlugin({
         analyzerMode: 'static',
         openAnalyzer: false,
-        // Webpack statistics in target folder
-        reportFilename: '../stats.html',
+        // Webpack statistics in temporary folder
+        reportFilename: '<%- this.relativeDir(clientDistDir, temporaryDir) %>stats.html',
       })
     );
   }
@@ -125,7 +125,7 @@ module.exports = async (config, options, targetOptions) => {
       from: path.join(path.dirname(require.resolve('axios/package.json')), 'dist/axios.min.js'),
       to: 'swagger-ui/',
     },
-    { from: './<%= clientSrcDir %>swagger-ui/', to: 'swagger-ui/' },
+    { from: './<%- this.relativeDir(clientRootDir, clientSrcDir) %>swagger-ui/', to: 'swagger-ui/' },
     // jhipster-needle-add-assets-to-webpack - JHipster will add/remove third-party resources in this array
   ];
 
diff --git a/generators/app/__snapshots__/generator.spec.mts.snap b/generators/app/__snapshots__/generator.spec.mts.snap
index c76b0c946086..a9a3f7b0a963 100644
--- a/generators/app/__snapshots__/generator.spec.mts.snap
+++ b/generators/app/__snapshots__/generator.spec.mts.snap
@@ -8,33 +8,26 @@ exports[`generator - app help should print expected information 1`] = `
 Options:
   --auto-crlf                              Detect line endings
   --defaults                               Execute jhipster with default config
-  --application-type <value>               Application type to generate
   --skip-client                            Skip the client-side application generation
   --skip-server                            Skip the server-side application generation
-  --skip-commit-hook                       Skip adding husky commit hooks
-  --skip-user-management                   Skip the user management module during app generation
-  --skip-check-length-of-identifier        Skip check the length of the identifier, only for recent Oracle databases that support 30+ characters metadata
-  --skip-fake-data                         Skip generation of fake data for development
   --jhi-prefix <value>                     Add prefix before services, controllers and states name
   --entity-suffix <value>                  Add suffix after entities name
   --dto-suffix <value>                     Add suffix after dtos name
-  --auth <value>                           Provide authentication type for the application when skipping server side generation
-  --db <value>                             Provide DB name for the application when skipping server side generation
   --blueprint <value...>                   DEPRECATED: Specify a generator blueprint to use for the sub generators
   --blueprints <value>                     A comma separated list of one or more generator blueprints to use for the sub generators, e.g. --blueprints kotlin,vuejs
-  --incremental-changelog                  Creates incremental database changelogs
-  --recreate-initial-changelog             Recreate the initial database changelog based on the current config
   --ignore-errors                          Don't fail on prettier errors.
-  --enable-translation                     Enable translation
-  -l, --language <value...>                Language to be added to application (existing languages are not removed)
   --pk-type <value>                        Default primary key type (beta)
   --client-package-manager <value>         Force an unsupported client package manager
-  --microfrontend                          Force generation of experimental microfrontend support
   --test-frameworks <value...>             Test frameworks to be generated
   --skip-cache                             Do not remember prompt answers (default: false)
   --skip-install                           Do not automatically install dependencies (default: false)
   --force-install                          Fail on install dependencies error (default: false)
   --ask-answered                           Show prompts for already configured options (default: false)
+  --auth <value>                           Provide authentication type for the application when skipping server side generation
+  --db <value>                             Provide DB name for the application when skipping server side generation
+  --incremental-changelog                  Creates incremental database changelogs
+  --skip-user-management                   Skip the user management module during app generation
+  --recreate-initial-changelog             Recreate the initial database changelog based on the current config
   --build <value>                          Provide build tool for the application when skipping server side generation
   --cache-provider <value>                 Cache provider
   --enable-swagger-codegen                 API first development using OpenAPI-generator
@@ -42,19 +35,30 @@ Options:
   --message-broker <value>                 message broker
   --reactive                               Generate a reactive backend
   --search-engine <value>                  Provide search engine for the application when skipping server side generation
+  --skip-check-length-of-identifier        Skip check the length of the identifier, only for recent Oracle databases that support 30+ characters metadata
   --skip-db-changelog                      Skip the generation of database migrations
+  --skip-fake-data                         Skip generation of fake data for development
   --websocket <value>                      Provide websocket option for the application when skipping server side generation
   --project-version <value>                project version to use, this option is not persisted (env: JHI_PROJECT_VERSION)
   --jhipster-dependencies-version <value>  jhipster-dependencies version to use, this option is not persisted (env: JHIPSTER_DEPENDENCIES_VERSION)
+  --application-type <value>               Application type to generate (choices: "monolith", "gateway", "microservice")
   --with-generated-flag                    Add a GeneratedByJHipster annotation to all generated java classes and interfaces
   --dev-database-type <value>              Development database
-  --client-framework <value>               Provide client framework for the application
-  --prettier-tab-width <value>             Default tab width for prettier
+  --client-framework <value>               Provide client framework for the application (choices: "angular", "react", "vue", "no")
+  --microfrontend                          Enable microfrontend support
+  --microfrontends <value>                 Microfrontends to load
   --with-admin-ui                          Generate administrative user interface
+  --client-root-dir <value>                Client root
+  --prettier-tab-width <value>             Default tab width for prettier
+  --skip-commit-hook                       Skip adding husky commit hooks
   --skip-git                               Skip git repository initialization
   --monorepository                         Use monorepository
   --cypress-coverage                       Enable Cypress code coverage report generation
   --cypress-audit                          Enable cypress-audit/lighthouse report generation
+  --enable-translation                     Enable translation
+  -l, --language <value...>                Language to be added to application (existing languages are not removed)
+  -n, --native-language [value]            Set application native language
+  --regenerate-languages                   Regenerate languages
   -h, --help                               display help for command
 "
 `;
@@ -85,6 +89,7 @@ exports[`generator - app with default config should match snapshot 1`] = `
   "addSpringMilestoneRepository": false,
   "angularLocaleId": "en",
   "applicationType": "monolith",
+  "applicationTypeAny": true,
   "applicationTypeGateway": false,
   "applicationTypeMicroservice": false,
   "applicationTypeMonolith": true,
@@ -94,6 +99,8 @@ exports[`generator - app with default config should match snapshot 1`] = `
   "authenticationTypeSession": false,
   "authenticationUsesCsrf": false,
   "backendType": "Java",
+  "backendTypeJavaAny": true,
+  "backendTypeSpringBoot": true,
   "baseName": "jhipster",
   "blueprints": [],
   "buildTool": "maven",
@@ -119,8 +126,12 @@ exports[`generator - app with default config should match snapshot 1`] = `
   "clientFrameworkReact": false,
   "clientFrameworkVue": false,
   "clientPackageManager": "npm",
+  "clientRootDir": "",
   "clientSrcDir": "src/main/webapp/",
   "clientTestDir": "src/test/javascript/",
+  "clientTestFrameworks": undefined,
+  "clientTestFrameworksAny": true,
+  "clientTestFrameworksCypress": false,
   "clientTheme": "none",
   "clientThemeDark": false,
   "clientThemeLight": false,
@@ -144,6 +155,7 @@ exports[`generator - app with default config should match snapshot 1`] = `
   "defaultEnvironment": "prod",
   "defaultPackaging": "jar",
   "devDatabaseExtraOptions": "",
+  "devDatabaseName": "jhipster",
   "devDatabasePassword": "",
   "devDatabaseType": "postgresql",
   "devDatabaseTypeH2Any": false,
@@ -154,6 +166,7 @@ exports[`generator - app with default config should match snapshot 1`] = `
   "devDatabaseTypeMysql": false,
   "devDatabaseTypeOracle": false,
   "devDatabaseTypePostgres": true,
+  "devDatabaseTypePostgresql": true,
   "devDatabaseUsername": "jhipster",
   "devHibernateDialect": "org.hibernate.dialect.PostgreSQLDialect",
   "devJdbcDriver": "org.postgresql.Driver",
@@ -286,7 +299,12 @@ exports[`generator - app with default config should match snapshot 1`] = `
     "zookeeperImage": "zookeeper-image-placeholder",
     "zookeeperTag": "zookeeper-tag-placeholder",
   },
+  "dockerServices": [
+    "app",
+    "postgresql",
+  ],
   "dockerServicesDir": "src/main/docker/",
+  "documentationArchiveUrl": "https://www.jhipster.tech/documentation-archive/vJHIPSTER_VERSION",
   "domains": [
     "com.mycompany.myapp",
   ],
@@ -308,11 +326,19 @@ exports[`generator - app with default config should match snapshot 1`] = `
   "generateBuiltInUserEntity": true,
   "generateInMemoryUserCredentials": false,
   "generateUserManagement": true,
+  "gradleEnterpriseHost": undefined,
   "gradleVersion": "GRADLE_VERSION",
   "hipster": "jhipster_family_member_3",
   "humanizedBaseName": "JHipster",
   "imperativeOrReactive": "imperative",
   "incrementalChangelog": undefined,
+  "javaCompatibleVersions": [
+    "17",
+    "18",
+    "19",
+    "20",
+    "21",
+  ],
   "javaDependencies": {
     "archunit-junit5": "'ARCHUNIT-JUNIT-5-VERSION'",
     "awaitility": "'AWAITILITY-VERSION'",
@@ -375,13 +401,14 @@ exports[`generator - app with default config should match snapshot 1`] = `
   },
   "javaPackageSrcDir": "src/main/java/com/mycompany/myapp/",
   "javaPackageTestDir": "src/test/java/com/mycompany/myapp/",
+  "javaVersion": "JAVA_VERSION",
   "jhiPrefix": "jhi",
   "jhiPrefixCapitalized": "Jhi",
   "jhiPrefixDashed": "jhi",
   "jhiTablePrefix": "jhi",
   "jhipsterDependenciesVersion": "JHIPSTER_DEPENDENCIES_VERSION",
   "jhipsterPackageJson": Any<Object>,
-  "jhipsterVersion": undefined,
+  "jhipsterVersion": "JHIPSTER_VERSION",
   "jwtSecretKey": "SECRET--64",
   "languages": [
     "en",
@@ -409,6 +436,7 @@ exports[`generator - app with default config should match snapshot 1`] = `
       "rtl": false,
     },
   ],
+  "liquibaseAddH2Properties": false,
   "liquibaseDefaultSchemaName": "",
   "lowercaseBaseName": "jhipster",
   "mainClass": "JhipsterApp",
@@ -544,13 +572,14 @@ exports[`generator - app with default config should match snapshot 1`] = `
   "prettierJava": undefined,
   "prettierTabWidth": 2,
   "prodDatabaseExtraOptions": "",
+  "prodDatabaseName": "jhipster",
   "prodDatabasePassword": "",
   "prodDatabaseType": "postgresql",
   "prodDatabaseTypeMariadb": false,
   "prodDatabaseTypeMssql": false,
   "prodDatabaseTypeMysql": false,
   "prodDatabaseTypeOracle": false,
-  "prodDatabaseTypePostgres": true,
+  "prodDatabaseTypePostgresql": true,
   "prodDatabaseUsername": "jhipster",
   "prodHibernateDialect": "org.hibernate.dialect.PostgreSQLDialect",
   "prodJdbcDriver": "org.postgresql.Driver",
@@ -571,10 +600,10 @@ exports[`generator - app with default config should match snapshot 1`] = `
   "serviceDiscoveryEureka": false,
   "serviceDiscoveryType": "no",
   "skipCheckLengthOfIdentifier": false,
-  "skipClient": false,
+  "skipClient": undefined,
   "skipCommitHook": undefined,
   "skipFakeData": false,
-  "skipJhipsterDependencies": false,
+  "skipJhipsterDependencies": undefined,
   "skipServer": undefined,
   "skipUserManagement": false,
   "srcMainDir": "src/main/",
@@ -591,6 +620,7 @@ exports[`generator - app with default config should match snapshot 1`] = `
   "testJavaPackageDir": "src/test/java/com/mycompany/myapp/",
   "testResourceDir": "src/test/resources/",
   "upperFirstCamelCaseBaseName": "Jhipster",
+  "useNpmWrapper": true,
   "user": Any<Object>,
   "webappEnumerationsDir": "src/main/webapp/app/entities/enumerations/",
   "webappLoginRegExp": "^[a-zA-Z0-9!$&*+=?^_\`{|}~.-]+@[a-zA-Z0-9-]+(?:\\\\.[a-zA-Z0-9-]+)*$|^[_.@A-Za-z0-9-]+$",
@@ -625,6 +655,7 @@ exports[`generator - app with gateway should match snapshot 1`] = `
   "addSpringMilestoneRepository": false,
   "angularLocaleId": "en",
   "applicationType": "gateway",
+  "applicationTypeAny": true,
   "applicationTypeGateway": true,
   "applicationTypeMicroservice": false,
   "applicationTypeMonolith": false,
@@ -634,6 +665,8 @@ exports[`generator - app with gateway should match snapshot 1`] = `
   "authenticationTypeSession": false,
   "authenticationUsesCsrf": false,
   "backendType": "Java",
+  "backendTypeJavaAny": true,
+  "backendTypeSpringBoot": true,
   "baseName": "jhipster",
   "blueprints": [],
   "buildTool": "maven",
@@ -659,8 +692,12 @@ exports[`generator - app with gateway should match snapshot 1`] = `
   "clientFrameworkReact": false,
   "clientFrameworkVue": false,
   "clientPackageManager": "npm",
+  "clientRootDir": "",
   "clientSrcDir": "src/main/webapp/",
   "clientTestDir": "src/test/javascript/",
+  "clientTestFrameworks": undefined,
+  "clientTestFrameworksAny": true,
+  "clientTestFrameworksCypress": false,
   "clientTheme": "none",
   "clientThemeDark": false,
   "clientThemeLight": false,
@@ -684,6 +721,7 @@ exports[`generator - app with gateway should match snapshot 1`] = `
   "defaultEnvironment": "prod",
   "defaultPackaging": "jar",
   "devDatabaseExtraOptions": "",
+  "devDatabaseName": "jhipster",
   "devDatabasePassword": "",
   "devDatabaseType": "postgresql",
   "devDatabaseTypeH2Any": false,
@@ -694,6 +732,7 @@ exports[`generator - app with gateway should match snapshot 1`] = `
   "devDatabaseTypeMysql": false,
   "devDatabaseTypeOracle": false,
   "devDatabaseTypePostgres": true,
+  "devDatabaseTypePostgresql": true,
   "devDatabaseUsername": "jhipster",
   "devHibernateDialect": "org.hibernate.dialect.PostgreSQLDialect",
   "devJdbcDriver": "org.postgresql.Driver",
@@ -826,7 +865,14 @@ exports[`generator - app with gateway should match snapshot 1`] = `
     "zookeeperImage": "zookeeper-image-placeholder",
     "zookeeperTag": "zookeeper-tag-placeholder",
   },
+  "dockerServices": [
+    "app",
+    "consul",
+    "zipkin",
+    "postgresql",
+  ],
   "dockerServicesDir": "src/main/docker/",
+  "documentationArchiveUrl": "https://www.jhipster.tech/documentation-archive/vJHIPSTER_VERSION",
   "domains": [
     "com.mycompany.myapp",
   ],
@@ -848,11 +894,19 @@ exports[`generator - app with gateway should match snapshot 1`] = `
   "generateBuiltInUserEntity": true,
   "generateInMemoryUserCredentials": false,
   "generateUserManagement": true,
+  "gradleEnterpriseHost": undefined,
   "gradleVersion": "GRADLE_VERSION",
   "hipster": "jhipster_family_member_3",
   "humanizedBaseName": "JHipster",
   "imperativeOrReactive": "reactive",
   "incrementalChangelog": undefined,
+  "javaCompatibleVersions": [
+    "17",
+    "18",
+    "19",
+    "20",
+    "21",
+  ],
   "javaDependencies": {
     "archunit-junit5": "'ARCHUNIT-JUNIT-5-VERSION'",
     "awaitility": "'AWAITILITY-VERSION'",
@@ -915,13 +969,14 @@ exports[`generator - app with gateway should match snapshot 1`] = `
   },
   "javaPackageSrcDir": "src/main/java/com/mycompany/myapp/",
   "javaPackageTestDir": "src/test/java/com/mycompany/myapp/",
+  "javaVersion": "JAVA_VERSION",
   "jhiPrefix": "jhi",
   "jhiPrefixCapitalized": "Jhi",
   "jhiPrefixDashed": "jhi",
   "jhiTablePrefix": "jhi",
   "jhipsterDependenciesVersion": "JHIPSTER_DEPENDENCIES_VERSION",
   "jhipsterPackageJson": Any<Object>,
-  "jhipsterVersion": undefined,
+  "jhipsterVersion": "JHIPSTER_VERSION",
   "jwtSecretKey": Any<String>,
   "languages": [
     "en",
@@ -949,6 +1004,7 @@ exports[`generator - app with gateway should match snapshot 1`] = `
       "rtl": false,
     },
   ],
+  "liquibaseAddH2Properties": false,
   "liquibaseDefaultSchemaName": "",
   "lowercaseBaseName": "jhipster",
   "mainClass": "JhipsterApp",
@@ -1084,13 +1140,14 @@ exports[`generator - app with gateway should match snapshot 1`] = `
   "prettierJava": undefined,
   "prettierTabWidth": 2,
   "prodDatabaseExtraOptions": "",
+  "prodDatabaseName": "jhipster",
   "prodDatabasePassword": "",
   "prodDatabaseType": "postgresql",
   "prodDatabaseTypeMariadb": false,
   "prodDatabaseTypeMssql": false,
   "prodDatabaseTypeMysql": false,
   "prodDatabaseTypeOracle": false,
-  "prodDatabaseTypePostgres": true,
+  "prodDatabaseTypePostgresql": true,
   "prodDatabaseUsername": "jhipster",
   "prodHibernateDialect": "org.hibernate.dialect.PostgreSQLDialect",
   "prodJdbcDriver": "org.postgresql.Driver",
@@ -1112,10 +1169,10 @@ exports[`generator - app with gateway should match snapshot 1`] = `
   "serviceDiscoveryEureka": false,
   "serviceDiscoveryType": "consul",
   "skipCheckLengthOfIdentifier": false,
-  "skipClient": false,
+  "skipClient": undefined,
   "skipCommitHook": undefined,
   "skipFakeData": false,
-  "skipJhipsterDependencies": false,
+  "skipJhipsterDependencies": undefined,
   "skipServer": undefined,
   "skipUserManagement": false,
   "srcMainDir": "src/main/",
@@ -1132,6 +1189,7 @@ exports[`generator - app with gateway should match snapshot 1`] = `
   "testJavaPackageDir": "src/test/java/com/mycompany/myapp/",
   "testResourceDir": "src/test/resources/",
   "upperFirstCamelCaseBaseName": "Jhipster",
+  "useNpmWrapper": true,
   "user": Any<Object>,
   "webappEnumerationsDir": "src/main/webapp/app/entities/enumerations/",
   "webappLoginRegExp": "^[a-zA-Z0-9!$&*+=?^_\`{|}~.-]+@[a-zA-Z0-9-]+(?:\\\\.[a-zA-Z0-9-]+)*$|^[_.@A-Za-z0-9-]+$",
@@ -1165,6 +1223,7 @@ exports[`generator - app with microservice should match snapshot 1`] = `
   "VUE": "vue",
   "addSpringMilestoneRepository": false,
   "applicationType": "microservice",
+  "applicationTypeAny": true,
   "applicationTypeGateway": false,
   "applicationTypeMicroservice": true,
   "applicationTypeMonolith": false,
@@ -1174,6 +1233,8 @@ exports[`generator - app with microservice should match snapshot 1`] = `
   "authenticationTypeSession": false,
   "authenticationUsesCsrf": false,
   "backendType": "Java",
+  "backendTypeJavaAny": true,
+  "backendTypeSpringBoot": true,
   "baseName": "jhipster",
   "blueprints": [],
   "buildTool": "maven",
@@ -1199,8 +1260,12 @@ exports[`generator - app with microservice should match snapshot 1`] = `
   "clientFrameworkReact": false,
   "clientFrameworkVue": false,
   "clientPackageManager": "npm",
+  "clientRootDir": "",
   "clientSrcDir": "src/main/webapp/",
   "clientTestDir": "src/test/javascript/",
+  "clientTestFrameworks": undefined,
+  "clientTestFrameworksAny": true,
+  "clientTestFrameworksCypress": false,
   "clientTheme": undefined,
   "clientThemeDark": false,
   "clientThemeLight": false,
@@ -1224,6 +1289,7 @@ exports[`generator - app with microservice should match snapshot 1`] = `
   "defaultEnvironment": "prod",
   "defaultPackaging": "jar",
   "devDatabaseExtraOptions": "",
+  "devDatabaseName": "jhipster",
   "devDatabasePassword": "",
   "devDatabaseType": "postgresql",
   "devDatabaseTypeH2Any": false,
@@ -1234,6 +1300,7 @@ exports[`generator - app with microservice should match snapshot 1`] = `
   "devDatabaseTypeMysql": false,
   "devDatabaseTypeOracle": false,
   "devDatabaseTypePostgres": true,
+  "devDatabaseTypePostgresql": true,
   "devDatabaseUsername": "jhipster",
   "devHibernateDialect": "org.hibernate.dialect.PostgreSQLDialect",
   "devJdbcDriver": "org.postgresql.Driver",
@@ -1366,7 +1433,15 @@ exports[`generator - app with microservice should match snapshot 1`] = `
     "zookeeperImage": "zookeeper-image-placeholder",
     "zookeeperTag": "zookeeper-tag-placeholder",
   },
+  "dockerServices": [
+    "app",
+    "consul",
+    "zipkin",
+    "hazelcast",
+    "postgresql",
+  ],
   "dockerServicesDir": "src/main/docker/",
+  "documentationArchiveUrl": "https://www.jhipster.tech/documentation-archive/vJHIPSTER_VERSION",
   "domains": [
     "com.mycompany.myapp",
   ],
@@ -1388,11 +1463,19 @@ exports[`generator - app with microservice should match snapshot 1`] = `
   "generateBuiltInUserEntity": false,
   "generateInMemoryUserCredentials": false,
   "generateUserManagement": false,
+  "gradleEnterpriseHost": undefined,
   "gradleVersion": "GRADLE_VERSION",
   "hipster": "jhipster_family_member_3",
   "humanizedBaseName": "JHipster",
   "imperativeOrReactive": "imperative",
   "incrementalChangelog": undefined,
+  "javaCompatibleVersions": [
+    "17",
+    "18",
+    "19",
+    "20",
+    "21",
+  ],
   "javaDependencies": {
     "archunit-junit5": "'ARCHUNIT-JUNIT-5-VERSION'",
     "awaitility": "'AWAITILITY-VERSION'",
@@ -1455,13 +1538,14 @@ exports[`generator - app with microservice should match snapshot 1`] = `
   },
   "javaPackageSrcDir": "src/main/java/com/mycompany/myapp/",
   "javaPackageTestDir": "src/test/java/com/mycompany/myapp/",
+  "javaVersion": "JAVA_VERSION",
   "jhiPrefix": "jhi",
   "jhiPrefixCapitalized": "Jhi",
   "jhiPrefixDashed": "jhi",
   "jhiTablePrefix": "jhi",
   "jhipsterDependenciesVersion": "JHIPSTER_DEPENDENCIES_VERSION",
   "jhipsterPackageJson": Any<Object>,
-  "jhipsterVersion": undefined,
+  "jhipsterVersion": "JHIPSTER_VERSION",
   "jwtSecretKey": Any<String>,
   "languages": [
     "en",
@@ -1489,6 +1573,7 @@ exports[`generator - app with microservice should match snapshot 1`] = `
       "rtl": false,
     },
   ],
+  "liquibaseAddH2Properties": false,
   "liquibaseDefaultSchemaName": "",
   "lowercaseBaseName": "jhipster",
   "mainClass": "JhipsterApp",
@@ -1569,13 +1654,14 @@ exports[`generator - app with microservice should match snapshot 1`] = `
   "prettierJava": undefined,
   "prettierTabWidth": 2,
   "prodDatabaseExtraOptions": "",
+  "prodDatabaseName": "jhipster",
   "prodDatabasePassword": "",
   "prodDatabaseType": "postgresql",
   "prodDatabaseTypeMariadb": false,
   "prodDatabaseTypeMssql": false,
   "prodDatabaseTypeMysql": false,
   "prodDatabaseTypeOracle": false,
-  "prodDatabaseTypePostgres": true,
+  "prodDatabaseTypePostgresql": true,
   "prodDatabaseUsername": "jhipster",
   "prodHibernateDialect": "org.hibernate.dialect.PostgreSQLDialect",
   "prodJdbcDriver": "org.postgresql.Driver",
@@ -1599,7 +1685,7 @@ exports[`generator - app with microservice should match snapshot 1`] = `
   "skipClient": true,
   "skipCommitHook": undefined,
   "skipFakeData": false,
-  "skipJhipsterDependencies": false,
+  "skipJhipsterDependencies": undefined,
   "skipServer": undefined,
   "skipUserManagement": true,
   "srcMainDir": "src/main/",
@@ -1616,6 +1702,7 @@ exports[`generator - app with microservice should match snapshot 1`] = `
   "testJavaPackageDir": "src/test/java/com/mycompany/myapp/",
   "testResourceDir": "src/test/resources/",
   "upperFirstCamelCaseBaseName": "Jhipster",
+  "useNpmWrapper": false,
   "websocket": "no",
   "withAdminUi": false,
 }
diff --git a/generators/app/command.mts b/generators/app/command.mts
index 6f80a09bf3aa..ff13ad83d31f 100644
--- a/generators/app/command.mts
+++ b/generators/app/command.mts
@@ -33,11 +33,6 @@ const command: JHipsterCommandDefinition = {
       description: 'Execute jhipster with default config',
       type: Boolean,
     },
-    applicationType: {
-      description: 'Application type to generate',
-      type: String,
-      scope: 'storage',
-    },
     skipClient: {
       description: 'Skip the client-side application generation',
       type: Boolean,
@@ -48,26 +43,6 @@ const command: JHipsterCommandDefinition = {
       type: Boolean,
       scope: 'storage',
     },
-    skipCommitHook: {
-      description: 'Skip adding husky commit hooks',
-      type: Boolean,
-      scope: 'storage',
-    },
-    skipUserManagement: {
-      description: 'Skip the user management module during app generation',
-      type: Boolean,
-      scope: 'storage',
-    },
-    skipCheckLengthOfIdentifier: {
-      description: 'Skip check the length of the identifier, only for recent Oracle databases that support 30+ characters metadata',
-      type: Boolean,
-      scope: 'storage',
-    },
-    skipFakeData: {
-      description: 'Skip generation of fake data for development',
-      type: Boolean,
-      scope: 'storage',
-    },
     jhiPrefix: {
       description: 'Add prefix before services, controllers and states name',
       type: String,
@@ -83,16 +58,6 @@ const command: JHipsterCommandDefinition = {
       type: String,
       scope: 'storage',
     },
-    authenticationType: {
-      name: 'auth',
-      description: 'Provide authentication type for the application when skipping server side generation',
-      type: String,
-      scope: 'storage',
-    },
-    db: {
-      description: 'Provide DB name for the application when skipping server side generation',
-      type: String,
-    },
     blueprint: {
       description: 'DEPRECATED: Specify a generator blueprint to use for the sub generators',
       type: Array,
@@ -102,30 +67,10 @@ const command: JHipsterCommandDefinition = {
         'A comma separated list of one or more generator blueprints to use for the sub generators, e.g. --blueprints kotlin,vuejs',
       type: String,
     },
-    incrementalChangelog: {
-      description: 'Creates incremental database changelogs',
-      type: Boolean,
-      scope: 'storage',
-    },
-    recreateInitialChangelog: {
-      description: 'Recreate the initial database changelog based on the current config',
-      type: Boolean,
-    },
     ignoreErrors: {
       description: "Don't fail on prettier errors.",
       type: Boolean,
     },
-    enableTranslation: {
-      description: 'Enable translation',
-      type: Boolean,
-      required: false,
-      scope: 'storage',
-    },
-    language: {
-      alias: 'l',
-      description: 'Language to be added to application (existing languages are not removed)',
-      type: Array,
-    },
     pkType: {
       description: 'Default primary key type (beta)',
       type: String,
@@ -136,17 +81,12 @@ const command: JHipsterCommandDefinition = {
       type: String,
       scope: 'storage',
     },
-    microfrontend: {
-      description: 'Force generation of experimental microfrontend support',
-      type: Boolean,
-      scope: 'storage',
-    },
     testFrameworks: {
       description: 'Test frameworks to be generated',
       type: Array,
     },
   },
-  loadGeneratorOptions: true,
+  configs: {},
   import: [
     GENERATOR_BOOTSTRAP,
     GENERATOR_SERVER,
diff --git a/generators/app/composing.spec.mts b/generators/app/composing.spec.mts
index 499445845cda..e7f6f49499bb 100644
--- a/generators/app/composing.spec.mts
+++ b/generators/app/composing.spec.mts
@@ -38,9 +38,9 @@ describe('generator - app - composing', () => {
         const ClientGenerator = runResult.mockedGenerators['jhipster:client'];
         assert(ClientGenerator.calledOnce);
       });
-      it('should compose with languages generator', () => {
+      it('should not compose with languages generator', () => {
         const LanguagesGenerator = runResult.mockedGenerators['jhipster:languages'];
-        assert(LanguagesGenerator.calledOnce);
+        assert.equal(LanguagesGenerator.callCount, 0);
       });
       it('should not compose with entities generator', () => {
         const MockedGenerator = runResult.mockedGenerators['jhipster:entities'];
@@ -83,9 +83,9 @@ describe('generator - app - composing', () => {
         const ClientGenerator = runResult.mockedGenerators['jhipster:client'];
         assert.equal(ClientGenerator.callCount, 0);
       });
-      it('should compose with languages generator', () => {
+      it('should not compose with languages generator', () => {
         const LanguagesGenerator = runResult.mockedGenerators['jhipster:languages'];
-        assert(LanguagesGenerator.calledOnce);
+        assert.equal(LanguagesGenerator.callCount, 0);
       });
       it('should not compose with entities generator', () => {
         const MockedGenerator = runResult.mockedGenerators['jhipster:entities'];
diff --git a/generators/app/generator.mjs b/generators/app/generator.mjs
index 24bb9dc1b052..32389264a4c8 100644
--- a/generators/app/generator.mjs
+++ b/generators/app/generator.mjs
@@ -18,42 +18,44 @@
  */
 /* eslint-disable consistent-return, import/no-named-as-default-member */
 import chalk from 'chalk';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 
 import BaseApplicationGenerator from '../base-application/index.mjs';
 import { checkNode, loadStoredAppOptions } from './support/index.mjs';
 import cleanupOldFilesTask from './cleanup.mjs';
-import { askForApplicationType, askForInsightOptIn } from './prompts.mjs';
+import { askForInsightOptIn } from './prompts.mjs';
 import statistics from '../statistics.mjs';
 import {
   GENERATOR_APP,
   GENERATOR_COMMON,
-  GENERATOR_LANGUAGES,
   GENERATOR_CLIENT,
-  GENERATOR_PAGE,
   GENERATOR_SERVER,
   GENERATOR_BOOTSTRAP_APPLICATION_BASE,
 } from '../generator-list.mjs';
 
-import { applicationTypes, applicationOptions, clientFrameworkTypes } from '../../jdl/jhipster/index.mjs';
+import { applicationTypes, applicationOptions } from '../../jdl/jhipster/index.mjs';
 import command from './command.mjs';
 
 const { MICROSERVICE } = applicationTypes;
-const { NO: CLIENT_FRAMEWORK_NO } = clientFrameworkTypes;
 const { JHI_PREFIX, BASE_NAME, JWT_SECRET_KEY, PACKAGE_NAME, PACKAGE_FOLDER, REMEMBER_ME_KEY } = applicationOptions.OptionNames;
 
 export default class JHipsterAppGenerator extends BaseApplicationGenerator {
+  command = command;
+
   async beforeQueue() {
     loadStoredAppOptions.call(this);
 
-    await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_BASE);
     if (!this.fromBlueprint) {
       await this.composeWithBlueprints(GENERATOR_APP);
     }
+
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_BASE);
+    }
   }
 
   get initializing() {
-    return {
+    return this.asInitializingTaskGroup({
       validateNode() {
         if (this.skipChecks) {
           return;
@@ -67,7 +69,7 @@ export default class JHipsterAppGenerator extends BaseApplicationGenerator {
         }
       },
       loadOptions() {
-        this.parseJHipsterOptions(command.options);
+        this.parseJHipsterCommand(this.command);
       },
 
       validate() {
@@ -75,7 +77,7 @@ export default class JHipsterAppGenerator extends BaseApplicationGenerator {
           throw new Error(`You can not pass both ${chalk.yellow('--skip-client')} and ${chalk.yellow('--skip-server')} together`);
         }
       },
-    };
+    });
   }
 
   get [BaseApplicationGenerator.INITIALIZING]() {
@@ -83,10 +85,13 @@ export default class JHipsterAppGenerator extends BaseApplicationGenerator {
   }
 
   get prompting() {
-    return {
+    return this.asPromptingTaskGroup({
       askForInsightOptIn,
-      askForApplicationType,
-    };
+      async prompting({ control }) {
+        if (control.existingProject && this.options.askAnswered !== true) return;
+        await this.prompt(this.prepareQuestions(this.command.configs));
+      },
+    });
   }
 
   get [BaseApplicationGenerator.PROMPTING]() {
@@ -97,18 +102,7 @@ export default class JHipsterAppGenerator extends BaseApplicationGenerator {
     return {
       setup() {
         if (this.jhipsterConfig.applicationType === MICROSERVICE) {
-          this.jhipsterConfig.skipClient =
-            this.jhipsterConfig.skipClient ||
-            !this.jhipsterConfig.clientFramework ||
-            this.jhipsterConfig.clientFramework === CLIENT_FRAMEWORK_NO;
-          this.jhipsterConfig.withAdminUi = false;
           this.jhipsterConfig.skipUserManagement = true;
-        } else {
-          this.jhipsterConfig.skipClient = this.jhipsterConfig.skipClient || this.jhipsterConfig.clientFramework === CLIENT_FRAMEWORK_NO;
-        }
-
-        if (this.jhipsterConfig.skipClient) {
-          this.jhipsterConfig.clientFramework = CLIENT_FRAMEWORK_NO;
         }
       },
       fixConfig() {
@@ -129,49 +123,32 @@ export default class JHipsterAppGenerator extends BaseApplicationGenerator {
        * Composing with others generators, must be executed after `configuring` priority to let others
        * generators `configuring` priority to run.
        *
-       * Generators `server`, `client`, `common`, `languages` depends on each other.
-       * We are composing in the same task so every priority are executed in parallel.
-       * - compose (app) -> initializing (common) -> initializing (server) -> ...
-       *
-       * When composing in different tasks the result would be:
+       * Composing in different tasks the result would be:
        * - composeCommon (app) -> initializing (common) -> prompting (common) -> ... -> composeServer (app) -> initializing (server) -> ...
+       *
+       * This behaviour allows a more consistent blueprint support.
        */
-      async compose() {
-        const { enableTranslation, skipServer, clientFramework } = this.jhipsterConfigWithDefaults;
+      async composeCommon() {
         await this.composeWithJHipster(GENERATOR_COMMON);
-        if (enableTranslation) {
-          await this.composeWithJHipster(GENERATOR_LANGUAGES, {
-            generatorOptions: { regenerate: true },
-          });
-        }
-        if (!skipServer) {
+      },
+      async composeServer() {
+        if (!this.jhipsterConfigWithDefaults.skipServer) {
           await this.composeWithJHipster(GENERATOR_SERVER);
         }
-        if (clientFramework !== CLIENT_FRAMEWORK_NO) {
+      },
+      async composeClient() {
+        if (!this.jhipsterConfigWithDefaults.skipClient) {
           await this.composeWithJHipster(GENERATOR_CLIENT);
         }
       },
-
       /**
        * At this point every other generator should already be configured, so, enforce defaults fallback.
        */
       saveConfigWithDefaults() {
-        this._validateAppConfiguration();
-      },
-
-      async composePages() {
-        if (!this.jhipsterConfig.pages || this.jhipsterConfig.pages.length === 0) return;
-        await Promise.all(
-          this.jhipsterConfig.pages.map(page => {
-            return this.composeWithJHipster(page.generator || GENERATOR_PAGE, {
-              generatorArgs: [page.name],
-              generatorOptions: {
-                skipInstall: true,
-                page,
-              },
-            });
-          }),
-        );
+        const config = this.jhipsterConfigWithDefaults;
+        if (config.entitySuffix === config.dtoSuffix) {
+          throw new Error('Entities cannot be generated as the entity suffix and DTO suffix are equals !');
+        }
       },
     });
   }
@@ -205,10 +182,4 @@ export default class JHipsterAppGenerator extends BaseApplicationGenerator {
   get [BaseApplicationGenerator.WRITING]() {
     return this.delegateTasksToBlueprint(() => this.writing);
   }
-
-  _validateAppConfiguration(config = this.jhipsterConfigWithDefaults) {
-    if (config.entitySuffix === config.dtoSuffix) {
-      throw new Error('Entities cannot be generated as the entity suffix and DTO suffix are equals !');
-    }
-  }
 }
diff --git a/generators/app/prompts.mjs b/generators/app/prompts.mjs
index a99590c87a95..6fe9731fc123 100644
--- a/generators/app/prompts.mjs
+++ b/generators/app/prompts.mjs
@@ -19,10 +19,6 @@
 import chalk from 'chalk';
 import statistics from '../statistics.mjs';
 
-import { applicationTypes } from '../../jdl/jhipster/index.mjs';
-
-const { GATEWAY, MONOLITH, MICROSERVICE } = applicationTypes;
-
 export async function askForInsightOptIn() {
   if (!statistics.shouldWeAskForOptIn()) return;
   const answers = await this.prompt({
@@ -35,81 +31,3 @@ export async function askForInsightOptIn() {
     statistics.setOptOutStatus(!answers.insight);
   }
 }
-
-const microfrontendsToPromptValue = answer => (Array.isArray(answer) ? answer.map(({ baseName }) => baseName).join(',') : answer);
-const promptValueToMicrofrontends = answer =>
-  answer
-    ? answer
-        .split(',')
-        .map(baseName => baseName.trim())
-        .filter(Boolean)
-        .map(baseName => ({ baseName }))
-    : [];
-
-export async function askForApplicationType({ control }) {
-  if (control.existingProject && this.options.askAnswered !== true) return;
-  const config = this.jhipsterConfigWithDefaults;
-
-  const applicationTypeChoices = [
-    {
-      value: MONOLITH,
-      name: 'Monolithic application (recommended for simple projects)',
-    },
-    {
-      value: GATEWAY,
-      name: 'Gateway application',
-    },
-    {
-      value: MICROSERVICE,
-      name: 'Microservice application',
-    },
-  ];
-
-  await this.prompt(
-    [
-      {
-        type: 'list',
-        name: 'applicationType',
-        message: `Which ${chalk.yellow('*type*')} of application would you like to create?`,
-        choices: applicationTypeChoices,
-        default: config.applicationType,
-      },
-      {
-        when: answers => {
-          const { applicationType } = answers;
-          const askForMicrofrontend = [GATEWAY, MICROSERVICE].includes(applicationType);
-          if (!askForMicrofrontend) {
-            answers.microfrontend = false;
-          }
-          return askForMicrofrontend;
-        },
-        type: 'confirm',
-        name: 'microfrontend',
-        message: `Do you want to enable ${chalk.yellow('*microfrontends*')}?`,
-        default: config.microfrontend ?? false,
-      },
-      {
-        when: answers => {
-          const { applicationType, microfrontend, microfrontends } = answers;
-          const askForMicrofrontends = applicationType === GATEWAY && microfrontend;
-          if (askForMicrofrontends) {
-            answers.microfrontends = microfrontendsToPromptValue(microfrontends);
-          } else {
-            answers.microfrontends = [];
-          }
-          return askForMicrofrontends;
-        },
-        type: 'input',
-        name: 'microfrontends',
-        message: `Comma separated ${chalk.yellow('*microfrontend*')} app names.`,
-        filter: promptValueToMicrofrontends,
-        transformer: microfrontendsToPromptValue,
-      },
-    ],
-    this.config,
-  );
-
-  const { applicationType } = this.jhipsterConfig;
-  // TODO drop for v8, setting the generator with config is deprecated
-  this.applicationType = applicationType;
-}
diff --git a/generators/app/support/config.mts b/generators/app/support/config.mts
index 246fc9b13fb5..8f0c81209695 100644
--- a/generators/app/support/config.mts
+++ b/generators/app/support/config.mts
@@ -1,12 +1,15 @@
-import _ from 'lodash';
+import { camelCase, kebabCase, startCase, upperFirst } from 'lodash-es';
 import { NODE_VERSION } from '../../generator-constants.mjs';
 import { applicationTypes, authenticationTypes, databaseTypes, testFrameworkTypes } from '../../../jdl/index.js';
-import { getHipster, upperFirstCamelCase } from '../../base/support/index.mjs';
+import { getHipster, mutateData, pickFields, upperFirstCamelCase } from '../../base/support/index.mjs';
 import { getDBTypeFromDBValue } from '../../server/support/index.mjs';
 import detectLanguage from '../../languages/support/detect-language.mjs';
+import { loadConfig, loadDerivedConfig } from '../../../lib/internal/index.mjs';
+import serverCommand from '../../server/command.mjs';
+import { packageJson } from '../../../lib/index.mjs';
 
 const { GATLING, CUCUMBER, CYPRESS } = testFrameworkTypes;
-const { GATEWAY, MICROSERVICE, MONOLITH } = applicationTypes;
+const { GATEWAY, MONOLITH } = applicationTypes;
 const { JWT, OAUTH2, SESSION } = authenticationTypes;
 const { CASSANDRA, NO: NO_DATABASE } = databaseTypes;
 
@@ -77,81 +80,84 @@ export const loadAppConfig = ({
   application: any;
   useVersionPlaceholders?: boolean;
 }) => {
-  if (useVersionPlaceholders) {
-    application.nodeVersion = 'NODE_VERSION';
-  } else {
-    application.nodeVersion = NODE_VERSION;
-  }
-
-  application.jhipsterVersion = config.jhipsterVersion;
-  application.baseName = config.baseName;
-  application.applicationType = config.applicationType;
-  application.reactive = config.reactive;
-  application.jhiPrefix = config.jhiPrefix;
-  application.skipFakeData = config.skipFakeData;
-  application.entitySuffix = config.entitySuffix;
-  application.dtoSuffix = config.dtoSuffix;
-  application.skipCheckLengthOfIdentifier = config.skipCheckLengthOfIdentifier;
-  application.microfrontend = config.microfrontend;
-  application.microfrontends = config.microfrontends;
-
-  application.skipServer = config.skipServer;
-  application.skipCommitHook = config.skipCommitHook;
-  application.blueprints = config.blueprints || [];
-  application.skipClient = config.skipClient;
-  application.prettierJava = config.prettierJava;
-  application.pages = config.pages;
-  application.skipJhipsterDependencies = !!config.skipJhipsterDependencies;
-  application.withAdminUi = config.withAdminUi;
-  application.gatewayServerPort = config.gatewayServerPort;
-
-  application.capitalizedBaseName = config.capitalizedBaseName;
-  application.dasherizedBaseName = config.dasherizedBaseName;
-  application.humanizedBaseName = config.humanizedBaseName;
-  application.projectDescription = config.projectDescription;
-
-  application.testFrameworks = config.testFrameworks || [];
-
-  application.gatlingTests = application.testFrameworks.includes(GATLING);
-  application.cucumberTests = application.testFrameworks.includes(CUCUMBER);
-  application.cypressTests = application.testFrameworks.includes(CYPRESS);
-
-  application.authenticationType = config.authenticationType;
-  application.rememberMeKey = config.rememberMeKey;
-  application.jwtSecretKey = config.jwtSecretKey;
-  application.fakerSeed = config.fakerSeed;
-  application.skipUserManagement = config.skipUserManagement;
+  loadConfig(serverCommand.configs, { config, application });
+
+  mutateData(
+    application,
+    {
+      nodeVersion: useVersionPlaceholders ? 'NODE_VERSION' : NODE_VERSION,
+      jhipsterVersion: useVersionPlaceholders ? 'JHIPSTER_VERSION' : undefined,
+    },
+    pickFields(config, [
+      'jhipsterVersion',
+      'baseName',
+      'reactive',
+      'jhiPrefix',
+      'skipFakeData',
+      'entitySuffix',
+      'dtoSuffix',
+      'skipCheckLengthOfIdentifier',
+      'microfrontend',
+      'microfrontends',
+      'skipServer',
+      'skipCommitHook',
+      'skipClient',
+      'prettierJava',
+      'pages',
+      'skipJhipsterDependencies',
+      'withAdminUi',
+      'gatewayServerPort',
+      'capitalizedBaseName',
+      'dasherizedBaseName',
+      'humanizedBaseName',
+      'projectDescription',
+      'authenticationType',
+      'rememberMeKey',
+      'jwtSecretKey',
+      'fakerSeed',
+      'skipUserManagement',
+      'blueprints',
+      'testFrameworks',
+    ]),
+    {
+      jhipsterVersion: packageJson.version,
+      blueprints: [],
+      testFrameworks: [],
+    },
+  );
 };
 
 /**
  * @param {Object} dest - destination context to use default is context
  */
 export const loadDerivedAppConfig = ({ application }: { application: any }) => {
-  application.jhiPrefixCapitalized = _.upperFirst(application.jhiPrefix);
-  application.jhiPrefixDashed = _.kebabCase(application.jhiPrefix);
-  application.applicationTypeGateway = application.applicationType === GATEWAY;
-  application.applicationTypeMonolith = application.applicationType === MONOLITH;
-  application.applicationTypeMicroservice = application.applicationType === MICROSERVICE;
-
-  // Application name modified, using each technology's conventions
-  if (application.baseName) {
-    application.camelizedBaseName = _.camelCase(application.baseName);
-    application.hipster = getHipster(application.baseName);
-    application.capitalizedBaseName = application.capitalizedBaseName || _.upperFirst(application.baseName);
-    application.dasherizedBaseName = application.dasherizedBaseName || _.kebabCase(application.baseName);
-    application.lowercaseBaseName = application.baseName.toLowerCase();
-    application.upperFirstCamelCaseBaseName = upperFirstCamelCase(application.baseName);
-    application.humanizedBaseName =
-      application.humanizedBaseName || (application.baseName.toLowerCase() === 'jhipster' ? 'JHipster' : _.startCase(application.baseName));
-    application.projectDescription = application.projectDescription || `Description for ${application.baseName}`;
-    application.endpointPrefix = application.applicationTypeMicroservice ? `services/${application.lowercaseBaseName}` : '';
-  }
+  loadDerivedConfig(serverCommand.configs, { application });
+
+  mutateData(application, {
+    jhiPrefixCapitalized: ({ jhiPrefix }) => upperFirst(jhiPrefix),
+    jhiPrefixDashed: ({ jhiPrefix }) => kebabCase(jhiPrefix),
+
+    camelizedBaseName: ({ baseName }) => camelCase(baseName),
+    hipster: ({ baseName }) => getHipster(baseName),
+    capitalizedBaseName: ({ baseName }) => upperFirst(baseName),
+    dasherizedBaseName: ({ baseName }) => kebabCase(baseName),
+    lowercaseBaseName: ({ baseName }) => baseName?.toLowerCase(),
+    upperFirstCamelCaseBaseName: ({ baseName }) => upperFirstCamelCase(baseName),
+    humanizedBaseName: ({ baseName }) => (baseName.toLowerCase() === 'jhipster' ? 'JHipster' : startCase(baseName)),
+
+    gatlingTests: ({ testFrameworks }) => testFrameworks?.includes(GATLING),
+    cucumberTests: ({ testFrameworks }) => testFrameworks?.includes(CUCUMBER),
+    cypressTests: ({ testFrameworks }) => testFrameworks?.includes(CYPRESS),
+
+    projectDescription: ({ projectDescription, baseName }) => projectDescription ?? `Description for ${baseName}`,
+    endpointPrefix: ({ applicationType, lowercaseBaseName }) => (applicationType === 'microservice' ? `services/${lowercaseBaseName}` : ''),
+  });
 
   if (application.microfrontends && application.microfrontends.length > 0) {
     application.microfrontends.forEach(microfrontend => {
       const { baseName } = microfrontend;
       microfrontend.lowercaseBaseName = baseName.toLowerCase();
-      microfrontend.capitalizedBaseName = _.upperFirst(baseName);
+      microfrontend.capitalizedBaseName = upperFirst(baseName);
       microfrontend.endpointPrefix = `services/${microfrontend.lowercaseBaseName}`;
     });
   } else if (application.microfrontend) {
diff --git a/generators/base-application/generator.mts b/generators/base-application/generator.mts
index fcff909c627d..375033d42d38 100644
--- a/generators/base-application/generator.mts
+++ b/generators/base-application/generator.mts
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import { upperFirst } from 'lodash-es';
 import type { Storage } from 'yeoman-generator';
 
 import BaseGenerator from '../base/index.mjs';
@@ -31,12 +31,12 @@ import { ClientSourceType } from '../client/types.mjs';
 import { LanguageSourceType } from '../languages/types.js';
 import command from './command.mjs';
 import { JHipsterGeneratorFeatures, JHipsterGeneratorOptions } from '../base/api.mjs';
-
-const { upperFirst } = _;
+import { mutateData } from '../base/support/config.mjs';
 
 const {
   LOADING,
   PREPARING,
+  POST_PREPARING,
   CONFIGURING_EACH_ENTITY,
   LOADING_ENTITIES,
   PREPARING_EACH_ENTITY,
@@ -125,7 +125,7 @@ export default class BaseApplicationGenerator<
       });
       if (this.options.applicationWithEntities.entities) {
         const entities = this.options.applicationWithEntities.entities.map(entity => {
-          const entityName = _.upperFirst(entity.name);
+          const entityName = upperFirst(entity.name);
           const file = this.getEntityConfigPath(entityName);
           this.fs.writeJSON(file, { ...this.fs.readJSON(file), ...entity });
           return entityName;
@@ -342,6 +342,7 @@ export default class BaseApplicationGenerator<
       ![
         LOADING,
         PREPARING,
+        POST_PREPARING,
 
         CONFIGURING_EACH_ENTITY,
         LOADING_ENTITIES,
@@ -367,6 +368,12 @@ export default class BaseApplicationGenerator<
     }
     const application = this.sharedData.getApplication();
 
+    if ([PREPARING, LOADING].includes(priorityName)) {
+      return {
+        application,
+        applicationDefaults: data => mutateData(application, data),
+      };
+    }
     if (LOADING_ENTITIES === priorityName) {
       return {
         application,
@@ -399,7 +406,7 @@ export default class BaseApplicationGenerator<
   /**
    * @private
    * Get entities to configure.
-   * This method doesn't filter entities. An filtered config can be changed at thie priority.
+   * This method doesn't filter entities. An filtered config can be changed at this priority.
    * @returns {string[]}
    */
   getEntitiesDataToConfigure() {
diff --git a/generators/base-application/generator.spec.mts b/generators/base-application/generator.spec.mts
index f4ba7ea3a0dc..86d8b99ba175 100644
--- a/generators/base-application/generator.spec.mts
+++ b/generators/base-application/generator.spec.mts
@@ -62,6 +62,7 @@ describe(`generator - ${generator}`, () => {
     // application arg
     const loading = esmocha.fn();
     const preparing = esmocha.fn();
+    const postPreparing = esmocha.fn();
     const writing = esmocha.fn();
     const postWriting = esmocha.fn();
     const install = esmocha.fn();
@@ -106,6 +107,10 @@ describe(`generator - ${generator}`, () => {
         return { preparing };
       }
 
+      get [Generator.POST_PREPARING]() {
+        return { postPreparing };
+      }
+
       get [Generator.CONFIGURING_EACH_ENTITY]() {
         return { configuringEachEntity };
       }
@@ -194,6 +199,11 @@ describe(`generator - ${generator}`, () => {
         source: expect.any(Object),
       };
 
+      const applicationDefaultsArg = {
+        ...applicationArg,
+        applicationDefaults: expect.any(Function),
+      };
+
       const entityConfiguringArg = {
         ...applicationArg,
         entityStorage: expect.any(Object),
@@ -230,6 +240,8 @@ describe(`generator - ${generator}`, () => {
       expect(prompting).toBeCalledWith(controlArg);
       expect(configuring).toBeCalledWith(controlArg);
       expect(composing).toBeCalledWith(controlArg);
+      expect(loading).toBeCalledWith(applicationDefaultsArg);
+      expect(postPreparing).toBeCalledWith(applicationSourceArg);
 
       expect(configuringEachEntity).toBeCalledTimes(3);
       expect(configuringEachEntity).toHaveBeenNthCalledWith(1, { ...entityConfiguringArg, entityName: 'One' });
@@ -271,7 +283,7 @@ describe(`generator - ${generator}`, () => {
       expect(install).toBeCalledWith(applicationArg);
       expect(end).toBeCalledWith(applicationArg);
 
-      expect(preparing).toBeCalledWith(applicationSourceArg);
+      expect(preparing).toBeCalledWith({ ...applicationSourceArg, ...applicationDefaultsArg });
       expect(postWriting).toBeCalledWith(applicationSourceArg);
     });
   });
@@ -423,6 +435,11 @@ describe(`generator - ${generator}`, () => {
         source: expect.any(Object),
       };
 
+      const applicationDefaultsArg = {
+        ...applicationArg,
+        applicationDefaults: expect.any(Function),
+      };
+
       const entityConfiguringArg = {
         ...applicationArg,
         entityStorage: expect.any(Object),
@@ -468,6 +485,7 @@ describe(`generator - ${generator}`, () => {
       expect(prompting).toBeCalledWith(controlArg);
       expect(configuring).toBeCalledWith(controlArg);
       expect(composing).toBeCalledWith(controlArg);
+      expect(loading).toBeCalledWith(applicationDefaultsArg);
 
       expect(configuringEachEntity).toBeCalledTimes(3);
       expect(configuringEachEntity).toHaveBeenNthCalledWith(1, { ...entityConfiguringArg, entityName: 'One' });
@@ -510,7 +528,7 @@ describe(`generator - ${generator}`, () => {
       expect(install).toBeCalledWith(applicationArg);
       expect(end).toBeCalledWith(applicationArg);
 
-      expect(preparing).toBeCalledWith(applicationSourceArg);
+      expect(preparing).toBeCalledWith({ ...applicationSourceArg, ...applicationDefaultsArg });
       expect(postWriting).toBeCalledWith(applicationSourceArg);
     });
   });
diff --git a/generators/base-application/support/entity.mts b/generators/base-application/support/entity.mts
index 8102371c45d4..b6ec6c08dfeb 100644
--- a/generators/base-application/support/entity.mts
+++ b/generators/base-application/support/entity.mts
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { Entity } from '../../../jdl/converters/types.js';
 
 const { upperFirst } = _;
diff --git a/generators/base-application/support/enum.mjs b/generators/base-application/support/enum.mjs
index 62fa22cf20e2..1b0b5ef551cb 100644
--- a/generators/base-application/support/enum.mjs
+++ b/generators/base-application/support/enum.mjs
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { formatDocAsJavaDoc } from '../../server/support/doc.mjs';
 
 const doesTheEnumValueHaveACustomValue = enumValue => {
@@ -90,7 +90,7 @@ export const getEnumInfo = (field, clientRootFolder) => {
   const customValuesState = getCustomValuesState(enums);
   return {
     enumName: field.fieldType,
-    javadoc: field.fieldTypeJavadoc && formatDocAsJavaDoc(field.fieldTypeJavadoc),
+    enumJavadoc: field.fieldTypeDocumentation && formatDocAsJavaDoc(field.fieldTypeDocumentation),
     enumInstance: field.enumInstance,
     enums,
     ...customValuesState,
diff --git a/generators/base-application/support/enum.spec.mts b/generators/base-application/support/enum.spec.mts
index 45662dc89794..8b8b5768cec1 100644
--- a/generators/base-application/support/enum.spec.mts
+++ b/generators/base-application/support/enum.spec.mts
@@ -8,7 +8,7 @@ describe('base-application - support - enum', () => {
 
       before(() => {
         const clientRootFolder = 'root';
-        const field = { enumName: 'fieldName', fieldType: 'BigLetters', fieldValues: 'AAA, BBB', fieldTypeJavadoc: 'enum comment' };
+        const field = { enumName: 'fieldName', fieldType: 'BigLetters', fieldValues: 'AAA, BBB', fieldTypeDocumentation: 'enum comment' };
         enumInfo = getEnumInfo(field, clientRootFolder);
       });
 
@@ -22,7 +22,7 @@ describe('base-application - support - enum', () => {
         assert.deepStrictEqual(enumInfo.enums, ['AAA', 'BBB']);
       });
       it('returns the enums comment', () => {
-        assert.deepStrictEqual(enumInfo.javadoc, '/**\n * enum comment\n */');
+        assert.deepStrictEqual(enumInfo.enumJavadoc, '/**\n * enum comment\n */');
       });
     });
     describe("when the enums don't have custom values", () => {
diff --git a/generators/base-application/support/prepare-entity.mts b/generators/base-application/support/prepare-entity.mts
index 78e2f28146e4..6b9daff6d908 100644
--- a/generators/base-application/support/prepare-entity.mts
+++ b/generators/base-application/support/prepare-entity.mts
@@ -16,12 +16,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import pluralize from 'pluralize';
 
 import type BaseGenerator from '../../base-core/index.mjs';
 import { getDatabaseTypeData, hibernateSnakeCase } from '../../server/support/index.mjs';
-import { createFaker, parseChangelog, stringHashCode, upperFirstCamelCase, getMicroserviceAppName } from '../../base/support/index.mjs';
+import {
+  createFaker,
+  parseChangelog,
+  stringHashCode,
+  upperFirstCamelCase,
+  getMicroserviceAppName,
+  mutateData,
+} from '../../base/support/index.mjs';
 import { fieldToReference } from './prepare-field.mjs';
 import { getTypescriptKeyType, getEntityParentPathAddition } from '../../client/support/index.mjs';
 import {
@@ -287,6 +294,10 @@ export function prepareEntityPrimaryKeyForTemplates(entityWithConfig, generator,
     if (idField) {
       idField.id = true;
     } else {
+      if (entityWithConfig.microserviceName) {
+        // TODO ignore warning for microfrontends.
+        generator.log.warn("Microservice entities should have a custom id to make sure gateway and microservice types won't conflict");
+      }
       idField = {
         fieldName: 'id',
         id: true,
@@ -371,6 +382,9 @@ export function prepareEntityPrimaryKeyForTemplates(entityWithConfig, generator,
       get name() {
         return relationshipId.otherEntity.primaryKey.name;
       },
+      get hibernateSnakeCaseName() {
+        return hibernateSnakeCase(relationshipId.otherEntity.primaryKey.name);
+      },
       get nameCapitalized() {
         return relationshipId.otherEntity.primaryKey.nameCapitalized;
       },
@@ -408,6 +422,7 @@ export function prepareEntityPrimaryKeyForTemplates(entityWithConfig, generator,
     entityWithConfig.primaryKey = {
       derived: false,
       name: primaryKeyName,
+      hibernateSnakeCaseName: hibernateSnakeCase(primaryKeyName),
       nameCapitalized: _.upperFirst(primaryKeyName),
       type: primaryKeyType,
       tsType: getTypescriptKeyType(primaryKeyType),
@@ -519,7 +534,7 @@ export function preparePostEntityCommonDerivedProperties(entity: Entity) {
   const fieldsType = sortedUniq(fields.map(({ fieldType }) => fieldType).filter(fieldType => !fieldIsEnum(fieldType)));
 
   // TODO move to server generator
-  entity.anyFieldHasDocumentation = entity.fields.some(({ javadoc }) => javadoc);
+  entity.anyFieldHasDocumentation = entity.fields.some(({ documentation }) => documentation);
 
   entity.anyFieldIsZonedDateTime = fieldsType.includes(ZONED_DATE_TIME);
   entity.anyFieldIsInstant = fieldsType.includes(INSTANT);
@@ -612,18 +627,19 @@ function preparePostEntityCommonDerivedPropertiesNotTyped(entity: any) {
       relationship.relationshipEagerLoad = false;
       return;
     }
-    relationship.bagRelationship = relationship.ownerSide && relationship.collection;
-    if (relationship.relationshipEagerLoad === undefined) {
-      relationship.relationshipEagerLoad =
+
+    mutateData(relationship, {
+      bagRelationship: relationship.ownerSide && relationship.collection,
+      relationshipEagerLoad: () =>
         relationship.bagRelationship ||
         entity.eagerLoad ||
         // Fetch relationships if otherEntityField differs otherwise the id is enough
-        (relationship.ownerSide && relationship.otherEntity.primaryKey.name !== relationship.otherEntityField);
-    }
+        (relationship.ownerSide && relationship.otherEntity.primaryKey.name !== relationship.otherEntityField),
+    });
   });
   entity.relationshipsContainEagerLoad = entity.relationships.some(relationship => relationship.relationshipEagerLoad);
   entity.containsBagRelationships = entity.relationships.some(relationship => relationship.bagRelationship);
-  entity.implementsEagerLoadApis = // Cassandra doesn't provides *WithEagerReationships apis
+  entity.implementsEagerLoadApis = // Cassandra doesn't provides *WithEagerRelationships apis
     ![CASSANDRA, COUCHBASE, NEO4J].includes(entity.databaseType) &&
     // Only sql and mongodb provides *WithEagerReationships apis for imperative implementation
     (entity.reactive || [SQL, MONGODB].includes(entity.databaseType)) &&
diff --git a/generators/base-application/support/prepare-field.mjs b/generators/base-application/support/prepare-field.mjs
index c7fe740fac0e..30319f644c97 100644
--- a/generators/base-application/support/prepare-field.mjs
+++ b/generators/base-application/support/prepare-field.mjs
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { fieldTypes, validations } from '../../../jdl/jhipster/index.mjs';
 import { getTypescriptType, prepareField as prepareClientFieldForTemplates } from '../../client/support/index.mjs';
 import { prepareField as prepareServerFieldForTemplates } from '../../server/support/index.mjs';
@@ -375,7 +375,13 @@ export function fieldToReference(entity, field, pathPrefix = []) {
     field,
     multiple: false,
     owned: true,
-    doc: field.javadoc,
+    doc: field.documentation,
+    get propertyJavadoc() {
+      return field.fieldJavadoc;
+    },
+    get propertyApiDescription() {
+      return field.fieldApiDescription;
+    },
     label: field.fieldNameHumanized,
     name: field.fieldName,
     type: field.fieldType,
diff --git a/generators/base-application/support/prepare-relationship.mjs b/generators/base-application/support/prepare-relationship.mjs
index 4d66b21c3d2a..30f6862de900 100644
--- a/generators/base-application/support/prepare-relationship.mjs
+++ b/generators/base-application/support/prepare-relationship.mjs
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import pluralize from 'pluralize';
 
 import {
@@ -261,7 +261,13 @@ function relationshipToReference(entity, relationship, pathPrefix = []) {
     relationship,
     owned: relationship.ownerSide,
     collection,
-    doc: relationship.javaDoc,
+    doc: relationship.documentation,
+    get propertyJavadoc() {
+      return relationship.relationshipJavadoc;
+    },
+    get propertyApiDescription() {
+      return relationship.relationshipApiDescription;
+    },
     name,
     nameCapitalized: collection ? relationship.relationshipNameCapitalizedPlural : relationship.relationshipNameCapitalized,
     get type() {
diff --git a/generators/base-application/support/relationship.mts b/generators/base-application/support/relationship.mts
index 8e3efb3971f9..0a0dfe1b5801 100644
--- a/generators/base-application/support/relationship.mts
+++ b/generators/base-application/support/relationship.mts
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 
 import { Relationship, Entity } from '../../../jdl/converters/types.js';
 import { ValidationResult } from '../../base/api.mjs';
diff --git a/generators/base-application/tasks.d.mts b/generators/base-application/tasks.d.mts
index 634e3fd4c638..b244c8645b97 100644
--- a/generators/base-application/tasks.d.mts
+++ b/generators/base-application/tasks.d.mts
@@ -32,6 +32,25 @@ type ApplicationTaskParam<Definition extends GenericApplicationDefinition = Cont
   application: Definition['applicationType'] & { user: Definition['entityType'] };
 };
 
+type ApplicationDefaultsTaskParam = {
+  /**
+   * Parameter properties accepts:
+   * - functions: receives the application and the return value is set at the application property.
+   * - non functions: application property will receive the property in case current value is undefined.
+   *
+   * Applies each object in order.
+   *
+   * @example
+   * // application = { prop: 'foo-bar', prop2: 'foo2' }
+   * applicationDefaults(
+   *   application,
+   *   { prop: 'foo', prop2: ({ prop }) => prop + 2 },
+   *   { prop: ({ prop }) => prop + '-bar', prop2: 'won\'t override' },
+   * );
+   */
+  applicationDefaults: (...defaults: Record<any, any>[]) => void;
+};
+
 export type EntitiesTaskParam<Definition extends GenericApplicationDefinition = GenericApplicationDefinition> = {
   entities: Definition['entityType'][];
 };
@@ -63,9 +82,9 @@ export type BaseApplicationGeneratorDefinition<
     GenericSourceTypeDefinition<Record<string, (...args: any[]) => any>>,
 > = BaseGeneratorDefinition<Definition> &
   // Add application to existing priorities
+  Record<'loadingTaskParam' | 'preparingTaskParam', ApplicationTaskParam<Definition> & ApplicationDefaultsTaskParam> &
   Record<
-    | 'loadingTaskParam'
-    | 'preparingTaskParam'
+    | 'postPreparingTaskParam'
     | 'defaultTaskParam'
     | 'postWritingTaskParam'
     | 'preConflictsTaskParam'
diff --git a/generators/base-application/types.d.mts b/generators/base-application/types.d.mts
index 0703a4b285af..d79a8549befb 100644
--- a/generators/base-application/types.d.mts
+++ b/generators/base-application/types.d.mts
@@ -13,6 +13,7 @@ export type BaseApplication = {
   hipster: string;
   lowercaseBaseName: string;
   upperFirstCamelCaseBaseName: string;
+  documentationArchiveUrl: string;
 
   projectVersion: string;
   projectDescription: string;
@@ -92,6 +93,7 @@ export type CommonClientServerApplication = BaseApplication &
   SpringBootApplication &
   ClientApplication &
   ApplicationType & {
+    clientRootDir: string;
     clientSrcDir: string;
     clientTestDir?: string;
     clientDistDir?: string;
@@ -100,9 +102,12 @@ export type CommonClientServerApplication = BaseApplication &
 
     serverPort: number;
     backendType?: string;
+    backendTypeJavaAny?: boolean;
+    backendTypeSpringBoot?: boolean;
     temporaryDir?: string;
 
     dockerServicesDir?: string;
+    dockerServices?: string[];
     prettierExtensions?: string;
 
     generateUserManagement?: boolean;
diff --git a/generators/base-core/generator.mts b/generators/base-core/generator.mts
index 6df12009170d..475f64f3ffa1 100644
--- a/generators/base-core/generator.mts
+++ b/generators/base-core/generator.mts
@@ -17,6 +17,7 @@
  * limitations under the License.
  */
 import { basename, join as joinPath, dirname, relative, isAbsolute, join, extname } from 'path';
+import { relative as posixRelative } from 'path/posix';
 import { createHash } from 'crypto';
 import { fileURLToPath } from 'url';
 import { statSync, rmSync, existsSync, readFileSync } from 'fs';
@@ -24,7 +25,7 @@ import assert from 'assert';
 import { requireNamespace } from '@yeoman/namespace';
 import chalk from 'chalk';
 import { parse as parseYaml, stringify as stringifyYaml } from 'yaml';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { simpleGit } from 'simple-git';
 import type { CopyOptions } from 'mem-fs-editor';
 import type { Data as TemplateData, Options as TemplateOptions } from 'ejs';
@@ -45,6 +46,8 @@ import type {
   ValidationResult,
   WriteFileOptions,
   JHipsterArguments,
+  JHipsterConfigs,
+  JHipsterCommandDefinition,
 } from '../base/api.mjs';
 import { packageJson } from '../../lib/index.mjs';
 import { CommonClientServerApplication, type BaseApplication } from '../base-application/types.mjs';
@@ -52,16 +55,35 @@ import { GENERATOR_BOOTSTRAP } from '../generator-list.mjs';
 import NeedleApi from '../needle-api.mjs';
 import command from '../base/command.mjs';
 import { GENERATOR_JHIPSTER, YO_RC_FILE } from '../generator-constants.mjs';
-
-const { merge } = _;
-const { INITIALIZING, PROMPTING, CONFIGURING, COMPOSING, LOADING, PREPARING, DEFAULT, WRITING, POST_WRITING, INSTALL, POST_INSTALL, END } =
-  PRIORITY_NAMES;
+import { convertConfigToOption } from '../../lib/internal/index.mjs';
+
+const { merge, get, set } = _;
+const {
+  INITIALIZING,
+  PROMPTING,
+  CONFIGURING,
+  COMPOSING,
+  LOADING,
+  PREPARING,
+  POST_PREPARING,
+  DEFAULT,
+  WRITING,
+  POST_WRITING,
+  INSTALL,
+  POST_INSTALL,
+  END,
+} = PRIORITY_NAMES;
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
 const asPriority = (priorityName: string) => `${PRIORITY_PREFIX}${priorityName}`;
 
+const relativeDir = (from: string, to: string) => {
+  const rel = posixRelative(from, to);
+  return rel ? `${rel}/` : '';
+};
+
 /**
  * This is the base class for a generator for every generator.
  */
@@ -80,6 +102,8 @@ export default class CoreGenerator extends YeomanGenerator<JHipsterGeneratorOpti
 
   static PREPARING = asPriority(PREPARING);
 
+  static POST_PREPARING = asPriority(POST_PREPARING);
+
   static DEFAULT = asPriority(DEFAULT);
 
   static WRITING = asPriority(WRITING);
@@ -97,6 +121,8 @@ export default class CoreGenerator extends YeomanGenerator<JHipsterGeneratorOpti
   experimental?: boolean;
   debugEnabled?: boolean;
   jhipster7Migration?: boolean;
+  relativeDir = relativeDir;
+  relative = posixRelative;
 
   readonly sharedData!: SharedData<CommonClientServerApplication>;
   readonly logger: Logger;
@@ -207,7 +233,7 @@ export default class CoreGenerator extends YeomanGenerator<JHipsterGeneratorOpti
    */
   getArgsForPriority(priorityName: string) {
     const control = this.sharedData.getControl();
-    if (priorityName === POST_WRITING || priorityName === PREPARING) {
+    if (priorityName === POST_WRITING || priorityName === PREPARING || priorityName === POST_PREPARING) {
       const source = this.sharedData.getSource();
       return [{ control, source }];
     }
@@ -249,38 +275,64 @@ export default class CoreGenerator extends YeomanGenerator<JHipsterGeneratorOpti
     return priorities;
   }
 
-  /**
-   * Load options from an object.
-   * When composing, we need to load options from others generators, externalising options allow to easily load them.
-   * @param options - Object containing options.
-   * @param common - skip generator scoped options.
-   */
-  parseJHipsterOptions(options: JHipsterOptions, common = false) {
-    Object.entries(options).forEach(([optionName, optionDesc]) => {
-      if (!optionDesc.scope || (common && optionDesc.scope === 'generator')) return;
-      let optionValue;
-      // Hidden options are test options, which doesn't rely on commoander for options parsing.
-      // We must parse environment variables manually
-      if (this.options[optionDesc.name ?? optionName] === undefined && optionDesc.env && process.env[optionDesc.env]) {
-        optionValue = process.env[optionDesc.env];
-      } else {
-        optionValue = this.options[optionDesc.name ?? optionName];
-      }
-      if (optionValue !== undefined) {
-        optionValue = optionDesc.type !== Array && optionDesc.type !== Function ? optionDesc.type(optionValue) : optionValue;
-        if (optionDesc.scope === 'storage') {
-          this.config.set(optionName, optionValue);
-        } else if (optionDesc.scope === 'blueprint') {
-          this.blueprintStorage!.set(optionName, optionValue);
-        } else if (optionDesc.scope === 'control') {
-          this.sharedData.getControl()[optionName] = optionValue;
-        } else if (optionDesc.scope === 'generator') {
-          this[optionName] = optionValue;
+  parseJHipsterCommand(commandDef: JHipsterCommandDefinition) {
+    if (commandDef.arguments) {
+      this.parseJHipsterArguments(commandDef.arguments);
+    } else if (commandDef.configs) {
+      this.parseJHipsterArguments(
+        Object.fromEntries(
+          Object.entries(commandDef.configs as Record<string, any>)
+            .filter(([_name, def]) => def.argument)
+            .map(([name, def]) => [
+              name,
+              {
+                description: def.description,
+                ...def.argument,
+              },
+            ]),
+        ) as any,
+      );
+    }
+    if (commandDef.options || commandDef.configs) {
+      this.parseJHipsterOptions(commandDef.options, commandDef.configs);
+    }
+  }
+
+  parseJHipsterOptions(options: JHipsterOptions | undefined, configs: JHipsterConfigs | boolean = {}, common = false) {
+    if (typeof configs === 'boolean') {
+      common = configs;
+      configs = {};
+    }
+
+    Object.entries(options ?? {})
+      .concat(Object.entries(configs).map(([name, def]) => [name, convertConfigToOption(name, def)]) as any)
+      .forEach(([optionName, optionDesc]) => {
+        if (!optionDesc?.type || !optionDesc.scope || (common && optionDesc.scope === 'generator')) return;
+        let optionValue;
+        // Hidden options are test options, which doesn't rely on commoander for options parsing.
+        // We must parse environment variables manually
+        if (this.options[optionDesc.name ?? optionName] === undefined && optionDesc.env && process.env[optionDesc.env]) {
+          optionValue = process.env[optionDesc.env];
         } else {
-          throw new Error(`Scope ${optionDesc.scope} not supported`);
+          optionValue = this.options[optionDesc.name ?? optionName];
         }
-      }
-    });
+        if (optionValue !== undefined) {
+          optionValue = optionDesc.type !== Array && optionDesc.type !== Function ? optionDesc.type(optionValue) : optionValue;
+          if (optionDesc.scope === 'storage') {
+            this.config.set(optionName, optionValue);
+          } else if (optionDesc.scope === 'blueprint') {
+            this.blueprintStorage!.set(optionName, optionValue);
+          } else if (optionDesc.scope === 'control') {
+            this.sharedData.getControl()[optionName] = optionValue;
+          } else if (optionDesc.scope === 'generator') {
+            this[optionName] = optionValue;
+          } else {
+            throw new Error(`Scope ${optionDesc.scope} not supported`);
+          }
+        } else if (optionDesc.default && optionDesc.scope === 'generator' && this[optionName] === undefined) {
+          this[optionName] = optionDesc.default;
+        }
+      });
   }
 
   parseJHipsterArguments(jhipsterArguments: JHipsterArguments = {}) {
@@ -304,7 +356,13 @@ export default class CoreGenerator extends YeomanGenerator<JHipsterGeneratorOpti
         }
         if (argument !== undefined) {
           const convertedValue = !argumentDef.type || argumentDef.type === Array ? argument : argumentDef.type(argument as any);
-          this[argumentName] = convertedValue;
+          if ((argumentDef.scope ?? 'generator') === 'generator') {
+            this[argumentName] = convertedValue;
+          } else if (argumentDef.scope === 'storage') {
+            this.config.set(argumentName, convertedValue);
+          } else if (argumentDef.scope === 'blueprint') {
+            this.blueprintStorage!.set(argumentName, convertedValue);
+          }
         }
       } else {
         if (argumentDef.required) {
@@ -319,6 +377,34 @@ export default class CoreGenerator extends YeomanGenerator<JHipsterGeneratorOpti
     this.options.positionalArguments = [];
   }
 
+  prepareQuestions(configs: JHipsterConfigs = {}) {
+    return Object.entries(configs)
+      .filter(([_name, def]) => def?.prompt)
+      .map(([name, def]) => {
+        const promptSpec = typeof def.prompt === 'function' ? def.prompt(this) : { ...def.prompt };
+        let storage: any;
+        if ((def.scope ?? 'storage') === 'storage') {
+          storage = this.config;
+          if (promptSpec.default === undefined) {
+            promptSpec.default = () => (this as any).jhipsterConfigWithDefaults?.[name];
+          }
+        } else if (def.scope === 'blueprint') {
+          storage = this.blueprintStorage;
+        } else if (def.scope === 'generator') {
+          storage = {
+            getPath: path => get(this, path),
+            setPath: (path, value) => set(this, path, value),
+          };
+        }
+        return {
+          name,
+          choices: def.choices,
+          ...promptSpec,
+          storage,
+        };
+      });
+  }
+
   /**
    * Generate a date to be used by Liquibase changelogs.
    *
@@ -830,7 +916,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
         if (error instanceof Error) {
           throw new Error(`Error editing file ${filePath}: ${error.message} at ${error.stack}`);
         }
-        throw new Error(`Unknow Error ${error}`);
+        throw new Error(`Unknown Error ${error}`);
       }
       return writeCallback;
     };
diff --git a/generators/base-entity-changes/generator.mts b/generators/base-entity-changes/generator.mts
index e4460de30799..5c812085eb9e 100644
--- a/generators/base-entity-changes/generator.mts
+++ b/generators/base-entity-changes/generator.mts
@@ -146,7 +146,7 @@ export default abstract class GeneratorBaseEntityChanges extends GeneratorBaseAp
           !newRelationships.some(newRelationship => relationshipEquals(newRelationship, oldRelationship)),
       );
 
-      // calcualte relationships that only need a foreign key recreation from the ones that are added
+      // calculate relationships that only need a foreign key recreation from the ones that are added
       // we need both the added and the removed ones here
       const relationshipsToRecreateForeignKeysOnly = addedRelationships
         .filter(addedRelationship =>
diff --git a/generators/base-workspaces/internal/deployments.mts b/generators/base-workspaces/internal/deployments.mts
index 6a89b43f62c4..71cdd880e496 100644
--- a/generators/base-workspaces/internal/deployments.mts
+++ b/generators/base-workspaces/internal/deployments.mts
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { applicationOptions, deploymentOptions } from '../../../jdl/index.js';
 import { loadDerivedPlatformConfig, loadPlatformConfig, loadDerivedServerAndPlatformProperties } from '../../server/support/index.mjs';
 import type { GeneratorBaseCore } from '../../index.js';
diff --git a/generators/base-workspaces/internal/docker-prompts.mjs b/generators/base-workspaces/internal/docker-prompts.mjs
index fe34119b426c..ead612f2a104 100644
--- a/generators/base-workspaces/internal/docker-prompts.mjs
+++ b/generators/base-workspaces/internal/docker-prompts.mjs
@@ -17,8 +17,9 @@
  * limitations under the License.
  */
 import chalk from 'chalk';
-import shelljs from 'shelljs';
 
+import { readFileSync, readdirSync, statSync } from 'node:fs';
+import { join } from 'node:path';
 import { loadConfigs } from './docker-base.mjs';
 import { applicationTypes, monitoringTypes, serviceDiscoveryTypes } from '../../../jdl/jhipster/index.mjs';
 import { convertSecretToBase64 } from '../../base/support/index.mjs';
@@ -118,15 +119,21 @@ async function askForPath() {
       name: 'directoryPath',
       message: messageAskForPath,
       default: this.directoryPath || '../',
-      validate: input => {
+      validate: async input => {
         const path = this.destinationPath(input);
-        if (shelljs.test('-d', path)) {
-          const appsFolders = getAppFolders.call(this, input, deploymentApplicationType);
-
-          if (appsFolders.length === 0) {
-            return deploymentApplicationType === MONOLITH ? `No monolith found in ${path}` : `No microservice or gateway found in ${path}`;
+        try {
+          if (statSync(path).isDirectory) {
+            const appsFolders = getAppFolders.call(this, path, deploymentApplicationType);
+
+            if (appsFolders.length === 0) {
+              return deploymentApplicationType === MONOLITH
+                ? `No monolith found in ${path}`
+                : `No microservice or gateway found in ${path}`;
+            }
+            return true;
           }
-          return true;
+        } catch {
+          // Ignore error
         }
         return `${path} is not a directory or doesn't exist`;
       },
@@ -141,7 +148,7 @@ async function askForPath() {
     this.directoryPath += '/';
   }
 
-  this.appsFolders = getAppFolders.call(this, this.directoryPath, deploymentApplicationType);
+  this.appsFolders = getAppFolders.call(this, this.destinationPath(this.directoryPath), deploymentApplicationType);
 
   // Removing registry from appsFolders, using reverse for loop
   for (let i = this.appsFolders.length - 1; i >= 0; i--) {
@@ -364,29 +371,33 @@ async function askForDockerPushCommand() {
  * @param deploymentApplicationType type of application being composed
  * @returns {Array} array of string representing app folders
  */
-export function getAppFolders(input, deploymentApplicationType) {
-  const destinationPath = this.destinationPath(input);
-  const files = shelljs.ls('-l', destinationPath);
+export function getAppFolders(directory, deploymentApplicationType) {
+  const files = readdirSync(directory);
   const appsFolders = [];
 
   files.forEach(file => {
-    if (file.isDirectory()) {
-      if (shelljs.test('-f', `${destinationPath}/${file.name}/.yo-rc.json`)) {
-        try {
-          const fileData = this.fs.readJSON(`${destinationPath}/${file.name}/.yo-rc.json`);
-          if (
-            fileData['generator-jhipster'].baseName !== undefined &&
-            (deploymentApplicationType === undefined ||
-              deploymentApplicationType === fileData['generator-jhipster'].applicationType ||
-              (deploymentApplicationType === MICROSERVICE && fileData['generator-jhipster'].applicationType === GATEWAY))
-          ) {
-            appsFolders.push(file.name.match(/([^/]*)\/*$/)[1]);
+    try {
+      if (statSync(join(directory, file)).isDirectory()) {
+        const yoRcFile = join(directory, file, '.yo-rc.json');
+        if (statSync(yoRcFile).isFile()) {
+          try {
+            const fileData = JSON.parse(readFileSync(yoRcFile).toString());
+            if (
+              fileData['generator-jhipster'].baseName !== undefined &&
+              (deploymentApplicationType === undefined ||
+                deploymentApplicationType === (fileData['generator-jhipster'].applicationType ?? MONOLITH) ||
+                (deploymentApplicationType === MICROSERVICE && fileData['generator-jhipster'].applicationType === GATEWAY))
+            ) {
+              appsFolders.push(file.match(/([^/]*)\/*$/)[1]);
+            }
+          } catch (err) {
+            this.log.error(chalk.red(`${yoRcFile}: this .yo-rc.json can't be read`));
+            this.log.debug('Error:', err);
           }
-        } catch (err) {
-          this.log.error(chalk.red(`${file}: this .yo-rc.json can't be read`));
-          this.log.debug('Error:', err);
         }
       }
+    } catch {
+      // Not a file or directory
     }
   });
 
diff --git a/generators/base/__snapshots__/generator.spec.mts.snap b/generators/base/__snapshots__/generator.spec.mts.snap
index 0a0b97598cf2..0afc10d6d38a 100644
--- a/generators/base/__snapshots__/generator.spec.mts.snap
+++ b/generators/base/__snapshots__/generator.spec.mts.snap
@@ -55,7 +55,6 @@ Commands:
   page                          Create a new page. (Supports vue clients)
   project-name                  Configure project name (alpha)
   run [generator]               Run a module or custom generator
-  spring-boot                   Create a Spring Boot application (alpha)
   spring-service|service        Create a new Spring service bean
   spring-controller             Create a new Spring controller
   openapi-client                Generates java client code from an OpenAPI/Swagger definition
diff --git a/generators/base/api.d.mts b/generators/base/api.d.mts
index efcb3b871c93..deb5bc5ba958 100644
--- a/generators/base/api.d.mts
+++ b/generators/base/api.d.mts
@@ -1,5 +1,5 @@
 import type { BaseOptions, BaseFeatures, ArgumentSpec, CliOptionSpec } from 'yeoman-generator';
-import { SetOptional } from 'type-fest';
+import type { SetOptional } from 'type-fest';
 import type CoreGenerator from '../base-core/index.mjs';
 
 export type ApplicationWithConfig = {
@@ -108,7 +108,7 @@ export type WriteFileTemplate<Generator = CoreGenerator, DataType = any> =
       /** @deprecated, use destinationFile instead */
       renameTo?: ((this: Generator, data: DataType, filePath: string) => string) | string;
       /** transforms (files processing) to be applied */
-      transform?: (() => string)[];
+      transform?: boolean | (() => string)[];
       /** binary files skips ejs render, ejs extension and file transform */
       binary?: boolean;
       /** ejs options. Refer to https://ejs.co/#docs */
@@ -127,7 +127,7 @@ export type WriteFileBlock<Generator = CoreGenerator, DataType = any> = {
   /** condition to enable to write the block */
   condition?: (this: Generator, data: DataType) => boolean | undefined;
   /** transforms (files processing) to be applied */
-  transform?: (() => string)[];
+  transform?: boolean | (() => string)[];
   templates: WriteFileTemplate<Generator, DataType>[];
 };
 
@@ -159,10 +159,13 @@ export type WriteFileOptions<Generator = CoreGenerator, DataType = any> = {
     }
 );
 
+export type JHispterChoices = string[] | { value: string; name: string }[];
+
 export type JHipsterOption = SetOptional<CliOptionSpec, 'name'> & {
   name?: string;
   scope?: 'storage' | 'blueprint' | 'control' | 'generator';
   env?: string;
+  choices?: JHispterChoices;
 };
 
 export type ValidationResult = {
@@ -172,15 +175,43 @@ export type ValidationResult = {
   error?: string | string[];
 };
 
-export type JHipsterArgumentConfig = SetOptional<ArgumentSpec, 'name'>;
+export type PromptSpec = {
+  type: 'input' | 'list' | 'confirm' | 'checkbox';
+  message: string | ((any) => string);
+  when?: boolean | ((any) => boolean);
+  default?: any | ((any) => any);
+  filter?: any | ((any) => any);
+  transformer?: any | ((any) => any);
+};
+
+export type JHipsterArgumentConfig = SetOptional<ArgumentSpec, 'name'> & { scope?: 'storage' | 'blueprint' | 'generator' };
+
+export type ConfigSpec = {
+  description?: string;
+  choices?: JHispterChoices;
+
+  cli?: SetOptional<CliOptionSpec, 'name'>;
+  argument?: JHipsterArgumentConfig;
+  prompt?: PromptSpec | ((CoreGenerator) => PromptSpec);
+  scope?: 'storage' | 'blueprint' | 'generator';
+  /**
+   * The callback receives the generator as input for 'generator' scope.
+   * The callback receives jhipsterConfigWithDefaults as input for 'storage' (default) scope.
+   * The callback receives blueprintStorage contents as input for 'blueprint' scope.
+   */
+  default?: string | boolean | string[] | ((any) => string | boolean | string[]);
+};
 
 export type JHipsterArguments = Record<string, JHipsterArgumentConfig>;
 
 export type JHipsterOptions = Record<string, JHipsterOption>;
 
+export type JHipsterConfigs = Record<string, ConfigSpec>;
+
 export type JHipsterCommandDefinition = {
   arguments?: JHipsterArguments;
-  options: JHipsterOptions;
+  options?: JHipsterOptions;
+  configs?: JHipsterConfigs;
   /**
    * Import options from a generator.
    * @example ['server', 'jhipster-blueprint:server']
diff --git a/generators/base/generator.mts b/generators/base/generator.mts
index 627941428547..645fc66df94e 100644
--- a/generators/base/generator.mts
+++ b/generators/base/generator.mts
@@ -20,7 +20,7 @@ import fs from 'fs';
 import path from 'path';
 import chalk from 'chalk';
 import semver from 'semver';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 
 import type { ComposeOptions } from 'yeoman-generator';
 import { packageJson } from '../../lib/index.mjs';
@@ -70,7 +70,11 @@ export default class JHipsterBaseBlueprintGenerator<
 
       if (this.getFeatures().checkBlueprint) {
         if (!this.jhipsterContext) {
-          throw new Error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprints ionic')}`);
+          throw new Error(
+            `This is a JHipster blueprint and should be used only like ${chalk.yellow(
+              `jhipster --blueprints ${this.options.namespace.split(':')[0]}`,
+            )}`,
+          );
         }
       }
 
@@ -251,6 +255,24 @@ export default class JHipsterBaseBlueprintGenerator<
     return taskGroup;
   }
 
+  /**
+   * Priority API stub for blueprints.
+   *
+   * Preparing should be used to generate derived properties.
+   */
+  get postPreparing(): GenericTaskGroup<this, Definition['preparingTaskParam']> {
+    return this.asPreparingTaskGroup({});
+  }
+
+  /**
+   * Utility method to get typed objects for autocomplete.
+   */
+  asPostPreparingTaskGroup(
+    taskGroup: GenericTaskGroup<this, Definition['postPreparingTaskParam']>,
+  ): GenericTaskGroup<this, Definition['postPreparingTaskParam']> {
+    return taskGroup;
+  }
+
   /**
    * Priority API stub for blueprints.
    *
diff --git a/generators/base/priorities.mjs b/generators/base/priorities.mjs
index ef9638f35ff0..00822bf07f54 100644
--- a/generators/base/priorities.mjs
+++ b/generators/base/priorities.mjs
@@ -50,6 +50,9 @@ const LOADING_QUEUE = `${QUEUE_PREFIX}${LOADING}`;
 const PREPARING = 'preparing';
 const PREPARING_QUEUE = `${QUEUE_PREFIX}${PREPARING}`;
 
+const POST_PREPARING = 'postPreparing';
+const POST_PREPARING_QUEUE = `${QUEUE_PREFIX}${POST_PREPARING}`;
+
 const MULTISTEP_TRANSFORM = 'multistepTransform';
 const MULTISTEP_TRANSFORM_QUEUE = `${QUEUE_PREFIX}${MULTISTEP_TRANSFORM}`;
 
@@ -98,9 +101,15 @@ export const CUSTOM_PRIORITIES = [
   {
     priorityName: PREPARING,
     queueName: PREPARING_QUEUE,
-    before: DEFAULT,
+    before: POST_PREPARING,
     args: generator => generator.getArgsForPriority(PREPARING),
   },
+  {
+    priorityName: POST_PREPARING,
+    queueName: POST_PREPARING_QUEUE,
+    before: DEFAULT,
+    args: generator => generator.getArgsForPriority(POST_PREPARING),
+  },
   {
     priorityName: DEFAULT,
     args: generator => generator.getArgsForPriority(DEFAULT),
@@ -153,6 +162,7 @@ export const PRIORITY_NAMES = {
   COMPOSING,
   LOADING,
   PREPARING,
+  POST_PREPARING,
 
   DEFAULT,
   WRITING,
@@ -172,6 +182,7 @@ export const PRIORITY_NAMES_LIST = [
   COMPOSING,
   LOADING,
   PREPARING,
+  POST_PREPARING,
 
   DEFAULT,
   WRITING,
@@ -190,6 +201,7 @@ export const QUEUES = {
   COMPOSING_QUEUE,
   LOADING_QUEUE,
   PREPARING_QUEUE,
+  POST_PREPARING_QUEUE,
 
   DEFAULT_QUEUE: DEFAULT,
   WRITING_QUEUE: WRITING,
diff --git a/generators/base/shared-data.mts b/generators/base/shared-data.mts
index 1a38b3b2e70c..ee2aee24f373 100644
--- a/generators/base/shared-data.mts
+++ b/generators/base/shared-data.mts
@@ -16,9 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import * as _ from 'lodash-es';
 import { type BaseApplication } from '../base-application/types.mjs';
 import { type Control } from './types.mjs';
 
+const { defaults } = _;
+
 export default class SharedData<ApplicationType extends BaseApplication = BaseApplication> {
   _storage: any;
 
@@ -28,15 +31,17 @@ export default class SharedData<ApplicationType extends BaseApplication = BaseAp
     }
     // Backward compatibility sharedData
     this._storage = storage;
-    this._storage.sharedDeployment = this._storage.sharedDeployment || {};
-    this._storage.sharedWorkspaces = this._storage.sharedWorkspaces || {};
-    this._storage.sharedEntities = this._storage.sharedEntities || {};
-    this._storage.sharedApplication = this._storage.sharedApplication || {
-      nodeDependencies: {},
-    };
-    this._storage.sharedSource = this._storage.sharedSource || {};
-    this._storage.control = this._storage.control || initialControl;
-    this._storage.props = this._storage.props ?? { configOptions: {} };
+
+    defaults(this._storage, {
+      sharedDeployment: {},
+      sharedWorkspaces: {},
+      sharedEntities: {},
+      sharedApplication: {},
+      sharedSource: {},
+      control: initialControl,
+      props: {},
+    });
+    this._storage.sharedApplication.nodeDependencies = this._storage.sharedApplication.nodeDependencies ?? {};
   }
 
   getSource() {
diff --git a/generators/base/support/basename.mts b/generators/base/support/basename.mts
index bfb4a2b4ca7c..53a5aed41bfe 100644
--- a/generators/base/support/basename.mts
+++ b/generators/base/support/basename.mts
@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 
 const { camelCase } = _;
 
diff --git a/generators/base/support/config.mts b/generators/base/support/config.mts
index 423fafa88c96..783138dfdeaa 100644
--- a/generators/base/support/config.mts
+++ b/generators/base/support/config.mts
@@ -51,3 +51,37 @@ function filterValue(object: Record<string, any>, filterValue: (any) => boolean
   }
   return clone;
 }
+
+/**
+ * Picks every field from source.
+ * A field with undefined value is returned for missing fields.
+ */
+export const pickFields = (source: Record<string | number, any>, fields: (string | number)[]) =>
+  Object.fromEntries(fields.map(field => [field, source[field]]));
+
+/**
+ * Mutation properties accepts:
+ * - functions: receives the application and the return value is set at the application property.
+ * - non functions: application property will receive the property in case current value is undefined.
+ *
+ * Applies each mutation object in order.
+ *
+ * @example
+ * // application = { prop: 'foo-bar', prop2: 'foo2' }
+ * mutateData(
+ *   data,
+ *   { prop: 'foo', prop2: ({ prop }) => prop + 2 },
+ *   { prop: ({ prop }) => prop + '-bar', prop2: 'won\'t override' },
+ * );
+ */
+export const mutateData = (context: Record<string | number, any>, ...mutations: Record<string | number, any>[]) => {
+  for (const mutation of mutations) {
+    for (const [key, value] of Object.entries(mutation)) {
+      if (typeof value === 'function') {
+        context[key] = value(context);
+      } else if (context[key] === undefined) {
+        context[key] = value;
+      }
+    }
+  }
+};
diff --git a/generators/base/support/jhipster7-context.mjs b/generators/base/support/jhipster7-context.mjs
index dfe785da1c32..248e2b709c21 100644
--- a/generators/base/support/jhipster7-context.mjs
+++ b/generators/base/support/jhipster7-context.mjs
@@ -14,6 +14,10 @@ const deprecatedProperties = {
     replacement: 'nodeDependencies.npm',
     get: ({ data }) => data.nodeDependencies.npm,
   },
+  JHIPSTER_DEPENDENCIES_VERSION: {
+    replacement: 'jhipsterDependenciesVersion',
+    get: ({ data }) => data.jhipsterDependenciesVersion,
+  },
   DOCKER_DIR: {
     replacement: 'dockerServicesDir',
     get: ({ data }) => data.dockerServicesDir,
@@ -67,8 +71,8 @@ const deprecatedProperties = {
     get: ({ data }) => data.anyFieldHasDocumentation,
   },
   fieldsContainBigDecimal: {
-    replacement: 'anyFieldIsDuration',
-    get: ({ data }) => data.anyFieldIsDuration,
+    replacement: 'anyFieldIsBigDecimal',
+    get: ({ data }) => data.anyFieldIsBigDecimal,
   },
   fieldsContainBlob: {
     replacement: 'anyFieldIsBlobDerived',
@@ -79,8 +83,8 @@ const deprecatedProperties = {
     get: ({ data }) => data.anyFieldIsDateDerived,
   },
   fieldsContainDuration: {
-    replacement: 'anyFieldIsBigDecimal',
-    get: ({ data }) => data.anyFieldIsBigDecimal,
+    replacement: 'anyFieldIsDuration',
+    get: ({ data }) => data.anyFieldIsDuration,
   },
   fieldsContainInstant: {
     replacement: 'anyFieldIsInstant',
@@ -130,6 +134,30 @@ const deprecatedProperties = {
     replacement: 'databaseMigrationLiquibase',
     get: ({ data }) => data.databaseMigrationLiquibase,
   },
+  databaseTypePostgres: {
+    replacement: 'prodDatabaseTypePostgresql',
+    get: ({ data }) => data.prodDatabaseTypePostgresql,
+  },
+  prodDatabaseTypePostgres: {
+    replacement: 'prodDatabaseTypePostgresql',
+    get: ({ data }) => data.prodDatabaseTypePostgresql,
+  },
+  databaseTypeMariadb: {
+    replacement: 'prodDatabaseTypeMariadb',
+    get: ({ data }) => data.prodDatabaseTypeMariadb,
+  },
+  databaseTypeMysql: {
+    replacement: 'prodDatabaseTypeMysql',
+    get: ({ data }) => data.prodDatabaseTypeMysql,
+  },
+  databaseTypeOracle: {
+    replacement: 'prodDatabaseTypeOracle',
+    get: ({ data }) => data.prodDatabaseTypeOracle,
+  },
+  databaseTypeMssql: {
+    replacement: 'prodDatabaseTypeMssql',
+    get: ({ data }) => data.prodDatabaseTypeMssql,
+  },
 };
 
 const ejsBuiltInProperties = ['__append', '__line', 'escapeFn', 'include', 'undefined'];
diff --git a/generators/base/support/needles.mts b/generators/base/support/needles.mts
index d2a3aee05532..861b2e497f1f 100644
--- a/generators/base/support/needles.mts
+++ b/generators/base/support/needles.mts
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import assert from 'assert';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import escapeStringRegexp from 'escape-string-regexp';
 import CoreGenerator from '../../base-core/index.mjs';
 import { CascatedEditFileCallback, EditFileCallback } from '../api.mjs';
@@ -96,7 +96,7 @@ export const checkContentIn = (contentToCheck: string | RegExp, content, ignoreW
 };
 
 /**
- * Write content before needle applying identation
+ * Write content before needle applying indentation
  *
  * @param args
  * @returns null if needle was not found, new content otherwise
diff --git a/generators/base/support/string.mts b/generators/base/support/string.mts
index ed83d3b0d61d..3b59df2707a7 100644
--- a/generators/base/support/string.mts
+++ b/generators/base/support/string.mts
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 
 /**
  * Calculate a hash code for a given string.
diff --git a/generators/base/tasks.d.mts b/generators/base/tasks.d.mts
index d4d520f4afd1..0dd4560bdcd0 100644
--- a/generators/base/tasks.d.mts
+++ b/generators/base/tasks.d.mts
@@ -20,7 +20,6 @@ export type BaseGeneratorDefinition<Definition extends GenericSourceTypeDefiniti
   | 'configuringTaskParam'
   | 'composingTaskParam'
   | 'loadingTaskParam'
-  | 'preparingTaskParam'
   | 'defaultTaskParam'
   | 'writingTaskParam'
   | 'postWritingTaskParam'
@@ -30,4 +29,4 @@ export type BaseGeneratorDefinition<Definition extends GenericSourceTypeDefiniti
   | 'endTaskParam',
   ControlTaskParam
 > &
-  Record<'preparingTaskParam' | 'postWritingTaskParam', SourceTaskParam<Definition>>;
+  Record<'preparingTaskParam' | 'postPreparingTaskParam' | 'postWritingTaskParam', SourceTaskParam<Definition>>;
diff --git a/generators/bootstrap-application-base/generator.mts b/generators/bootstrap-application-base/generator.mts
index 8dd33b2d3b83..a5e9d577ed55 100644
--- a/generators/bootstrap-application-base/generator.mts
+++ b/generators/bootstrap-application-base/generator.mts
@@ -18,7 +18,7 @@
  */
 import assert from 'assert';
 import os from 'os';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import chalk from 'chalk';
 import { passthrough } from '@yeoman/transform';
 
@@ -33,8 +33,8 @@ import {
   prepareRelationship,
 } from '../base-application/support/index.mjs';
 import { createUserEntity } from './utils.mjs';
-import { DOCKER_DIR } from '../generator-constants.mjs';
-import { GENERATOR_BOOTSTRAP, GENERATOR_COMMON, GENERATOR_PROJECT_NAME } from '../generator-list.mjs';
+import { JAVA_DOCKER_DIR } from '../generator-constants.mjs';
+import { GENERATOR_BOOTSTRAP, GENERATOR_BOOTSTRAP_APPLICATION_BASE, GENERATOR_COMMON, GENERATOR_PROJECT_NAME } from '../generator-list.mjs';
 import { packageJson } from '../../lib/index.mjs';
 import { loadLanguagesConfig } from '../languages/support/index.mjs';
 import { loadAppConfig, loadDerivedAppConfig, loadStoredAppOptions } from '../app/support/index.mjs';
@@ -53,6 +53,14 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator {
   }
 
   async beforeQueue() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_BOOTSTRAP_APPLICATION_BASE);
+    }
+
+    if (this.delegateToBlueprint) {
+      throw new Error('Only sbs blueprint is supported');
+    }
+
     await this.dependsOnJHipster(GENERATOR_PROJECT_NAME);
     await this.composeWithJHipster(GENERATOR_BOOTSTRAP);
   }
@@ -114,16 +122,15 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator {
 
   get preparing() {
     return this.asPreparingTaskGroup({
-      prepareApplication({ application }) {
+      prepareApplication({ application, applicationDefaults }) {
         loadDerivedAppConfig({ application });
 
-        application.nodePackageManager = 'npm';
-        application.dockerServicesDir = DOCKER_DIR;
-
-        // TODO v8 drop the following variables
-        const anyApplication = application as any;
-
-        anyApplication.clientPackageManager = application.nodePackageManager;
+        applicationDefaults({
+          nodePackageManager: 'npm',
+          dockerServicesDir: JAVA_DOCKER_DIR,
+          // TODO drop clientPackageManager
+          clientPackageManager: ({ nodePackageManager }) => nodePackageManager,
+        });
       },
     });
   }
@@ -278,7 +285,11 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator {
   get default() {
     return this.asDefaultTaskGroup({
       task({ application }) {
-        const isPackageJson = file => file.path === this.destinationPath('package.json');
+        const packageJsonFiles = [this.destinationPath('package.json')];
+        if (application.clientRootDir) {
+          packageJsonFiles.push(this.destinationPath(`${application.clientRootDir}package.json`));
+        }
+        const isPackageJson = file => packageJsonFiles.includes(file.path);
         const populateNullValues = dependencies => {
           if (!dependencies) return;
           for (const key of Object.keys(dependencies)) {
diff --git a/generators/bootstrap-application-base/utils.mjs b/generators/bootstrap-application-base/utils.mjs
index 7e1798d26ce2..67d72f4e5ce4 100644
--- a/generators/bootstrap-application-base/utils.mjs
+++ b/generators/bootstrap-application-base/utils.mjs
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { authenticationTypes, databaseTypes, fieldTypes } from '../../jdl/jhipster/index.mjs';
 import { loadRequiredConfigIntoEntity } from '../base-application/support/index.mjs';
 import { hibernateSnakeCase } from '../server/support/string.mjs';
diff --git a/generators/bootstrap-application-client/generator.mts b/generators/bootstrap-application-client/generator.mts
index 3bd260b8c46c..908b0df55d0b 100644
--- a/generators/bootstrap-application-client/generator.mts
+++ b/generators/bootstrap-application-client/generator.mts
@@ -18,8 +18,10 @@
  */
 import { loadClientConfig, loadDerivedClientConfig, preparePostEntityClientDerivedProperties } from '../client/support/index.mjs';
 import BaseApplicationGenerator from '../base-application/index.mjs';
-import { GENERATOR_BOOTSTRAP_APPLICATION_BASE } from '../generator-list.mjs';
+import { GENERATOR_BOOTSTRAP_APPLICATION_BASE, GENERATOR_BOOTSTRAP_APPLICATION_CLIENT } from '../generator-list.mjs';
 import { loadStoredAppOptions } from '../app/support/index.mjs';
+import clientCommand from '../client/command.mjs';
+import { loadConfig, loadDerivedConfig } from '../../lib/internal/index.mjs';
 
 export default class BootStrapApplicationClient extends BaseApplicationGenerator {
   constructor(args: any, options: any, features: any) {
@@ -31,12 +33,21 @@ export default class BootStrapApplicationClient extends BaseApplicationGenerator
   }
 
   async beforeQueue() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_BOOTSTRAP_APPLICATION_CLIENT);
+    }
+
+    if (this.delegateToBlueprint) {
+      throw new Error('Only sbs blueprint is supported');
+    }
+
     await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_BASE);
   }
 
   get loading() {
     return this.asLoadingTaskGroup({
       loadApplication({ application }) {
+        loadConfig(clientCommand.configs, { config: this.jhipsterConfigWithDefaults, application });
         loadClientConfig({ config: this.jhipsterConfigWithDefaults, application });
       },
     });
@@ -49,6 +60,7 @@ export default class BootStrapApplicationClient extends BaseApplicationGenerator
   get preparing() {
     return this.asPreparingTaskGroup({
       prepareApplication({ application }) {
+        loadDerivedConfig(clientCommand.configs, { application });
         loadDerivedClientConfig({ application });
       },
     });
diff --git a/generators/bootstrap-application-server/generator.mts b/generators/bootstrap-application-server/generator.mts
index 91efb34cf6e7..0133c587db83 100644
--- a/generators/bootstrap-application-server/generator.mts
+++ b/generators/bootstrap-application-server/generator.mts
@@ -16,11 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 
 import BaseApplicationGenerator from '../base-application/index.mjs';
-import { GENERATOR_BOOTSTRAP_APPLICATION_BASE } from '../generator-list.mjs';
+import { GENERATOR_BOOTSTRAP_APPLICATION_BASE, GENERATOR_BOOTSTRAP_APPLICATION_SERVER } from '../generator-list.mjs';
 import {
+  JAVA_VERSION,
   MAIN_DIR,
   SERVER_MAIN_RES_DIR,
   SERVER_MAIN_SRC_DIR,
@@ -40,6 +41,7 @@ import {
   hibernateSnakeCase,
   loadServerConfig,
   loadDerivedServerConfig,
+  prepareRelationship,
 } from '../server/support/index.mjs';
 import { prepareField as prepareFieldForLiquibaseTemplates } from '../liquibase/support/index.mjs';
 import { dockerPlaceholderGenerator, getDockerfileContainers } from '../docker/utils.mjs';
@@ -47,6 +49,8 @@ import { GRADLE_VERSION } from '../gradle/constants.mjs';
 import { normalizePathEnd } from '../base/support/path.mjs';
 import { getFrontendAppName } from '../base/support/index.mjs';
 import { getMainClassName } from '../java/support/index.mjs';
+import { loadConfig, loadDerivedConfig } from '../../lib/internal/index.mjs';
+import serverCommand from '../server/command.mjs';
 
 export default class BoostrapApplicationServer extends BaseApplicationGenerator {
   constructor(args: any, options: any, features: any) {
@@ -54,16 +58,26 @@ export default class BoostrapApplicationServer extends BaseApplicationGenerator
   }
 
   async beforeQueue() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_BOOTSTRAP_APPLICATION_SERVER);
+    }
+
+    if (this.delegateToBlueprint) {
+      throw new Error('Only sbs blueprint is supported');
+    }
+
     await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_BASE);
   }
 
   get loading() {
     return this.asLoadingTaskGroup({
       async loadApplication({ application }) {
+        loadConfig(serverCommand.configs, { config: this.jhipsterConfigWithDefaults, application });
         loadServerConfig({ config: this.jhipsterConfigWithDefaults, application });
 
         (application as any).gradleVersion = this.useVersionPlaceholders ? 'GRADLE_VERSION' : GRADLE_VERSION;
-        application.backendType = 'Java';
+        application.javaVersion = this.useVersionPlaceholders ? 'JAVA_VERSION' : JAVA_VERSION;
+        application.backendType = this.jhipsterConfig.backendType ?? 'Java';
 
         const pomFile = this.readTemplate(this.jhipsterTemplatePath('../../server/resources/pom.xml'))?.toString();
         const gradleLibsVersions = this.readTemplate(
@@ -99,6 +113,7 @@ export default class BoostrapApplicationServer extends BaseApplicationGenerator
   get preparing() {
     return this.asPreparingTaskGroup({
       prepareApplication({ application }) {
+        loadDerivedConfig(serverCommand.configs, { application });
         loadDerivedServerConfig({ application });
       },
       prepareForTemplates({ application: app }) {
@@ -117,6 +132,9 @@ export default class BoostrapApplicationServer extends BaseApplicationGenerator
         application.testResourceDir = SERVER_TEST_RES_DIR;
         application.srcMainDir = MAIN_DIR;
         application.srcTestDir = TEST_DIR;
+
+        application.backendTypeSpringBoot = application.backendType === 'Java';
+        application.backendTypeJavaAny = application.backendTypeJavaAny ?? application.backendTypeSpringBoot;
       },
     });
   }
@@ -174,6 +192,18 @@ export default class BoostrapApplicationServer extends BaseApplicationGenerator
     return this.preparingEachEntityField;
   }
 
+  get preparingEachEntityRelationship() {
+    return this.asPreparingEachEntityRelationshipTaskGroup({
+      prepareRelationship({ entity, relationship }) {
+        prepareRelationship({ entity, relationship });
+      },
+    });
+  }
+
+  get [BaseApplicationGenerator.PREPARING_EACH_ENTITY_RELATIONSHIP]() {
+    return this.preparingEachEntityRelationship;
+  }
+
   get postPreparingEachEntity() {
     return this.asPostPreparingEachEntityTaskGroup({
       processDerivedPrimaryKeyFields({ entity }) {
diff --git a/generators/bootstrap-application/generator.mts b/generators/bootstrap-application/generator.mts
index 60a493226c8b..68f0d01d53b6 100644
--- a/generators/bootstrap-application/generator.mts
+++ b/generators/bootstrap-application/generator.mts
@@ -26,12 +26,17 @@ import {
   preparePostEntitiesCommonDerivedProperties,
   preparePostEntityCommonDerivedProperties,
 } from '../base-application/support/index.mjs';
-import { GENERATOR_BOOTSTRAP_APPLICATION_CLIENT, GENERATOR_BOOTSTRAP_APPLICATION_SERVER } from '../generator-list.mjs';
+import {
+  GENERATOR_BOOTSTRAP_APPLICATION,
+  GENERATOR_BOOTSTRAP_APPLICATION_CLIENT,
+  GENERATOR_BOOTSTRAP_APPLICATION_SERVER,
+} from '../generator-list.mjs';
 
 import { preparePostEntityServerDerivedProperties } from '../server/support/index.mjs';
 import { getDefaultAppName } from '../project-name/support/index.mjs';
 import { packageJson } from '../../lib/index.mjs';
 import { loadStoredAppOptions } from '../app/support/index.mjs';
+import { JHIPSTER_DOCUMENTATION_ARCHIVE_PATH, JHIPSTER_DOCUMENTATION_URL } from '../generator-constants.mjs';
 
 const {
   Validations: { MAX, MIN, MAXLENGTH, MINLENGTH, MAXBYTES, MINBYTES, PATTERN },
@@ -48,6 +53,14 @@ export default class BootstrapApplicationGenerator extends BaseApplicationGenera
   }
 
   async beforeQueue() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_BOOTSTRAP_APPLICATION);
+    }
+
+    if (this.delegateToBlueprint) {
+      throw new Error('Only sbs blueprint is supported');
+    }
+
     await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_CLIENT);
     await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_SERVER);
   }
@@ -72,20 +85,23 @@ export default class BootstrapApplicationGenerator extends BaseApplicationGenera
 
   get preparing() {
     return this.asPreparingTaskGroup({
-      preparing({ application }) {
+      preparing({ application, applicationDefaults }) {
         if (application.authenticationType === 'oauth2' || application.databaseType === 'no') {
           (application as any).skipUserManagement = true;
         }
 
+        applicationDefaults({
+          useNpmWrapper: application => application.clientFrameworkAny && application.backendTypeSpringBoot,
+          documentationArchiveUrl: ({ jhipsterVersion }) =>
+            `${JHIPSTER_DOCUMENTATION_URL}${JHIPSTER_DOCUMENTATION_ARCHIVE_PATH}v${jhipsterVersion}`,
+        });
+
         let prettierExtensions = 'md,json,yml,html';
         if (application.clientFrameworkAny) {
           prettierExtensions = `${prettierExtensions},cjs,mjs,js,ts,tsx,css,scss`;
           if (application.clientFrameworkVue) {
             prettierExtensions = `${prettierExtensions},vue`;
           }
-          if (application.clientFrameworkSvelte) {
-            prettierExtensions = `${prettierExtensions},svelte`;
-          }
         }
         if (!application.skipServer) {
           prettierExtensions = `${prettierExtensions},java`;
diff --git a/generators/bootstrap-application/generator.spec.mts b/generators/bootstrap-application/generator.spec.mts
index 5ed36c8831a8..0e9db408337b 100644
--- a/generators/bootstrap-application/generator.spec.mts
+++ b/generators/bootstrap-application/generator.spec.mts
@@ -210,6 +210,7 @@ describe(`generator - ${generator}`, () => {
   "entityAngularName": "User",
   "entityAngularNamePlural": "Users",
   "entityApi": "",
+  "entityApiDescription": undefined,
   "entityApiUrl": "users",
   "entityClass": "User",
   "entityClassHumanized": "User",
@@ -223,6 +224,7 @@ describe(`generator - ${generator}`, () => {
   "entityInstanceDbSafe": "jhiUser",
   "entityInstancePlural": "users",
   "entityJavaPackageFolder": "",
+  "entityJavadoc": undefined,
   "entityModelFileName": "user",
   "entityNameCapitalized": "User",
   "entityNamePlural": "Users",
@@ -585,6 +587,7 @@ describe(`generator - ${generator}`, () => {
     "hasInteger": false,
     "hasLong": false,
     "hasUUID": true,
+    "hibernateSnakeCaseName": "id",
     "ids": [
       {
         "autoGenerate": true,
@@ -692,6 +695,7 @@ describe(`generator - ${generator}`, () => {
   "entityAngularName": "EntityA",
   "entityAngularNamePlural": "EntityAS",
   "entityApi": "",
+  "entityApiDescription": undefined,
   "entityApiUrl": "entity-as",
   "entityClass": "EntityA",
   "entityClassHumanized": "Entity A",
@@ -705,6 +709,7 @@ describe(`generator - ${generator}`, () => {
   "entityInstanceDbSafe": "entityA",
   "entityInstancePlural": "entityAS",
   "entityJavaPackageFolder": "",
+  "entityJavadoc": undefined,
   "entityModelFileName": "entity-a",
   "entityNameCapitalized": "EntityA",
   "entityNamePlural": "EntityAS",
@@ -849,6 +854,7 @@ describe(`generator - ${generator}`, () => {
     "hasInteger": false,
     "hasLong": false,
     "hasUUID": true,
+    "hibernateSnakeCaseName": "id",
     "ids": [
       {
         "autoGenerate": true,
@@ -1008,6 +1014,7 @@ describe(`generator - ${generator}`, () => {
   "entityAngularName": "EntityA",
   "entityAngularNamePlural": "EntityAS",
   "entityApi": "",
+  "entityApiDescription": undefined,
   "entityApiUrl": "entity-as",
   "entityClass": "EntityA",
   "entityClassHumanized": "Entity A",
@@ -1021,6 +1028,7 @@ describe(`generator - ${generator}`, () => {
   "entityInstanceDbSafe": "entityA",
   "entityInstancePlural": "entityAS",
   "entityJavaPackageFolder": "",
+  "entityJavadoc": undefined,
   "entityModelFileName": "entity-a",
   "entityNameCapitalized": "EntityA",
   "entityNamePlural": "EntityAS",
@@ -1165,6 +1173,7 @@ describe(`generator - ${generator}`, () => {
     "hasInteger": false,
     "hasLong": false,
     "hasUUID": true,
+    "hibernateSnakeCaseName": "id",
     "ids": [
       {
         "autoGenerate": true,
diff --git a/generators/bootstrap/generator.mts b/generators/bootstrap/generator.mts
index 62c925faa757..36cdb3a640ea 100644
--- a/generators/bootstrap/generator.mts
+++ b/generators/bootstrap/generator.mts
@@ -18,6 +18,7 @@
  */
 import { forceYoFiles, createConflicterTransform, createYoResolveTransform } from '@yeoman/conflicter';
 import { isFilePending } from 'mem-fs-editor/state';
+import prettier from 'prettier';
 
 import BaseGenerator from '../base/index.mjs';
 import {
@@ -28,13 +29,13 @@ import {
   isPrettierConfigFilePath,
   createSortConfigFilesTransform,
   createESLintTransform,
+  createRemoveUnusedImportsTransform,
 } from './support/index.mjs';
 import { PRETTIER_EXTENSIONS } from '../generator-constants.mjs';
-import { GENERATOR_UPGRADE } from '../generator-list.mjs';
+import { GENERATOR_BOOTSTRAP, GENERATOR_UPGRADE } from '../generator-list.mjs';
 import { PRIORITY_NAMES, QUEUES } from '../base-application/priorities.mjs';
 import type { BaseGeneratorDefinition, GenericTaskGroup } from '../base/tasks.mjs';
 import command from './command.mjs';
-import { createRemoveUnusedImportsTransform } from './support/java-unused-imports-transform.mjs';
 import { loadStoredAppOptions } from '../app/support/index.mjs';
 
 const { MULTISTEP_TRANSFORM, PRE_CONFLICTS } = PRIORITY_NAMES;
@@ -50,17 +51,27 @@ export default class BootstrapGenerator extends BaseGenerator {
 
   upgradeCommand?: boolean;
   skipPrettier?: boolean;
+  prettierExtensions: string[] = PRETTIER_EXTENSIONS.split(',');
+  prettierOptions: prettier.Options = { plugins: [] };
 
   constructor(args: any, options: any, features: any) {
     super(args, options, { jhipsterBootstrap: false, uniqueGlobally: true, customCommitTask: () => this.commitSharedFs(), ...features });
   }
 
-  beforeQueue() {
+  async beforeQueue() {
     loadStoredAppOptions.call(this);
 
     // Force npm override later if needed
     (this.env as any).options.nodePackageManager = 'npm';
     this.upgradeCommand = this.options.commandName === GENERATOR_UPGRADE;
+
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_BOOTSTRAP);
+    }
+
+    if (this.delegateToBlueprint) {
+      throw new Error('Only sbs blueprint is supported');
+    }
   }
 
   get initializing() {
@@ -177,7 +188,8 @@ export default class BootstrapGenerator extends BaseGenerator {
               ignoreErrors,
               prettierPackageJson: true,
               prettierJava: !this.jhipsterConfig.skipServer,
-              extensions: PRETTIER_EXTENSIONS,
+              extensions: this.prettierExtensions.join(','),
+              prettierOptions: this.prettierOptions,
             }),
           ]),
       ...(this.jhipsterConfig.autoCrlf ? [autoCrlfTransform(this.createGit())] : []),
diff --git a/generators/bootstrap/support/index.mts b/generators/bootstrap/support/index.mts
index 4299687cced2..2b9ca2921394 100644
--- a/generators/bootstrap/support/index.mts
+++ b/generators/bootstrap/support/index.mts
@@ -19,6 +19,7 @@
 export { default as autoCrlfTransform } from './auto-crlf-transform.mjs';
 export { default as createForceWriteConfigFilesTransform } from './force-write-config-files-transform.mjs';
 export * from './eslint-transform.mjs';
+export * from './java-unused-imports-transform.mjs';
 export * from './multi-step-transform/index.mjs';
 export * from './prettier-support.mjs';
 export { default as createSortConfigFilesTransform } from './sort-config-files-transform.mjs';
diff --git a/generators/ci-cd/__snapshots__/ci-cd.spec.mts.snap b/generators/ci-cd/__snapshots__/ci-cd.spec.mts.snap
index e7a4ce49344c..3f157f1f6650 100644
--- a/generators/ci-cd/__snapshots__/ci-cd.spec.mts.snap
+++ b/generators/ci-cd/__snapshots__/ci-cd.spec.mts.snap
@@ -934,7 +934,7 @@ jobs:
     name: "Gradle Wrapper Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v1
   pipeline:
     name: sampleMysql pipeline
@@ -948,14 +948,14 @@ jobs:
       JHI_DISABLE_WEBPACK_LOGS: true
       NG_CLI_ANALYTICS: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
           node-version: NODE_VERSION
       - uses: actions/setup-java@v3
         with:
           distribution: "temurin"
-          java-version: 17
+          java-version: JAVA_VERSION
       - name: Install node.js packages
         run: npm install
       - name: Run backend test
@@ -1006,7 +1006,7 @@ jobs:
     name: "Gradle Wrapper Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v1
   pipeline:
     name: sampleMysql pipeline
@@ -1020,14 +1020,14 @@ jobs:
       JHI_DISABLE_WEBPACK_LOGS: true
       NG_CLI_ANALYTICS: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
           node-version: NODE_VERSION
       - uses: actions/setup-java@v3
         with:
           distribution: "temurin"
-          java-version: 17
+          java-version: JAVA_VERSION
       - name: Install node.js packages
         run: npm install
       - name: Install Snyk CLI
@@ -1169,14 +1169,14 @@ jobs:
       JHI_DISABLE_WEBPACK_LOGS: true
       NG_CLI_ANALYTICS: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
           node-version: NODE_VERSION
       - uses: actions/setup-java@v3
         with:
           distribution: "temurin"
-          java-version: 17
+          java-version: JAVA_VERSION
       - name: Install node.js packages
         run: npm install
       - name: Run backend test
@@ -1235,14 +1235,14 @@ jobs:
       JHI_DISABLE_WEBPACK_LOGS: true
       NG_CLI_ANALYTICS: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
           node-version: NODE_VERSION
       - uses: actions/setup-java@v3
         with:
           distribution: "temurin"
-          java-version: 17
+          java-version: JAVA_VERSION
       - name: Install node.js packages
         run: npm install
       - name: Install Snyk CLI
@@ -1403,14 +1403,14 @@ jobs:
       JHI_DISABLE_WEBPACK_LOGS: true
       NG_CLI_ANALYTICS: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
           node-version: NODE_VERSION
       - uses: actions/setup-java@v3
         with:
           distribution: "temurin"
-          java-version: 17
+          java-version: JAVA_VERSION
       - name: Install node.js packages
         run: npm install
       - name: Run backend test
@@ -1562,7 +1562,7 @@ gradle-package:
 exports[`generator - CI-CD GitLab CI tests GitLab CI: Maven Angular NPM inside Docker should match files snapshot 1`] = `
 {
   ".gitlab-ci.yml": {
-    "contents": "image: jhipster/jhipster:v
+    "contents": "image: jhipster/jhipster:vJHIPSTER_VERSION
 
 cache:
   key: "$CI_COMMIT_REF_NAME"
@@ -1963,7 +1963,7 @@ deploy-to-production:
 exports[`generator - CI-CD GitLab CI tests GitLab CI: Maven Angular Yarn inside Docker Autoconfigure should match files snapshot 1`] = `
 {
   ".gitlab-ci.yml": {
-    "contents": "image: jhipster/jhipster:v
+    "contents": "image: jhipster/jhipster:vJHIPSTER_VERSION
 
 cache:
   key: "$CI_COMMIT_REF_NAME"
@@ -2074,7 +2074,7 @@ maven-package:
 exports[`generator - CI-CD GitLab CI tests GitLab CI: npm skip server should match files snapshot 1`] = `
 {
   ".gitlab-ci.yml": {
-    "contents": "image: jhipster/jhipster:v
+    "contents": "image: jhipster/jhipster:vJHIPSTER_VERSION
 
 before_script:
   - export NG_CLI_ANALYTICS="false"
@@ -2410,7 +2410,7 @@ node {
         checkout scm
     }
 
-    docker.image('jhipster/jhipster:v').inside('-u jhipster -e MAVEN_OPTS="-Duser.home=./"') {
+    docker.image('jhipster/jhipster:vJHIPSTER_VERSION').inside('-u jhipster -e MAVEN_OPTS="-Duser.home=./"') {
         stage('check java') {
             sh "java -version"
         }
@@ -3136,7 +3136,7 @@ cache:
 env:
   global:
     - NODE_VERSION=NODE_VERSION
-    - JHI_JDK=17
+    - JHI_JDK=JAVA_VERSION
     - SPRING_OUTPUT_ANSI_ENABLED=ALWAYS
     - SPRING_JPA_SHOW_SQL=false
     - JHI_DISABLE_WEBPACK_LOGS=true
@@ -3208,7 +3208,7 @@ cache:
 env:
   global:
     - NODE_VERSION=NODE_VERSION
-    - JHI_JDK=17
+    - JHI_JDK=JAVA_VERSION
     - SPRING_OUTPUT_ANSI_ENABLED=ALWAYS
     - SPRING_JPA_SHOW_SQL=false
     - JHI_DISABLE_WEBPACK_LOGS=true
@@ -3281,7 +3281,7 @@ cache:
 env:
   global:
     - NODE_VERSION=NODE_VERSION
-    - JHI_JDK=17
+    - JHI_JDK=JAVA_VERSION
     - SPRING_OUTPUT_ANSI_ENABLED=ALWAYS
     - SPRING_JPA_SHOW_SQL=false
     - JHI_DISABLE_WEBPACK_LOGS=true
diff --git a/generators/ci-cd/ci-cd.spec.mts b/generators/ci-cd/ci-cd.spec.mts
index 19a9790f5c3b..5ed0d559ecf6 100644
--- a/generators/ci-cd/ci-cd.spec.mts
+++ b/generators/ci-cd/ci-cd.spec.mts
@@ -38,9 +38,9 @@ describe('generator - CI-CD', () => {
           .createJHipster(GENERATOR_CI_CD)
           .withJHipsterConfig(mavenSample)
           .withAnswers({
-            pipeline: 'jenkins',
+            ciCd: 'jenkins',
             insideDocker: false,
-            cicdIntegrations: [],
+            ciCdIntegrations: [],
           })
           .run();
       });
@@ -64,9 +64,9 @@ describe('generator - CI-CD', () => {
           .createJHipster(GENERATOR_CI_CD)
           .withJHipsterConfig(gradleSample)
           .withAnswers({
-            pipeline: 'jenkins',
+            ciCd: 'jenkins',
             insideDocker: false,
-            cicdIntegrations: [],
+            ciCdIntegrations: [],
           })
           .run();
       });
@@ -91,9 +91,9 @@ describe('generator - CI-CD', () => {
           .withJHipsterConfig(mavenSample)
           .withFiles({ 'pom.xml': pomFile })
           .withAnswers({
-            pipeline: 'jenkins',
+            ciCd: 'jenkins',
             insideDocker: false,
-            cicdIntegrations: ['deploy', 'sonar', 'publishDocker', 'heroku', 'snyk'],
+            ciCdIntegrations: ['deploy', 'sonar', 'publishDocker', 'heroku', 'snyk'],
             artifactorySnapshotsId: 'snapshots',
             artifactorySnapshotsUrl: 'http://artifactory:8081/artifactory/libs-snapshot',
             artifactoryReleasesId: 'releases',
@@ -126,9 +126,9 @@ describe('generator - CI-CD', () => {
           .withJHipsterConfig(mavenSample)
           .withFiles({ 'pom.xml': pomFile })
           .withAnswers({
-            pipeline: 'jenkins',
+            ciCd: 'jenkins',
             insideDocker: true,
-            cicdIntegrations: ['deploy', 'sonar', 'publishDocker', 'heroku', 'snyk'],
+            ciCdIntegrations: ['deploy', 'sonar', 'publishDocker', 'heroku', 'snyk'],
             artifactorySnapshotsId: 'snapshots',
             artifactorySnapshotsUrl: 'http://artifactory:8081/artifactory/libs-snapshot',
             artifactoryReleasesId: 'releases',
@@ -164,9 +164,9 @@ describe('generator - CI-CD', () => {
           .createJHipster(GENERATOR_CI_CD)
           .withJHipsterConfig(mavenSample)
           .withAnswers({
-            pipeline: 'gitlab',
+            ciCd: 'gitlab',
             insideDocker: false,
-            cicdIntegrations: [],
+            ciCdIntegrations: [],
           })
           .run();
       });
@@ -190,8 +190,8 @@ describe('generator - CI-CD', () => {
           .createJHipster(GENERATOR_CI_CD)
           .withJHipsterConfig(gradleSample)
           .withAnswers({
-            pipeline: 'gitlab',
-            cicdIntegrations: [],
+            ciCd: 'gitlab',
+            ciCdIntegrations: [],
           })
           .run();
       });
@@ -215,9 +215,9 @@ describe('generator - CI-CD', () => {
           .createJHipster(GENERATOR_CI_CD)
           .withJHipsterConfig(skipServerSample)
           .withAnswers({
-            pipeline: 'gitlab',
+            ciCd: 'gitlab',
             insideDocker: true,
-            cicdIntegrations: [],
+            ciCdIntegrations: [],
           })
           .run();
       });
@@ -239,9 +239,9 @@ describe('generator - CI-CD', () => {
           .withJHipsterConfig(mavenSample)
           .withFiles({ 'pom.xml': pomFile })
           .withAnswers({
-            pipeline: 'gitlab',
+            ciCd: 'gitlab',
             insideDocker: false,
-            cicdIntegrations: ['deploy', 'sonar', 'heroku', 'snyk'],
+            ciCdIntegrations: ['deploy', 'sonar', 'heroku', 'snyk'],
             artifactorySnapshotsId: 'snapshots',
             artifactorySnapshotsUrl: 'http://artifactory:8081/artifactory/libs-snapshot',
             artifactoryReleasesId: 'releases',
@@ -274,9 +274,9 @@ describe('generator - CI-CD', () => {
           .withJHipsterConfig(mavenSample)
           .withFiles({ 'pom.xml': pomFile })
           .withAnswers({
-            pipeline: 'gitlab',
+            ciCd: 'gitlab',
             insideDocker: true,
-            cicdIntegrations: ['deploy', 'sonar', 'heroku', 'snyk'],
+            ciCdIntegrations: ['deploy', 'sonar', 'heroku', 'snyk'],
             artifactorySnapshotsId: 'snapshots',
             artifactorySnapshotsUrl: 'http://artifactory:8081/artifactory/libs-snapshot',
             artifactoryReleasesId: 'releases',
@@ -307,7 +307,10 @@ describe('generator - CI-CD', () => {
         runResult = await helpers
           .createJHipster(GENERATOR_CI_CD)
           .withJHipsterConfig(mavenSample)
-          .withOptions({ autoconfigureGitlab: true })
+          .withArguments(['gitlab'])
+          .withAnswers({
+            insideDocker: true,
+          })
           .run();
       });
       it('should match files snapshot', function () {
@@ -336,8 +339,8 @@ describe('generator - CI-CD', () => {
           .createJHipster(GENERATOR_CI_CD)
           .withJHipsterConfig(mavenSample)
           .withAnswers({
-            pipeline: 'travis',
-            cicdIntegrations: [],
+            ciCd: 'travis',
+            ciCdIntegrations: [],
           })
           .run();
       });
@@ -359,8 +362,8 @@ describe('generator - CI-CD', () => {
           .createJHipster(GENERATOR_CI_CD)
           .withJHipsterConfig(gradleSample)
           .withAnswers({
-            pipeline: 'travis',
-            cicdIntegrations: [],
+            ciCd: 'travis',
+            ciCdIntegrations: [],
           })
           .run();
       });
@@ -387,8 +390,8 @@ describe('generator - CI-CD', () => {
           .withJHipsterConfig(mavenSample)
           .withFiles({ 'pom.xml': pomFile })
           .withAnswers({
-            pipeline: 'travis',
-            cicdIntegrations: ['deploy', 'sonar', 'heroku', 'snyk', 'cypressDashboard'],
+            ciCd: 'travis',
+            ciCdIntegrations: ['deploy', 'sonar', 'heroku', 'snyk', 'cypressDashboard'],
             artifactorySnapshotsId: 'snapshots',
             artifactorySnapshotsUrl: 'http://artifactory:8081/artifactory/libs-snapshot',
             artifactoryReleasesId: 'releases',
@@ -429,8 +432,8 @@ describe('generator - CI-CD', () => {
           .createJHipster(GENERATOR_CI_CD)
           .withJHipsterConfig(mavenSample)
           .withAnswers({
-            pipeline: 'azure',
-            cicdIntegrations: ['cypressDashboard'],
+            ciCd: 'azure',
+            ciCdIntegrations: ['cypressDashboard'],
           })
           .run();
       });
@@ -454,8 +457,8 @@ describe('generator - CI-CD', () => {
           .createJHipster(GENERATOR_CI_CD)
           .withJHipsterConfig(gradleSample)
           .withAnswers({
-            pipeline: 'azure',
-            cicdIntegrations: [],
+            ciCd: 'azure',
+            ciCdIntegrations: [],
           })
           .run();
       });
@@ -477,8 +480,8 @@ describe('generator - CI-CD', () => {
           .createJHipster(GENERATOR_CI_CD)
           .withJHipsterConfig(mavenSample)
           .withAnswers({
-            pipeline: 'azure',
-            cicdIntegrations: ['snyk'],
+            ciCd: 'azure',
+            ciCdIntegrations: ['snyk'],
           })
           .run();
       });
@@ -499,8 +502,8 @@ describe('generator - CI-CD', () => {
           .createJHipster(GENERATOR_CI_CD)
           .withJHipsterConfig(gradleSample)
           .withAnswers({
-            pipeline: 'azure',
-            cicdIntegrations: ['snyk'],
+            ciCd: 'azure',
+            ciCdIntegrations: ['snyk'],
           })
           .run();
       });
@@ -517,11 +520,7 @@ describe('generator - CI-CD', () => {
     describe('Azure Pipelines: autoconfigure', () => {
       let runResult;
       before(async () => {
-        runResult = await helpers
-          .createJHipster(GENERATOR_CI_CD)
-          .withJHipsterConfig(mavenSample)
-          .withOptions({ autoconfigureAzure: true })
-          .run();
+        runResult = await helpers.createJHipster(GENERATOR_CI_CD).withJHipsterConfig(mavenSample).withArguments(['azure']).run();
       });
       it('should match files snapshot', function () {
         expect(runResult.getSnapshot()).toMatchSnapshot();
@@ -543,8 +542,8 @@ describe('generator - CI-CD', () => {
           .createJHipster(GENERATOR_CI_CD)
           .withJHipsterConfig(mavenSample)
           .withAnswers({
-            pipeline: 'github',
-            cicdIntegrations: [],
+            ciCd: 'github',
+            ciCdIntegrations: [],
           })
           .run();
       });
@@ -562,8 +561,8 @@ describe('generator - CI-CD', () => {
           .createJHipster(GENERATOR_CI_CD)
           .withJHipsterConfig(gradleSample)
           .withAnswers({
-            pipeline: 'github',
-            cicdIntegrations: [],
+            ciCd: 'github',
+            ciCdIntegrations: [],
           })
           .run();
       });
@@ -582,8 +581,8 @@ describe('generator - CI-CD', () => {
           .withJHipsterConfig(mavenSample)
           .withFiles({ 'pom.xml': pomFile })
           .withAnswers({
-            pipeline: 'github',
-            cicdIntegrations: ['deploy', 'sonar', 'publishDocker', 'heroku', 'snyk', 'cypressDashboard'],
+            ciCd: 'github',
+            ciCdIntegrations: ['deploy', 'sonar', 'publishDocker', 'heroku', 'snyk', 'cypressDashboard'],
             dockerImage: 'jhipster-publish-docker',
             artifactorySnapshotsId: 'snapshots',
             artifactorySnapshotsUrl: 'http://artifactory:8081/artifactory/libs-snapshot',
@@ -622,8 +621,8 @@ describe('generator - CI-CD', () => {
           .createJHipster(GENERATOR_CI_CD)
           .withJHipsterConfig(gradleSample)
           .withAnswers({
-            pipeline: 'github',
-            cicdIntegrations: ['sonar', 'publishDocker', 'heroku', 'snyk'],
+            ciCd: 'github',
+            ciCdIntegrations: ['sonar', 'publishDocker', 'heroku', 'snyk'],
             dockerImage: 'jhipster-publish-docker',
             sonarUrl: 'http://sonar.com:9000',
           })
@@ -651,11 +650,7 @@ describe('generator - CI-CD', () => {
     describe('GitHub Actions: autoconfigure', () => {
       let runResult;
       before(async () => {
-        runResult = await helpers
-          .createJHipster(GENERATOR_CI_CD)
-          .withJHipsterConfig(mavenSample)
-          .withOptions({ autoconfigureGithub: true })
-          .run();
+        runResult = await helpers.createJHipster(GENERATOR_CI_CD).withJHipsterConfig(mavenSample).withArguments(['github']).run();
       });
       it('should match files snapshot', function () {
         expect(runResult.getSnapshot()).toMatchSnapshot();
@@ -677,8 +672,8 @@ describe('generator - CI-CD', () => {
           .createJHipster(GENERATOR_CI_CD)
           .withJHipsterConfig(mavenSample)
           .withAnswers({
-            pipeline: 'circle',
-            cicdIntegrations: ['cypressDashboard'],
+            ciCd: 'circle',
+            ciCdIntegrations: ['cypressDashboard'],
           })
           .run();
       });
@@ -703,8 +698,8 @@ describe('generator - CI-CD', () => {
           .createJHipster(GENERATOR_CI_CD)
           .withJHipsterConfig(gradleSample)
           .withAnswers({
-            pipeline: 'circle',
-            cicdIntegrations: [],
+            ciCd: 'circle',
+            ciCdIntegrations: [],
           })
           .run();
       });
@@ -729,8 +724,8 @@ describe('generator - CI-CD', () => {
           .createJHipster(GENERATOR_CI_CD)
           .withJHipsterConfig(mavenSample)
           .withAnswers({
-            pipeline: 'circle',
-            cicdIntegrations: ['snyk'],
+            ciCd: 'circle',
+            ciCdIntegrations: ['snyk'],
           })
           .run();
       });
@@ -751,8 +746,8 @@ describe('generator - CI-CD', () => {
           .createJHipster(GENERATOR_CI_CD)
           .withJHipsterConfig(gradleSample)
           .withAnswers({
-            pipeline: 'circle',
-            cicdIntegrations: ['snyk'],
+            ciCd: ['circle'],
+            ciCdIntegrations: ['snyk'],
           })
           .run();
       });
diff --git a/generators/ci-cd/command.mts b/generators/ci-cd/command.mts
new file mode 100644
index 000000000000..e044a7d8a7bf
--- /dev/null
+++ b/generators/ci-cd/command.mts
@@ -0,0 +1,181 @@
+/**
+ * Copyright 2013-2023 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import chalk from 'chalk';
+import * as _ from 'lodash-es';
+import { JHipsterCommandDefinition } from '../base/api.mjs';
+
+const { kebabCase, intersection } = _;
+
+const includesValue = (prop, values) => answers => answers[prop] && intersection(answers[prop], values);
+
+const command: JHipsterCommandDefinition = {
+  options: {},
+  configs: {
+    ciCd: {
+      argument: {
+        type: Array,
+      },
+      prompt: {
+        type: 'checkbox',
+        message: 'What CI/CD pipeline do you want to generate?',
+      },
+      choices: [
+        { name: 'GitHub Actions', value: 'github' },
+        { name: 'Jenkins pipeline', value: 'jenkins' },
+        { name: 'GitLab CI', value: 'gitlab' },
+        { name: 'Azure Pipelines', value: 'azure' },
+        { name: 'Travis CI', value: 'travis' },
+        { name: 'CircleCI', value: 'circle' },
+      ],
+      scope: 'generator',
+    },
+    ciCdIntegrations: {
+      prompt: {
+        type: 'checkbox',
+        message: 'What tasks/integrations do you want to include ?',
+      },
+      choices: [
+        // ['jenkins', 'gitlab']
+        { name: `Deploy your application to an ${chalk.yellow('*Artifactory*')}`, value: 'deploy' },
+        // ['jenkins', 'gitlab', 'travis', 'github']
+        { name: `Analyze your code with ${chalk.yellow('*Sonar*')}`, value: 'sonar' },
+        // ['jenkins', 'github'].includes(this.pipeline)
+        { name: `Build and publish a ${chalk.yellow('*Docker*')} image`, value: 'publishDocker' },
+        // ['jenkins', 'gitlab', 'travis', 'github', 'circle', 'azure']
+        {
+          name: `${chalk.yellow('*Snyk*')}: dependency scanning for security vulnerabilities (requires SNYK_TOKEN)`,
+          value: 'snyk',
+        },
+        // ['jenkins', 'gitlab', 'travis', 'github', 'circle']
+        {
+          name: `Deploy to ${chalk.yellow('*Heroku*')} (requires HEROKU_API_KEY set on CI service)`,
+          value: 'heroku',
+        },
+        // ['github']
+        {
+          name: `Would you like to enable the ${chalk.yellow(
+            '*Cypress Dashboard*',
+          )} (requires both CYPRESS_PROJECT_ID and CYPRESS_RECORD_KEY set on CI service)`,
+          value: 'cypressDashboard',
+        },
+      ],
+      scope: 'generator',
+    },
+    insideDocker: {
+      prompt: {
+        when: includesValue('ciCd', ['jenkins', 'gitlab']),
+        type: 'confirm',
+        message: 'Would you like to perform the build in a Docker container ?',
+        default: false,
+      },
+      scope: 'generator',
+    },
+    sendBuildToGitlab: {
+      prompt: {
+        when: includesValue('ciCd', ['jenkins']),
+        type: 'confirm',
+        message: 'Would you like to send build status to GitLab ?',
+        default: false,
+      },
+      scope: 'generator',
+    },
+    artifactorySnapshotsId: {
+      prompt: {
+        when: includesValue('ciCdIntegrations', ['deploy']),
+        type: 'input',
+        message: `${chalk.yellow('*Artifactory*')}: what is the ID of distributionManagement for snapshots ?`,
+      },
+      default: 'snapshots',
+      scope: 'generator',
+    },
+    artifactorySnapshotsUrl: {
+      prompt: {
+        when: includesValue('ciCdIntegrations', ['deploy']),
+        type: 'input',
+        message: `${chalk.yellow('*Artifactory*')}: what is the URL of distributionManagement for snapshots ?`,
+      },
+      default: 'http://artifactory:8081/artifactory/libs-snapshot',
+      scope: 'generator',
+    },
+    artifactoryReleasesId: {
+      prompt: {
+        when: includesValue('ciCdIntegrations', ['deploy']),
+        type: 'input',
+        message: `${chalk.yellow('*Artifactory*')}: what is the ID of distributionManagement for releases ?`,
+      },
+      default: 'releases',
+      scope: 'generator',
+    },
+    artifactoryReleasesUrl: {
+      prompt: {
+        when: includesValue('ciCdIntegrations', ['deploy']),
+        type: 'input',
+        message: `${chalk.yellow('*Artifactory*')}: what is the URL of distributionManagement for releases ?`,
+      },
+      default: 'http://artifactory:8081/artifactory/libs-release',
+      scope: 'generator',
+    },
+    sonarName: {
+      prompt: {
+        when: answers => includesValue('ciCd', ['jenkins'])(answers) && includesValue('ciCdIntegrations', ['ciCdIntegrations'])(answers),
+        type: 'input',
+        message: `${chalk.yellow('*Sonar*')}: what is the name of the Sonar server ?`,
+      },
+      default: 'sonar',
+      scope: 'generator',
+    },
+    sonarUrl: {
+      prompt: {
+        when: answers => includesValue('ciCd', ['jenkins'])(answers) && includesValue('ciCdIntegrations', ['ciCdIntegrations'])(answers),
+        type: 'input',
+        message: `${chalk.yellow('*Sonar*')}: what is the URL of the Sonar server ?`,
+      },
+      default: 'https://sonarcloud.io',
+      scope: 'generator',
+    },
+    sonarOrga: {
+      prompt: {
+        when: answers => includesValue('ciCd', ['jenkins'])(answers) && includesValue('ciCdIntegrations', ['ciCdIntegrations'])(answers),
+        type: 'input',
+        message: `${chalk.yellow('*Sonar*')}: what is the Organization of the Sonar server ?`,
+      },
+      scope: 'generator',
+    },
+    dockerImage: {
+      prompt: ({ jhipsterConfigWithDefaults: config }) => ({
+        when: answers => includesValue('ciCd', ['github'])(answers) && includesValue('ciCdIntegrations', ['publishDocker'])(answers),
+        type: 'input',
+        message: `${chalk.yellow('*Docker*')}: what is the name of the image ?`,
+        default: () => `jhipster/${config.dasherizedBaseName}`,
+      }),
+      scope: 'generator',
+    },
+    herokuAppName: {
+      prompt: {
+        when: includesValue('ciCdIntegrations', ['heroku']),
+        type: 'input',
+        message: `${chalk.yellow('*Heroku*')}: name of your Heroku Application ?`,
+      },
+      scope: 'generator',
+      default: config => kebabCase(config.jhipsterConfigWithDefaults.baseName),
+    },
+  },
+};
+
+export default command;
diff --git a/generators/ci-cd/generator.mjs b/generators/ci-cd/generator.mjs
index 4b6d127f1662..4a79020a1d2f 100644
--- a/generators/ci-cd/generator.mjs
+++ b/generators/ci-cd/generator.mjs
@@ -17,120 +17,42 @@
  * limitations under the License.
  */
 /* eslint-disable consistent-return */
-import _ from 'lodash';
 import chalk from 'chalk';
 
 import BaseApplicationGenerator from '../base-application/index.mjs';
-import prompts from './prompts.mjs';
 import statistics from '../statistics.mjs';
-import { NODE_VERSION, SERVER_MAIN_RES_DIR, JAVA_VERSION } from '../generator-constants.mjs';
 import { GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_CI_CD } from '../generator-list.mjs';
-import { buildToolTypes, clientFrameworkTypes } from '../../jdl/jhipster/index.mjs';
+import { clientFrameworkTypes } from '../../jdl/jhipster/index.mjs';
 import { createPomStorage } from '../maven/support/pom-store.mjs';
-import { loadAppConfig, loadDerivedAppConfig } from '../app/support/index.mjs';
-import { loadDerivedServerConfig, loadServerConfig } from '../server/support/index.mjs';
+import command from './command.mjs';
+import { loadConfig, loadDerivedConfig } from '../../lib/internal/config-def.mjs';
 
-const { MAVEN, GRADLE } = buildToolTypes;
 const { REACT } = clientFrameworkTypes;
 
-/**
- * @class
- * @extends {BaseApplicationGenerator<import('../server/types.mjs').SpringBootApplication>}
- */
 export default class CiCdGenerator extends BaseApplicationGenerator {
-  constructor(args, options, features) {
-    super(args, options, features);
-
-    // Automatically configure Travis
-    this.option('autoconfigure-travis', {
-      type: Boolean,
-      default: false,
-      description: 'Automatically configure Travis',
-    });
-
-    // Automatically configure Jenkins
-    this.option('autoconfigure-jenkins', {
-      type: Boolean,
-      default: false,
-      description: 'Automatically configure Jenkins',
-    });
-
-    // Automatically configure Gitlab
-    this.option('autoconfigure-gitlab', {
-      type: Boolean,
-      default: false,
-      description: 'Automatically configure Gitlab',
-    });
-
-    // Automatically configure Azure
-    this.option('autoconfigure-azure', {
-      type: Boolean,
-      default: false,
-      description: 'Automatically configure Azure',
-    });
-
-    // Automatically configure GitHub Actions
-    this.option('autoconfigure-github', {
-      type: Boolean,
-      default: false,
-      description: 'Automatically configure GitHub Actions',
-    });
-
-    // Automatically configure CircleCI
-    this.option('autoconfigure-circle', {
-      type: Boolean,
-      default: false,
-      description: 'Automatically configure CircleCI',
-    });
-  }
+  insideDocker;
 
   async beforeQueue() {
-    await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
     if (!this.fromBlueprint) {
       await this.composeWithBlueprints(GENERATOR_CI_CD);
     }
+
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+    }
   }
 
   // Public API method used by the getter and also by Blueprints
   get initializing() {
-    return {
+    return this.asInitializingTaskGroup({
       sayHello() {
         this.log.log(chalk.white('🚀 Welcome to the JHipster CI/CD Sub-Generator 🚀'));
       },
 
-      getSharedConfig() {
-        loadAppConfig({ config: this.jhipsterConfigWithDefaults, application: this, useVersionPlaceholders: this.useVersionPlaceholders });
-        loadServerConfig({ config: this.jhipsterConfigWithDefaults, application: this });
-
-        loadDerivedAppConfig({ application: this });
-        loadDerivedServerConfig({ application: this });
-      },
-
       getConfig() {
-        const configuration = this.config;
-        this.dasherizedBaseName = _.kebabCase(this.baseName);
-        this.herokuAppName = configuration.get('herokuAppName');
-        if (this.herokuAppName === undefined) {
-          this.herokuAppName = _.kebabCase(this.baseName);
-        }
-        this.autoconfigureTravis = this.options.autoconfigureTravis;
-        this.autoconfigureJenkins = this.options.autoconfigureJenkins;
-        this.autoconfigureGitlab = this.options.autoconfigureGitlab;
-        this.autoconfigureAzure = this.options.autoconfigureAzure;
-        this.autoconfigureGithub = this.options.autoconfigureGithub;
-        this.autoconfigureCircleCI = this.options.autoconfigureCircle;
-        this.abort = false;
-      },
-
-      initConstants() {
-        this.NODE_VERSION = NODE_VERSION;
+        this.parseJHipsterCommand(command);
       },
-
-      getConstants() {
-        this.SERVER_MAIN_RES_DIR = SERVER_MAIN_RES_DIR;
-        this.JAVA_VERSION = JAVA_VERSION;
-      },
-    };
+    });
   }
 
   get [BaseApplicationGenerator.INITIALIZING]() {
@@ -139,10 +61,11 @@ export default class CiCdGenerator extends BaseApplicationGenerator {
 
   // Public API method used by the getter and also by Blueprints
   get prompting() {
-    return {
-      askPipeline: prompts.askPipeline,
-      askIntegrations: prompts.askIntegrations,
-    };
+    return this.asPromptingTaskGroup({
+      async prompting() {
+        await this.prompt(this.prepareQuestions(command.configs));
+      },
+    });
   }
 
   get [BaseApplicationGenerator.PROMPTING]() {
@@ -150,137 +73,126 @@ export default class CiCdGenerator extends BaseApplicationGenerator {
   }
 
   // Public API method used by the getter and also by Blueprints
-  get configuring() {
+  get loading() {
     return {
-      insight() {
-        if (this.abort) return;
-        statistics.sendSubGenEvent('generator', GENERATOR_CI_CD);
-      },
-      setTemplateConstants() {
-        if (this.abort) return;
-        if (this.cicdIntegrations === undefined) {
-          this.cicdIntegrations = [];
-        }
-        this.gitLabIndent = this.sendBuildToGitlab ? '    ' : '';
-        this.indent = this.insideDocker ? '    ' : '';
-        this.indent += this.gitLabIndent;
-        if (this.clientFramework === REACT) {
-          this.frontTestCommand = 'test-ci';
-        } else {
-          this.frontTestCommand = 'test';
-        }
+      loadSharedConfig({ application }) {
+        loadConfig.call(this, command.configs, { application });
       },
     };
   }
 
-  get [BaseApplicationGenerator.CONFIGURING]() {
-    return this.delegateTasksToBlueprint(() => this.configuring);
+  get [BaseApplicationGenerator.LOADING]() {
+    return this.delegateTasksToBlueprint(() => this.loading);
   }
 
-  _loadCiCdConfig(config = this.jhipsterConfigWithDefaults, dest = this) {
-    dest.cicdIntegrations = dest.cicdIntegrations || config.cicdIntegrations || [];
-    dest.cicdIntegrationsSnyk = dest.cicdIntegrations.includes('snyk');
-    dest.cicdIntegrationsSonar = dest.cicdIntegrations.includes('sonar');
-    dest.cicdIntegrationsHeroku = dest.cicdIntegrations.includes('heroku');
-    dest.cicdIntegrationsDeploy = dest.cicdIntegrations.includes('deploy');
-    dest.cicdIntegrationsPublishDocker = dest.cicdIntegrations.includes('publishDocker');
-    dest.cicdIntegrationsCypressDashboard = dest.cicdIntegrations.includes('cypressDashboard');
-  }
+  get preparing() {
+    return this.asPreparingTaskGroup({
+      setTemplateConstants({ application }) {
+        loadDerivedConfig(command.configs, { application });
 
-  // Public API method used by the getter and also by Blueprints
-  get loading() {
-    return {
-      loadSharedConfig() {
-        this._loadCiCdConfig();
+        if (application.ciCdIntegrations === undefined) {
+          application.ciCdIntegrations = [];
+        }
+        application.gitLabIndent = application.sendBuildToGitlab ? '    ' : '';
+        application.indent = application.insideDocker ? '    ' : '';
+        application.indent += application.gitLabIndent;
+        if (application.clientFramework === REACT) {
+          application.frontTestCommand = 'test-ci';
+        } else {
+          application.frontTestCommand = 'test';
+        }
       },
-    };
+    });
   }
 
-  get [BaseApplicationGenerator.LOADING]() {
-    return this.delegateTasksToBlueprint(() => this.loading);
+  get [BaseApplicationGenerator.PREPARING]() {
+    return this.delegateTasksToBlueprint(() => this.preparing);
   }
 
   // Public API method used by the getter and also by Blueprints
   get writing() {
     return this.asWritingTaskGroup({
+      insight() {
+        statistics.sendSubGenEvent('generator', GENERATOR_CI_CD);
+      },
       async writeFiles({ application }) {
-        Object.assign(this, application);
-        if (this.pipeline === 'jenkins') {
-          await this.writeFiles({
-            rootTemplatesPath: 'jenkins',
-            blocks: [
-              {
-                templates: [
-                  {
-                    sourceFile: 'Jenkinsfile',
-                    destinationFile: 'Jenkinsfile',
-                  },
-                  {
-                    sourceFile: 'jenkins.yml',
-                    destinationFile: `${application.dockerServicesDir}jenkins.yml`,
-                  },
-                  {
-                    sourceFile: 'idea.gdsl',
-                    destinationFile: `${application.srcMainResources}idea.gdsl`,
-                  },
-                ],
-              },
-            ],
-            context: this,
-          });
-        }
-        if (this.pipeline === 'gitlab') {
-          this.writeFile('.gitlab-ci.yml.ejs', '.gitlab-ci.yml');
-        }
-        if (this.pipeline === 'circle') {
-          this.writeFile('circle.yml.ejs', '.circleci/config.yml');
-        }
-        if (this.pipeline === 'travis') {
-          this.writeFile('travis.yml.ejs', '.travis.yml');
-        }
-        if (this.pipeline === 'azure') {
-          this.writeFile('azure-pipelines.yml.ejs', 'azure-pipelines.yml');
-        }
-        if (this.pipeline === 'github') {
-          this.writeFile('github-actions.yml.ejs', '.github/workflows/main.yml');
+        await this.writeFiles({
+          blocks: [
+            {
+              condition: ctx => ctx.ciCdJenkins,
+              templates: [
+                {
+                  sourceFile: 'jenkins/Jenkinsfile',
+                  destinationFile: 'Jenkinsfile',
+                },
+                {
+                  sourceFile: 'jenkins/jenkins.yml',
+                  destinationFile: `${application.dockerServicesDir}jenkins.yml`,
+                },
+                {
+                  sourceFile: 'jenkins/idea.gdsl',
+                  destinationFile: `${application.srcMainResources}idea.gdsl`,
+                },
+              ],
+            },
+            {
+              condition: ctx => ctx.ciCdGitlab,
+              templates: ['.gitlab-ci.yml'],
+            },
+            {
+              condition: ctx => ctx.ciCdCircle,
+              templates: ['.circleci/config.yml'],
+            },
+            {
+              condition: ctx => ctx.ciCdTravis,
+              templates: ['.travis.yml'],
+            },
+            {
+              condition: ctx => ctx.ciCdAzure,
+              templates: ['azure-pipelines.yml'],
+            },
+            {
+              condition: ctx => ctx.ciCdGithub,
+              templates: ['.github/workflows/main.yml'],
+            },
+          ],
+          context: application,
+        });
+
+        if (application.ciCdIntegrations.includes('publishDocker')) {
+          this.writeFile('docker-registry.yml.ejs', `${application.dockerServicesDir}docker-registry.yml`);
         }
+      },
+    });
+  }
 
-        if (this.cicdIntegrations.includes('deploy')) {
-          if (this.buildTool === MAVEN) {
-            this.addMavenDistributionManagement(
-              this.artifactorySnapshotsId,
-              this.artifactorySnapshotsUrl,
-              this.artifactoryReleasesId,
-              this.artifactoryReleasesUrl,
-            );
-          } else if (this.buildTool === GRADLE) {
+  get [BaseApplicationGenerator.WRITING]() {
+    return this.delegateTasksToBlueprint(() => this.writing);
+  }
+
+  // Public API method used by the getter and also by Blueprints
+  get postWriting() {
+    return this.asPostWritingTaskGroup({
+      postWriting({ application }) {
+        if (application.ciCdIntegrations.includes('deploy')) {
+          if (application.buildToolMaven) {
+            createPomStorage(this).addDistributionManagement({
+              releasesId: application.artifactoryReleasesId,
+              releasesUrl: application.artifactoryReleasesUrl,
+              snapshotsId: application.artifactorySnapshotsId,
+              snapshotsUrl: application.artifactorySnapshotsUrl,
+            });
+          } else if (application.buildToolGradle) {
             // TODO: add support here
             // this.addGradleDistributionManagement(this.artifactoryId, this.artifactoryName);
             this.log.warn('No support for Artifactory yet, when using Gradle.\n');
           }
         }
-
-        if (this.cicdIntegrations.includes('publishDocker')) {
-          this.writeFile('docker-registry.yml.ejs', `${application.dockerServicesDir}docker-registry.yml`);
-        }
       },
     });
   }
 
-  get [BaseApplicationGenerator.WRITING]() {
-    return this.delegateTasksToBlueprint(() => this.writing);
-  }
-
-  /**
-   * @private
-   * Add a distributionManagement to the Maven build.
-   *
-   * @param {string} snapshotsId Snapshots Repository Id
-   * @param {string} snapshotsUrl Snapshots Repository Url
-   * @param {string} releasesId Repository Id
-   * @param {string} releasesUrl Repository Url
-   */
-  addMavenDistributionManagement(snapshotsId, snapshotsUrl, releasesId, releasesUrl) {
-    createPomStorage(this).addDistributionManagement({ snapshotsId, snapshotsUrl, releasesId, releasesUrl });
+  get [BaseApplicationGenerator.POST_WRITING]() {
+    return this.delegateTasksToBlueprint(() => this.postWriting);
   }
 }
diff --git a/generators/ci-cd/prompts.mjs b/generators/ci-cd/prompts.mjs
deleted file mode 100644
index 0322dff08b3c..000000000000
--- a/generators/ci-cd/prompts.mjs
+++ /dev/null
@@ -1,270 +0,0 @@
-/**
- * Copyright 2013-2023 the original author or authors from the JHipster project.
- *
- * This file is part of the JHipster project, see https://www.jhipster.tech/
- * for more information.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import chalk from 'chalk';
-
-export default {
-  askPipeline,
-  askIntegrations,
-};
-
-async function askPipeline() {
-  if (this.abort) return;
-  if (this.autoconfigureTravis) {
-    this.log.verboseInfo('Auto-configuring Travis CI');
-    this.pipeline = 'travis';
-    return;
-  }
-  if (this.autoconfigureJenkins) {
-    this.log.verboseInfo('Auto-configuring Jenkins');
-    this.pipeline = 'jenkins';
-    this.sendBuildToGitlab = false;
-    this.insideDocker = false;
-    return;
-  }
-
-  if (this.autoconfigureGitlab) {
-    this.log.verboseInfo('Auto-configuring Gitlab');
-    this.pipeline = 'gitlab';
-    this.sendBuildToGitlab = true;
-    this.insideDocker = true;
-    return;
-  }
-
-  if (this.autoconfigureAzure) {
-    this.log.verboseInfo('Auto-configuring Azure');
-    this.pipeline = 'azure';
-    return;
-  }
-
-  if (this.autoconfigureGithub) {
-    this.log.verboseInfo('Auto-configuring GitHub Actions');
-    this.pipeline = 'github';
-    return;
-  }
-
-  if (this.autoconfigureCircleCI) {
-    this.log.verboseInfo('Auto-configuring CircleCI');
-    this.pipeline = 'circle';
-    return;
-  }
-
-  const prompts = [
-    {
-      type: 'list',
-      name: 'pipeline',
-      message: 'What CI/CD pipeline do you want to generate?',
-      default: 'jenkins',
-      choices: [
-        { name: 'Jenkins pipeline', value: 'jenkins' },
-        { name: 'Azure Pipelines', value: 'azure' },
-        { name: 'GitLab CI', value: 'gitlab' },
-        { name: 'GitHub Actions', value: 'github' },
-        { name: 'Travis CI', value: 'travis' },
-        { name: 'CircleCI', value: 'circle' },
-      ],
-    },
-  ];
-  const props = await this.prompt(prompts);
-  this.pipeline = props.pipeline;
-}
-
-async function askIntegrations() {
-  if (this.abort || !this.pipeline) return;
-  if (this.autoconfigureTravis) {
-    this.cicdIntegrations = [];
-    return;
-  }
-  if (this.autoconfigureJenkins) {
-    this.cicdIntegrations = [];
-    this.sendBuildToGitlab = false;
-    this.insideDocker = false;
-    return;
-  }
-
-  if (this.autoconfigureGitlab) {
-    this.cicdIntegrations = [];
-    this.sendBuildToGitlab = true;
-    this.insideDocker = true;
-    return;
-  }
-
-  if (this.autoconfigureAzure) {
-    this.log.verboseInfo('Auto-configuring Azure');
-    this.pipeline = 'azure';
-    return;
-  }
-
-  if (this.autoconfigureGithub) {
-    this.log.verboseInfo('Auto-configuring GitHub Actions');
-    this.pipeline = 'github';
-    return;
-  }
-
-  if (this.autoconfigureCircleCI) {
-    this.log.verboseInfo('Auto-configuring CircleCI');
-    this.pipeline = 'circle';
-    return;
-  }
-
-  const integrationChoices = [];
-  if (['jenkins', 'gitlab'].includes(this.pipeline)) {
-    integrationChoices.push({ name: `Deploy your application to an ${chalk.yellow('*Artifactory*')}`, value: 'deploy' });
-  }
-  if (['jenkins', 'gitlab', 'travis', 'github'].includes(this.pipeline)) {
-    integrationChoices.push({ name: `Analyze your code with ${chalk.yellow('*Sonar*')}`, value: 'sonar' });
-  }
-  if (['jenkins', 'github'].includes(this.pipeline)) {
-    integrationChoices.push({ name: `Build and publish a ${chalk.yellow('*Docker*')} image`, value: 'publishDocker' });
-  }
-  if (['jenkins', 'gitlab', 'travis', 'github', 'circle', 'azure'].includes(this.pipeline)) {
-    integrationChoices.push({
-      name: `${chalk.yellow('*Snyk*')}: dependency scanning for security vulnerabilities (requires SNYK_TOKEN)`,
-      value: 'snyk',
-    });
-  }
-  if (['jenkins', 'gitlab', 'travis', 'github', 'circle'].includes(this.pipeline)) {
-    integrationChoices.push({
-      name: `Deploy to ${chalk.yellow('*Heroku*')} (requires HEROKU_API_KEY set on CI service)`,
-      value: 'heroku',
-    });
-  }
-  if (['github'].includes(this.pipeline)) {
-    integrationChoices.push({
-      name: `Would you like to enable the ${chalk.yellow(
-        '*Cypress Dashboard*',
-      )} (requires both CYPRESS_PROJECT_ID and CYPRESS_RECORD_KEY set on CI service)`,
-      value: 'cypressDashboard',
-    });
-  }
-  const defaultDockerImage = `jhipster/${this.dasherizedBaseName}`;
-
-  const prompts = [
-    {
-      when: this.pipeline === 'jenkins',
-      type: 'confirm',
-      name: 'insideDocker',
-      message: 'Would you like to perform the build in a Docker container ?',
-      default: false,
-    },
-    {
-      when: this.pipeline === 'gitlab',
-      type: 'confirm',
-      name: 'insideDocker',
-      message: 'In GitLab CI, perform the build in a docker container (hint: GitLab.com uses Docker container) ?',
-      default: false,
-    },
-    {
-      when: this.pipeline === 'jenkins',
-      type: 'confirm',
-      name: 'sendBuildToGitlab',
-      message: 'Would you like to send build status to GitLab ?',
-      default: false,
-    },
-    {
-      when: integrationChoices.length > 0,
-      type: 'checkbox',
-      name: 'cicdIntegrations',
-      message: 'What tasks/integrations do you want to include ?',
-      default: [],
-      choices: integrationChoices,
-    },
-    {
-      when: response => response.cicdIntegrations.includes('deploy'),
-      type: 'input',
-      name: 'artifactorySnapshotsId',
-      message: `${chalk.yellow('*Artifactory*')}: what is the ID of distributionManagement for snapshots ?`,
-      default: 'snapshots',
-    },
-    {
-      when: response => response.cicdIntegrations.includes('deploy'),
-      type: 'input',
-      name: 'artifactorySnapshotsUrl',
-      message: `${chalk.yellow('*Artifactory*')}: what is the URL of distributionManagement for snapshots ?`,
-      default: 'http://artifactory:8081/artifactory/libs-snapshot',
-    },
-    {
-      when: response => response.cicdIntegrations.includes('deploy'),
-      type: 'input',
-      name: 'artifactoryReleasesId',
-      message: `${chalk.yellow('*Artifactory*')}: what is the ID of distributionManagement for releases ?`,
-      default: 'releases',
-    },
-    {
-      when: response => response.cicdIntegrations.includes('deploy'),
-      type: 'input',
-      name: 'artifactoryReleasesUrl',
-      message: `${chalk.yellow('*Artifactory*')}: what is the URL of distributionManagement for releases ?`,
-      default: 'http://artifactory:8081/artifactory/libs-release',
-    },
-    {
-      when: response => this.pipeline === 'jenkins' && response.cicdIntegrations.includes('sonar'),
-      type: 'input',
-      name: 'sonarName',
-      message: `${chalk.yellow('*Sonar*')}: what is the name of the Sonar server ?`,
-      default: 'sonar',
-    },
-    {
-      when: response => this.pipeline !== 'jenkins' && response.cicdIntegrations.includes('sonar'),
-      type: 'input',
-      name: 'sonarUrl',
-      message: `${chalk.yellow('*Sonar*')}: what is the URL of the Sonar server ?`,
-      default: 'https://sonarcloud.io',
-    },
-    {
-      when: response => this.pipeline !== 'jenkins' && response.cicdIntegrations.includes('sonar'),
-      type: 'input',
-      name: 'sonarOrga',
-      message: `${chalk.yellow('*Sonar*')}: what is the Organization of the Sonar server ?`,
-      default: '',
-    },
-    {
-      when: response => this.pipeline === 'github' && response.cicdIntegrations.includes('publishDocker'),
-      type: 'input',
-      name: 'dockerImage',
-      message: `${chalk.yellow('*Docker*')}: what is the name of the image ?`,
-      default: defaultDockerImage,
-    },
-    {
-      when: response => response.cicdIntegrations.includes('heroku'),
-      type: 'input',
-      name: 'herokuAppName',
-      message: `${chalk.yellow('*Heroku*')}: name of your Heroku Application ?`,
-      default: `${this.herokuAppName}`,
-    },
-  ];
-  const props = await this.prompt(prompts);
-
-  this.cicdIntegrations = props.cicdIntegrations;
-
-  this.artifactorySnapshotsId = props.artifactorySnapshotsId;
-  this.artifactorySnapshotsUrl = props.artifactorySnapshotsUrl;
-  this.artifactoryReleasesId = props.artifactoryReleasesId;
-  this.artifactoryReleasesUrl = props.artifactoryReleasesUrl;
-
-  this.sonarName = props.sonarName;
-  this.sonarUrl = props.sonarUrl;
-  this.sonarOrga = props.sonarOrga;
-
-  this.publishDocker = props.publishDocker;
-  this.dockerImage = props.dockerImage;
-
-  this.insideDocker = props.insideDocker;
-
-  this.sendBuildToGitlab = props.sendBuildToGitlab;
-}
diff --git a/generators/ci-cd/templates/circle.yml.ejs b/generators/ci-cd/templates/.circleci/config.yml.ejs
similarity index 95%
rename from generators/ci-cd/templates/circle.yml.ejs
rename to generators/ci-cd/templates/.circleci/config.yml.ejs
index eddb27a226f7..3b7d2c3e0026 100644
--- a/generators/ci-cd/templates/circle.yml.ejs
+++ b/generators/ci-cd/templates/.circleci/config.yml.ejs
@@ -46,7 +46,7 @@ jobs:
             - run:
                 name: Install Node Modules
                 command: 'npm install'
-            <%_ if (cicdIntegrationsSnyk) { _%>
+            <%_ if (ciCdIntegrationsSnyk) { _%>
             - run:
                 name: Install Snyk CLI
                 command: |
@@ -90,13 +90,13 @@ jobs:
                 command: <%= clientPackageManager %> run ci:frontend:test
             <%_ } _%>
             <%_ if (buildToolMaven) { _%>
-                <%_ if (cicdIntegrationsHeroku) { _%>
+                <%_ if (ciCdIntegrationsHeroku) { _%>
             - run:
                 name: Deploy to Heroku
                 command: './mvnw -ntp com.heroku.sdk:heroku-maven-plugin:2.0.5:deploy -DskipTests -Pprod -Dheroku.buildpacks=heroku/jvm -Dheroku.appName=<%= herokuAppName %>'
                 <%_ } _%>
             <%_ } else if (buildToolGradle) { _%>
-                <%_ if (cicdIntegrationsHeroku) { _%>
+                <%_ if (ciCdIntegrationsHeroku) { _%>
             - run:
                 name: Deploy to Heroku
                 command: './gradlew deployHeroku --no-daemon'
@@ -115,7 +115,7 @@ jobs:
             <%= commented %>    command: <%= clientPackageManager %> run ci:e2e:run
             <%_ if(cypressTests) { _%>
             <%= commented %>    environment:
-            <%= commented %>      CYPRESS_ENABLE_RECORD: <%= cicdIntegrationsCypressDashboard %>
+            <%= commented %>      CYPRESS_ENABLE_RECORD: <%= ciCdIntegrationsCypressDashboard %>
             <%_ } _%>
             <%= commented %>- run:
             <%= commented %>    name: 'E2E: Teardown'
diff --git a/generators/ci-cd/templates/github-actions.yml.ejs b/generators/ci-cd/templates/.github/workflows/main.yml.ejs
similarity index 95%
rename from generators/ci-cd/templates/github-actions.yml.ejs
rename to generators/ci-cd/templates/.github/workflows/main.yml.ejs
index 55667c9e588c..3ff1c843cc74 100644
--- a/generators/ci-cd/templates/github-actions.yml.ejs
+++ b/generators/ci-cd/templates/.github/workflows/main.yml.ejs
@@ -24,7 +24,7 @@ jobs:
         name: "Gradle Wrapper Validation"
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
             - uses: gradle/wrapper-validation-action@v1
 <%_ } _%>
     pipeline:
@@ -52,7 +52,7 @@ if (!databaseTypeNo && !skipServer ) { _%>
             GRADLE_ENTERPRISE_ACCESS_KEY: ${{secrets.GRADLE_ENTERPRISE_ACCESS_KEY}}
 <%_ } _%>
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 <%_ if (!skipClient) { _%>
             - uses: actions/setup-node@v3
               with:
@@ -62,13 +62,13 @@ if (!skipServer) { _%>
             - uses: actions/setup-java@v3
               with:
                   distribution: 'temurin'
-                  java-version: <%= JAVA_VERSION %>
+                  java-version: <%= javaVersion %>
 <%_ }
 if (!skipClient) { _%>
             - name: Install node.js packages
               run: <%= clientPackageManager %> install
 <%_ } _%>
-<%_ if (cicdIntegrationsSnyk) { _%>
+<%_ if (ciCdIntegrationsSnyk) { _%>
             - name: Install Snyk CLI
               run: |
                   curl -Lo ./snyk $(curl -s https://api.github.com/repos/snyk/snyk/releases/latest | grep "browser_download_url.*snyk-linux" | cut -d ':' -f 2,3 | tr -d \" | tr -d ' ')
@@ -98,7 +98,7 @@ if (!skipClient) { _%>
               run: <%= clientPackageManager %> run ci:frontend:test
     <%_ } _%>
 <%_ } _%>
-<%_ if (cicdIntegrationsSonar) { _%>
+<%_ if (ciCdIntegrationsSonar) { _%>
             - name: Analyze code with SonarQube
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -120,7 +120,7 @@ if (!skipClient) { _%>
 <%_ } else { _%>
               run: <%= clientPackageManager %> run build
 <%_ }
-if (cicdIntegrationsHeroku) { _%>
+if (ciCdIntegrationsHeroku) { _%>
             - name: Deploy to Heroku
               if: github.event_name == 'push' && github.ref == 'refs/heads/main'
               env:
@@ -136,7 +136,7 @@ if (cicdIntegrationsHeroku) { _%>
                       echo No HEROKU_API_KEY, skipping...
                   fi
 <%_ } _%>
-<%_ if (cicdIntegrationsPublishDocker) { _%>
+<%_ if (ciCdIntegrationsPublishDocker) { _%>
             - name: Build and publish docker image
               if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/'))
               run: |
@@ -158,7 +158,7 @@ if (cicdIntegrationsHeroku) { _%>
             <%= commented %>  run: <%= clientPackageManager %> run ci:e2e:run
     <%_ if(cypressTests) { _%>
             <%= commented %>  env:
-            <%= commented %>    CYPRESS_ENABLE_RECORD: <%= cicdIntegrationsCypressDashboard %>
+            <%= commented %>    CYPRESS_ENABLE_RECORD: <%= ciCdIntegrationsCypressDashboard %>
             <%= commented %>    CYPRESS_PROJECT_ID: ${{ secrets.CYPRESS_PROJECT_ID }}
             <%= commented %>    CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
     <%_ } _%>
diff --git a/generators/ci-cd/templates/.gitlab-ci.yml.ejs b/generators/ci-cd/templates/.gitlab-ci.yml.ejs
index 161041d81c38..37f37aae5c02 100644
--- a/generators/ci-cd/templates/.gitlab-ci.yml.ejs
+++ b/generators/ci-cd/templates/.gitlab-ci.yml.ejs
@@ -55,7 +55,7 @@ nohttp:
     stage: check
     script:
         - ./gradlew checkstyleNohttp --no-daemon
-    <%_ if (cicdIntegrationsSnyk) { _%>
+    <%_ if (ciCdIntegrationsSnyk) { _%>
 
 dependency-scanning:
     stage: check
@@ -129,7 +129,7 @@ frontend-test:
         expire_in: 1 day
     <%_ } _%>
 
-    <%_ if (cicdIntegrationsSonar) { _%>
+    <%_ if (ciCdIntegrationsSonar) { _%>
 sonar-analyze:
     stage: analyze
     except:
@@ -166,7 +166,7 @@ gradle-package:
 #    script:
 #        - ./gradlew jib -Pprod -PnodeInstall -Djib.to.image=$IMAGE_TAG -Djib.to.auth.username="gitlab-ci-token"  -Djib.to.auth.password=$CI_BUILD_TOKEN
 
-    <%_ if (cicdIntegrationsHeroku) { _%>
+    <%_ if (ciCdIntegrationsHeroku) { _%>
 deploy-to-production:
     stage: deploy
     script:
@@ -193,7 +193,7 @@ nohttp:
     stage: check
     script:
         - ./mvnw -ntp checkstyle:check -Dmaven.repo.local=$MAVEN_USER_HOME
-    <%_ if (cicdIntegrationsSnyk) { _%>
+    <%_ if (ciCdIntegrationsSnyk) { _%>
 
 dependency-scanning:
     stage: check
@@ -261,7 +261,7 @@ frontend-test:
             - target/jacoco
         expire_in: 1 day
     <%_ } _%>
-    <%_ if (cicdIntegrationsSonar) { _%>
+    <%_ if (ciCdIntegrationsSonar) { _%>
 sonar-analyze:
     stage: analyze
     dependencies:
@@ -277,7 +277,7 @@ sonar-analyze:
 maven-package:
     stage: package
     script:
-        - ./mvnw -ntp verify <% if (cicdIntegrationsDeploy) { %>deploy <% } %>-Pprod -DskipTests -Dmaven.repo.local=$MAVEN_USER_HOME
+        - ./mvnw -ntp verify <% if (ciCdIntegrationsDeploy) { %>deploy <% } %>-Pprod -DskipTests -Dmaven.repo.local=$MAVEN_USER_HOME
     artifacts:
         paths:
             - target/*.jar
@@ -295,7 +295,7 @@ maven-package:
 #    script:
 #        - ./mvnw -ntp jib:build -Pprod -Djib.to.image=$IMAGE_TAG -Djib.to.auth.username=gitlab-ci-token  -Djib.to.auth.password=$CI_BUILD_TOKEN -Dmaven.repo.local=$MAVEN_USER_HOME
 
-    <%_ if (cicdIntegrationsHeroku) { _%>
+    <%_ if (ciCdIntegrationsHeroku) { _%>
 deploy-to-production:
     stage: deploy
     script:
@@ -312,7 +312,7 @@ cache:
 stages:
     - build
     - test
-    <%_ if (cicdIntegrationsSonar) { _%>
+    <%_ if (ciCdIntegrationsSonar) { _%>
     - analyze
     <%_ } _%>
     - packaging
@@ -336,7 +336,7 @@ webapp-test:
         paths:
             - build/test-results
         expire_in: 1 day
-    <%_ if (cicdIntegrationsSonar) { _%>
+    <%_ if (ciCdIntegrationsSonar) { _%>
 sonar-analyze:
     stage: analyze
     dependencies:
diff --git a/generators/ci-cd/templates/travis.yml.ejs b/generators/ci-cd/templates/.travis.yml.ejs
similarity index 92%
rename from generators/ci-cd/templates/travis.yml.ejs
rename to generators/ci-cd/templates/.travis.yml.ejs
index fa614c35ccd6..dae0c9a7fa24 100644
--- a/generators/ci-cd/templates/travis.yml.ejs
+++ b/generators/ci-cd/templates/.travis.yml.ejs
@@ -35,7 +35,7 @@ cache:
 env:
   global:
     - NODE_VERSION=<%= nodeVersion %>
-    - JHI_JDK=<%= JAVA_VERSION %>
+    - JHI_JDK=<%= javaVersion %>
     - SPRING_OUTPUT_ANSI_ENABLED=ALWAYS
     - SPRING_JPA_SHOW_SQL=false
     - JHI_DISABLE_WEBPACK_LOGS=true
@@ -44,7 +44,7 @@ env:
     - MAVEN_USER_HOME=$HOME/.m2/repository/
 <%_ } _%>
 <%_ if(cypressTests) { _%>
-    - CYPRESS_ENABLE_RECORD: <%= cicdIntegrationsCypressDashboard %>
+    - CYPRESS_ENABLE_RECORD: <%= ciCdIntegrationsCypressDashboard %>
 <%_ } _%>
 before_install:
   - |
@@ -62,7 +62,7 @@ before_install:
 install:
   - <%= clientPackageManager %> install
 script:
-<%_ if (cicdIntegrationsSnyk) { _%>
+<%_ if (ciCdIntegrationsSnyk) { _%>
   - curl -Lo ./snyk $(curl -s https://api.github.com/repos/snyk/snyk/releases/latest | grep "browser_download_url.*snyk-linux" | cut -d ':' -f 2,3 | tr -d \" | tr -d ' ')
   - chmod +x snyk
   - ./snyk test --all-projects || true
@@ -79,17 +79,17 @@ script:
 <%_ } _%>
   - <%= clientPackageManager %> run java:jar:prod
 <%_ if (buildToolMaven) { _%>
-  <%_ if (cicdIntegrationsSonar) { _%>
+  <%_ if (ciCdIntegrationsSonar) { _%>
   - if [ $TRAVIS_PULL_REQUEST == "false" ]; then ./mvnw -ntp org.jacoco:jacoco-maven-plugin:prepare-agent initialize sonar:sonar <% if (sonarOrga) { %>-Dsonar.organization=<%= sonarOrga %> <% } %>-Dsonar.host.url=<%= sonarUrl %> -Dsonar.login=$SONAR_TOKEN; fi
   <%_ } _%>
-  <%_ if (cicdIntegrationsHeroku) { _%>
+  <%_ if (ciCdIntegrationsHeroku) { _%>
   - ./mvnw -ntp com.heroku.sdk:heroku-maven-plugin:2.0.5:deploy -DskipTests -Pprod -Dheroku.buildpacks=heroku/jvm -Dheroku.appName=<%= herokuAppName %>
   <%_ } _%>
 <%_ } else if (buildToolGradle) { _%>
-  <%_ if (cicdIntegrationsSonar) { _%>
+  <%_ if (ciCdIntegrationsSonar) { _%>
   - if [ $TRAVIS_PULL_REQUEST == "false" ]; then ./gradlew sonarqube --no-daemon <% if (sonarOrga) { %>-Dsonar.organization=<%= sonarOrga %> <% } %>-Dsonar.host.url=<%= sonarUrl %> -Dsonar.login=$SONAR_TOKEN; fi
   <%_ } _%>
-  <%_ if (cicdIntegrationsHeroku) { _%>
+  <%_ if (ciCdIntegrationsHeroku) { _%>
   - ./gradlew deployHeroku
   <%_ } _%>
 <%_ } _%>
diff --git a/generators/ci-cd/templates/azure-pipelines.yml.ejs b/generators/ci-cd/templates/azure-pipelines.yml.ejs
index 9a7a3783f0b8..b0214a4307ce 100644
--- a/generators/ci-cd/templates/azure-pipelines.yml.ejs
+++ b/generators/ci-cd/templates/azure-pipelines.yml.ejs
@@ -57,7 +57,7 @@ jobs:
       command: 'install'
     displayName: 'INSTALL: launch npm install'
 <%_ } _%>
-<%_ if (cicdIntegrationsSnyk) { _%>
+<%_ if (ciCdIntegrationsSnyk) { _%>
   - script: |
       curl -Lo ./snyk $(curl -s https://api.github.com/repos/snyk/snyk/releases/latest | grep "browser_download_url.*snyk-linux" | cut -d ':' -f 2,3 | tr -d \" | tr -d ' ')
       chmod +x snyk
@@ -129,7 +129,7 @@ jobs:
   <%= commented %>  displayName: 'E2E: Run'
   <%_ if(cypressTests) { _%>
   <%= commented %>  env:
-  <%= commented %>    CYPRESS_ENABLE_RECORD: <%= cicdIntegrationsCypressDashboard %>
+  <%= commented %>    CYPRESS_ENABLE_RECORD: <%= ciCdIntegrationsCypressDashboard %>
   <%= commented %>    CYPRESS_PROJECT_ID: $(CYPRESS_PROJECT_ID)
   <%= commented %>    CYPRESS_RECORD_KEY: $(CYPRESS_RECORD_KEY)
   <%= commented %>- task: PublishPipelineArtifact@1
diff --git a/generators/ci-cd/templates/jenkins/Jenkinsfile.ejs b/generators/ci-cd/templates/jenkins/Jenkinsfile.ejs
index a4ba3701f908..64454a80f111 100644
--- a/generators/ci-cd/templates/jenkins/Jenkinsfile.ejs
+++ b/generators/ci-cd/templates/jenkins/Jenkinsfile.ejs
@@ -51,7 +51,7 @@ node {
 <%= indent %>        sh "./mvnw -ntp com.github.eirslett:frontend-maven-plugin:npm"
 <%= indent %>    }
     <%_ } _%>
-    <%_ if (cicdIntegrationsSnyk) { _%>
+    <%_ if (ciCdIntegrationsSnyk) { _%>
 <%= indent %>    stage('Install Snyk CLI') {
 <%= indent %>       sh """
 <%= indent %>           curl -Lo ./snyk $(curl -s https://api.github.com/repos/snyk/snyk/releases/latest | grep "browser_download_url.*snyk-linux" | cut -d ':' -f 2,3 | tr -d \" | tr -d ' ')
@@ -92,12 +92,12 @@ node {
 <%= indent %>    }
 
     <%_ } _%>
-    <%_ if (cicdIntegrationsHeroku) { _%>
+    <%_ if (ciCdIntegrationsHeroku) { _%>
 <%= indent %>    stage('package and deploy') {
 <%= indent %>        sh "./mvnw -ntp com.heroku.sdk:heroku-maven-plugin:2.0.5:deploy -DskipTests -Pprod -Dheroku.buildpacks=heroku/jvm -Dheroku.appName=<%= herokuAppName %>"
     <%_ } else { _%>
 <%= indent %>    stage('packaging') {
-<%= indent %>        sh "./mvnw -ntp verify -P-webapp <% if (cicdIntegrationsDeploy) { %>deploy <% } %>-Pprod -DskipTests"
+<%= indent %>        sh "./mvnw -ntp verify -P-webapp <% if (ciCdIntegrationsDeploy) { %>deploy <% } %>-Pprod -DskipTests"
     <%_ } _%>
 <%= indent %>        archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true
 <%= indent %>    }
@@ -115,7 +115,7 @@ node {
 <%= indent %>        sh "./gradlew <%= clientPackageManager %>_install -PnodeInstall --no-daemon"
 <%= indent %>    }
     <%_ } _%>
-    <%_ if (cicdIntegrationsSnyk) { _%>
+    <%_ if (ciCdIntegrationsSnyk) { _%>
 <%= indent %>    stage('Install Snyk CLI') {
 <%= indent %>       sh """
 <%= indent %>           curl -Lo ./snyk $(curl -s https://api.github.com/repos/snyk/snyk/releases/latest | grep "browser_download_url.*snyk-linux" | cut -d ':' -f 2,3 | tr -d \" | tr -d ' ')
@@ -156,14 +156,14 @@ node {
 <%= indent %>        archiveArtifacts artifacts: '**/build/libs/*.jar', fingerprint: true
 <%= indent %>    }
 
-    <%_ if (cicdIntegrationsHeroku) { _%>
+    <%_ if (ciCdIntegrationsHeroku) { _%>
 <%= indent %>    stage('deployment') {
 <%= indent %>        sh "./gradlew deployHeroku --no-daemon"
 <%= indent %>    }
 
      <%_ } _%>
 <%_ } _%>
-<%_ if (cicdIntegrationsSonar) { _%>
+<%_ if (ciCdIntegrationsSonar) { _%>
 <%= indent %>    stage('quality analysis') {
 <%= indent %>        withSonarQubeEnv('<%= sonarName %>') {
     <%_ if (buildToolMaven) { _%>
@@ -177,7 +177,7 @@ node {
 <%_ if (insideDocker) { _%>
 <%= gitLabIndent %>    }
 <%_ } _%>
-<%_ if (cicdIntegrationsPublishDocker) { _%>
+<%_ if (ciCdIntegrationsPublishDocker) { _%>
 
 <%= gitLabIndent %>    def dockerImage
 <%= gitLabIndent %>    stage('publish docker') {
diff --git a/generators/client/command.mts b/generators/client/command.mts
index af7bf8b9dde1..d2eb392ad806 100644
--- a/generators/client/command.mts
+++ b/generators/client/command.mts
@@ -16,14 +16,112 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import chalk from 'chalk';
+import * as _ from 'lodash-es';
+import { testFrameworkTypes } from '../../jdl/jhipster/index.mjs';
 import { JHipsterCommandDefinition } from '../base/api.mjs';
+import { APPLICATION_TYPE_GATEWAY, APPLICATION_TYPE_MICROSERVICE, clientFrameworkTypes } from '../../jdl/index.js';
+
+const { CYPRESS } = testFrameworkTypes;
+const { intersection } = _;
+const { ANGULAR, REACT, VUE, NO: CLIENT_FRAMEWORK_NO } = clientFrameworkTypes;
+
+const microfrontendsToPromptValue = answer => (Array.isArray(answer) ? answer.map(({ baseName }) => baseName).join(',') : answer);
+const promptValueToMicrofrontends = answer =>
+  answer
+    ? answer
+        .split(',')
+        .map(baseName => baseName.trim())
+        .filter(Boolean)
+        .map(baseName => ({ baseName }))
+    : [];
 
 const command: JHipsterCommandDefinition = {
-  options: {
+  options: {},
+  configs: {
     clientFramework: {
       description: 'Provide client framework for the application',
-      type: String,
-      scope: 'storage',
+      cli: {
+        type: String,
+      },
+      prompt: generator => ({
+        type: 'list',
+        message: () =>
+          generator.jhipsterConfigWithDefaults.applicationType === APPLICATION_TYPE_MICROSERVICE
+            ? `Which ${chalk.yellow('*Framework*')} would you like to use as microfrontend?`
+            : `Which ${chalk.yellow('*Framework*')} would you like to use for the client?`,
+      }),
+      choices: [
+        { value: ANGULAR, name: 'Angular' },
+        { value: REACT, name: 'React' },
+        { value: VUE, name: 'Vue' },
+        { value: CLIENT_FRAMEWORK_NO, name: 'No client' },
+      ],
+    },
+    microfrontend: {
+      description: 'Enable microfrontend support',
+      cli: {
+        type: Boolean,
+      },
+      prompt: ({ jhipsterConfigWithDefaults: config }) => ({
+        type: 'confirm',
+        when: answers =>
+          [ANGULAR, REACT, VUE].includes(answers.clientFramework ?? config.clientFramework) &&
+          config.applicationType === APPLICATION_TYPE_GATEWAY,
+        message: `Do you want to enable ${chalk.yellow('*microfrontends*')}?`,
+        default: false,
+      }),
+    },
+    microfrontends: {
+      description: 'Microfrontends to load',
+      cli: {
+        type: String,
+      },
+      prompt: ({ jhipsterConfigWithDefaults: config }) => ({
+        when: answers => {
+          const askForMicrofrontends = Boolean(
+            (answers.microfrontend ?? config.microfrontend) &&
+              (answers.applicationType ?? config.applicationType) === APPLICATION_TYPE_GATEWAY,
+          );
+          if (askForMicrofrontends && answers.microfrontends) {
+            answers.microfrontends = microfrontendsToPromptValue(answers.microfrontends);
+          } else {
+            answers.microfrontends = [];
+          }
+          return askForMicrofrontends;
+        },
+        type: 'input',
+        message: `Comma separated ${chalk.yellow('*microfrontend*')} app names.`,
+        filter: promptValueToMicrofrontends,
+        transformer: microfrontendsToPromptValue,
+      }),
+    },
+    clientTestFrameworks: {
+      description: 'Client test frameworks',
+      prompt: ({ jhipsterConfigWithDefaults: config }) => ({
+        when: answers => [ANGULAR, REACT, VUE].includes(answers.clientFramework ?? config.clientFramework),
+        type: 'checkbox',
+        message: 'Besides Jest/Vitest, which testing frameworks would you like to use?',
+        default: () => intersection([CYPRESS], config.testFrameworks),
+      }),
+      choices: [{ name: 'Cypress', value: CYPRESS }],
+    },
+    withAdminUi: {
+      description: 'Generate administrative user interface',
+      cli: {
+        type: Boolean,
+      },
+      prompt: ({ jhipsterConfigWithDefaults: config }) => ({
+        type: 'confirm',
+        when: answers => [ANGULAR, REACT, VUE].includes(answers.clientFramework ?? config.clientFramework),
+        message: 'Do you want to generate the admin UI?',
+      }),
+    },
+    clientRootDir: {
+      description: 'Client root',
+      cli: {
+        type: String,
+      },
     },
   },
 };
diff --git a/generators/client/entity-files.mjs b/generators/client/entity-files.mjs
index 45e324064dc0..8dd0318072b9 100644
--- a/generators/client/entity-files.mjs
+++ b/generators/client/entity-files.mjs
@@ -19,7 +19,7 @@
 import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.mjs';
 import { getEnumInfo } from '../base-application/support/index.mjs';
 
-async function addEnumerationFiles({ application, entity }) {
+export async function addEnumerationFiles({ application, entity }) {
   for (const field of entity.fields) {
     if (field.fieldIsEnum === true) {
       const { enumFileName } = field;
@@ -41,11 +41,3 @@ async function addEnumerationFiles({ application, entity }) {
     }
   }
 }
-
-// eslint-disable-next-line import/prefer-default-export
-export async function writeEnumerationFiles({ application, entities }) {
-  if (!application.webappEnumerationsDir) return;
-  for (const entity of entities.filter(entity => !entity.skipClient && !entity.builtIn)) {
-    await addEnumerationFiles.call(this, { application, entity });
-  }
-}
diff --git a/generators/client/files-common.mjs b/generators/client/files-common.mjs
index 5f51950a3539..8a9f29ee1f3d 100644
--- a/generators/client/files-common.mjs
+++ b/generators/client/files-common.mjs
@@ -16,17 +16,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { clientSrcTemplatesBlock } from './support/files.mjs';
+import { clientRootTemplatesBlock, clientSrcTemplatesBlock } from './support/files.mjs';
+import { clientFrameworkTypes } from '../../jdl/index.js';
+
+const { ANGULAR, REACT, VUE } = clientFrameworkTypes;
 
 export const files = {
   common: [
     {
-      templates: ['.eslintignore', 'README.md.jhi.client'],
+      templates: ['README.md.jhi.client', '.prettierignore.jhi.client'],
     },
-    {
+    clientRootTemplatesBlock({
+      templates: ['.eslintignore'],
+    }),
+    clientRootTemplatesBlock({
       condition: generator => generator.microfrontend && (generator.clientFrameworkVue || generator.clientFrameworkReact),
       templates: ['webpack/webpack.microfrontend.js.jhi'],
-    },
+    }),
     {
       ...clientSrcTemplatesBlock(),
       templates: [
@@ -75,6 +81,10 @@ export const files = {
 };
 
 export async function writeFiles({ application }) {
+  if (![ANGULAR, REACT, VUE].includes(application.clientFramework)) {
+    return;
+  }
+
   await this.writeFiles({
     sections: files,
     context: application,
diff --git a/generators/client/generator.mjs b/generators/client/generator.mjs
index ee9d2b6af203..5202f9f945bc 100644
--- a/generators/client/generator.mjs
+++ b/generators/client/generator.mjs
@@ -19,10 +19,10 @@
 
 import BaseApplicationGenerator from '../base-application/index.mjs';
 
-import { askForAdminUi, askForClient, askForClientTheme, askForClientThemeVariant, askForClientTestOpts } from './prompts.mjs';
+import { askForClientTheme, askForClientThemeVariant } from './prompts.mjs';
 import { writeFiles as writeCommonFiles } from './files-common.mjs';
 
-import { writeEnumerationFiles } from './entity-files.mjs';
+import { addEnumerationFiles } from './entity-files.mjs';
 
 import { LOGIN_REGEX_JS } from '../generator-constants.mjs';
 import statistics from '../statistics.mjs';
@@ -33,30 +33,30 @@ import { createNeedleCallback } from '../base/support/index.mjs';
 import { loadStoredAppOptions } from '../app/support/index.mjs';
 import command from './command.mjs';
 
-const { ANGULAR, VUE, REACT } = clientFrameworkTypes;
+const { ANGULAR, VUE, REACT, NO: CLIENT_FRAMEWORK_NO } = clientFrameworkTypes;
 const { CYPRESS } = testFrameworkTypes;
 
-/**
- * @class
- * @extends {BaseApplicationGenerator<import('./types.mjs').ClientApplication>}
- */
 export default class JHipsterClientGenerator extends BaseApplicationGenerator {
+  command = command;
+
   async beforeQueue() {
     loadStoredAppOptions.call(this);
 
-    // TODO depend on GENERATOR_BOOTSTRAP_APPLICATION_CLIENT.
-    await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
-    await this.dependsOnJHipster(GENERATOR_COMMON);
-
     if (!this.fromBlueprint) {
       await this.composeWithBlueprints(GENERATOR_CLIENT);
     }
+
+    if (!this.delegateToBlueprint) {
+      // TODO depend on GENERATOR_BOOTSTRAP_APPLICATION_CLIENT.
+      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+      await this.dependsOnJHipster(GENERATOR_COMMON);
+    }
   }
 
   get initializing() {
     return this.asInitializingTaskGroup({
       loadOptions() {
-        this.parseJHipsterOptions(command.options);
+        this.parseJHipsterCommand(this.command);
       },
     });
   }
@@ -67,9 +67,10 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
 
   get prompting() {
     return this.asPromptingTaskGroup({
-      askForClient,
-      askForClientTestOpts,
-      askForAdminUi,
+      async prompting({ control }) {
+        if (control.existingProject && this.options.askAnswered !== true) return;
+        await this.prompt(this.prepareQuestions(this.command.configs));
+      },
       askForClientTheme,
       askForClientThemeVariant,
     });
@@ -81,6 +82,21 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
 
   get configuring() {
     return this.asConfiguringTaskGroup({
+      applyNoFramework() {
+        const { clientFramework } = this.jhipsterConfigWithDefaults;
+        if (clientFramework === CLIENT_FRAMEWORK_NO) {
+          this.jhipsterConfig.skipClient = true;
+          this.cancelCancellableTasks();
+        }
+      },
+      mergeTestConfig() {
+        if (this.jhipsterConfig.clientTestFrameworks) {
+          this.jhipsterConfig.testFrameworks = [
+            ...new Set([...(this.jhipsterConfig.testFrameworks ?? []), ...this.jhipsterConfig.clientTestFrameworks]),
+          ];
+          delete this.jhipsterConfig.clientTestFrameworks;
+        }
+      },
       upgradeAngular() {
         if (this.jhipsterConfig.clientFramework === 'angularX') {
           this.jhipsterConfig.clientFramework = ANGULAR;
@@ -162,6 +178,9 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
       },
 
       addExternalResource({ application, source }) {
+        if (![ANGULAR, VUE, REACT].includes(application.clientFramework)) {
+          return;
+        }
         source.addExternalResourceToRoot = ({ resource, comment }) =>
           this.editFile(
             `${application.clientSrcDir}index.html`,
@@ -213,7 +232,14 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
 
   get writingEntities() {
     return this.asWritingEntitiesTaskGroup({
-      writeEnumerationFiles,
+      async writeEnumerationFiles({ application, entities }) {
+        if (!application.webappEnumerationsDir || ![ANGULAR, VUE, REACT].includes(application.clientFramework)) {
+          return;
+        }
+        for (const entity of entities.filter(entity => !entity.skipClient && !entity.builtIn)) {
+          await addEnumerationFiles.call(this, { application, entity });
+        }
+      },
     });
   }
 
@@ -224,7 +250,10 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
   get postWriting() {
     return this.asPostWritingTaskGroup({
       packageJsonScripts({ application }) {
-        const packageJsonStorage = this.createStorage('package.json');
+        if (![ANGULAR, VUE, REACT].includes(application.clientFramework)) {
+          return;
+        }
+        const packageJsonStorage = this.createStorage(this.destinationPath(application.clientRootDir, 'package.json'));
         const scriptsStorage = packageJsonStorage.createStorage('scripts');
 
         const packageJsonConfigStorage = packageJsonStorage.createStorage('config').createProxy();
@@ -245,7 +274,9 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
       },
 
       microfrontend({ application, source }) {
-        if (!application.microfrontend) return;
+        if (!application.microfrontend || ![ANGULAR, VUE, REACT].includes(application.clientFramework)) {
+          return;
+        }
         if (application.clientFrameworkAngular) {
           const conditional = application.applicationTypeMicroservice ? "targetOptions.target === 'serve' ? {} : " : '';
           source.addWebpackConfig({
diff --git a/generators/client/generator.spec.mts b/generators/client/generator.spec.mts
index 05d3e8bae422..7c2666639ccc 100644
--- a/generators/client/generator.spec.mts
+++ b/generators/client/generator.spec.mts
@@ -24,7 +24,7 @@ import { expect } from 'esmocha';
 
 import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.mjs';
 import Generator from './index.mjs';
-import { defaultHelpers as helpers, checkEnforcements } from '../../test/support/index.mjs';
+import { defaultHelpers as helpers, checkEnforcements, result } from '../../test/support/index.mjs';
 import { testFrameworkTypes } from '../../jdl/jhipster/index.mjs';
 import { GENERATOR_CLIENT } from '../generator-list.mjs';
 
@@ -138,4 +138,42 @@ describe(`generator - ${generator}`, () => {
       });
     });
   });
+
+  describe('with microservices', () => {
+    const mockedComposedGenerators = [
+      'jhipster:common',
+      'jhipster:languages',
+      'jhipster:cypress',
+      'jhipster:angular',
+      'jhipster:react',
+      'jhipster:vue',
+    ];
+    const options = { applicationType: 'microservice' };
+    before(async () => {
+      await helpers
+        .run(generatorFile)
+        .withJHipsterConfig(options)
+        .withSkipWritingPriorities()
+        .withMockedGenerators(mockedComposedGenerators);
+    });
+
+    it('should compose with jhipster:common', () => {
+      assert(result.mockedGenerators['jhipster:common'].calledOnce);
+    });
+    it('should compose with jhipster:languages', () => {
+      assert(result.mockedGenerators['jhipster:languages'].notCalled);
+    });
+    it('should compose with jhipster:cypress', () => {
+      assert(result.mockedGenerators['jhipster:cypress'].notCalled);
+    });
+    it('should compose with jhipster:angular', () => {
+      assert(result.mockedGenerators['jhipster:angular'].notCalled);
+    });
+    it('should compose with jhipster:react', () => {
+      assert(result.mockedGenerators['jhipster:react'].notCalled);
+    });
+    it('should compose with jhipster:vue', () => {
+      assert(result.mockedGenerators['jhipster:vue'].notCalled);
+    });
+  });
 });
diff --git a/generators/client/needle-api/needle-client-vue.mts b/generators/client/needle-api/needle-client-vue.mts
index ee6b1a8bc160..ebf51da233ac 100644
--- a/generators/client/needle-api/needle-client-vue.mts
+++ b/generators/client/needle-api/needle-client-vue.mts
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import chalk from 'chalk';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import needleClientBase from './needle-client.mjs';
 import { stripMargin } from '../../base/support/index.mjs';
 import { createNeedleCallback } from '../../base/support/needles.mjs';
diff --git a/generators/client/prompts.mjs b/generators/client/prompts.mjs
index e86f9f17ae71..bb2fc7467f98 100644
--- a/generators/client/prompts.mjs
+++ b/generators/client/prompts.mjs
@@ -16,56 +16,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import chalk from 'chalk';
-import _ from 'lodash';
-import { clientFrameworkTypes, testFrameworkTypes } from '../../jdl/jhipster/index.mjs';
 import { httpsGet } from '../base/support/index.mjs';
 
-const { ANGULAR, REACT, VUE, NO: NO_CLIENT_FRAMEWORK } = clientFrameworkTypes;
-const { CYPRESS } = testFrameworkTypes;
-const { intersection } = _;
-
-export async function askForClient({ control }) {
-  if (control.existingProject && !this.options.askAnswered) return;
-
-  const config = this.jhipsterConfigWithDefaults;
-  const choices = [
-    {
-      value: ANGULAR,
-      name: 'Angular',
-    },
-    {
-      value: REACT,
-      name: 'React',
-    },
-    {
-      value: VUE,
-      name: 'Vue',
-    },
-    {
-      value: 'no',
-      name: 'No client',
-    },
-  ];
-
-  const answers = await this.prompt(
-    {
-      type: 'list',
-      name: 'clientFramework',
-      when: () => this.jhipsterConfig.applicationType !== 'microservice',
-      message: `Which ${chalk.yellow('*Framework*')} would you like to use for the client?`,
-      choices,
-      default: config.clientFramework,
-    },
-    this.config,
-  );
-
-  if (answers.clientFramework === NO_CLIENT_FRAMEWORK) {
-    this.jhipsterConfig.skipClient = true;
-    this.cancelCancellableTasks();
-  }
-}
-
 export async function askForClientTheme({ control }) {
   if (control.existingProject && !this.options.askAnswered) return;
 
@@ -74,7 +26,7 @@ export async function askForClientTheme({ control }) {
     {
       type: 'list',
       name: 'clientTheme',
-      when: () => !this.jhipsterConfig.skipClient,
+      when: () => ['angular', 'react', 'vue'].includes(config.clientFramework),
       message: 'Would you like to use a Bootswatch theme (https://bootswatch.com/)?',
       choices: async () => {
         const bootswatchChoices = await retrieveOnlineBootswatchThemes(this).catch(errorMessage => {
@@ -97,7 +49,7 @@ export async function askForClientTheme({ control }) {
 
 export async function askForClientThemeVariant({ control }) {
   if (control.existingProject && !this.options.askAnswered) return;
-  if (this.jhipsterConfig.clientTheme === 'none') {
+  if ((this.jhipsterConfig.clientTheme ?? 'none') === 'none') {
     return;
   }
 
@@ -119,22 +71,6 @@ export async function askForClientThemeVariant({ control }) {
   );
 }
 
-export async function askForAdminUi({ control }) {
-  if (control.existingProject && !this.options.askAnswered) return;
-
-  const config = this.jhipsterConfigWithDefaults;
-  await this.prompt(
-    {
-      type: 'confirm',
-      name: 'withAdminUi',
-      when: () => !this.jhipsterConfig.skipClient,
-      message: 'Do you want to generate the admin UI?',
-      default: config.withAdminUi,
-    },
-    this.config,
-  );
-}
-
 async function retrieveOnlineBootswatchThemes(generator) {
   return _retrieveBootswatchThemes(generator, true);
 }
@@ -199,19 +135,3 @@ async function _retrieveBootswatchThemes(generator, useApi) {
     );
   });
 }
-
-export async function askForClientTestOpts({ control }) {
-  if (control.existingProject && this.options.askAnswered !== true) return;
-
-  const defaultValues = intersection([CYPRESS], this.jhipsterConfigWithDefaults.testFrameworks);
-  const answers = await this.prompt([
-    {
-      type: 'checkbox',
-      name: 'clientTestFrameworks',
-      message: 'Besides Jest/Vitest, which testing frameworks would you like to use?',
-      choices: [{ name: 'Cypress', value: CYPRESS }],
-      default: defaultValues,
-    },
-  ]);
-  this.jhipsterConfig.testFrameworks = [...new Set([...(this.jhipsterConfig.testFrameworks ?? []), ...answers.clientTestFrameworks])];
-}
diff --git a/generators/client/resources/package.json b/generators/client/resources/package.json
index 80803951daeb..b518254584f4 100644
--- a/generators/client/resources/package.json
+++ b/generators/client/resources/package.json
@@ -1,16 +1,16 @@
 {
   "dependencies": {
-    "dayjs": "1.11.9"
+    "dayjs": "1.11.10"
   },
   "devDependencies": {
-    "@cypress/code-coverage": "3.12.1",
+    "@cypress/code-coverage": "3.12.4",
     "babel-loader": "9.1.3",
     "babel-plugin-istanbul": "6.1.1",
-    "cypress": "13.2.0",
+    "cypress": "13.3.2",
     "cypress-audit": "1.1.0",
-    "eslint-plugin-cypress": "2.14.0",
-    "lighthouse": "11.1.0",
+    "eslint-plugin-cypress": "2.15.1",
+    "lighthouse": "11.2.0",
     "nyc": "15.1.0",
-    "swagger-ui-dist": "5.7.2"
+    "swagger-ui-dist": "5.9.0"
   }
 }
diff --git a/generators/client/support/config.mts b/generators/client/support/config.mts
index a0f586be399a..0a42070ab975 100644
--- a/generators/client/support/config.mts
+++ b/generators/client/support/config.mts
@@ -1,9 +1,6 @@
-import { clientFrameworkTypes } from '../../../jdl/index.js';
 import { getFrontendAppName } from '../../base/support/basename.mjs';
 import { CLIENT_MAIN_SRC_DIR, CLIENT_TEST_SRC_DIR } from '../../generator-constants.mjs';
 
-const { ANGULAR, REACT, VUE, NO: CLIENT_FRAMEWORK_NO } = clientFrameworkTypes;
-
 /**
  * Load client configs into application.
  */
@@ -14,19 +11,15 @@ export const loadClientConfig = ({ config, application }: { config: any; applica
   (application as any).clientThemeVariant = config.clientThemeVariant;
   (application as any).devServerPort = config.devServerPort;
 
-  (application as any).clientSrcDir = config.clientSrcDir ?? CLIENT_MAIN_SRC_DIR;
-  (application as any).clientTestDir = config.clientTestDir ?? CLIENT_TEST_SRC_DIR;
+  (application as any).clientRootDir = config.clientRootDir ?? '';
+  (application as any).clientSrcDir = config.clientSrcDir ?? `${application.clientRootDir}${CLIENT_MAIN_SRC_DIR}`;
+  (application as any).clientTestDir = config.clientTestDir ?? `${application.clientRootDir}${CLIENT_TEST_SRC_DIR}`;
 };
 
 /**
  * Load client derived properties.
  */
 export const loadDerivedClientConfig = ({ application }: { application: any }) => {
-  application.clientFrameworkAngular = application.clientFramework === ANGULAR;
-  application.clientFrameworkReact = application.clientFramework === REACT;
-  application.clientFrameworkVue = application.clientFramework === VUE;
-  application.clientFrameworkNo = !application.clientFramework || application.clientFramework === CLIENT_FRAMEWORK_NO;
-  application.clientFrameworkAny = !application.clientFrameworkNo;
   if ((application as any).microfrontend === undefined) {
     if ((application as any).applicationTypeMicroservice) {
       (application as any).microfrontend = application.clientFrameworkAny;
diff --git a/generators/client/support/files.mts b/generators/client/support/files.mts
index 4a56be8092d4..3304b868a1b5 100644
--- a/generators/client/support/files.mts
+++ b/generators/client/support/files.mts
@@ -1,46 +1,79 @@
+import type { WriteFileBlock } from '../../base/api.mjs';
+import type CoreGenerator from '../../base-core/index.mjs';
 import { CLIENT_MAIN_SRC_DIR, CLIENT_TEST_SRC_DIR } from '../../generator-constants.mjs';
 
 export const replaceEntityFilePath = (data: any, filepath: string) =>
   filepath
-    .replace(/_entityFolder/, data.entityFolderName)
-    .replace(/_entityFile/, data.entityFileName)
-    .replace(/_entityModel/, data.entityModelFileName);
+    .replace(/_entityFolder_/, data.entityFolderName)
+    .replace(/_entityFile_/, data.entityFileName)
+    .replace(/_entityModel_/, data.entityModelFileName);
 
-const srcRenameTo = (relativePath: string) => (data: any, filepath: string) =>
-  `${data.clientSrcDir}${relativePath}${replaceEntityFilePath(data, filepath)}`;
+const CLIENT_TEMPLATES_SRC_DIR = CLIENT_MAIN_SRC_DIR;
 
-const appRenameTo = (relativePath: string) => (data: any, filepath: string) =>
-  `${data.clientSrcDir}app/${relativePath}${replaceEntityFilePath(data, filepath)}`;
+type RelativeWriteFileBlock = WriteFileBlock & { relativePath?: string };
 
-const testRenameTo = (relativePath: string) => (data: any, filepath: string) =>
-  `${data.clientTestDir}${relativePath}${replaceEntityFilePath(data, filepath)}`;
+export function clientRootTemplatesBlock(blockOrRelativePath?: string): Pick<WriteFileBlock, 'path' | 'renameTo'>;
+export function clientRootTemplatesBlock(blockOrRelativePath: RelativeWriteFileBlock): WriteFileBlock;
+export function clientRootTemplatesBlock(blockOrRelativePath: string | RelativeWriteFileBlock = ''): Partial<WriteFileBlock> {
+  return clientBlock({
+    srcPath: '',
+    destProperty: 'clientRootDir',
+    blockOrRelativePath,
+  });
+}
 
-const CLIENT_TEMPLATES_SRC_DIR = CLIENT_MAIN_SRC_DIR;
-const CLIENT_TEMPLATES_APP_DIR = `${CLIENT_MAIN_SRC_DIR}app/`;
+export function clientSrcTemplatesBlock(blockOrRelativePath?: string): Pick<WriteFileBlock, 'path' | 'renameTo'>;
+export function clientSrcTemplatesBlock(blockOrRelativePath: RelativeWriteFileBlock): WriteFileBlock;
+export function clientSrcTemplatesBlock(blockOrRelativePath: string | RelativeWriteFileBlock = ''): Partial<WriteFileBlock> {
+  return clientBlock({
+    srcPath: CLIENT_TEMPLATES_SRC_DIR,
+    destProperty: 'clientSrcDir',
+    blockOrRelativePath,
+  });
+}
 
-export const clientSrcTemplatesBlock = (relativePath: string | any = '') => {
-  relativePath = typeof relativePath === 'object' ? relativePath.relativePath : relativePath;
-  return {
-    path: `${CLIENT_TEMPLATES_SRC_DIR}${relativePath}`,
-    renameTo: srcRenameTo(relativePath),
-    ...(typeof relativePath === 'object' ? relativePath : undefined),
-  };
-};
+export function clientApplicationTemplatesBlock(blockOrRelativePath?: string): Pick<WriteFileBlock, 'path' | 'renameTo'>;
+export function clientApplicationTemplatesBlock(blockOrRelativePath: RelativeWriteFileBlock): WriteFileBlock;
+export function clientApplicationTemplatesBlock(blockOrRelativePath: string | RelativeWriteFileBlock = ''): Partial<WriteFileBlock> {
+  return clientBlock({
+    srcPath: CLIENT_TEMPLATES_SRC_DIR,
+    relativeToSrc: 'app/',
+    destProperty: 'clientSrcDir',
+    blockOrRelativePath,
+  });
+}
 
-export const clientApplicationTemplatesBlock = (relativePath: string | any = '') => {
-  relativePath = typeof relativePath === 'object' ? relativePath.relativePath : relativePath;
-  return {
-    path: `${CLIENT_TEMPLATES_APP_DIR}${relativePath}`,
-    renameTo: appRenameTo(relativePath),
-    ...(typeof relativePath === 'object' ? relativePath : undefined),
-  };
-};
+export function clientTestTemplatesBlock(blockOrRelativePath?: string): Pick<WriteFileBlock, 'path' | 'renameTo'>;
+export function clientTestTemplatesBlock(blockOrRelativePath: RelativeWriteFileBlock): WriteFileBlock;
+export function clientTestTemplatesBlock(blockOrRelativePath: string | RelativeWriteFileBlock = ''): Partial<WriteFileBlock> {
+  return clientBlock({
+    srcPath: CLIENT_TEST_SRC_DIR,
+    destProperty: 'clientTestDir',
+    blockOrRelativePath,
+  });
+}
 
-export const clientTestTemplatesBlock = (relativePath: string | any = '') => {
-  relativePath = typeof relativePath === 'object' ? relativePath.relativePath : relativePath;
+function clientBlock({
+  srcPath,
+  destProperty,
+  blockOrRelativePath = '',
+  relativeToSrc = '',
+}: {
+  srcPath: string;
+  destProperty: string;
+  blockOrRelativePath: string | RelativeWriteFileBlock;
+  relativeToSrc?: string;
+}): WriteFileBlock | Pick<WriteFileBlock, 'path' | 'renameTo'> {
+  const block: RelativeWriteFileBlock | undefined = typeof blockOrRelativePath !== 'string' ? blockOrRelativePath : undefined;
+  const blockRenameTo = typeof block?.renameTo === 'function' ? block.renameTo : undefined;
+  const relativePath: string = typeof blockOrRelativePath === 'string' ? blockOrRelativePath : blockOrRelativePath.relativePath ?? '';
   return {
-    path: `${CLIENT_TEST_SRC_DIR}${relativePath}`,
-    renameTo: testRenameTo(relativePath),
-    ...(typeof relativePath === 'object' ? relativePath : undefined),
+    path: `${srcPath}${relativeToSrc}${relativePath}`,
+    ...block,
+    renameTo(this: CoreGenerator, data: any, filePath: string) {
+      return `${data[destProperty]}${relativeToSrc}${replaceEntityFilePath(data, relativePath) ?? ''}${
+        replaceEntityFilePath(data, blockRenameTo?.call?.(this, data, filePath) ?? filePath) ?? ''
+      }`;
+    },
   };
-};
+}
diff --git a/generators/client/templates/.eslintignore.ejs b/generators/client/templates/.eslintignore.ejs
index 0c629b6f7fc9..fe38cfc20d55 100644
--- a/generators/client/templates/.eslintignore.ejs
+++ b/generators/client/templates/.eslintignore.ejs
@@ -25,3 +25,4 @@ build/
 node/
 coverage/
 postcss.config.js
+<%- this.relativeDir(clientRootDir, clientDistDir) %>
diff --git a/generators/client/templates/.prettierignore.jhi.client.ejs b/generators/client/templates/.prettierignore.jhi.client.ejs
new file mode 100644
index 000000000000..6d6cd4a7da5b
--- /dev/null
+++ b/generators/client/templates/.prettierignore.jhi.client.ejs
@@ -0,0 +1,22 @@
+<%#
+ Copyright 2013-2023 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+<&_ if (!fragment.section) { -&>
+# Generated by jhipster:client
+<%- clientDistDir %>
+<&_ } -&>
diff --git a/generators/common/__snapshots__/generator.spec.mjs.snap b/generators/common/__snapshots__/generator.spec.mjs.snap
index c200c7a2cc64..44ce69ce0f61 100644
--- a/generators/common/__snapshots__/generator.spec.mjs.snap
+++ b/generators/common/__snapshots__/generator.spec.mjs.snap
@@ -38,22 +38,18 @@ trim_trailing_whitespace = false
 ",
     "stateCleared": "modified",
   },
-  ".lintstagedrc.js": {
+  ".lintstagedrc.cjs": {
     "contents": "module.exports = {
-  '{,src/**/,webpack/}*.{md,json,yml,html,cjs,mjs,js,ts,tsx,css,scss,java}': ['prettier --write'],
+  '{,**/}*.{md,json,yml,html,cjs,mjs,js,ts,tsx,css,scss,java}': ['prettier --write'],
 };
 ",
     "stateCleared": "modified",
   },
   ".prettierignore": {
     "contents": "node_modules
-target
-build
 package-lock.json
 .git
-.mvn
-gradle
-.gradle
+target/
 ",
     "stateCleared": "modified",
   },
@@ -96,166 +92,31 @@ overrides:
   "README.md": {
     "contents": "# jhipster
 
-This application was generated using JHipster , you can find documentation and help at [https://www.jhipster.tech/documentation-archive/vundefined](https://www.jhipster.tech/documentation-archive/vundefined).
-
-## Project Structure
-
-Node is required for generation and recommended for development. \`package.json\` is always generated for a better development experience with prettier, commit hooks, scripts and so on.
-
-In the project root, JHipster generates configuration files for tools like git, prettier, eslint, husky, and others that are well known and you can find references in the web.
+This application was generated using JHipster JHIPSTER_VERSION, you can find documentation and help at [https://www.jhipster.tech/documentation-archive/vJHIPSTER_VERSION](https://www.jhipster.tech/documentation-archive/vJHIPSTER_VERSION).
 
 
-\`/src/*\` structure follows default Java structure.
-
-- \`.yo-rc.json\` - Yeoman configuration file
-JHipster configuration is stored in this file at \`generator-jhipster\` key. You may find \`generator-jhipster-*\` for specific blueprints configuration.
-- \`.yo-resolve\` (optional) - Yeoman conflict resolver
-Allows to use a specific action when conflicts are found skipping prompts for files that matches a pattern. Each line should match \`[pattern] [action]\` with pattern been a [Minimatch](https://github.com/isaacs/minimatch#minimatch) pattern and action been one of skip (default if ommited) or force. Lines starting with \`#\` are considered comments and are ignored.
-- \`.jhipster/*.json\` - JHipster entity configuration files
+## Project Structure
 
-- \`npmw\` - wrapper to use locally installed npm.
-JHipster installs Node and npm locally using the build tool by default. This wrapper makes sure npm is installed locally and uses it avoiding some differences different versions can cause. By using \`./npmw\` instead of the traditional \`npm\` you can configure a Node-less environment to develop or test your application.
-- \`/src/main/docker\` - Docker configurations for the application and services that the application depends on
 
 ## Development
 
 
-### JHipster Control Center
-
-JHipster Control Center can help you manage and control your application(s). You can start a local control center server (accessible on http://localhost:7419) with:
-
-\`\`\`
-docker compose -f src/main/docker/jhipster-control-center.yml up
-\`\`\`
-
-
 
 ## Building for production
 
-### Packaging as jar
-
-To build the final jar and optimize the jhipster application for production, run:
-
-\`\`\`
-./mvnw -Pprod clean verify
-\`\`\`
-
-This will concatenate and minify the client CSS and JavaScript files. It will also modify \`index.html\` so it references these new files.
-To ensure everything worked, run:
-
-\`\`\`
-java -jar target/*.jar
-\`\`\`
-
-Then navigate to [http://localhost:8080](http://localhost:8080) in your browser.
-
-Refer to [Using JHipster in production][] for more details.
-
-### Packaging as war
-
-To package your application as a war in order to deploy it to an application server, run:
-
-\`\`\`
-./mvnw -Pprod,war clean verify
-\`\`\`
-
 
 ## Testing
 
-To launch your application's tests, run:
-
-\`\`\`
-./mvnw verify
-\`\`\`
-
-
-For more information, refer to the [Running tests page][].
-
-### Code quality
-
-Sonar is used to analyse code quality. You can start a local Sonar server (accessible on http://localhost:9001) with:
-
-\`\`\`
-docker compose -f src/main/docker/sonar.yml up -d
-\`\`\`
-
-Note: we have turned off forced authentication redirect for UI in [src/main/docker/sonar.yml](src/main/docker/sonar.yml) for out of the box experience while trying out SonarQube, for real use cases turn it back on.
-
-You can run a Sonar analysis with using the [sonar-scanner](https://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner) or by using the maven plugin.
-
-Then, run a Sonar analysis:
-
-\`\`\`
-./mvnw -Pprod clean verify sonar:sonar -Dsonar.login=admin -Dsonar.password=admin
-\`\`\`
-
-If you need to re-run the Sonar phase, please be sure to specify at least the \`initialize\` phase since Sonar properties are loaded from the sonar-project.properties file.
-
-\`\`\`
-./mvnw initialize sonar:sonar -Dsonar.login=admin -Dsonar.password=admin
-\`\`\`
-
-Additionally, Instead of passing \`sonar.password\` and \`sonar.login\` as CLI arguments, these parameters can be configured from [sonar-project.properties](sonar-project.properties) as shown below:
-
-\`\`\`
-sonar.login=admin
-sonar.password=admin
-\`\`\`
-
-For more information, refer to the [Code quality page][].
-
-## Using Docker to simplify development (optional)
-
-You can use Docker to improve your JHipster development experience. A number of docker-compose configuration are available in the [src/main/docker](src/main/docker) folder to launch required third party services.
-
-For example, to start a postgresql database in a docker container, run:
-
-\`\`\`
-docker compose -f src/main/docker/postgresql.yml up -d
-\`\`\`
-
-To stop it and remove the container, run:
-
-\`\`\`
-docker compose -f src/main/docker/postgresql.yml down
-\`\`\`
-
-You can also fully dockerize your application and all the services that it depends on.
-To achieve this, first build a docker image of your app by running:
-
-\`\`\`
-npm run java:docker
-\`\`\`
-
-Or build a arm64 docker image when using an arm64 processor os like MacOS with M1 processor family running:
-
-\`\`\`
-npm run java:docker:arm64
-\`\`\`
-
-Then run:
-
-\`\`\`
-docker compose -f src/main/docker/app.yml up -d
-\`\`\`
-
-When running Docker Desktop on MacOS Big Sur or later, consider enabling experimental \`Use the new Virtualization framework\` for better processing performance ([disk access performance is worse](https://github.com/docker/roadmap/issues/7)).
-
-For more information refer to [Using Docker and Docker-Compose][], this page also contains information on the docker-compose sub-generator (\`jhipster docker-compose\`), which is able to generate docker configurations for one or several JHipster applications.
-
-## Continuous Integration (optional)
-
-To configure CI for your project, run the ci-cd sub-generator (\`jhipster ci-cd\`), this will let you generate configuration files for a number of Continuous Integration systems. Consult the [Setting up Continuous Integration][] page for more information.
 
 
 [JHipster Homepage and latest documentation]: https://www.jhipster.tech
-[JHipster  archive]: https://www.jhipster.tech/documentation-archive/vundefined
-[Using JHipster in development]: https://www.jhipster.tech/documentation-archive/vundefined/development/
-[Using Docker and Docker-Compose]: https://www.jhipster.tech/documentation-archive/vundefined/docker-compose
-[Using JHipster in production]: https://www.jhipster.tech/documentation-archive/vundefined/production/
-[Running tests page]: https://www.jhipster.tech/documentation-archive/vundefined/running-tests/
-[Code quality page]: https://www.jhipster.tech/documentation-archive/vundefined/code-quality/
-[Setting up Continuous Integration]: https://www.jhipster.tech/documentation-archive/vundefined/setting-up-ci/
+[JHipster JHIPSTER_VERSION archive]: https://www.jhipster.tech/documentation-archive/vJHIPSTER_VERSION
+[Using JHipster in development]: https://www.jhipster.tech/documentation-archive/vJHIPSTER_VERSION/development/
+[Using Docker and Docker-Compose]: https://www.jhipster.tech/documentation-archive/vJHIPSTER_VERSION/docker-compose
+[Using JHipster in production]: https://www.jhipster.tech/documentation-archive/vJHIPSTER_VERSION/production/
+[Running tests page]: https://www.jhipster.tech/documentation-archive/vJHIPSTER_VERSION/running-tests/
+[Code quality page]: https://www.jhipster.tech/documentation-archive/vJHIPSTER_VERSION/code-quality/
+[Setting up Continuous Integration]: https://www.jhipster.tech/documentation-archive/vJHIPSTER_VERSION/setting-up-ci/
 
 [Node.js]: https://nodejs.org/
 [NPM]: https://www.npmjs.com/
@@ -264,12 +125,16 @@ To configure CI for your project, run the ci-cd sub-generator (\`jhipster ci-cd\
   },
   "package.json": {
     "contents": "{
-  "scripts": {
-    "prepare": "husky install"
-  },
   "devDependencies": {
+    "generator-jhipster": "JHIPSTER_VERSION",
     "husky": "HUSKY_VERSION",
-    "lint-staged": "LINT_STAGED_VERSION"
+    "lint-staged": "LINT_STAGED_VERSION",
+    "prettier": "PRETTIER_VERSION",
+    "prettier-plugin-packagejson": "PRETTIER_PLUGIN_PACKAGEJSON_VERSION",
+    "prettier-plugin-java": "PRETTIER_PLUGIN_JAVA_VERSION"
+  },
+  "scripts": {
+    "prepare": "husky install"
   }
 }
 ",
diff --git a/generators/common/command.mts b/generators/common/command.mts
index fe479599cffb..0eec88e9d2d9 100644
--- a/generators/common/command.mts
+++ b/generators/common/command.mts
@@ -25,8 +25,8 @@ const command: JHipsterCommandDefinition = {
       type: Number,
       scope: 'storage',
     },
-    withAdminUi: {
-      description: 'Generate administrative user interface',
+    skipCommitHook: {
+      description: 'Skip adding husky commit hooks',
       type: Boolean,
       scope: 'storage',
     },
diff --git a/generators/common/files.mjs b/generators/common/files.mjs
index a78bd4af2e88..1051e76b644d 100644
--- a/generators/common/files.mjs
+++ b/generators/common/files.mjs
@@ -24,7 +24,7 @@
 export const prettierConfigFiles = {
   global: [
     {
-      templates: ['.prettierrc', '.prettierignore'],
+      templates: ['.prettierrc', '.prettierignore.jhi'],
     },
   ],
 };
@@ -43,7 +43,7 @@ export const commonFiles = {
   commitHooks: [
     {
       condition: generator => !generator.skipCommitHook,
-      templates: ['.lintstagedrc.js', '.husky/pre-commit'],
+      templates: ['.lintstagedrc.cjs', '.husky/pre-commit'],
     },
   ],
 };
diff --git a/generators/common/generator.mjs b/generators/common/generator.mjs
index 6ccebe6664b6..98f4ab64ce23 100644
--- a/generators/common/generator.mjs
+++ b/generators/common/generator.mjs
@@ -37,21 +37,25 @@ import { loadStoredAppOptions } from '../app/support/index.mjs';
 const { REACT, ANGULAR } = clientFrameworkTypes;
 
 export default class CommonGenerator extends BaseApplicationGenerator {
+  command = command;
+
   async beforeQueue() {
     loadStoredAppOptions.call(this);
 
-    await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
-    await this.dependsOnJHipster(GENERATOR_GIT);
-
     if (!this.fromBlueprint) {
       await this.composeWithBlueprints(GENERATOR_COMMON);
     }
+
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+      await this.dependsOnJHipster(GENERATOR_GIT);
+    }
   }
 
   get initializing() {
     return this.asInitializingTaskGroup({
       loadOptions() {
-        this.parseJHipsterOptions(command.options);
+        this.parseJHipsterCommand(this.command);
       },
     });
   }
@@ -60,6 +64,19 @@ export default class CommonGenerator extends BaseApplicationGenerator {
     return this.delegateTasksToBlueprint(() => this.initializing);
   }
 
+  get prompting() {
+    return this.asPromptingTaskGroup({
+      async prompting({ control }) {
+        if (control.existingProject && this.options.askAnswered !== true) return;
+        await this.prompt(this.prepareQuestions(this.command.configs));
+      },
+    });
+  }
+
+  get [BaseApplicationGenerator.PROMPTING]() {
+    return this.asPromptingTaskGroup(this.delegateTasksToBlueprint(() => this.prompting));
+  }
+
   // Public API method used by the getter and also by Blueprints
   get configuring() {
     return {
@@ -83,9 +100,42 @@ export default class CommonGenerator extends BaseApplicationGenerator {
     return this.delegateTasksToBlueprint(() => this.configuring);
   }
 
+  get configuringEachEntity() {
+    return this.asConfiguringEachEntityTaskGroup({
+      migrateEntity({ entityConfig, entityStorage }) {
+        for (const field of entityConfig.fields) {
+          if (field.javadoc) {
+            field.documentation = field.javadoc;
+            delete field.javadoc;
+          }
+          if (field.fieldTypeJavadoc) {
+            field.fieldTypeDocumentation = field.fieldTypeJavadoc;
+            delete field.fieldTypeJavadoc;
+          }
+        }
+        for (const relationship of entityConfig.relationships) {
+          if (relationship.javadoc) {
+            relationship.documentation = relationship.javadoc;
+            delete relationship.javadoc;
+          }
+        }
+        if (entityConfig.javadoc) {
+          entityConfig.documentation = entityConfig.javadoc;
+          delete entityConfig.javadoc;
+        } else {
+          entityStorage.save();
+        }
+      },
+    });
+  }
+
+  get [BaseApplicationGenerator.CONFIGURING_EACH_ENTITY]() {
+    return this.delegateTasksToBlueprint(() => this.configuringEachEntity);
+  }
+
   // Public API method used by the getter and also by Blueprints
   get loading() {
-    return {
+    return this.asLoadingTaskGroup({
       loadPackageJson({ application }) {
         this.loadNodeDependenciesFromPackageJson(
           application.nodeDependencies,
@@ -93,10 +143,12 @@ export default class CommonGenerator extends BaseApplicationGenerator {
         );
       },
 
-      loadConfig({ application }) {
-        application.prettierTabWidth = this.jhipsterConfig.prettierTabWidth || 2;
+      loadConfig({ applicationDefaults }) {
+        applicationDefaults({
+          prettierTabWidth: this.jhipsterConfig.prettierTabWidth ?? 2,
+        });
       },
-    };
+    });
   }
 
   get [BaseApplicationGenerator.LOADING]() {
@@ -105,7 +157,7 @@ export default class CommonGenerator extends BaseApplicationGenerator {
 
   // Public API method used by the getter and also by Blueprints
   get preparing() {
-    return {
+    return this.asPreparingTaskGroup({
       setupConstants({ application }) {
         // Make constants available in templates
         application.MAIN_DIR = MAIN_DIR;
@@ -118,7 +170,7 @@ export default class CommonGenerator extends BaseApplicationGenerator {
         application.DOCUMENTATION_URL = JHIPSTER_DOCUMENTATION_URL;
         application.DOCUMENTATION_ARCHIVE_PATH = JHIPSTER_DOCUMENTATION_ARCHIVE_PATH;
       },
-    };
+    });
   }
 
   get [BaseApplicationGenerator.PREPARING]() {
@@ -140,6 +192,11 @@ export default class CommonGenerator extends BaseApplicationGenerator {
             this.removeFile('npmw.cmd');
           }
         }
+        if (this.isJhipsterVersionLessThan('8.0.0-rc.2')) {
+          if (!application.skipCommitHook) {
+            this.removeFile('.lintstagedrc.js');
+          }
+        }
       },
       writePrettierConfig({ application }) {
         return this.writeFiles({
@@ -157,6 +214,16 @@ export default class CommonGenerator extends BaseApplicationGenerator {
 
   get postWriting() {
     return this.asPostWritingTaskGroup({
+      addJHipsterDependencies({ application }) {
+        if (application.skipJhipsterDependencies) return;
+
+        this.packageJson.merge({
+          devDependencies: {
+            'generator-jhipster': application.jhipsterVersion,
+            ...Object.fromEntries(application.blueprints.map(blueprint => [blueprint.name, blueprint.version])),
+          },
+        });
+      },
       async formatSonarProperties() {
         this.queueTransformStream(await createPrettierTransform.call(this, { extensions: 'properties', prettierProperties: true }), {
           name: 'prettifying sonar-project.properties',
@@ -172,8 +239,17 @@ export default class CommonGenerator extends BaseApplicationGenerator {
           devDependencies: {
             husky: application.nodeDependencies.husky,
             'lint-staged': application.nodeDependencies['lint-staged'],
+            prettier: application.nodeDependencies.prettier,
+            'prettier-plugin-packagejson': application.nodeDependencies['prettier-plugin-packagejson'],
           },
         });
+        if (application.backendTypeJavaAny) {
+          this.packageJson.merge({
+            devDependencies: {
+              'prettier-plugin-java': application.nodeDependencies['prettier-plugin-java'],
+            },
+          });
+        }
       },
     });
   }
diff --git a/generators/common/generator.spec.mjs b/generators/common/generator.spec.mjs
index c6c22db3407a..d3c5eb164ba6 100644
--- a/generators/common/generator.spec.mjs
+++ b/generators/common/generator.spec.mjs
@@ -53,6 +53,10 @@ describe(`generator - ${generator}`, () => {
       it('should succeed', () => {
         expect(runResult.getSnapshot()).toMatchSnapshot();
       });
+
+      it('should add generator-jhipster to package.json', () => {
+        runResult.assertFileContent('package.json', 'generator-jhipster');
+      });
     });
     describe('Custom prettier', () => {
       before(async () => {
@@ -69,7 +73,7 @@ describe(`generator - ${generator}`, () => {
       });
 
       it('uses custom prettier formatting to js file', () => {
-        runResult.assertFileContent('.lintstagedrc.js', / {10}'{/);
+        runResult.assertFileContent('.lintstagedrc.cjs', / {10}'{/);
       });
     });
   });
diff --git a/generators/common/resources/package.json b/generators/common/resources/package.json
index 7d3188bcf71a..a101a4cff685 100644
--- a/generators/common/resources/package.json
+++ b/generators/common/resources/package.json
@@ -1,9 +1,9 @@
 {
   "devDependencies": {
-    "concurrently": "8.2.1",
+    "concurrently": "8.2.2",
     "husky": "8.0.3",
-    "lint-staged": "14.0.1",
-    "npm": "10.1.0",
+    "lint-staged": "15.0.2",
+    "npm": "10.2.1",
     "wait-on": "7.0.1"
   }
 }
diff --git a/generators/common/templates/.husky/pre-commit.ejs b/generators/common/templates/.husky/pre-commit.ejs
index 5fc905bfea48..96421e83b237 100755
--- a/generators/common/templates/.husky/pre-commit.ejs
+++ b/generators/common/templates/.husky/pre-commit.ejs
@@ -2,8 +2,8 @@
 . "$(dirname "$0")/_/husky.sh"
 
 
-<%_ if (skipClient || skipServer) { _%>
-npx --no-install lint-staged
-<%_ } else { _%>
+<%_ if (useNpmWrapper) { _%>
 "$(dirname "$0")/../npmw" exec --no-install lint-staged
+<%_ } else { _%>
+npx --no-install lint-staged
 <%_ } _%>
diff --git a/generators/common/templates/.lintstagedrc.js.ejs b/generators/common/templates/.lintstagedrc.cjs.ejs
similarity index 87%
rename from generators/common/templates/.lintstagedrc.js.ejs
rename to generators/common/templates/.lintstagedrc.cjs.ejs
index 7def557d0fe6..3d5b195c1a18 100644
--- a/generators/common/templates/.lintstagedrc.js.ejs
+++ b/generators/common/templates/.lintstagedrc.cjs.ejs
@@ -17,5 +17,5 @@
  limitations under the License.
 -%>
 module.exports = {
-  '{,src/**/<%= !skipClient ? ',webpack/' : '' %>}*.{<%= prettierExtensions %>}': ['prettier --write'],
+  '{,**/}*.{<%= prettierExtensions %>}': ['prettier --write'],
 };
diff --git a/generators/common/templates/.prettierignore.ejs b/generators/common/templates/.prettierignore.ejs
deleted file mode 100644
index ab0567f5c373..000000000000
--- a/generators/common/templates/.prettierignore.ejs
+++ /dev/null
@@ -1,8 +0,0 @@
-node_modules
-target
-build
-package-lock.json
-.git
-.mvn
-gradle
-.gradle
diff --git a/generators/page/templates/vue/src/test/javascript/spec/app/pages/page.service.spec.ts.ejs b/generators/common/templates/.prettierignore.jhi.ejs
similarity index 64%
rename from generators/page/templates/vue/src/test/javascript/spec/app/pages/page.service.spec.ts.ejs
rename to generators/common/templates/.prettierignore.jhi.ejs
index ef43aebd2542..765588c69b1d 100644
--- a/generators/page/templates/vue/src/test/javascript/spec/app/pages/page.service.spec.ts.ejs
+++ b/generators/common/templates/.prettierignore.jhi.ejs
@@ -16,17 +16,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import <%= pageName %>Service from '@/pages/<%= pageFolderName %>/<%= pageFolderName %>.service';
+node_modules
+package-lock.json
+.git
+<%- temporaryDir %>
 
-describe('<%= pageName %> Service', () => {
-  let service: <%= pageName %>Service;
-  beforeEach(() => {
-    service = new <%= pageName %>Service();
-  });
-
-  describe('Service methods', () => {
-    it('should call "method"', async () => {
-      expect(service.method()).toBeTruthy();
-    });
-  });
-});
+<&- fragments.render({ join: '\n\n' }) &>
diff --git a/generators/common/templates/.prettierrc.ejs b/generators/common/templates/.prettierrc.ejs
index e36c0dca6ee9..f3aa52d3d94e 100644
--- a/generators/common/templates/.prettierrc.ejs
+++ b/generators/common/templates/.prettierrc.ejs
@@ -13,7 +13,7 @@ bracketSameLine: false
 
 plugins:
   - prettier-plugin-packagejson
-<%_ if (!skipServer) { _%>
+<%_ if (backendTypeJavaAny) { _%>
   - prettier-plugin-java
   
 # java rules:
diff --git a/generators/common/templates/README.md.jhi.ejs b/generators/common/templates/README.md.jhi.ejs
index 39a09e765a50..cbb54e9a0389 100644
--- a/generators/common/templates/README.md.jhi.ejs
+++ b/generators/common/templates/README.md.jhi.ejs
@@ -23,6 +23,8 @@
 <&_
  // Register sections and max allowed fragments, 0 for unlimited.
  fragments.registerSections({
+   introSection: 0,
+   structureSection: 0,
    developmentSection: 0,
    productionSection: 0,
    testingSection: 0,
@@ -32,424 +34,46 @@
 _&>
 # <%= baseName %>
 
-<%_
-let clientPackageMngrName = 'Npm';
-let clientPackageMngrAddGlobal = 'install -g';
-let clientPackageMngrAdd = 'install --save --save-exact';
-let clientPackageMngrAddDev = 'install --save-dev --save-exact';
-let DOCUMENTATION_ARCHIVE_URL = `${DOCUMENTATION_URL + DOCUMENTATION_ARCHIVE_PATH}v${jhipsterVersion}`;
-_%>
-This application was generated using JHipster <%= jhipsterVersion %>, you can find documentation and help at [<%= DOCUMENTATION_ARCHIVE_URL %>](<%= DOCUMENTATION_ARCHIVE_URL %>).
-<%_ if (applicationTypeGateway || applicationTypeMicroservice) { _%>
-
-This is a "<%= applicationType %>" application intended to be part of a microservice architecture, please refer to the [Doing microservices with JHipster][] page of the documentation for more information.
-This application is configured for Service Discovery and Configuration with <% if (serviceDiscoveryEureka) { %>the JHipster-Registry<% } %><% if (serviceDiscoveryConsul) { %>Consul<% } %>. On launch, it will refuse to start if it is not able to connect to <% if (serviceDiscoveryEureka) { %>the JHipster-Registry at [http://localhost:8761](http://localhost:8761)<% } %><% if (serviceDiscoveryConsul) { %>Consul at [http://localhost:8500](http://localhost:8500)<% } %>.<% if (serviceDiscoveryEureka) { %> For more information, read our documentation on [Service Discovery and Configuration with the JHipster-Registry][].<% } %><% if (serviceDiscoveryConsul) { %> For more information, read our documentation on [Service Discovery and Configuration with Consul][].<% } %>
-<%_ } _%>
+This application was generated using JHipster <%= jhipsterVersion %>, you can find documentation and help at [<%= documentationArchiveUrl %>](<%= documentationArchiveUrl %>).
 
+<&- fragments.introSection() &>
 ## Project Structure
 
-Node is required for generation and recommended for development. `package.json` is always generated for a better development experience with prettier, commit hooks, scripts and so on.
-
-In the project root, JHipster generates configuration files for tools like git, prettier, eslint, husky, and others that are well known and you can find references in the web.
-
-<%_ if (backendType === 'Java') { %>
-`/src/*` structure follows default <%= backendType %> structure.
-
-<%_ } _%>
-- `.yo-rc.json` - Yeoman configuration file
-JHipster configuration is stored in this file at `generator-jhipster` key. You may find `generator-jhipster-*` for specific blueprints configuration.
-- `.yo-resolve` (optional) - Yeoman conflict resolver
-Allows to use a specific action when conflicts are found skipping prompts for files that matches a pattern. Each line should match `[pattern] [action]` with pattern been a [Minimatch](https://github.com/isaacs/minimatch#minimatch) pattern and action been one of skip (default if ommited) or force. Lines starting with `#` are considered comments and are ignored.
-- `.jhipster/*.json` - JHipster entity configuration files
-<%_ if (!skipClient) { %>
-- `npmw` - wrapper to use locally installed npm.
-JHipster installs Node and npm locally using the build tool by default. This wrapper makes sure npm is installed locally and uses it avoiding some differences different versions can cause. By using `./npmw` instead of the traditional `npm` you can configure a Node-less environment to develop or test your application.
-<%_ } _%>
-- `/src/main/docker` - Docker configurations for the application and services that the application depends on
-
+<&- fragments.structureSection() &>
 ## Development
 
-<%_ if (skipClient) { _%>
-To start your application in the dev profile, run:
-
-```
-<% if (buildToolMaven) { %>./mvnw<% } %><% if (buildToolGradle) { %>./gradlew<% } %>
-```
-
-For further instructions on how to develop with JHipster, have a look at [Using JHipster in development][].
-
-<%_ } _%>
 <&- fragments.developmentSection() &>
-### JHipster Control Center
-
-JHipster Control Center can help you manage and control your application(s). You can start a local control center server (accessible on http://localhost:7419) with:
-
-```
-docker compose -f src/main/docker/jhipster-control-center.yml up
-```
-
-<%_ if (authenticationTypeOauth2) { -%>
-### OAuth 2.0 / OpenID Connect
-
-Congratulations! You've selected an excellent way to secure your JHipster application. If you're not sure what OAuth and OpenID Connect (OIDC) are, please see [What the Heck is OAuth?](https://developer.okta.com/blog/2017/06/21/what-the-heck-is-oauth)
-
-To log in to your app, you'll need to have [Keycloak](https://keycloak.org) up and running. The JHipster Team has created a Docker container for you that has the default users and roles. Start Keycloak using the following command.
-
-```
-docker compose -f src/main/docker/keycloak.yml up
-```
-
-The security settings in `src/main/resources/config/application.yml` are configured for this image.
-
-```yaml
-spring:
-  ...
-  security:
-    oauth2:
-      client:
-        provider:
-          oidc:
-            issuer-uri: http://localhost:9080/realms/jhipster
-        registration:
-          oidc:
-            client-id: web_app
-            client-secret: web_app
-            scope: openid,profile,email
-```
-
-Some of Keycloak configuration is now done in build time and the other part before running the app, here is the [list](https://www.keycloak.org/server/all-config) of all build and configuration options.
-
-Before moving to production, please make sure to follow this [guide](https://www.keycloak.org/server/configuration) for better security and performance.
-
-Also, you should never use `start-dev` nor `KC_DB=dev-file` in production.
-
-When using Kubernetes, importing should be done using init-containers (with a volume when using `db=dev-file`).
-
-### Okta
-
-If you'd like to use Okta instead of Keycloak, it's pretty quick using the [Okta CLI](https://cli.okta.com/). After you've installed it, run:
-
-```shell
-okta register
-```
-
-Then, in your JHipster app's directory, run `okta apps create` and select **JHipster**. This will set up an Okta app for you, create `ROLE_ADMIN` and `ROLE_USER` groups, create a `.okta.env` file with your Okta settings, and configure a `groups` claim in your ID token.
-
-Run `source .okta.env` and start your app with Maven or Gradle. You should be able to sign in with the credentials you registered with.
-
-If you're on Windows, you should install [WSL](https://docs.microsoft.com/en-us/windows/wsl/install-win10) so the `source` command will work.
-
-If you'd like to configure things manually through the Okta developer console, see the instructions below.
-
-First, you'll need to create a free developer account at <https://developer.okta.com/signup/>. After doing so, you'll get your own Okta domain, that has a name like `https://dev-123456.okta.com`.
-
-Modify `src/main/resources/config/application.yml` to use your Okta settings.
-
-```yaml
-spring:
-  ...
-  security:
-    oauth2:
-      client:
-        provider:
-          oidc:
-            issuer-uri: https://{yourOktaDomain}/oauth2/default
-        registration:
-          oidc:
-            client-id: {clientId}
-            client-secret: {clientSecret}
-security:
-```
-
-Create an OIDC App in Okta to get a `{clientId}` and `{clientSecret}`. To do this, log in to your Okta Developer account and navigate to **Applications** > **Add Application**. Click **Web** and click the **Next** button. Give the app a name you’ll remember, specify `http://localhost:8080` as a Base URI, and `http://localhost:8080/login/oauth2/code/oidc` as a Login Redirect URI. Click **Done**, then Edit and add `http://localhost:8080` as a Logout redirect URI. Copy and paste the client ID and secret into your `application.yml` file.
-
-Create a `ROLE_ADMIN` and `ROLE_USER` group and add users into them. Modify e2e tests to use this account when running integration tests. You'll need to change credentials in `<%= clientTestDir %>e2e/account/account.spec.ts` and `<%= clientTestDir %>e2e/admin/administration.spec.ts`.
-
-Navigate to **API** > **Authorization Servers**, click the **Authorization Servers** tab and edit the default one. Click the **Claims** tab and **Add Claim**. Name it "groups", and include it in the ID Token. Set the value type to "Groups" and set the filter to be a Regex of `.*`.
-
-After making these changes, you should be good to go! If you have any issues, please post them to [Stack Overflow](https://stackoverflow.com/questions/tagged/jhipster). Make sure to tag your question with "jhipster" and "okta".
-
-### Auth0
-
-If you'd like to use [Auth0](https://auth0.com/) instead of Keycloak, follow the configuration steps below:
-
-- Create a free developer account at <https://auth0.com/signup>. After successful sign-up, your account will be associated with a unique domain like `dev-xxx.us.auth0.com`
-- Create a new application of type `Regular Web Applications`. Switch to the `Settings` tab, and configure your application settings like:
-    - Allowed Callback URLs: `http://localhost:8080/login/oauth2/code/oidc`
-    - Allowed Logout URLs: `http://localhost:8080/`
-- Navigate to **User Management** > **Roles** and create new roles named `ROLE_ADMIN`, and `ROLE_USER`.
-- Navigate to **User Management** > **Users** and create a new user account. Click on the **Role** tab to assign roles to the newly created user account.
-- Navigate to **Auth Pipeline** > **Rules** and create a new Rule. Choose `Empty rule` template. Provide a meaningful name like `JHipster claims` and replace `Script` content with the following and Save.
-```javascript
-function (user, context, callback) {
-  user.preferred_username = user.email;
-  const roles = (context.authorization || {}).roles;
-
-  function prepareCustomClaimKey(claim) {
-    return `https://www.jhipster.tech/${claim}`;
-  }
-
-  const rolesClaim = prepareCustomClaimKey('roles');
-
-  if (context.idToken) {
-    context.idToken[rolesClaim] = roles;
-  }
-
-  if (context.accessToken) {
-    context.accessToken[rolesClaim] = roles;
-  }
-
-  callback(null, user, context);
-}
-```
-- In your `JHipster` application, modify `src/main/resources/config/application.yml` to use your Auth0 application settings:
-```yaml
-spring:
-  ...
-  security:
-    oauth2:
-      client:
-        provider:
-          oidc:
-            # make sure to include the ending slash!
-            issuer-uri: https://{your-auth0-domain}/
-        registration:
-          oidc:
-            client-id: {clientId}
-            client-secret: {clientSecret}
-            scope: openid,profile,email
-jhipster:
-  ...
-  security:
-    oauth2:
-      audience:
-        - https://{your-auth0-domain}/api/v2/
-```
-  <%_ if (cypressTests) { _%>
-
-Before running Cypress tests, specify Auth0 user credentials by overriding the `CYPRESS_E2E_USERNAME` and `CYPRESS_E2E_PASSWORD` environment variables.
-
-```
-export CYPRESS_E2E_USERNAME="<your-username>"
-export CYPRESS_E2E_PASSWORD="<your-password>"
-```
-
-See Cypress' documentation for setting OS [environment variables](https://docs.cypress.io/guides/guides/environment-variables#Setting) to learn more.
-
-**Auth0 requires a user to provide authorization consent on the first login.** Consent flow is currently not handled in the Cypress test suite. To mitigate the issue, you can use a user account that has already granted consent to authorize application access via interactive login.
-  <%_ } _%>
-<%_ } _%>
-
-<%_ if (enableSwaggerCodegen) { _%>
-### Doing API-First development using openapi-generator-cli
-
-[OpenAPI-Generator]() is configured for this application. You can generate API code from the `src/main/resources/swagger/api.yml` definition file by running:
-    <%_ if (buildToolMaven) { _%>
-```bash
-./mvnw generate-sources
-```
-    <%_ } _%>
-    <%_ if (buildToolGradle) { _%>
-```bash
-./gradlew openApiGenerate
-```
-    <%_ } _%>
-Then implements the generated delegate classes with `@Service` classes.
-
-To edit the `api.yml` definition file, you can use a tool such as [Swagger-Editor](). Start a local instance of the swagger-editor using docker by running: `docker compose -f src/main/docker/swagger-editor.yml up -d`. The editor will then be reachable at [http://localhost:7742](http://localhost:7742).
-
-Refer to [Doing API-First development][] for more details.
-<%_ } _%>
 
 ## Building for production
 
-### Packaging as jar
-
-To build the final jar and optimize the <%= baseName %> application for production, run:
-
-```
-<%_ if (buildToolMaven) { _%>
-./mvnw -Pprod clean verify
-<%_ } _%>
-<%_ if (buildToolGradle) { _%>
-./gradlew -Pprod clean bootJar
-<%_ } _%>
-```
-
-<%_ if (!skipClient) { _%>
-This will concatenate and minify the client CSS and JavaScript files. It will also modify `index.html` so it references these new files.
-<%_ } _%>
-To ensure everything worked, run:
-
-```
-<%_ if (buildToolMaven) { _%>
-java -jar target/*.jar
-<%_ } _%>
-<%_ if (buildToolGradle) { _%>
-java -jar build/libs/*.jar
-<%_ } _%>
-```
-
-<% if (!skipClient) { %>Then navigate to [http://localhost:<%= serverPort %>](http://localhost:<%= serverPort %>) in your browser.
-<% } %>
-Refer to [Using JHipster in production][] for more details.
-
-### Packaging as war
-
-To package your application as a war in order to deploy it to an application server, run:
-
-```
-<%_ if (buildToolMaven) { _%>
-./mvnw -Pprod,war clean verify
-<%_ } _%>
-<%_ if (buildToolGradle) { _%>
-./gradlew -Pprod -Pwar clean bootWar
-<%_ } _%>
-```
-
 <&- fragments.productionSection() &>
 ## Testing
 
-To launch your application's tests, run:
-
-```
-<%_ if (buildToolMaven) { _%>
-./mvnw verify
-<%_ } else { _%>
-./gradlew test integrationTest jacocoTestReport
-<%_ } _%>
-```
-
 <&- fragments.testingSection() -&>
-<%_ if (gatlingTests) { _%>
-### Other tests
-
-Performance tests are run by [Gatling][] and written in Scala. They're located in [src/test/java/gatling/simulations](src/test/java/gatling/simulations).
-
-You can execute all Gatling tests with
-```
-<%_ if (buildToolMaven) { _%>
-./mvnw gatling:test
-<%_ } else { _%>
-./gradlew gatlingRun.
-<%_ } _%>
-```
-<%_ } _%>
-
-For more information, refer to the [Running tests page][].
-
-### Code quality
-
-Sonar is used to analyse code quality. You can start a local Sonar server (accessible on http://localhost:9001) with:
-
-```
-docker compose -f src/main/docker/sonar.yml up -d
-```
-
-Note: we have turned off forced authentication redirect for UI in [src/main/docker/sonar.yml](src/main/docker/sonar.yml) for out of the box experience while trying out SonarQube, for real use cases turn it back on.
-
-You can run a Sonar analysis with using the [sonar-scanner](https://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner)<% if (buildTool) { %> or by using the <% if (buildTool === 'maven') { %>maven<% } %><% if (buildTool === 'gradle') { %>gradle<% } %> plugin<% } %>.
-
-Then, run a Sonar analysis:
-
-<%_ if (buildToolMaven) { _%>
-```
-./mvnw -Pprod clean verify sonar:sonar -Dsonar.login=admin -Dsonar.password=admin
-```
-
-If you need to re-run the Sonar phase, please be sure to specify at least the `initialize` phase since Sonar properties are loaded from the sonar-project.properties file.
-
-```
-./mvnw initialize sonar:sonar -Dsonar.login=admin -Dsonar.password=admin
-```
-<%_ } else if (buildToolGradle) { _%>
-```
-./gradlew -Pprod clean check jacocoTestReport sonarqube -Dsonar.login=admin -Dsonar.password=admin
-```
-<%_ } _%>
-
-Additionally, Instead of passing `sonar.password` and `sonar.login` as CLI arguments, these parameters can be configured from [sonar-project.properties](sonar-project.properties) as shown below:
-
-```
-sonar.login=admin
-sonar.password=admin
-```
-
-For more information, refer to the [Code quality page][].
-
-## Using Docker to simplify development (optional)
-
-You can use Docker to improve your JHipster development experience. A number of docker-compose configuration are available in the [src/main/docker](src/main/docker) folder to launch required third party services.
-
-<%_ if (!databaseTypeNo) { _%>
-For example, to start a <%= prodDatabaseType %> database in a docker container, run:
-
-```
-docker compose -f src/main/docker/<%= prodDatabaseType ?? databaseType %>.yml up -d
-```
-
-To stop it and remove the container, run:
-
-```
-docker compose -f src/main/docker/<%= prodDatabaseType ?? databaseType %>.yml down
-```
-<%_ } _%>
-
-You can also fully dockerize your application and all the services that it depends on.
-To achieve this, first build a docker image of your app by running:
-
-```
-npm run java:docker
-```
-
-Or build a arm64 docker image when using an arm64 processor os like MacOS with M1 processor family running:
-
-```
-npm run java:docker:arm64
-```
-
-Then run:
-
-```
-docker compose -f src/main/docker/app.yml up -d
-```
-
-When running Docker Desktop on MacOS Big Sur or later, consider enabling experimental `Use the new Virtualization framework` for better processing performance ([disk access performance is worse](https://github.com/docker/roadmap/issues/7)).
-
-For more information refer to [Using Docker and Docker-Compose][], this page also contains information on the docker-compose sub-generator (`jhipster docker-compose`), which is able to generate docker configurations for one or several JHipster applications.
-
-## Continuous Integration (optional)
-
-To configure CI for your project, run the ci-cd sub-generator (`jhipster ci-cd`), this will let you generate configuration files for a number of Continuous Integration systems. Consult the [Setting up Continuous Integration][] page for more information.
 
 <& if (fragments.othersSection()) { &>
 ## Others
+
 <&- fragments.othersSection() &>
 <& } &>
 [JHipster Homepage and latest documentation]: <%= DOCUMENTATION_URL %>
-[JHipster <%= jhipsterVersion %> archive]: <%= DOCUMENTATION_ARCHIVE_URL %>
+[JHipster <%= jhipsterVersion %> archive]: <%= documentationArchiveUrl %>
 <%_ if (applicationTypeGateway || applicationTypeMicroservice) { _%>
-[Doing microservices with JHipster]: <%= DOCUMENTATION_ARCHIVE_URL %>/microservices-architecture/
+[Doing microservices with JHipster]: <%= documentationArchiveUrl %>/microservices-architecture/
 <%_ } _%>
-[Using JHipster in development]: <%= DOCUMENTATION_ARCHIVE_URL %>/development/
+[Using JHipster in development]: <%= documentationArchiveUrl %>/development/
 <%_ if (serviceDiscoveryEureka) { _%>
-[Service Discovery and Configuration with the JHipster-Registry]: <%= DOCUMENTATION_ARCHIVE_URL %>/microservices-architecture/#jhipster-registry
+[Service Discovery and Configuration with the JHipster-Registry]: <%= documentationArchiveUrl %>/microservices-architecture/#jhipster-registry
 <%_ } _%>
 <%_ if (serviceDiscoveryConsul) { _%>
-[Service Discovery and Configuration with Consul]: <%= DOCUMENTATION_ARCHIVE_URL %>/microservices-architecture/#consul
+[Service Discovery and Configuration with Consul]: <%= documentationArchiveUrl %>/microservices-architecture/#consul
 <%_ } _%>
-[Using Docker and Docker-Compose]: <%= DOCUMENTATION_ARCHIVE_URL %>/docker-compose
-[Using JHipster in production]: <%= DOCUMENTATION_ARCHIVE_URL %>/production/
-[Running tests page]: <%= DOCUMENTATION_ARCHIVE_URL %>/running-tests/
-[Code quality page]: <%= DOCUMENTATION_ARCHIVE_URL %>/code-quality/
-[Setting up Continuous Integration]: <%= DOCUMENTATION_ARCHIVE_URL %>/setting-up-ci/
+[Using Docker and Docker-Compose]: <%= documentationArchiveUrl %>/docker-compose
+[Using JHipster in production]: <%= documentationArchiveUrl %>/production/
+[Running tests page]: <%= documentationArchiveUrl %>/running-tests/
+[Code quality page]: <%= documentationArchiveUrl %>/code-quality/
+[Setting up Continuous Integration]: <%= documentationArchiveUrl %>/setting-up-ci/
 
 [Node.js]: https://nodejs.org/
 [NPM]: https://www.npmjs.com/
 <&- fragments.referenceSection() &>
-<% if (gatlingTests) { %>[Gatling]: https://gatling.io/<% } %>
-<%_ if (enableSwaggerCodegen) { _%>
-[OpenAPI-Generator]: https://openapi-generator.tech
-[Swagger-Editor]: https://editor.swagger.io
-[Doing API-First development]: <%= DOCUMENTATION_ARCHIVE_URL %>/doing-api-first-development/
-<%_ } _%>
diff --git a/generators/cucumber/files.mts b/generators/cucumber/files.mts
index bd8dd53f4afe..e3ae5cea093f 100644
--- a/generators/cucumber/files.mts
+++ b/generators/cucumber/files.mts
@@ -25,7 +25,7 @@ import { CommonClientServerApplication } from '../base-application/types.mjs';
 const cucumberFiles: WriteFileSection<Generator, CommonClientServerApplication> = {
   cucumberFiles: [
     {
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: [
         // Create Cucumber test files
@@ -35,19 +35,19 @@ const cucumberFiles: WriteFileSection<Generator, CommonClientServerApplication>
       ],
     },
     {
-      path: `${SERVER_TEST_RES_DIR}package/`,
+      path: `${SERVER_TEST_RES_DIR}_package_/`,
       renameTo: (data, filename) => `${data.srcTestResources}${data.packageFolder}${filename}`,
       templates: ['cucumber/gitkeep'],
     },
     {
       condition: generator => generator.generateUserManagement && !generator.databaseTypeMongodb && !generator.databaseTypeCassandra,
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: ['cucumber/stepdefs/UserStepDefs.java'],
     },
     {
       condition: generator => generator.generateUserManagement && !generator.databaseTypeMongodb && !generator.databaseTypeCassandra,
-      path: `${SERVER_TEST_RES_DIR}package/`,
+      path: `${SERVER_TEST_RES_DIR}_package_/`,
       renameTo: (data, filename) => `${data.srcTestResources}${data.packageFolder}${filename}`,
       templates: ['cucumber/user.feature'],
     },
diff --git a/generators/cucumber/generator.mts b/generators/cucumber/generator.mts
index 05727f7da0c5..c5a87b6612ff 100644
--- a/generators/cucumber/generator.mts
+++ b/generators/cucumber/generator.mts
@@ -23,10 +23,13 @@ import cleanupTask from './cleanup.mjs';
 
 export default class CucumberGenerator extends BaseApplicationGenerator {
   async beforeQueue() {
-    await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
     if (!this.fromBlueprint) {
       await this.composeWithBlueprints(GENERATOR_CUCUMBER);
     }
+
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+    }
   }
 
   get writing() {
diff --git a/generators/cucumber/templates/src/test/java/package/cucumber/CucumberIT.java.ejs b/generators/cucumber/templates/src/test/java/_package_/cucumber/CucumberIT.java.ejs
similarity index 100%
rename from generators/cucumber/templates/src/test/java/package/cucumber/CucumberIT.java.ejs
rename to generators/cucumber/templates/src/test/java/_package_/cucumber/CucumberIT.java.ejs
diff --git a/generators/cucumber/templates/src/test/java/package/cucumber/CucumberTestContextConfiguration.java.ejs b/generators/cucumber/templates/src/test/java/_package_/cucumber/CucumberTestContextConfiguration.java.ejs
similarity index 100%
rename from generators/cucumber/templates/src/test/java/package/cucumber/CucumberTestContextConfiguration.java.ejs
rename to generators/cucumber/templates/src/test/java/_package_/cucumber/CucumberTestContextConfiguration.java.ejs
diff --git a/generators/cucumber/templates/src/test/java/package/cucumber/stepdefs/StepDefs.java.ejs b/generators/cucumber/templates/src/test/java/_package_/cucumber/stepdefs/StepDefs.java.ejs
similarity index 100%
rename from generators/cucumber/templates/src/test/java/package/cucumber/stepdefs/StepDefs.java.ejs
rename to generators/cucumber/templates/src/test/java/_package_/cucumber/stepdefs/StepDefs.java.ejs
diff --git a/generators/cucumber/templates/src/test/java/package/cucumber/stepdefs/UserStepDefs.java.ejs b/generators/cucumber/templates/src/test/java/_package_/cucumber/stepdefs/UserStepDefs.java.ejs
similarity index 100%
rename from generators/cucumber/templates/src/test/java/package/cucumber/stepdefs/UserStepDefs.java.ejs
rename to generators/cucumber/templates/src/test/java/_package_/cucumber/stepdefs/UserStepDefs.java.ejs
diff --git a/generators/cucumber/templates/src/test/resources/package/cucumber/gitkeep.ejs b/generators/cucumber/templates/src/test/resources/_package_/cucumber/gitkeep.ejs
similarity index 100%
rename from generators/cucumber/templates/src/test/resources/package/cucumber/gitkeep.ejs
rename to generators/cucumber/templates/src/test/resources/_package_/cucumber/gitkeep.ejs
diff --git a/generators/cucumber/templates/src/test/resources/package/cucumber/user.feature.ejs b/generators/cucumber/templates/src/test/resources/_package_/cucumber/user.feature.ejs
similarity index 100%
rename from generators/cucumber/templates/src/test/resources/package/cucumber/user.feature.ejs
rename to generators/cucumber/templates/src/test/resources/_package_/cucumber/user.feature.ejs
diff --git a/generators/cypress/__snapshots__/generator.spec.mts.snap b/generators/cypress/__snapshots__/generator.spec.mts.snap
index 723c5f343799..b85bd546133d 100644
--- a/generators/cypress/__snapshots__/generator.spec.mts.snap
+++ b/generators/cypress/__snapshots__/generator.spec.mts.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`generator - cypress jwt-cypressAudit(false)-angular-withAdminUi(false)-cypressCoverage(false)-src/ should match generated files snapshot 1`] = `
+exports[`generator - cypress jwt-cypressAudit(false)-angular-withAdminUi(false)-cypressCoverage(false)-clientRoot/ should match generated files snapshot 1`] = `
 {
   ".jhipster/EntityA.json": {
     "stateCleared": "modified",
@@ -8,67 +8,67 @@ exports[`generator - cypress jwt-cypressAudit(false)-angular-withAdminUi(false)-
   ".yo-rc.json": {
     "stateCleared": "modified",
   },
-  "cypress.config.ts": {
+  "clientRoot/cypress.config.ts": {
     "stateCleared": "modified",
   },
-  "package.json": {
+  "clientRoot/package.json": {
     "stateCleared": "modified",
   },
-  "test/cypress/.eslintrc.json": {
+  "clientRoot/src/test/javascript/cypress/.eslintrc.json": {
     "stateCleared": "modified",
   },
-  "test/cypress/e2e/account/login-page.cy.ts": {
+  "clientRoot/src/test/javascript/cypress/e2e/account/login-page.cy.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/e2e/account/password-page.cy.ts": {
+  "clientRoot/src/test/javascript/cypress/e2e/account/password-page.cy.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/e2e/account/register-page.cy.ts": {
+  "clientRoot/src/test/javascript/cypress/e2e/account/register-page.cy.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/e2e/account/reset-password-page.cy.ts": {
+  "clientRoot/src/test/javascript/cypress/e2e/account/reset-password-page.cy.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/e2e/account/settings-page.cy.ts": {
+  "clientRoot/src/test/javascript/cypress/e2e/account/settings-page.cy.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/e2e/administration/administration.cy.ts": {
+  "clientRoot/src/test/javascript/cypress/e2e/administration/administration.cy.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/e2e/entity/entity-a.cy.ts": {
+  "clientRoot/src/test/javascript/cypress/e2e/entity/entity-a.cy.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/fixtures/integration-test.png": {
+  "clientRoot/src/test/javascript/cypress/fixtures/integration-test.png": {
     "stateCleared": "modified",
   },
-  "test/cypress/plugins/index.ts": {
+  "clientRoot/src/test/javascript/cypress/plugins/index.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/support/account.ts": {
+  "clientRoot/src/test/javascript/cypress/support/account.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/support/commands.ts": {
+  "clientRoot/src/test/javascript/cypress/support/commands.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/support/entity.ts": {
+  "clientRoot/src/test/javascript/cypress/support/entity.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/support/index.ts": {
+  "clientRoot/src/test/javascript/cypress/support/index.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/support/management.ts": {
+  "clientRoot/src/test/javascript/cypress/support/management.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/support/navbar.ts": {
+  "clientRoot/src/test/javascript/cypress/support/navbar.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/tsconfig.json": {
+  "clientRoot/src/test/javascript/cypress/tsconfig.json": {
     "stateCleared": "modified",
   },
 }
 `;
 
-exports[`generator - cypress jwt-cypressAudit(true)-vue-withAdminUi(true)-cypressCoverage(true)-src/ should match generated files snapshot 1`] = `
+exports[`generator - cypress jwt-cypressAudit(true)-vue-withAdminUi(true)-cypressCoverage(true)-clientRoot/ should match generated files snapshot 1`] = `
 {
   ".jhipster/EntityA.json": {
     "stateCleared": "modified",
@@ -76,70 +76,70 @@ exports[`generator - cypress jwt-cypressAudit(true)-vue-withAdminUi(true)-cypres
   ".yo-rc.json": {
     "stateCleared": "modified",
   },
-  "cypress-audits.config.ts": {
+  "clientRoot/cypress-audits.config.ts": {
     "stateCleared": "modified",
   },
-  "cypress.config.ts": {
+  "clientRoot/cypress.config.ts": {
     "stateCleared": "modified",
   },
-  "package.json": {
+  "clientRoot/package.json": {
     "stateCleared": "modified",
   },
-  "test/cypress/.eslintrc.json": {
+  "clientRoot/src/test/javascript/cypress/.eslintrc.json": {
     "stateCleared": "modified",
   },
-  "test/cypress/e2e/account/login-page.cy.ts": {
+  "clientRoot/src/test/javascript/cypress/e2e/account/login-page.cy.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/e2e/account/password-page.cy.ts": {
+  "clientRoot/src/test/javascript/cypress/e2e/account/password-page.cy.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/e2e/account/register-page.cy.ts": {
+  "clientRoot/src/test/javascript/cypress/e2e/account/register-page.cy.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/e2e/account/reset-password-page.cy.ts": {
+  "clientRoot/src/test/javascript/cypress/e2e/account/reset-password-page.cy.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/e2e/account/settings-page.cy.ts": {
+  "clientRoot/src/test/javascript/cypress/e2e/account/settings-page.cy.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/e2e/administration/administration.cy.ts": {
+  "clientRoot/src/test/javascript/cypress/e2e/administration/administration.cy.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/e2e/entity/entity-a.cy.ts": {
+  "clientRoot/src/test/javascript/cypress/e2e/entity/entity-a.cy.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/e2e/lighthouse.audits.ts": {
+  "clientRoot/src/test/javascript/cypress/e2e/lighthouse.audits.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/fixtures/integration-test.png": {
+  "clientRoot/src/test/javascript/cypress/fixtures/integration-test.png": {
     "stateCleared": "modified",
   },
-  "test/cypress/plugins/global.d.ts": {
+  "clientRoot/src/test/javascript/cypress/plugins/global.d.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/plugins/index.ts": {
+  "clientRoot/src/test/javascript/cypress/plugins/index.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/support/account.ts": {
+  "clientRoot/src/test/javascript/cypress/support/account.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/support/commands.ts": {
+  "clientRoot/src/test/javascript/cypress/support/commands.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/support/entity.ts": {
+  "clientRoot/src/test/javascript/cypress/support/entity.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/support/index.ts": {
+  "clientRoot/src/test/javascript/cypress/support/index.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/support/management.ts": {
+  "clientRoot/src/test/javascript/cypress/support/management.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/support/navbar.ts": {
+  "clientRoot/src/test/javascript/cypress/support/navbar.ts": {
     "stateCleared": "modified",
   },
-  "test/cypress/tsconfig.json": {
+  "clientRoot/src/test/javascript/cypress/tsconfig.json": {
     "stateCleared": "modified",
   },
 }
@@ -198,7 +198,7 @@ exports[`generator - cypress oauth2-cypressAudit(false)-angular-withAdminUi(fals
 }
 `;
 
-exports[`generator - cypress oauth2-cypressAudit(true)-vue-withAdminUi(true)-cypressCoverage(true)-src/main/webapp2/ should match generated files snapshot 1`] = `
+exports[`generator - cypress oauth2-cypressAudit(true)-vue-withAdminUi(true)-cypressCoverage(true)- should match generated files snapshot 1`] = `
 {
   ".jhipster/EntityA.json": {
     "stateCleared": "modified",
@@ -215,46 +215,46 @@ exports[`generator - cypress oauth2-cypressAudit(true)-vue-withAdminUi(true)-cyp
   "package.json": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/.eslintrc.json": {
+  "src/test/javascript/cypress/.eslintrc.json": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/e2e/administration/administration.cy.ts": {
+  "src/test/javascript/cypress/e2e/administration/administration.cy.ts": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/e2e/entity/entity-a.cy.ts": {
+  "src/test/javascript/cypress/e2e/entity/entity-a.cy.ts": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/e2e/lighthouse.audits.ts": {
+  "src/test/javascript/cypress/e2e/lighthouse.audits.ts": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/fixtures/integration-test.png": {
+  "src/test/javascript/cypress/fixtures/integration-test.png": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/plugins/global.d.ts": {
+  "src/test/javascript/cypress/plugins/global.d.ts": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/plugins/index.ts": {
+  "src/test/javascript/cypress/plugins/index.ts": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/support/commands.ts": {
+  "src/test/javascript/cypress/support/commands.ts": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/support/entity.ts": {
+  "src/test/javascript/cypress/support/entity.ts": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/support/index.ts": {
+  "src/test/javascript/cypress/support/index.ts": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/support/management.ts": {
+  "src/test/javascript/cypress/support/management.ts": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/support/navbar.ts": {
+  "src/test/javascript/cypress/support/navbar.ts": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/support/oauth2.ts": {
+  "src/test/javascript/cypress/support/oauth2.ts": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/tsconfig.json": {
+  "src/test/javascript/cypress/tsconfig.json": {
     "stateCleared": "modified",
   },
 }
@@ -262,11 +262,10 @@ exports[`generator - cypress oauth2-cypressAudit(true)-vue-withAdminUi(true)-cyp
 
 exports[`generator - cypress samples matrix should match snapshot 1`] = `
 {
-  "jwt-cypressAudit(false)-angular-withAdminUi(false)-cypressCoverage(false)-src/": {
+  "jwt-cypressAudit(false)-angular-withAdminUi(false)-cypressCoverage(false)-clientRoot/": {
     "authenticationType": "jwt",
     "clientFramework": "angular",
-    "clientSrcDir": "src/",
-    "clientTestDir": "test/",
+    "clientRootDir": "clientRoot/",
     "cypressAudit": false,
     "cypressCoverage": false,
     "testFrameworks": [
@@ -274,11 +273,10 @@ exports[`generator - cypress samples matrix should match snapshot 1`] = `
     ],
     "withAdminUi": false,
   },
-  "jwt-cypressAudit(true)-vue-withAdminUi(true)-cypressCoverage(true)-src/": {
+  "jwt-cypressAudit(true)-vue-withAdminUi(true)-cypressCoverage(true)-clientRoot/": {
     "authenticationType": "jwt",
     "clientFramework": "vue",
-    "clientSrcDir": "src/",
-    "clientTestDir": "test/",
+    "clientRootDir": "clientRoot/",
     "cypressAudit": true,
     "cypressCoverage": true,
     "testFrameworks": [
@@ -289,7 +287,7 @@ exports[`generator - cypress samples matrix should match snapshot 1`] = `
   "oauth2-cypressAudit(false)-angular-withAdminUi(false)-cypressCoverage(false)": {
     "authenticationType": "oauth2",
     "clientFramework": "angular",
-    "clientSrcDir": undefined,
+    "clientRootDir": undefined,
     "cypressAudit": false,
     "cypressCoverage": false,
     "testFrameworks": [
@@ -297,11 +295,10 @@ exports[`generator - cypress samples matrix should match snapshot 1`] = `
     ],
     "withAdminUi": false,
   },
-  "oauth2-cypressAudit(true)-vue-withAdminUi(true)-cypressCoverage(true)-src/main/webapp2/": {
+  "oauth2-cypressAudit(true)-vue-withAdminUi(true)-cypressCoverage(true)-": {
     "authenticationType": "oauth2",
     "clientFramework": "vue",
-    "clientSrcDir": "src/main/webapp2/",
-    "clientTestDir": "src/test/javascript2/",
+    "clientRootDir": "",
     "cypressAudit": true,
     "cypressCoverage": true,
     "testFrameworks": [
@@ -309,11 +306,10 @@ exports[`generator - cypress samples matrix should match snapshot 1`] = `
     ],
     "withAdminUi": true,
   },
-  "session-cypressAudit(false)-angular-withAdminUi(false)-cypressCoverage(false)-src/main/webapp2/": {
+  "session-cypressAudit(false)-angular-withAdminUi(false)-cypressCoverage(false)-": {
     "authenticationType": "session",
     "clientFramework": "angular",
-    "clientSrcDir": "src/main/webapp2/",
-    "clientTestDir": "src/test/javascript2/",
+    "clientRootDir": "",
     "cypressAudit": false,
     "cypressCoverage": false,
     "testFrameworks": [
@@ -324,7 +320,7 @@ exports[`generator - cypress samples matrix should match snapshot 1`] = `
   "session-cypressAudit(true)-vue-withAdminUi(true)-cypressCoverage(true)": {
     "authenticationType": "session",
     "clientFramework": "vue",
-    "clientSrcDir": undefined,
+    "clientRootDir": undefined,
     "cypressAudit": true,
     "cypressCoverage": true,
     "testFrameworks": [
@@ -335,7 +331,7 @@ exports[`generator - cypress samples matrix should match snapshot 1`] = `
 }
 `;
 
-exports[`generator - cypress session-cypressAudit(false)-angular-withAdminUi(false)-cypressCoverage(false)-src/main/webapp2/ should match generated files snapshot 1`] = `
+exports[`generator - cypress session-cypressAudit(false)-angular-withAdminUi(false)-cypressCoverage(false)- should match generated files snapshot 1`] = `
 {
   ".jhipster/EntityA.json": {
     "stateCleared": "modified",
@@ -349,55 +345,55 @@ exports[`generator - cypress session-cypressAudit(false)-angular-withAdminUi(fal
   "package.json": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/.eslintrc.json": {
+  "src/test/javascript/cypress/.eslintrc.json": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/e2e/account/login-page.cy.ts": {
+  "src/test/javascript/cypress/e2e/account/login-page.cy.ts": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/e2e/account/password-page.cy.ts": {
+  "src/test/javascript/cypress/e2e/account/password-page.cy.ts": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/e2e/account/register-page.cy.ts": {
+  "src/test/javascript/cypress/e2e/account/register-page.cy.ts": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/e2e/account/reset-password-page.cy.ts": {
+  "src/test/javascript/cypress/e2e/account/reset-password-page.cy.ts": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/e2e/account/settings-page.cy.ts": {
+  "src/test/javascript/cypress/e2e/account/settings-page.cy.ts": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/e2e/administration/administration.cy.ts": {
+  "src/test/javascript/cypress/e2e/administration/administration.cy.ts": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/e2e/entity/entity-a.cy.ts": {
+  "src/test/javascript/cypress/e2e/entity/entity-a.cy.ts": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/fixtures/integration-test.png": {
+  "src/test/javascript/cypress/fixtures/integration-test.png": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/plugins/index.ts": {
+  "src/test/javascript/cypress/plugins/index.ts": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/support/account.ts": {
+  "src/test/javascript/cypress/support/account.ts": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/support/commands.ts": {
+  "src/test/javascript/cypress/support/commands.ts": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/support/entity.ts": {
+  "src/test/javascript/cypress/support/entity.ts": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/support/index.ts": {
+  "src/test/javascript/cypress/support/index.ts": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/support/management.ts": {
+  "src/test/javascript/cypress/support/management.ts": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/support/navbar.ts": {
+  "src/test/javascript/cypress/support/navbar.ts": {
     "stateCleared": "modified",
   },
-  "src/test/javascript2/cypress/tsconfig.json": {
+  "src/test/javascript/cypress/tsconfig.json": {
     "stateCleared": "modified",
   },
 }
diff --git a/generators/cypress/files.mts b/generators/cypress/files.mts
index e5d141ed5a2f..4eb201cf37dc 100644
--- a/generators/cypress/files.mts
+++ b/generators/cypress/files.mts
@@ -23,14 +23,18 @@ import type CypressGenerator from './generator.mjs';
 import type { CypressApplication } from './types.mjs';
 import { type Entity } from '../base-application/index.mjs';
 import type { CommonClientServerApplication } from '../base-application/types.mjs';
+import { clientRootTemplatesBlock } from '../client/support/index.mjs';
 
 const CYPRESS_TEMPLATE_SOURCE_DIR = `${CLIENT_TEST_SRC_DIR}cypress/`;
 
 export const cypressFiles: WriteFileSection<CypressGenerator, CommonClientServerApplication> = {
   common: [
     {
-      templates: ['cypress.config.ts', 'README.md.jhi.cypress'],
+      templates: ['README.md.jhi.cypress'],
     },
+    clientRootTemplatesBlock({
+      templates: ['cypress.config.ts'],
+    }),
   ],
   clientTestFw: [
     {
@@ -81,10 +85,10 @@ export const cypressFiles: WriteFileSection<CypressGenerator, CommonClientServer
       renameTo: (ctx, file) => `${ctx.cypressDir}${file}`,
       templates: ['e2e/lighthouse.audits.ts'],
     },
-    {
+    clientRootTemplatesBlock({
       condition: generator => generator.cypressAudit,
       templates: ['cypress-audits.config.ts'],
-    },
+    }),
   ],
   coverage: [
     {
diff --git a/generators/cypress/generator.mts b/generators/cypress/generator.mts
index 23b24cced489..80320ffc1b1a 100644
--- a/generators/cypress/generator.mts
+++ b/generators/cypress/generator.mts
@@ -30,11 +30,14 @@ const { ANGULAR } = clientFrameworkTypes;
 
 export default class CypressGenerator extends BaseApplicationGenerator {
   async beforeQueue() {
-    // TODO depend on GENERATOR_BOOTSTRAP_APPLICATION_CLIENT.
-    await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
     if (!this.fromBlueprint) {
       await this.composeWithBlueprints(GENERATOR_CYPRESS);
     }
+
+    if (!this.delegateToBlueprint) {
+      // TODO depend on GENERATOR_BOOTSTRAP_APPLICATION_CLIENT.
+      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+    }
   }
 
   get prompting() {
@@ -182,7 +185,8 @@ export default class CypressGenerator extends BaseApplicationGenerator {
       },
 
       configure({ application }) {
-        this.packageJson.merge({
+        const clientPackageJson = this.createStorage(this.destinationPath(application.clientRootDir!, 'package.json'));
+        clientPackageJson.merge({
           devDependencies: {
             'eslint-plugin-cypress': application.nodeDependencies['eslint-plugin-cypress'],
           },
@@ -199,7 +203,8 @@ export default class CypressGenerator extends BaseApplicationGenerator {
 
       configureAudits({ application }) {
         if (!application.cypressAudit) return;
-        this.packageJson.merge({
+        const clientPackageJson = this.createStorage(this.destinationPath(application.clientRootDir!, 'package.json'));
+        clientPackageJson.merge({
           devDependencies: {
             lighthouse: application.nodeDependencies.lighthouse,
             'cypress-audit': application.nodeDependencies['cypress-audit'],
@@ -216,7 +221,8 @@ export default class CypressGenerator extends BaseApplicationGenerator {
       configureCoverage({ application, source }) {
         const { cypressCoverage, clientFrameworkAngular, dasherizedBaseName } = application;
         if (!cypressCoverage) return;
-        this.packageJson.merge({
+        const clientPackageJson = this.createStorage(this.destinationPath(application.clientRootDir!, 'package.json'));
+        clientPackageJson.merge({
           devDependencies: {
             '@cypress/code-coverage': application.nodeDependencies['@cypress/code-coverage'],
             'babel-loader': application.nodeDependencies['babel-loader'],
@@ -225,7 +231,7 @@ export default class CypressGenerator extends BaseApplicationGenerator {
           },
           scripts: {
             'clean-coverage': 'rimraf .nyc_output coverage',
-            'pree2e:cypress:coverage': 'npm run clean coverage && npm run ci:server:await',
+            'pree2e:cypress:coverage': 'npm run clean-coverage && npm run ci:server:await',
             'e2e:cypress:coverage': 'npm run e2e:cypress:headed',
             'poste2e:cypress:coverage': 'nyc report',
             'prewebapp:instrumenter': 'npm run clean-www && npm run clean-coverage',
diff --git a/generators/cypress/generator.spec.mts b/generators/cypress/generator.spec.mts
index b72f865b2c22..ad2ac6a1237e 100644
--- a/generators/cypress/generator.spec.mts
+++ b/generators/cypress/generator.spec.mts
@@ -30,7 +30,6 @@ import {
 } from '../../test/support/index.mjs';
 import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.mjs';
 import Generator from './generator.mjs';
-import { CLIENT_TEST_SRC_DIR } from '../generator-constants.mjs';
 import { GENERATOR_CYPRESS } from '../generator-list.mjs';
 
 const { CYPRESS } = testFrameworkTypes;
@@ -53,11 +52,7 @@ const e2eMatrix = extendMatrix(
     clientFramework: [ANGULAR, REACT, VUE],
     withAdminUi: [false, true],
     cypressCoverage: [false, true],
-    clientSrcDir: [
-      undefined,
-      { value: 'src/', additional: { clientTestDir: 'test/' } },
-      { value: 'src/main/webapp2/', additional: { clientTestDir: 'src/test/javascript2/' } },
-    ],
+    clientRootDir: [undefined, { value: 'clientRoot/' }, { value: '' }],
   },
 );
 
@@ -108,7 +103,7 @@ describe(`generator - ${generator}`, () => {
       });
 
       describe('withAdminUi', () => {
-        const { applicationType, withAdminUi, clientTestDir = CLIENT_TEST_SRC_DIR } = sampleConfig;
+        const { applicationType, withAdminUi, clientRootDir = '' } = sampleConfig;
         const generateAdminUi = applicationType !== 'microservice' && withAdminUi;
 
         if (applicationType !== 'microservice') {
@@ -118,7 +113,7 @@ describe(`generator - ${generator}`, () => {
               generateAdminUi ? runResult.assertFileContent(...args) : runResult.assertNoFileContent(...args);
 
             assertion(
-              `${clientTestDir}cypress/e2e/administration/administration.cy.ts`,
+              `${clientRootDir}src/test/javascript/cypress/e2e/administration/administration.cy.ts`,
               '  metricsPageHeadingSelector,\n' +
                 '  healthPageHeadingSelector,\n' +
                 '  logsPageHeadingSelector,\n' +
@@ -126,7 +121,7 @@ describe(`generator - ${generator}`, () => {
             );
 
             assertion(
-              `${clientTestDir}cypress/e2e/administration/administration.cy.ts`,
+              `${clientRootDir}src/test/javascript/cypress/e2e/administration/administration.cy.ts`,
               "  describe('/metrics', () => {\n" +
                 "    it('should load the page', () => {\n" +
                 "      cy.clickOnAdminMenuItem('metrics');\n" +
@@ -157,7 +152,7 @@ describe(`generator - ${generator}`, () => {
             );
 
             assertion(
-              `${clientTestDir}cypress/support/commands.ts`,
+              `${clientRootDir}src/test/javascript/cypress/support/commands.ts`,
               'export const metricsPageHeadingSelector = \'[data-cy="metricsPageHeading"]\';\n' +
                 'export const healthPageHeadingSelector = \'[data-cy="healthPageHeading"]\';\n' +
                 'export const logsPageHeadingSelector = \'[data-cy="logsPageHeading"]\';\n' +
diff --git a/generators/cypress/templates/cypress.config.ts.ejs b/generators/cypress/templates/cypress.config.ts.ejs
index 9f230b9464c8..9a1d2bd66250 100644
--- a/generators/cypress/templates/cypress.config.ts.ejs
+++ b/generators/cypress/templates/cypress.config.ts.ejs
@@ -20,10 +20,10 @@ import { defineConfig } from 'cypress';
 
 export default defineConfig({
   video: false,
-  fixturesFolder: '<%= cypressDir %>fixtures',
-  screenshotsFolder: '<%= cypressTemporaryDir %>screenshots',
-  downloadsFolder: '<%= cypressTemporaryDir %>downloads',
-  videosFolder: '<%= cypressTemporaryDir %>videos',
+  fixturesFolder: '<%= this.relativeDir(clientRootDir, cypressDir) %>fixtures',
+  screenshotsFolder: '<%= this.relativeDir(clientRootDir, cypressTemporaryDir) %>screenshots',
+  downloadsFolder: '<%= this.relativeDir(clientRootDir, cypressTemporaryDir) %>downloads',
+  videosFolder: '<%= this.relativeDir(clientRootDir, cypressTemporaryDir) %>videos',
   chromeWebSecurity: true,
   viewportWidth: 1200,
   viewportHeight: 720,
@@ -45,11 +45,12 @@ export default defineConfig({
     // We've imported your old cypress plugins here.
     // You may want to clean this up later by importing these.
     async setupNodeEvents(on, config) {
-      return (await import('./<%= cypressDir %>plugins/index')).default(on, config);
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+      return (await import('./<%= this.relativeDir(clientRootDir, cypressDir) %>plugins/index')).default(on, config);
     },
     baseUrl: 'http://localhost:<%= gatewayServerPort || serverPort %>/',
-    specPattern: '<%= cypressDir %>e2e/**/*.cy.ts',
-    supportFile: '<%= cypressDir %>support/index.ts',
+    specPattern: '<%= this.relativeDir(clientRootDir, cypressDir) %>e2e/**/*.cy.ts',
+    supportFile: '<%= this.relativeDir(clientRootDir, cypressDir) %>support/index.ts',
     experimentalRunAllSpecs: true,
   },
 });
diff --git a/generators/cypress/templates/src/test/javascript/cypress/e2e/account/login-page.cy.ts.ejs b/generators/cypress/templates/src/test/javascript/cypress/e2e/account/login-page.cy.ts.ejs
index a06e7eb44388..66d961a3fa6d 100644
--- a/generators/cypress/templates/src/test/javascript/cypress/e2e/account/login-page.cy.ts.ejs
+++ b/generators/cypress/templates/src/test/javascript/cypress/e2e/account/login-page.cy.ts.ejs
@@ -40,6 +40,13 @@ describe('login modal', () => {
   it('greets with signin', () => {
     cy.get(titleLoginSelector).should('be.visible');
   });
+<%_ if (clientFrameworkAngular) { _%>
+
+  it('greets visiting /login directly', () => {
+    cy.visit('/login');
+    cy.get(titleLoginSelector).should('be.visible');
+  });
+<%_ } _%>
 
   it('requires username', () => {
     cy.get(passwordLoginSelector).type('a-password');
diff --git a/generators/cypress/templates/src/test/javascript/cypress/tsconfig.json.ejs b/generators/cypress/templates/src/test/javascript/cypress/tsconfig.json.ejs
index fde48fdc8f63..d6fb8579666f 100644
--- a/generators/cypress/templates/src/test/javascript/cypress/tsconfig.json.ejs
+++ b/generators/cypress/templates/src/test/javascript/cypress/tsconfig.json.ejs
@@ -20,14 +20,14 @@
 <%_ if (clientFrameworkVue) { _%>
   "extends": "@vue/tsconfig/tsconfig.dom.json",
 <%_ } else { _%>
-  "extends": "../../../../tsconfig.json",
+  "extends": "<%= this.relativeDir(cypressDir, clientRootDir) %>tsconfig.json",
 <%_ } _%>
   "compilerOptions": {
     "baseUrl": "./",
     "sourceMap": false,
-    "outDir": "../../../../<%= cypressTemporaryDir %>out-tsc",
+    "outDir": "<%- this.relativeDir(cypressDir, temporaryDir) %>cypress/tsc",
     "target": "es2018",
     "types": ["cypress", "node"]
   },
-  "include": ["./../../../../cypress*.config.ts", "./**/*.ts"]
+  "include": ["./<%= this.relativeDir(cypressDir, clientRootDir) %>cypress*.config.ts", "./**/*.ts"]
 }
diff --git a/generators/docker-compose/generator.mjs b/generators/docker-compose/generator.mjs
index 253ec2523204..9fe114b92c7f 100644
--- a/generators/docker-compose/generator.mjs
+++ b/generators/docker-compose/generator.mjs
@@ -19,11 +19,9 @@
 import { existsSync } from 'fs';
 import pathjs from 'path';
 import chalk from 'chalk';
-import shelljs from 'shelljs';
 import jsyaml from 'js-yaml';
 import normalize from 'normalize-path';
-import runAsync from 'run-async';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 
 import BaseWorkspacesGenerator from '../base-workspaces/index.mjs';
 
@@ -73,36 +71,31 @@ export default class DockerComposeGenerator extends BaseWorkspacesGenerator {
         this.parseJHipsterOptions(command.options);
       },
       checkDocker,
-      checkDockerCompose: runAsync(function () {
+      async checkDockerCompose() {
         if (this.skipChecks) return;
 
-        const done = this.async();
-
-        shelljs.exec('docker compose version', { silent: true }, (code, stdout, stderr) => {
-          if (stderr) {
-            this.log.error(
-              chalk.red(
-                'Docker Compose 1.6.0 or later is not installed on your computer.\n' +
-                  '         Read https://docs.docker.com/compose/install/\n',
-              ),
-            );
-          } else {
-            const composeVersion = stdout.split(' ')[2].replace(/,/g, '');
-            const composeVersionMajor = composeVersion.split('.')[0];
-            const composeVersionMinor = composeVersion.split('.')[1];
-            if (composeVersionMajor < 1 || (composeVersionMajor === 1 && composeVersionMinor < 6)) {
-              this.log.error(
-                chalk.red(
-                  `$Docker Compose version 1.6.0 or later is not installed on your computer.
+        const { stdout, exitCode } = await this.spawnCommand('docker compose version', { reject: false, stdio: 'pipe' });
+        if (exitCode !== 0) {
+          this.log.error(
+            chalk.red(
+              'Docker Compose 1.6.0 or later is not installed on your computer.\n' +
+                '         Read https://docs.docker.com/compose/install/\n',
+            ),
+          );
+        }
+        const composeVersion = stdout.split(' ')[2].replace(/,/g, '');
+        const composeVersionMajor = composeVersion.split('.')[0];
+        const composeVersionMinor = composeVersion.split('.')[1];
+        if (composeVersionMajor < 1 || (composeVersionMajor === 1 && composeVersionMinor < 6)) {
+          this.log.error(
+            chalk.red(
+              `$Docker Compose version 1.6.0 or later is not installed on your computer.
                                              Docker Compose version found: ${composeVersion}
                                              Read https://docs.docker.com/compose/install`,
-                ),
-              );
-            }
-          }
-          done();
-        });
-      }),
+            ),
+          );
+        }
+      },
     };
   }
 
diff --git a/generators/docker/__snapshots__/generator.spec.mts.snap b/generators/docker/__snapshots__/generator.spec.mts.snap
index dd420f23b284..3e7ac935694c 100644
--- a/generators/docker/__snapshots__/generator.spec.mts.snap
+++ b/generators/docker/__snapshots__/generator.spec.mts.snap
@@ -473,14 +473,14 @@ services:
     extends:
       file: ./mssql.yml
       service: mssql
-  memcached:
-    extends:
-      file: ./memcached.yml
-      service: memcached
   keycloak:
     extends:
       file: ./keycloak.yml
       service: keycloak
+  memcached:
+    extends:
+      file: ./memcached.yml
+      service: memcached
 ",
     "stateCleared": "modified",
   },
@@ -602,6 +602,10 @@ services:
     extends:
       file: ./keycloak.yml
       service: keycloak
+  pulsar:
+    extends:
+      file: ./pulsar.yml
+      service: pulsar
   consul:
     extends:
       file: ./consul.yml
@@ -610,10 +614,6 @@ services:
     extends:
       file: ./consul.yml
       service: consul-config-loader
-  pulsar:
-    extends:
-      file: ./pulsar.yml
-      service: pulsar
 ",
     "stateCleared": "modified",
   },
@@ -1088,6 +1088,10 @@ services:
     extends:
       file: ./keycloak.yml
       service: keycloak
+  pulsar:
+    extends:
+      file: ./pulsar.yml
+      service: pulsar
   consul:
     extends:
       file: ./consul.yml
@@ -1096,10 +1100,6 @@ services:
     extends:
       file: ./consul.yml
       service: consul-config-loader
-  pulsar:
-    extends:
-      file: ./pulsar.yml
-      service: pulsar
 ",
     "stateCleared": "modified",
   },
@@ -1216,14 +1216,14 @@ services:
     extends:
       file: ./mysql.yml
       service: mysql
-  redis:
-    extends:
-      file: ./redis.yml
-      service: redis
   pulsar:
     extends:
       file: ./pulsar.yml
       service: pulsar
+  redis:
+    extends:
+      file: ./redis.yml
+      service: redis
 ",
     "stateCleared": "modified",
   },
diff --git a/generators/docker/__test-support/service-discovery-matcher.mts b/generators/docker/__test-support/service-discovery-matcher.mts
index c6ff2dc5076d..ee67f91e1b7e 100644
--- a/generators/docker/__test-support/service-discovery-matcher.mts
+++ b/generators/docker/__test-support/service-discovery-matcher.mts
@@ -1,13 +1,13 @@
 import type { RunResult } from 'yeoman-test';
 
-import { DOCKER_DIR } from '../../generator-constants.mjs';
+import { JAVA_DOCKER_DIR } from '../../generator-constants.mjs';
 import { matchWrittenConfig, matchWrittenFiles } from '../../../test/support/matcher.mjs';
 
 const expectedEurekaFiles = () => {
   return [
-    `${DOCKER_DIR}central-server-config/localhost-config/application.yml`,
-    `${DOCKER_DIR}central-server-config/docker-config/application.yml`,
-    `${DOCKER_DIR}jhipster-registry.yml`,
+    `${JAVA_DOCKER_DIR}central-server-config/localhost-config/application.yml`,
+    `${JAVA_DOCKER_DIR}central-server-config/docker-config/application.yml`,
+    `${JAVA_DOCKER_DIR}jhipster-registry.yml`,
   ];
 };
 
@@ -18,7 +18,11 @@ const desiredEurekaConfig = {
 };
 
 const expectedConsulFiles = () => {
-  return [`${DOCKER_DIR}central-server-config/application.yml`, `${DOCKER_DIR}consul.yml`, `${DOCKER_DIR}config/git2consul.json`];
+  return [
+    `${JAVA_DOCKER_DIR}central-server-config/application.yml`,
+    `${JAVA_DOCKER_DIR}consul.yml`,
+    `${JAVA_DOCKER_DIR}config/git2consul.json`,
+  ];
 };
 
 const desiredConsulConfig = {
diff --git a/generators/docker/files.mjs b/generators/docker/files.mjs
index dd8a6e2e5280..59641fd7252e 100644
--- a/generators/docker/files.mjs
+++ b/generators/docker/files.mjs
@@ -1,42 +1,55 @@
-import { DOCKER_DIR } from '../generator-constants.mjs';
+import { TEMPLATES_DOCKER_DIR } from '../generator-constants.mjs';
+
+const renameTo = (ctx, filepath) => `${ctx.dockerServicesDir}${filepath}`.replace('/_eureka_', '').replace('/_consul_', '');
 
 // eslint-disable-next-line import/prefer-default-export
 export const dockerFiles = {
   sqlDatabasesFiles: [
     {
-      condition: ctx => ctx.databaseTypeSql && !ctx.prodDatabaseTypeOracle,
-      path: DOCKER_DIR,
-      templates: [{ file: ctx => `${ctx.prodDatabaseType}.yml` }],
+      condition: ctx => ctx.dockerServices.some(service => ['postgresql', 'mariadb', 'mysql', 'mssql'].includes(service)),
+      templates: [
+        {
+          sourceFile: ctx => `${TEMPLATES_DOCKER_DIR}${ctx.prodDatabaseType}.yml`,
+          destinationFile: ctx => `${ctx.dockerServicesDir}${ctx.prodDatabaseType}.yml`,
+        },
+      ],
     },
     {
-      condition: ctx => ctx.prodDatabaseTypeMysql,
-      path: DOCKER_DIR,
-      templates: [{ file: 'config/mysql/my.cnf', noEjs: true }],
+      condition: ctx => ctx.dockerServices.includes('mysql'),
+      path: TEMPLATES_DOCKER_DIR,
+      renameTo,
+      transform: false,
+      templates: ['config/mysql/my.cnf'],
     },
     {
-      condition: ctx => ctx.prodDatabaseTypeMariadb,
-      path: DOCKER_DIR,
-      templates: [{ file: 'config/mariadb/my.cnf', noEjs: true }],
+      condition: ctx => ctx.dockerServices.includes('mariadb'),
+      path: TEMPLATES_DOCKER_DIR,
+      renameTo,
+      transform: false,
+      templates: ['config/mariadb/my.cnf'],
     },
   ],
   couchbaseFiles: [
     {
-      condition: ctx => ctx.databaseTypeCouchbase,
-      path: DOCKER_DIR,
+      condition: ctx => ctx.dockerServices.includes('couchbase'),
+      path: TEMPLATES_DOCKER_DIR,
+      renameTo,
       templates: ['couchbase.yml', 'couchbase-cluster.yml', 'couchbase/Couchbase.Dockerfile', 'couchbase/scripts/configure-node.sh'],
     },
   ],
   mongodbFiles: [
     {
-      condition: ctx => ctx.databaseTypeMongodb,
-      path: DOCKER_DIR,
+      condition: ctx => ctx.dockerServices.includes('mongodb'),
+      path: TEMPLATES_DOCKER_DIR,
+      renameTo,
       templates: ['mongodb.yml', 'mongodb-cluster.yml', 'mongodb/MongoDB.Dockerfile', 'mongodb/scripts/init_replicaset.js'],
     },
   ],
   cassandraFiles: [
     {
-      condition: ctx => ctx.databaseTypeCassandra,
-      path: DOCKER_DIR,
+      condition: ctx => ctx.dockerServices.includes('cassandra'),
+      path: TEMPLATES_DOCKER_DIR,
+      renameTo,
       templates: [
         // docker-compose files
         'cassandra.yml',
@@ -52,112 +65,121 @@ export const dockerFiles = {
   ],
   neo4jFiles: [
     {
-      condition: ctx => ctx.databaseTypeNeo4j,
-      path: DOCKER_DIR,
+      condition: ctx => ctx.dockerServices.includes('neo4j'),
+      path: TEMPLATES_DOCKER_DIR,
+      renameTo,
       templates: ['neo4j.yml'],
     },
   ],
   cacheProvideFiles: [
     {
-      condition: generator => generator.cacheProviderHazelcast,
-      path: DOCKER_DIR,
+      condition: generator => generator.dockerServices.includes('hazelcast'),
+      path: TEMPLATES_DOCKER_DIR,
+      renameTo,
       templates: ['hazelcast-management-center.yml'],
     },
     {
-      condition: generator => generator.cacheProviderMemcached,
-      path: DOCKER_DIR,
+      condition: generator => generator.dockerServices.includes('memcached'),
+      path: TEMPLATES_DOCKER_DIR,
+      renameTo,
       templates: ['memcached.yml'],
     },
     {
-      condition: generator => generator.cacheProviderRedis,
-      path: DOCKER_DIR,
+      condition: generator => generator.dockerServices.includes('redis'),
+      path: TEMPLATES_DOCKER_DIR,
+      renameTo,
       templates: ['redis.yml', 'redis-cluster.yml', 'redis/Redis-Cluster.Dockerfile', 'redis/connectRedisCluster.sh'],
     },
   ],
   searchDiscoveryFiles: [
     {
       condition: generator => generator.serviceDiscoveryAny,
-      path: DOCKER_DIR,
-      templates: [{ file: 'config/README.md', renameTo: () => 'central-server-config/README.md' }],
+      path: TEMPLATES_DOCKER_DIR,
+      renameTo,
+      templates: ['central-server-config/README.md'],
     },
     {
-      condition: generator => generator.serviceDiscoveryConsul,
-      path: DOCKER_DIR,
-      templates: [
-        'consul.yml',
-        'config/git2consul.json',
-        { file: 'config/consul-config/application.yml', renameTo: () => 'central-server-config/application.yml' },
-      ],
+      condition: generator => generator.dockerServices.includes('consul'),
+      path: TEMPLATES_DOCKER_DIR,
+      renameTo,
+      templates: ['consul.yml', 'config/git2consul.json', 'central-server-config/_consul_/application.yml'],
     },
     {
-      condition: generator => generator.serviceDiscoveryEureka,
-      path: DOCKER_DIR,
+      condition: generator => generator.dockerServices.includes('eureka'),
+      path: TEMPLATES_DOCKER_DIR,
+      renameTo,
       templates: [
         'jhipster-registry.yml',
-        {
-          file: 'config/docker-config/application.yml',
-          renameTo: () => 'central-server-config/docker-config/application.yml',
-        },
-        {
-          file: 'config/localhost-config/application.yml',
-          renameTo: () => 'central-server-config/localhost-config/application.yml',
-        },
+        'central-server-config/_eureka_/docker-config/application.yml',
+        'central-server-config/_eureka_/localhost-config/application.yml',
       ],
     },
   ],
   applicationFiles: [
     {
-      path: DOCKER_DIR,
+      path: TEMPLATES_DOCKER_DIR,
+      condition: ctx => ctx.dockerServices.includes('app'),
+      renameTo,
+      templates: ['app.yml'],
+    },
+    {
+      path: TEMPLATES_DOCKER_DIR,
+      condition: ctx => ctx.backendTypeJavaAny,
+      renameTo,
       templates: [
-        'app.yml',
         'jhipster-control-center.yml',
-        'sonar.yml',
         'monitoring.yml',
-        'prometheus/prometheus.yml',
         'grafana/provisioning/dashboards/dashboard.yml',
         'grafana/provisioning/dashboards/JVM.json',
         'grafana/provisioning/datasources/datasource.yml',
       ],
     },
     {
-      condition: generator => generator.searchEngineElasticsearch,
-      path: DOCKER_DIR,
+      path: TEMPLATES_DOCKER_DIR,
+      renameTo,
+      templates: ['sonar.yml', 'prometheus/prometheus.yml'],
+    },
+    {
+      condition: generator => generator.dockerServices.includes('elasticsearch'),
+      path: TEMPLATES_DOCKER_DIR,
+      renameTo,
       templates: ['elasticsearch.yml'],
     },
     {
-      condition: generator => generator.messageBrokerKafka,
-      path: DOCKER_DIR,
+      condition: generator => generator.dockerServices.includes('kafka'),
+      path: TEMPLATES_DOCKER_DIR,
+      renameTo,
       templates: ['kafka.yml'],
     },
     {
-      condition: generator => generator.messageBrokerPulsar,
-      path: DOCKER_DIR,
+      condition: generator => generator.dockerServices.includes('pulsar'),
+      path: TEMPLATES_DOCKER_DIR,
+      renameTo,
       templates: ['pulsar.yml'],
     },
     {
-      condition: generator => !!generator.enableSwaggerCodegen,
-      path: DOCKER_DIR,
+      condition: generator => !!generator.dockerServices.includes('swagger-editor'),
+      path: TEMPLATES_DOCKER_DIR,
+      renameTo,
       templates: ['swagger-editor.yml'],
     },
     {
-      condition: generator => generator.authenticationTypeOauth2,
-      path: DOCKER_DIR,
-      templates: [
-        'keycloak.yml',
-        {
-          file: 'config/keycloak-health-check.sh',
-          renameTo: () => 'realm-config/keycloak-health-check.sh',
-          transform: false,
-        },
-        {
-          file: 'config/realm-config/jhipster-realm.json',
-          renameTo: () => 'realm-config/jhipster-realm.json',
-        },
-      ],
+      condition: generator => generator.dockerServices.includes('keycloak'),
+      path: TEMPLATES_DOCKER_DIR,
+      renameTo,
+      templates: ['keycloak.yml', 'realm-config/jhipster-realm.json'],
+    },
+    {
+      condition: generator => generator.dockerServices.includes('keycloak'),
+      path: TEMPLATES_DOCKER_DIR,
+      renameTo,
+      transform: false,
+      templates: ['realm-config/keycloak-health-check.sh'],
     },
     {
-      condition: generator => generator.serviceDiscoveryAny || generator.applicationTypeGateway || generator.applicationTypeMicroservice,
-      path: DOCKER_DIR,
+      condition: generator => generator.dockerServices.includes('zipkin'),
+      path: TEMPLATES_DOCKER_DIR,
+      renameTo,
       templates: ['zipkin.yml'],
     },
   ],
diff --git a/generators/docker/generator.mjs b/generators/docker/generator.mjs
index 5933ef364f3a..5ad7da2b6532 100644
--- a/generators/docker/generator.mjs
+++ b/generators/docker/generator.mjs
@@ -17,6 +17,7 @@
  * limitations under the License.
  */
 /* eslint-disable camelcase */
+import * as _ from 'lodash-es';
 import BaseApplicationGenerator from '../base-application/index.mjs';
 import { createDockerComposeFile, createDockerExtendedServices } from '../docker/support/index.mjs';
 import { GENERATOR_BOOTSTRAP_APPLICATION_SERVER, GENERATOR_DOCKER } from '../generator-list.mjs';
@@ -25,19 +26,80 @@ import { SERVICE_COMPLETED_SUCCESSFULLY, SERVICE_HEALTHY } from './constants.mjs
 import { stringHashCode, createFaker } from '../base/support/index.mjs';
 import { getJdbcUrl, getR2dbcUrl } from '../spring-data-relational/support/index.mjs';
 
+const { intersection } = _;
+
 export default class DockerGenerator extends BaseApplicationGenerator {
   hasServicesFile = false;
 
   async beforeQueue() {
-    // TODO depend on GENERATOR_BOOTSTRAP_APPLICATION_SERVER.
-    await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_SERVER);
     if (!this.fromBlueprint) {
       await this.composeWithBlueprints(GENERATOR_DOCKER);
     }
+
+    if (!this.delegateToBlueprint) {
+      // TODO depend on GENERATOR_BOOTSTRAP_APPLICATION_SERVER.
+      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_SERVER);
+    }
+  }
+
+  get loading() {
+    return this.asLoadingTaskGroup({
+      loading({ applicationDefaults }) {
+        applicationDefaults({
+          dockerServices: [],
+        });
+      },
+    });
+  }
+
+  get [BaseApplicationGenerator.LOADING]() {
+    return this.asLoadingTaskGroup(this.delegateTasksToBlueprint(() => this.loading));
   }
 
   get preparing() {
     return this.asPreparingTaskGroup({
+      dockerServices({ application }) {
+        if (application.backendTypeSpringBoot) {
+          application.dockerServices.push('app');
+        }
+        if (application.authenticationTypeOauth2) {
+          application.dockerServices.push('keycloak');
+        }
+        if (application.searchEngineElasticsearch) {
+          application.dockerServices.push('elasticsearch');
+        }
+        if (application.messageBrokerKafka || application.messageBrokerPulsar) {
+          application.dockerServices.push(application.messageBroker);
+        }
+        if (application.serviceDiscoveryConsul || application.serviceDiscoveryEureka) {
+          application.dockerServices.push(application.serviceDiscoveryType);
+        }
+        if (application.serviceDiscoveryAny || application.applicationTypeGateway || application.applicationTypeMicroservice) {
+          application.dockerServices.push('zipkin');
+        }
+        if (application.enableSwaggerCodegen) {
+          application.dockerServices.push('swagger-editor');
+        }
+        if (application.cacheProviderMemcached || application.cacheProviderRedis || application.cacheProviderHazelcast) {
+          application.dockerServices.push(application.cacheProvider);
+        }
+        if (
+          application.databaseTypeCassandra ||
+          application.databaseTypeCouchbase ||
+          application.databaseTypeMongodb ||
+          application.databaseTypeNeo4j
+        ) {
+          application.dockerServices.push(application.databaseType);
+        }
+        if (
+          application.prodDatabaseTypePostgresql ||
+          application.prodDatabaseTypeMariadb ||
+          application.prodDatabaseTypeMysql ||
+          application.prodDatabaseTypeMssql
+        ) {
+          application.dockerServices.push(application.prodDatabaseType);
+        }
+      },
       addAppServices({ application, source }) {
         const writeInitialServicesFile = () => {
           if (!this.hasServicesFile) {
@@ -107,7 +169,7 @@ export default class DockerGenerator extends BaseApplicationGenerator {
   get postWriting() {
     return this.asPostWritingTaskGroup({
       async dockerServices({ application, source }) {
-        if (application.databaseTypeCassandra) {
+        if (application.dockerServices.includes('cassandra')) {
           const serviceName = application.databaseType;
           source.addDockerExtendedServiceToApplicationAndServices(
             { serviceName },
@@ -117,27 +179,21 @@ export default class DockerGenerator extends BaseApplicationGenerator {
             { serviceName, condition: SERVICE_HEALTHY },
             { serviceName: 'cassandra-migration', condition: SERVICE_COMPLETED_SUCCESSFULLY },
           );
-        } else if (application.databaseTypeAny && !application.prodDatabaseTypeOracle) {
-          const serviceName = application.databaseTypeSql ? application.prodDatabaseType : application.databaseType;
-          source.addDockerExtendedServiceToApplicationAndServices({ serviceName });
-          source.addDockerDependencyToApplication({ serviceName, condition: SERVICE_HEALTHY });
         }
 
-        if (application.searchEngineElasticsearch) {
-          source.addDockerExtendedServiceToApplicationAndServices({ serviceName: application.searchEngine });
-          source.addDockerDependencyToApplication({ serviceName: application.searchEngine, condition: SERVICE_HEALTHY });
-        }
-
-        if (application.cacheProviderMemcached || application.cacheProviderRedis) {
-          source.addDockerExtendedServiceToApplicationAndServices({ serviceName: application.cacheProvider });
+        for (const serviceName of intersection(
+          ['couchbase', 'mongodb', 'neo4j', 'postgresql', 'mysql', 'mariadb', 'mssql', 'elasticsearch', 'keycloak'],
+          application.dockerServices,
+        )) {
+          source.addDockerExtendedServiceToApplicationAndServices({ serviceName });
+          source.addDockerDependencyToApplication({ serviceName, condition: SERVICE_HEALTHY });
         }
 
-        if (application.authenticationTypeOauth2) {
-          source.addDockerExtendedServiceToApplicationAndServices({ serviceName: 'keycloak' });
-          source.addDockerDependencyToApplication({ serviceName: 'keycloak', condition: SERVICE_HEALTHY });
+        for (const serviceName of application.dockerServices.filter(service => ['redis', 'memcached', 'pulsar'].includes(service))) {
+          source.addDockerExtendedServiceToApplicationAndServices({ serviceName });
         }
 
-        if (application.serviceDiscoveryEureka) {
+        if (application.dockerServices.includes('eureka')) {
           const depends_on = application.authenticationTypeOauth2
             ? {
                 keycloak: {
@@ -154,21 +210,18 @@ export default class DockerGenerator extends BaseApplicationGenerator {
 
           source.addDockerDependencyToApplication({ serviceName: 'jhipster-registry', condition: SERVICE_HEALTHY });
         }
-        if (application.serviceDiscoveryConsul) {
+        if (application.dockerServices.includes('consul')) {
           source.addDockerExtendedServiceToApplicationAndServices(
             { serviceName: 'consul' },
             { serviceFile: './consul.yml', serviceName: 'consul-config-loader' },
           );
         }
-        if (application.messageBrokerKafka) {
+        if (application.dockerServices.includes('kafka')) {
           source.addDockerExtendedServiceToApplicationAndServices(
             { serviceName: 'kafka' },
             { serviceFile: './kafka.yml', serviceName: 'zookeeper' },
           );
         }
-        if (application.messageBrokerPulsar) {
-          source.addDockerExtendedServiceToApplicationAndServices({ serviceName: 'pulsar' });
-        }
       },
 
       packageJsonScripts({ application }) {
diff --git a/generators/docker/generator.spec.mts b/generators/docker/generator.spec.mts
index d150da3cec41..54f9d229d785 100644
--- a/generators/docker/generator.spec.mts
+++ b/generators/docker/generator.spec.mts
@@ -23,7 +23,7 @@ import lodash from 'lodash';
 
 import Generator from './index.mjs';
 import { buildSamplesFromMatrix, extendFilteredMatrix, extendMatrix } from '../../test/support/matrix-utils.mjs';
-import { defaultHelpers as helpers } from '../../test/support/index.mjs';
+import { defaultHelpers as helpers, runResult } from '../../test/support/index.mjs';
 import { matchElasticSearchDocker } from '../spring-data-elasticsearch/__test-support/elastic-search-matcher.mjs';
 import { matchConsul, matchEureka } from './__test-support/service-discovery-matcher.mjs';
 
@@ -84,14 +84,10 @@ describe(`generator - ${generator}`, () => {
     const { searchEngine, serviceDiscoveryType } = sampleConfig;
 
     describe(name, () => {
-      let runResult;
-
       before(async () => {
-        runResult = await helpers.run(generatorFile).withJHipsterConfig(sampleConfig);
+        await helpers.run(generatorFile).withJHipsterConfig(sampleConfig);
       });
 
-      after(() => runResult.cleanup());
-
       it('should match generated files snapshot', () => {
         expect(runResult.getStateSnapshot()).toMatchSnapshot();
       });
@@ -107,5 +103,20 @@ describe(`generator - ${generator}`, () => {
         matchConsul(() => runResult, serviceDiscoveryType === CONSUL);
       });
     });
+
+    describe(`custom path for ${name}`, () => {
+      before(async () => {
+        await helpers
+          .run(generatorFile)
+          .withSharedApplication({
+            dockerServicesDir: 'foo/',
+          })
+          .withJHipsterConfig(sampleConfig);
+      });
+
+      it('should not generate any file inside src/', () => {
+        expect(Object.keys(runResult.getStateSnapshot('**/src/**')).length).toBe(0);
+      });
+    });
   });
 });
diff --git a/generators/docker/support/check-docker.mjs b/generators/docker/support/check-docker.mjs
index d04e579221ea..b5ca8740d006 100644
--- a/generators/docker/support/check-docker.mjs
+++ b/generators/docker/support/check-docker.mjs
@@ -16,46 +16,42 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import shelljs from 'shelljs';
 import chalk from 'chalk';
-import runAsync from 'run-async';
 
 /**
  * Check that Docker exists.
+ * @this {import('../../base-core/index.mjs').default}
  */
-export const checkDocker = runAsync(function () {
+export const checkDocker = async function () {
   if (this.abort || this.skipChecks) return;
-  const done = this.async();
+  const ret = await this.spawnCommand('docker -v', { reject: false, stdio: 'pipe' });
+  if (ret.exitCode !== 0) {
+    this.log.error(
+      chalk.red(
+        `Docker version 1.10.0 or later is not installed on your computer.
+         Read http://docs.docker.com/engine/installation/#installation
+`,
+      ),
+    );
+    throw new Error();
+  }
 
-  shelljs.exec('docker -v', { silent: true }, (code, stdout, stderr) => {
-    if (stderr) {
-      this.log.error(
-        chalk.red(
-          'Docker version 1.10.0 or later is not installed on your computer.\n' +
-            '         Read http://docs.docker.com/engine/installation/#installation\n',
-        ),
-      );
-      this.abort = true;
-    } else {
-      const dockerVersion = stdout.split(' ')[2].replace(/,/g, '');
-      const dockerVersionMajor = dockerVersion.split('.')[0];
-      const dockerVersionMinor = dockerVersion.split('.')[1];
-      if (dockerVersionMajor < 1 || (dockerVersionMajor === 1 && dockerVersionMinor < 10)) {
-        this.log.error(
-          chalk.red(
-            `Docker version 1.10.0 or later is not installed on your computer.
-                                 Docker version found: ${dockerVersion}
-                                 Read http://docs.docker.com/engine/installation/#installation`,
-          ),
-        );
-        this.abort = true;
-      } else {
-        this.log.verboseInfo('Docker is installed');
-      }
-    }
-    done();
-  });
-});
+  const dockerVersion = ret.stdout.split(' ')[2].replace(/,/g, '');
+  const dockerVersionMajor = dockerVersion.split('.')[0];
+  const dockerVersionMinor = dockerVersion.split('.')[1];
+  if (dockerVersionMajor < 1 || (dockerVersionMajor === 1 && dockerVersionMinor < 10)) {
+    this.log.error(
+      chalk.red(
+        `Docker version 1.10.0 or later is not installed on your computer.
+                               Docker version found: ${dockerVersion}
+                               Read http://docs.docker.com/engine/installation/#installation`,
+      ),
+    );
+    throw new Error();
+  } else {
+    this.log.verboseInfo('Docker is installed');
+  }
+};
 
 /**
  * This is the Generator base class.
diff --git a/generators/docker/templates/src/main/docker/app.yml.ejs b/generators/docker/templates/docker/app.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/app.yml.ejs
rename to generators/docker/templates/docker/app.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/cassandra-cluster.yml.ejs b/generators/docker/templates/docker/cassandra-cluster.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/cassandra-cluster.yml.ejs
rename to generators/docker/templates/docker/cassandra-cluster.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/cassandra-migration.yml.ejs b/generators/docker/templates/docker/cassandra-migration.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/cassandra-migration.yml.ejs
rename to generators/docker/templates/docker/cassandra-migration.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/cassandra.yml.ejs b/generators/docker/templates/docker/cassandra.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/cassandra.yml.ejs
rename to generators/docker/templates/docker/cassandra.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/cassandra/Cassandra-Migration.Dockerfile.ejs b/generators/docker/templates/docker/cassandra/Cassandra-Migration.Dockerfile.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/cassandra/Cassandra-Migration.Dockerfile.ejs
rename to generators/docker/templates/docker/cassandra/Cassandra-Migration.Dockerfile.ejs
diff --git a/generators/docker/templates/src/main/docker/cassandra/scripts/autoMigrate.sh.ejs b/generators/docker/templates/docker/cassandra/scripts/autoMigrate.sh.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/cassandra/scripts/autoMigrate.sh.ejs
rename to generators/docker/templates/docker/cassandra/scripts/autoMigrate.sh.ejs
diff --git a/generators/docker/templates/src/main/docker/cassandra/scripts/execute-cql.sh.ejs b/generators/docker/templates/docker/cassandra/scripts/execute-cql.sh.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/cassandra/scripts/execute-cql.sh.ejs
rename to generators/docker/templates/docker/cassandra/scripts/execute-cql.sh.ejs
diff --git a/generators/docker/templates/src/main/docker/config/README.md.ejs b/generators/docker/templates/docker/central-server-config/README.md.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/config/README.md.ejs
rename to generators/docker/templates/docker/central-server-config/README.md.ejs
diff --git a/generators/docker/templates/src/main/docker/config/consul-config/application.yml.ejs b/generators/docker/templates/docker/central-server-config/_consul_/application.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/config/consul-config/application.yml.ejs
rename to generators/docker/templates/docker/central-server-config/_consul_/application.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/config/docker-config/application.yml.ejs b/generators/docker/templates/docker/central-server-config/_eureka_/docker-config/application.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/config/docker-config/application.yml.ejs
rename to generators/docker/templates/docker/central-server-config/_eureka_/docker-config/application.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/config/localhost-config/application.yml.ejs b/generators/docker/templates/docker/central-server-config/_eureka_/localhost-config/application.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/config/localhost-config/application.yml.ejs
rename to generators/docker/templates/docker/central-server-config/_eureka_/localhost-config/application.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/config/git2consul.json.ejs b/generators/docker/templates/docker/config/git2consul.json.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/config/git2consul.json.ejs
rename to generators/docker/templates/docker/config/git2consul.json.ejs
diff --git a/generators/docker/templates/src/main/docker/config/mariadb/my.cnf b/generators/docker/templates/docker/config/mariadb/my.cnf
similarity index 100%
rename from generators/docker/templates/src/main/docker/config/mariadb/my.cnf
rename to generators/docker/templates/docker/config/mariadb/my.cnf
diff --git a/generators/docker/templates/src/main/docker/config/mysql/my.cnf b/generators/docker/templates/docker/config/mysql/my.cnf
similarity index 100%
rename from generators/docker/templates/src/main/docker/config/mysql/my.cnf
rename to generators/docker/templates/docker/config/mysql/my.cnf
diff --git a/generators/docker/templates/src/main/docker/consul.yml.ejs b/generators/docker/templates/docker/consul.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/consul.yml.ejs
rename to generators/docker/templates/docker/consul.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/couchbase-cluster.yml.ejs b/generators/docker/templates/docker/couchbase-cluster.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/couchbase-cluster.yml.ejs
rename to generators/docker/templates/docker/couchbase-cluster.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/couchbase.yml.ejs b/generators/docker/templates/docker/couchbase.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/couchbase.yml.ejs
rename to generators/docker/templates/docker/couchbase.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/couchbase/Couchbase.Dockerfile.ejs b/generators/docker/templates/docker/couchbase/Couchbase.Dockerfile.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/couchbase/Couchbase.Dockerfile.ejs
rename to generators/docker/templates/docker/couchbase/Couchbase.Dockerfile.ejs
diff --git a/generators/docker/templates/src/main/docker/couchbase/scripts/configure-node.sh.ejs b/generators/docker/templates/docker/couchbase/scripts/configure-node.sh.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/couchbase/scripts/configure-node.sh.ejs
rename to generators/docker/templates/docker/couchbase/scripts/configure-node.sh.ejs
diff --git a/generators/docker/templates/src/main/docker/elasticsearch.yml.ejs b/generators/docker/templates/docker/elasticsearch.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/elasticsearch.yml.ejs
rename to generators/docker/templates/docker/elasticsearch.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/grafana/provisioning/dashboards/JVM.json.ejs b/generators/docker/templates/docker/grafana/provisioning/dashboards/JVM.json.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/grafana/provisioning/dashboards/JVM.json.ejs
rename to generators/docker/templates/docker/grafana/provisioning/dashboards/JVM.json.ejs
diff --git a/generators/docker/templates/src/main/docker/grafana/provisioning/dashboards/dashboard.yml.ejs b/generators/docker/templates/docker/grafana/provisioning/dashboards/dashboard.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/grafana/provisioning/dashboards/dashboard.yml.ejs
rename to generators/docker/templates/docker/grafana/provisioning/dashboards/dashboard.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/grafana/provisioning/datasources/datasource.yml.ejs b/generators/docker/templates/docker/grafana/provisioning/datasources/datasource.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/grafana/provisioning/datasources/datasource.yml.ejs
rename to generators/docker/templates/docker/grafana/provisioning/datasources/datasource.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/hazelcast-management-center.yml.ejs b/generators/docker/templates/docker/hazelcast-management-center.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/hazelcast-management-center.yml.ejs
rename to generators/docker/templates/docker/hazelcast-management-center.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/jhipster-control-center.yml.ejs b/generators/docker/templates/docker/jhipster-control-center.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/jhipster-control-center.yml.ejs
rename to generators/docker/templates/docker/jhipster-control-center.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/jhipster-registry.yml.ejs b/generators/docker/templates/docker/jhipster-registry.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/jhipster-registry.yml.ejs
rename to generators/docker/templates/docker/jhipster-registry.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/kafka.yml.ejs b/generators/docker/templates/docker/kafka.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/kafka.yml.ejs
rename to generators/docker/templates/docker/kafka.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/keycloak.yml.ejs b/generators/docker/templates/docker/keycloak.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/keycloak.yml.ejs
rename to generators/docker/templates/docker/keycloak.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/mariadb.yml.ejs b/generators/docker/templates/docker/mariadb.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/mariadb.yml.ejs
rename to generators/docker/templates/docker/mariadb.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/memcached.yml.ejs b/generators/docker/templates/docker/memcached.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/memcached.yml.ejs
rename to generators/docker/templates/docker/memcached.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/mongodb-cluster.yml.ejs b/generators/docker/templates/docker/mongodb-cluster.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/mongodb-cluster.yml.ejs
rename to generators/docker/templates/docker/mongodb-cluster.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/mongodb.yml.ejs b/generators/docker/templates/docker/mongodb.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/mongodb.yml.ejs
rename to generators/docker/templates/docker/mongodb.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/mongodb/MongoDB.Dockerfile.ejs b/generators/docker/templates/docker/mongodb/MongoDB.Dockerfile.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/mongodb/MongoDB.Dockerfile.ejs
rename to generators/docker/templates/docker/mongodb/MongoDB.Dockerfile.ejs
diff --git a/generators/docker/templates/src/main/docker/mongodb/scripts/init_replicaset.js.ejs b/generators/docker/templates/docker/mongodb/scripts/init_replicaset.js.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/mongodb/scripts/init_replicaset.js.ejs
rename to generators/docker/templates/docker/mongodb/scripts/init_replicaset.js.ejs
diff --git a/generators/docker/templates/src/main/docker/monitoring.yml.ejs b/generators/docker/templates/docker/monitoring.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/monitoring.yml.ejs
rename to generators/docker/templates/docker/monitoring.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/mssql.yml.ejs b/generators/docker/templates/docker/mssql.yml.ejs
similarity index 86%
rename from generators/docker/templates/src/main/docker/mssql.yml.ejs
rename to generators/docker/templates/docker/mssql.yml.ejs
index 3d4c1e93934b..470cb4dc10fd 100644
--- a/generators/docker/templates/src/main/docker/mssql.yml.ejs
+++ b/generators/docker/templates/docker/mssql.yml.ejs
@@ -21,7 +21,6 @@ name: <%= baseName.toLowerCase() %>
 services:
   mssql:
     image: <%- dockerContainers.mssql %>
-    # volumes are not supported on macOS
     # volumes:
     #   - ~/volumes/jhipster/tempdb/mssql/:/var/opt/mssql/data/
     environment:
@@ -29,9 +28,15 @@ services:
       - MSSQL_PID=Express
       - SA_PASSWORD=yourStrong(!)Password
       - MSSQL_DATABASE=<%= baseName %>
-      - MSSQL_SLEEP=60
+      - MSSQL_SLEEP=15
     # If you want to expose these ports outside your dev PC,
     # remove the "127.0.0.1:" prefix
     ports:
       - 127.0.0.1:1433:1433
     command: /bin/bash -c '/opt/mssql/bin/sqlservr & echo "wait $$MSSQL_SLEEP sec for DB to start "; sleep $$MSSQL_SLEEP; /opt/mssql-tools/bin/sqlcmd -U sa -P $$SA_PASSWORD -d tempdb -q "EXIT(CREATE DATABASE $$MSSQL_DATABASE)"; wait;'
+    healthcheck:
+      test: /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P "$${SA_PASSWORD}" -Q "USE $${MSSQL_DATABASE}" -b -o /dev/null
+      interval: 10s
+      timeout: 3s
+      retries: 10
+      start_period: 10s
diff --git a/generators/docker/templates/src/main/docker/mysql.yml.ejs b/generators/docker/templates/docker/mysql.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/mysql.yml.ejs
rename to generators/docker/templates/docker/mysql.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/neo4j.yml.ejs b/generators/docker/templates/docker/neo4j.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/neo4j.yml.ejs
rename to generators/docker/templates/docker/neo4j.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/postgresql.yml.ejs b/generators/docker/templates/docker/postgresql.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/postgresql.yml.ejs
rename to generators/docker/templates/docker/postgresql.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/prometheus/prometheus.yml.ejs b/generators/docker/templates/docker/prometheus/prometheus.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/prometheus/prometheus.yml.ejs
rename to generators/docker/templates/docker/prometheus/prometheus.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/pulsar.yml.ejs b/generators/docker/templates/docker/pulsar.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/pulsar.yml.ejs
rename to generators/docker/templates/docker/pulsar.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs b/generators/docker/templates/docker/realm-config/jhipster-realm.json.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs
rename to generators/docker/templates/docker/realm-config/jhipster-realm.json.ejs
diff --git a/generators/docker/templates/src/main/docker/config/keycloak-health-check.sh b/generators/docker/templates/docker/realm-config/keycloak-health-check.sh
similarity index 100%
rename from generators/docker/templates/src/main/docker/config/keycloak-health-check.sh
rename to generators/docker/templates/docker/realm-config/keycloak-health-check.sh
diff --git a/generators/docker/templates/src/main/docker/redis-cluster.yml.ejs b/generators/docker/templates/docker/redis-cluster.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/redis-cluster.yml.ejs
rename to generators/docker/templates/docker/redis-cluster.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/redis.yml.ejs b/generators/docker/templates/docker/redis.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/redis.yml.ejs
rename to generators/docker/templates/docker/redis.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/redis/Redis-Cluster.Dockerfile.ejs b/generators/docker/templates/docker/redis/Redis-Cluster.Dockerfile.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/redis/Redis-Cluster.Dockerfile.ejs
rename to generators/docker/templates/docker/redis/Redis-Cluster.Dockerfile.ejs
diff --git a/generators/docker/templates/src/main/docker/redis/connectRedisCluster.sh.ejs b/generators/docker/templates/docker/redis/connectRedisCluster.sh.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/redis/connectRedisCluster.sh.ejs
rename to generators/docker/templates/docker/redis/connectRedisCluster.sh.ejs
diff --git a/generators/docker/templates/src/main/docker/sonar.yml.ejs b/generators/docker/templates/docker/sonar.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/sonar.yml.ejs
rename to generators/docker/templates/docker/sonar.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/swagger-editor.yml.ejs b/generators/docker/templates/docker/swagger-editor.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/swagger-editor.yml.ejs
rename to generators/docker/templates/docker/swagger-editor.yml.ejs
diff --git a/generators/docker/templates/src/main/docker/zipkin.yml.ejs b/generators/docker/templates/docker/zipkin.yml.ejs
similarity index 100%
rename from generators/docker/templates/src/main/docker/zipkin.yml.ejs
rename to generators/docker/templates/docker/zipkin.yml.ejs
diff --git a/generators/docker/utils.mjs b/generators/docker/utils.mjs
index 48e4a8a889a9..95dad580f936 100644
--- a/generators/docker/utils.mjs
+++ b/generators/docker/utils.mjs
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import { DockerfileParser } from 'dockerfile-ast';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 
 const { camelCase } = _;
 
diff --git a/generators/entities/command.mts b/generators/entities/command.mts
index 3a1a81cfee93..acd240227160 100644
--- a/generators/entities/command.mts
+++ b/generators/entities/command.mts
@@ -28,7 +28,7 @@ const command: JHipsterCommandDefinition = {
     },
   },
   options: {
-    skipDbChangelog: serverCommand.options.skipDbChangelog,
+    skipDbChangelog: serverCommand.options!.skipDbChangelog,
   },
 };
 
diff --git a/generators/entities/generator.mjs b/generators/entities/generator.mjs
index e645b74257a5..e172b5d1e600 100644
--- a/generators/entities/generator.mjs
+++ b/generators/entities/generator.mjs
@@ -37,6 +37,12 @@ export default class EntitiesGenerator extends BaseApplicationGenerator {
         this.parseJHipsterArguments(command.arguments);
         if (!this.entities || this.entities.length === 0) {
           this.entities = this.getExistingEntityNames();
+        } else {
+          for (const entity of this.entities) {
+            if (!this.jhipsterConfig.entities.includes(entity)) {
+              this.jhipsterConfig.entities.push(entity);
+            }
+          }
         }
         if (this.entities) {
           this.log.verboseInfo('Generating entities', ...this.entities);
diff --git a/generators/entity/generator.mjs b/generators/entity/generator.mjs
index fe4edc9cb4a4..3925fc0b64e2 100644
--- a/generators/entity/generator.mjs
+++ b/generators/entity/generator.mjs
@@ -20,112 +20,116 @@
 import fs from 'fs';
 import path from 'path';
 import chalk from 'chalk';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 
 import BaseApplicationGenerator from '../base-application/index.mjs';
 import prompts from './prompts.mjs';
 import { JHIPSTER_CONFIG_DIR } from '../generator-constants.mjs';
-import { applicationTypes, clientFrameworkTypes, getConfigWithDefaults, reservedKeywords } from '../../jdl/jhipster/index.mjs';
-import { GENERATOR_ENTITIES, GENERATOR_ENTITY } from '../generator-list.mjs';
-import { removeFieldsWithNullishValues } from '../base/support/index.mjs';
-import {
-  getDBTypeFromDBValue,
-  hibernateSnakeCase,
-  loadDerivedPlatformConfig,
-  loadDerivedServerConfig,
-  loadServerConfig,
-} from '../server/support/index.mjs';
-import { loadAppConfig, loadDerivedAppConfig } from '../app/support/index.mjs';
-import { loadClientConfig, loadDerivedClientConfig } from '../client/support/index.mjs';
-import { loadLanguagesConfig } from '../languages/support/index.mjs';
+import { applicationTypes, reservedKeywords } from '../../jdl/jhipster/index.mjs';
+import { GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_ENTITIES, GENERATOR_ENTITY } from '../generator-list.mjs';
+import { getDBTypeFromDBValue, hibernateSnakeCase } from '../server/support/index.mjs';
 import command from './command.mjs';
 
 const { GATEWAY, MICROSERVICE } = applicationTypes;
-const { NO: CLIENT_FRAMEWORK_NO } = clientFrameworkTypes;
 const { isReservedClassName } = reservedKeywords;
 
 export default class EntityGenerator extends BaseApplicationGenerator {
+  name;
+  application = {};
+
   constructor(args, options, features) {
     super(args, options, { unique: 'argument', ...features });
   }
 
   async beforeQueue() {
-    this.parseJHipsterArguments(command.arguments);
-    const name = _.upperFirst(this.name).replace('.json', '');
-    this.entityStorage = this.getEntityConfig(name, true);
-    this.entityConfig = this.entityStorage.createProxy();
-
-    const configExisted = this.entityStorage.existed;
-    const filename = path.join(JHIPSTER_CONFIG_DIR, `${name}.json`);
-    const entityExisted = fs.existsSync(this.destinationPath(filename));
-
-    this.jhipsterConfig.entities = [...(this.jhipsterConfig.entities ?? []), name];
-    this.context = {
-      name,
-      filename,
-      configExisted,
-      entityExisted,
-      configurationFileExists: this.fs.exists(this.destinationPath(filename)),
-    };
-
     if (!this.fromBlueprint) {
-      await this.composeWithBlueprints(GENERATOR_ENTITY, {
-        generatorOptions: {
-          entityExisted,
-          configExisted,
-          arguments: [name],
-        },
-      });
+      await this.composeWithBlueprints(GENERATOR_ENTITY);
     }
 
-    this._setupEntityOptions(this, this, this.context);
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+    }
   }
 
   // Public API method used by the getter and also by Blueprints
   get initializing() {
-    return {
-      /* Use need microservice path to load the entity file */
-      askForMicroserviceJson: prompts.askForMicroserviceJson,
+    return this.asInitializingTaskGroup({
+      parseOptions() {
+        this.parseJHipsterArguments(command.arguments);
+        const name = _.upperFirst(this.name).replace('.json', '');
+        this.entityStorage = this.getEntityConfig(name, true);
+        this.entityConfig = this.entityStorage.createProxy();
+
+        const configExisted = this.entityStorage.existed;
+        const filename = path.join(JHIPSTER_CONFIG_DIR, `${name}.json`);
+        const entityExisted = fs.existsSync(this.destinationPath(filename));
+
+        this.jhipsterConfig.entities = [...(this.jhipsterConfig.entities ?? []), name];
+        this.entityData = {
+          name,
+          filename,
+          configExisted,
+          entityExisted,
+          configurationFileExists: this.fs.exists(this.destinationPath(filename)),
+        };
 
-      loadSharedConfig() {
-        this.application = {};
-        loadAppConfig({
-          config: this.jhipsterConfigWithDefaults,
-          application: this.application,
-          useVersionPlaceholders: this.useVersionPlaceholders,
-        });
-        loadClientConfig({ config: this.jhipsterConfigWithDefaults, application: this.application });
-        loadLanguagesConfig({ application: this.application, config: this.jhipsterConfigWithDefaults });
-        // Try to load server config from microservice side, falling back to the app config.
-        loadServerConfig({
-          config: getConfigWithDefaults({
-            ...removeFieldsWithNullishValues(this.jhipsterConfig),
-            ...removeFieldsWithNullishValues(this.microserviceConfig ?? {}),
-          }),
-          application: this.application,
-        });
+        this._setupEntityOptions(this, this, this.entityData);
+      },
+
+      loadOptions() {
+        if (this.options.db) {
+          this.entityConfig.databaseType = getDBTypeFromDBValue(this.options.db);
+          if (this.entityConfig.databaseType === 'sql') {
+            this.entityConfig.prodDatabaseType = this.options.db;
+            this.entityConfig.devDatabaseType = this.options.db;
+          }
+        }
 
-        loadDerivedAppConfig({ application: this.application });
-        loadDerivedClientConfig({ application: this.application });
-        loadDerivedServerConfig({ application: this.application });
-        loadDerivedPlatformConfig({ application: this.application });
+        if (this.options.skipServer !== undefined) {
+          this.entityConfig.skipServer = this.options.skipServer;
+        }
+        if (this.options.skipDbChangelog !== undefined) {
+          this.entityConfig.skipDbChangelog = this.options.skipDbChangelog;
+        }
+        if (this.options.skipClient !== undefined) {
+          this.entityConfig.skipClient = this.options.skipClient;
+        }
       },
+    });
+  }
 
+  get [BaseApplicationGenerator.INITIALIZING]() {
+    return this.delegateTasksToBlueprint(() => this.initializing);
+  }
+
+  get prompting() {
+    return this.asPromptingTaskGroup({
+      /* Use need microservice path to load the entity file */
+      askForMicroserviceJson: prompts.askForMicroserviceJson,
+    });
+  }
+
+  get [BaseApplicationGenerator.PROMPTING]() {
+    return this.delegateTasksToBlueprint(() => this.prompting);
+  }
+
+  get loading() {
+    return this.asLoadingTaskGroup({
       isBuiltInEntity() {
-        if (this.isBuiltInUser(this.context.name) || this.isBuiltInAuthority(this.context.name)) {
-          throw new Error(`Is not possible to override built in ${this.context.name}`);
+        if (this.isBuiltInUser(this.entityData.name) || this.isBuiltInAuthority(this.entityData.name)) {
+          throw new Error(`Is not possible to override built in ${this.entityData.name}`);
         }
       },
 
-      setupMicroServiceEntity() {
-        const context = this.context;
+      setupMicroServiceEntity({ application }) {
+        const context = this.entityData;
 
-        if (this.application.applicationType === MICROSERVICE) {
+        if (application.applicationType === MICROSERVICE) {
           context.microserviceName = this.entityConfig.microserviceName = this.jhipsterConfig.baseName;
           if (!this.entityConfig.clientRootFolder) {
             context.clientRootFolder = this.entityConfig.clientRootFolder = this.entityConfig.microserviceName;
           }
-        } else if (this.application.applicationType === GATEWAY) {
+        } else if (application.applicationType === GATEWAY) {
           // If microservicePath is set we are loading the entity from the microservice side.
           context.useMicroserviceJson = !!this.entityConfig.microservicePath;
           if (context.useMicroserviceJson) {
@@ -150,48 +154,25 @@ export default class EntityGenerator extends BaseApplicationGenerator {
               ? ''
               : this.entityConfig.microserviceName;
           }
-
-          if (this.jhipsterConfig.applications && !this.entityConfig.skipClient) {
-            const remoteConfig = this.jhipsterConfig.applications[this.entityConfig.microserviceName];
-            if (remoteConfig && remoteConfig.clientFramework && remoteConfig.clientFramework !== CLIENT_FRAMEWORK_NO) {
-              // Gateway requires entities to discover a microfrontend.
-              // Microfrontends is generated at the microservice side, so skip it at gateway side.
-              this.entityConfig.skipClient = true;
-            }
-          }
         }
       },
 
-      loadOptions() {
-        const context = this.context;
-
-        if (this.options.db) {
-          context.databaseType = getDBTypeFromDBValue(this.options.db);
-          context.prodDatabaseType = this.options.db;
-          context.devDatabaseType = this.options.db;
-        }
-
-        context.skipServer = context.skipServer || this.options.skipServer;
-        context.skipDbChangelog = context.skipDbChangelog || this.options.skipDbChangelog;
-        context.skipClient = context.skipClient || this.options.skipClient;
-      },
-
-      loadEntitySpecificOptions() {
-        this.context.skipClient = this.context.skipClient || this.entityConfig.skipClient;
-        this.context.databaseType = this.context.databaseType || this.entityConfig.databaseType || this.jhipsterConfig.databaseType;
+      loadEntitySpecificOptions({ application }) {
+        this.entityData.skipClient = this.entityData.skipClient || this.entityConfig.skipClient;
+        this.entityData.databaseType = this.entityData.databaseType || this.entityConfig.databaseType || application.databaseType;
       },
 
       validateEntityName() {
-        const validation = this._validateEntityName(this.context.name);
+        const validation = this._validateEntityName(this.entityData.name);
         if (validation !== true) {
           throw new Error(validation);
         }
       },
 
-      bootstrapConfig() {
-        const context = this.context;
+      bootstrapConfig({ application }) {
+        const context = this.entityData;
         const entityName = context.name;
-        if ([MICROSERVICE, GATEWAY].includes(this.application.applicationType)) {
+        if ([MICROSERVICE, GATEWAY].includes(application.applicationType)) {
           if (this.entityConfig.databaseType === undefined) {
             this.entityConfig.databaseType = context.databaseType;
           }
@@ -208,16 +189,15 @@ export default class EntityGenerator extends BaseApplicationGenerator {
           this.log.verboseInfo(`\nThe entity ${entityName} is being created.\n`);
         }
       },
-    };
+    });
   }
 
-  get [BaseApplicationGenerator.INITIALIZING]() {
-    return this.delegateTasksToBlueprint(() => this.initializing);
+  get [BaseApplicationGenerator.LOADING]() {
+    return this.delegateTasksToBlueprint(() => this.loading);
   }
 
-  // Public API method used by the getter and also by Blueprints
-  get prompting() {
-    return {
+  get postPreparing() {
+    return this.asPostPreparingTaskGroup({
       /* ask question to user if s/he wants to update entity */
       askForUpdate: prompts.askForUpdate,
       askForFields: prompts.askForFields,
@@ -229,20 +209,20 @@ export default class EntityGenerator extends BaseApplicationGenerator {
       askForFiltering: prompts.askForFiltering,
       askForReadOnly: prompts.askForReadOnly,
       askForPagination: prompts.askForPagination,
-    };
+    });
   }
 
-  get [BaseApplicationGenerator.PROMPTING]() {
-    return this.delegateTasksToBlueprint(() => this.prompting);
+  get [BaseApplicationGenerator.POST_PREPARING]() {
+    return this.delegateTasksToBlueprint(() => this.postPreparing);
   }
 
   // Public API method used by the getter and also by Blueprints
-  get composing() {
-    return this.asComposingTaskGroup({
+  get default() {
+    return this.asDefaultTaskGroup({
       async composeEntities() {
         // We need to compose with others entities to update relationships.
         await this.composeWithJHipster(GENERATOR_ENTITIES, {
-          generatorArgs: this.options.singleEntity ? [this.context.name] : [],
+          generatorArgs: this.options.singleEntity ? [this.entityData.name] : [],
           generatorOptions: {
             skipDbChangelog: this.options.skipDbChangelog,
             skipInstall: this.options.skipInstall,
@@ -252,15 +232,15 @@ export default class EntityGenerator extends BaseApplicationGenerator {
     });
   }
 
-  get [BaseApplicationGenerator.COMPOSING]() {
-    return this.delegateTasksToBlueprint(() => this.composing);
+  get [BaseApplicationGenerator.DEFAULT]() {
+    return this.delegateTasksToBlueprint(() => this.default);
   }
 
   // Public API method used by the getter and also by Blueprints
   get end() {
     return {
       end() {
-        this.log.log(chalk.bold.green(`Entity ${this.context.entityNameCapitalized} generated successfully.`));
+        this.log.log(chalk.bold.green(`Entity ${this.entityData.entityNameCapitalized} generated successfully.`));
       },
     };
   }
@@ -328,7 +308,7 @@ export default class EntityGenerator extends BaseApplicationGenerator {
     if (entityName.indexOf('Detail', entityName.length - 'Detail'.length) !== -1) {
       return "The entity name cannot end with 'Detail'";
     }
-    if (!this.context.skipServer && isReservedClassName(entityName)) {
+    if (!this.entityData.skipServer && isReservedClassName(entityName)) {
       return 'The entity name cannot contain a Java or JHipster reserved keyword';
     }
     return true;
diff --git a/generators/entity/prompts.mjs b/generators/entity/prompts.mjs
index 16a1f848c1f2..1815fcec055e 100644
--- a/generators/entity/prompts.mjs
+++ b/generators/entity/prompts.mjs
@@ -18,7 +18,7 @@
  */
 import fs from 'fs';
 import chalk from 'chalk';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import {
   reservedKeywords,
   databaseTypes,
@@ -80,7 +80,7 @@ const getFieldNameUndercored = fields =>
   );
 
 function askForMicroserviceJson() {
-  const context = this.context;
+  const context = this.entityData;
   if (this.jhipsterConfig.applicationType !== GATEWAY || context.configExisted) {
     return undefined;
   }
@@ -120,7 +120,7 @@ function askForMicroserviceJson() {
 }
 
 function askForUpdate() {
-  const context = this.context;
+  const context = this.entityData;
   // ask only if running an existing entity without arg option --force or --regenerate
   const isForce = this.options.force || context.regenerate;
   context.updateEntity = 'regenerate'; // default if skipping questions by --force
@@ -163,7 +163,7 @@ function askForUpdate() {
 }
 
 function askForFields() {
-  const context = this.context;
+  const context = this.entityData;
   // don't prompt if data is imported from a file
   if (this.options.defaults || (context.useConfigurationFile && context.updateEntity !== 'add')) {
     return undefined;
@@ -177,7 +177,7 @@ function askForFields() {
 }
 
 function askForFieldsToRemove() {
-  const context = this.context;
+  const context = this.entityData;
   // prompt only if data is imported from a file
   if (!context.useConfigurationFile || context.updateEntity !== 'remove' || this.entityConfig.fields.length === 0) {
     return undefined;
@@ -216,11 +216,8 @@ function askForFieldsToRemove() {
   });
 }
 
-function askForRelationships() {
-  const context = this.context;
-  if (this.options.defaults) {
-    return undefined;
-  }
+function askForRelationships(...args) {
+  const context = this.entityData;
   // don't prompt if data is imported from a file
   if (context.useConfigurationFile && context.updateEntity !== 'add') {
     return undefined;
@@ -229,11 +226,11 @@ function askForRelationships() {
     return undefined;
   }
 
-  return askForRelationship.call(this);
+  return askForRelationship.call(this, ...args);
 }
 
 function askForRelationsToRemove() {
-  const context = this.context;
+  const context = this.entityData;
   // prompt only if data is imported from a file
   if (!context.useConfigurationFile || context.updateEntity !== 'remove' || this.entityConfig.relationships.length === 0) {
     return undefined;
@@ -279,7 +276,7 @@ function askForRelationsToRemove() {
 }
 
 function askForFiltering() {
-  const context = this.context;
+  const context = this.entityData;
   // don't prompt if server is skipped, or the backend is not sql, or no service requested
   if (context.useConfigurationFile || context.skipServer || context.databaseType !== 'sql' || this.entityConfig.service === 'no') {
     return undefined;
@@ -308,7 +305,7 @@ function askForFiltering() {
 }
 
 function askForReadOnly() {
-  const context = this.context;
+  const context = this.entityData;
   // don't prompt if data is imported from a file
   if (context.useConfigurationFile) {
     return undefined;
@@ -327,7 +324,7 @@ function askForReadOnly() {
 }
 
 function askForDTO() {
-  const context = this.context;
+  const context = this.entityData;
   // don't prompt if data is imported from a file or server is skipped or if no service layer
   if (context.useConfigurationFile || context.skipServer || this.entityConfig.service === 'no') {
     return undefined;
@@ -356,7 +353,7 @@ function askForDTO() {
 }
 
 function askForService() {
-  const context = this.context;
+  const context = this.entityData;
   // don't prompt if data is imported from a file or server is skipped
   if (context.useConfigurationFile || context.skipServer) {
     return undefined;
@@ -389,7 +386,7 @@ function askForService() {
 }
 
 function askForPagination() {
-  const context = this.context;
+  const context = this.entityData;
   // don't prompt if data are imported from a file
   if (context.useConfigurationFile) {
     return undefined;
@@ -428,22 +425,27 @@ function askForPagination() {
 /**
  * ask question for a field creation
  */
-function askForField() {
-  const context = this.context;
+async function askForField() {
+  const context = this.entityData;
   this.log.log(chalk.green(`\nGenerating field #${this.entityConfig.fields.length + 1}\n`));
-  const skipServer = context.skipServer;
   const databaseType = context.databaseType;
   const clientFramework = context.clientFramework;
   const possibleFiltering = databaseType === SQL && !context.reactive;
-  const prompts = [
+  const fieldAddAnswer = await this.prompt([
     {
       type: 'confirm',
       name: 'fieldAdd',
       message: 'Do you want to add a field to your entity?',
       default: true,
     },
+  ]);
+
+  if (!fieldAddAnswer.fieldAdd) {
+    logFieldsAndRelationships.call(this);
+    return;
+  }
+  const answers = await this.prompt([
     {
-      when: response => response.fieldAdd === true,
       type: 'input',
       name: 'fieldName',
       validate: input => {
@@ -474,67 +476,25 @@ function askForField() {
       message: 'What is the name of your field?',
     },
     {
-      when: response => response.fieldAdd === true && (skipServer || ['sql', 'mongodb', 'neo4j', 'couchbase'].includes(databaseType)),
       type: 'list',
       name: 'fieldType',
       message: 'What is the type of your field?',
-      choices: [
-        {
-          value: STRING,
-          name: 'String',
-        },
-        {
-          value: INTEGER,
-          name: 'Integer',
-        },
-        {
-          value: LONG,
-          name: 'Long',
-        },
-        {
-          value: FLOAT,
-          name: 'Float',
-        },
-        {
-          value: DOUBLE,
-          name: 'Double',
-        },
-        {
-          value: BIG_DECIMAL,
-          name: 'BigDecimal',
-        },
-        {
-          value: LOCAL_DATE,
-          name: 'LocalDate',
-        },
-        {
-          value: INSTANT,
-          name: 'Instant',
-        },
-        {
-          value: ZONED_DATE_TIME,
-          name: 'ZonedDateTime',
-        },
-        {
-          value: DURATION,
-          name: 'Duration',
-        },
-        {
-          value: BOOLEAN,
-          name: 'Boolean',
-        },
-        {
-          value: ENUM,
-          name: 'Enumeration (Java enum type)',
-        },
-        {
-          value: UUID,
-          name: 'UUID',
-        },
-        {
-          value: BYTES,
-          name: '[BETA] Blob',
-        },
+      choices: () => [
+        { value: STRING, name: 'String' },
+        { value: INTEGER, name: 'Integer' },
+        { value: LONG, name: 'Long' },
+        { value: FLOAT, name: 'Float' },
+        { value: DOUBLE, name: 'Double' },
+        { value: BIG_DECIMAL, name: 'BigDecimal' },
+        { value: LOCAL_DATE, name: 'LocalDate' },
+        { value: INSTANT, name: 'Instant' },
+        { value: ZONED_DATE_TIME, name: 'ZonedDateTime' },
+        { value: DURATION, name: 'Duration' },
+        { value: BOOLEAN, name: 'Boolean' },
+        { value: ENUM, name: 'Enumeration (Java enum type)' },
+        { value: UUID, name: 'UUID' },
+        { value: UUID, name: 'UUID' },
+        ...(databaseType === CASSANDRA ? [{ value: BYTE_BUFFER, name: '[BETA] Blob' }] : [{ value: BYTES, name: '[BETA] Blob' }]),
       ],
       default: 0,
     },
@@ -609,117 +569,26 @@ function askForField() {
       },
     },
     {
-      when: response => response.fieldAdd === true && databaseType === CASSANDRA,
-      type: 'list',
-      name: 'fieldType',
-      message: 'What is the type of your field?',
-      choices: [
-        {
-          value: UUID,
-          name: 'UUID',
-        },
-        {
-          value: STRING,
-          name: 'String',
-        },
-        {
-          value: INTEGER,
-          name: 'Integer',
-        },
-        {
-          value: LONG,
-          name: 'Long',
-        },
-        {
-          value: FLOAT,
-          name: 'Float',
-        },
-        {
-          value: DOUBLE,
-          name: 'Double',
-        },
-        {
-          value: BIG_DECIMAL,
-          name: 'BigDecimal',
-        },
-        {
-          value: LOCAL_DATE,
-          name: 'LocalDate',
-        },
-        {
-          value: INSTANT,
-          name: 'Instant',
-        },
-        {
-          value: ZONED_DATE_TIME,
-          name: 'ZonedDateTime',
-        },
-        {
-          value: DURATION,
-          name: 'Duration',
-        },
-        {
-          value: ENUM,
-          name: 'Enumeration (Java enum type)',
-        },
-        {
-          value: BOOLEAN,
-          name: 'Boolean',
-        },
-        {
-          value: BYTE_BUFFER,
-          name: '[BETA] blob',
-        },
-      ],
-      default: 0,
-    },
-    {
-      when: response => response.fieldAdd === true && response.fieldType === BYTES,
+      when: response => response.fieldType === BYTES || response.fieldType === BYTE_BUFFER,
       type: 'list',
       name: 'fieldTypeBlobContent',
       message: 'What is the content of the Blob field?',
-      choices: [
-        {
-          value: IMAGE,
-          name: 'An image',
-        },
-        {
-          value: ANY,
-          name: 'A binary file',
-        },
-        {
-          value: TEXT,
-          name: 'A CLOB (Text field)',
-        },
+      choices: answers => [
+        { value: IMAGE, name: 'An image' },
+        { value: ANY, name: 'A binary file' },
+        ...(answers.fieldType === BYTES ? [{ value: TEXT, name: 'A CLOB (Text field)' }] : []),
       ],
       default: 0,
     },
     {
-      when: response => response.fieldAdd === true && response.fieldType === BYTE_BUFFER,
-      type: 'list',
-      name: 'fieldTypeBlobContent',
-      message: 'What is the content of the Blob field?',
-      choices: [
-        {
-          value: IMAGE,
-          name: 'An image',
-        },
-        {
-          value: ANY,
-          name: 'A binary file',
-        },
-      ],
-      default: 0,
-    },
-    {
-      when: response => response.fieldAdd === true && response.fieldType !== BYTE_BUFFER,
+      when: response => response.fieldType !== BYTE_BUFFER,
       type: 'confirm',
       name: 'fieldValidate',
       message: 'Do you want to add validation rules to your field?',
       default: false,
     },
     {
-      when: response => response.fieldAdd === true && response.fieldValidate === true,
+      when: response => response.fieldValidate === true,
       type: 'checkbox',
       name: 'fieldValidateRules',
       message: 'Which validation rules do you want to add?',
@@ -768,7 +637,7 @@ function askForField() {
       default: 0,
     },
     {
-      when: response => response.fieldAdd === true && response.fieldValidate === true && response.fieldValidateRules.includes('minlength'),
+      when: response => response.fieldValidate === true && response.fieldValidateRules.includes('minlength'),
       type: 'input',
       name: 'fieldValidateRulesMinlength',
       validate: input => (inputIsNumber(input) ? true : 'Minimum length must be a positive number'),
@@ -776,7 +645,7 @@ function askForField() {
       default: 0,
     },
     {
-      when: response => response.fieldAdd === true && response.fieldValidate === true && response.fieldValidateRules.includes('maxlength'),
+      when: response => response.fieldValidate === true && response.fieldValidateRules.includes('maxlength'),
       type: 'input',
       name: 'fieldValidateRulesMaxlength',
       validate: input => (inputIsNumber(input) ? true : 'Maximum length must be a positive number'),
@@ -784,7 +653,7 @@ function askForField() {
       default: 20,
     },
     {
-      when: response => response.fieldAdd === true && response.fieldValidate === true && response.fieldValidateRules.includes('min'),
+      when: response => response.fieldValidate === true && response.fieldValidateRules.includes('min'),
       type: 'input',
       name: 'fieldValidateRulesMin',
       message: 'What is the minimum of your field?',
@@ -797,7 +666,7 @@ function askForField() {
       default: 0,
     },
     {
-      when: response => response.fieldAdd === true && response.fieldValidate === true && response.fieldValidateRules.includes('max'),
+      when: response => response.fieldValidate === true && response.fieldValidateRules.includes('max'),
       type: 'input',
       name: 'fieldValidateRulesMax',
       message: 'What is the maximum of your field?',
@@ -811,7 +680,6 @@ function askForField() {
     },
     {
       when: response =>
-        response.fieldAdd === true &&
         response.fieldValidate === true &&
         response.fieldValidateRules.includes(MINBYTES) &&
         response.fieldType === BYTES &&
@@ -824,7 +692,6 @@ function askForField() {
     },
     {
       when: response =>
-        response.fieldAdd === true &&
         response.fieldValidate === true &&
         response.fieldValidateRules.includes(MAXBYTES) &&
         response.fieldType === BYTES &&
@@ -836,82 +703,71 @@ function askForField() {
       default: 5000000,
     },
     {
-      when: response => response.fieldAdd === true && response.fieldValidate === true && response.fieldValidateRules.includes('pattern'),
+      when: response => response.fieldValidate === true && response.fieldValidateRules.includes('pattern'),
       type: 'input',
       name: 'fieldValidateRulesPattern',
       message: 'What is the regular expression pattern you want to apply on your field?',
       default: '^[a-zA-Z0-9]*$',
     },
-  ];
-  return this.prompt(prompts).then(props => {
-    if (props.fieldAdd) {
-      if (props.fieldIsEnum) {
-        props.fieldType = _.upperFirst(props.fieldType);
-        props.fieldValues = props.fieldValues.toUpperCase();
-      }
+  ]);
 
-      const field = {
-        fieldName: props.fieldName,
-        fieldType: props.enumType || props.fieldType,
-        fieldTypeBlobContent: props.fieldTypeBlobContent,
-        fieldValues: props.fieldValues,
-        fieldValidateRules: props.fieldValidateRules,
-        fieldValidateRulesMinlength: props.fieldValidateRulesMinlength,
-        fieldValidateRulesMaxlength: props.fieldValidateRulesMaxlength,
-        fieldValidateRulesPattern: props.fieldValidateRulesPattern,
-        fieldValidateRulesMin: props.fieldValidateRulesMin,
-        fieldValidateRulesMax: props.fieldValidateRulesMax,
-        fieldValidateRulesMinbytes: props.fieldValidateRulesMinbytes,
-        fieldValidateRulesMaxbytes: props.fieldValidateRulesMaxbytes,
-      };
+  if (answers.fieldIsEnum) {
+    answers.fieldType = _.upperFirst(answers.fieldType);
+    answers.fieldValues = answers.fieldValues.toUpperCase();
+  }
 
-      this.entityConfig.fields = this.entityConfig.fields.concat(field);
-    }
-    logFieldsAndRelationships.call(this);
-    if (props.fieldAdd) {
-      return askForField.call(this);
-    }
-    return undefined;
-  });
+  const field = {
+    fieldName: answers.fieldName,
+    fieldType: answers.enumType || answers.fieldType,
+    fieldTypeBlobContent: answers.fieldTypeBlobContent,
+    fieldValues: answers.fieldValues,
+    fieldValidateRules: answers.fieldValidateRules,
+    fieldValidateRulesMinlength: answers.fieldValidateRulesMinlength,
+    fieldValidateRulesMaxlength: answers.fieldValidateRulesMaxlength,
+    fieldValidateRulesPattern: answers.fieldValidateRulesPattern,
+    fieldValidateRulesMin: answers.fieldValidateRulesMin,
+    fieldValidateRulesMax: answers.fieldValidateRulesMax,
+    fieldValidateRulesMinbytes: answers.fieldValidateRulesMinbytes,
+    fieldValidateRulesMaxbytes: answers.fieldValidateRulesMaxbytes,
+  };
+
+  this.entityConfig.fields = this.entityConfig.fields.concat(field);
+
+  logFieldsAndRelationships.call(this);
+  await askForField.call(this);
 }
 
 /**
  * ask question for a relationship creation
  */
-function askForRelationship() {
-  const context = this.context;
+async function askForRelationship(...args) {
+  const [{ application }] = args;
+  const context = this.entityData;
   const name = context.name;
   this.log.log(chalk.green('\nGenerating relationships to other entities\n'));
-  const prompts = [
+  const addRelationshipAnswers = await this.prompt([
     {
       type: 'confirm',
       name: 'relationshipAdd',
       message: 'Do you want to add a relationship to another entity?',
       default: true,
     },
+  ]);
+
+  if (!addRelationshipAnswers.relationshipAdd) {
+    logFieldsAndRelationships.call(this);
+    this.log.log('\n');
+    return;
+  }
+
+  const answers = await this.prompt([
     {
-      when: response => response.relationshipAdd === true,
-      type: 'input',
+      type: 'list',
       name: 'otherEntityName',
-      validate: input => {
-        if (!/^([a-zA-Z0-9_]*)$/.test(input)) {
-          return 'Your other entity name cannot contain special characters';
-        }
-        if (input === '') {
-          return 'Your other entity name cannot be empty';
-        }
-        if (isReservedTableName(input, 'JAVA')) {
-          return 'Your other entity name cannot contain a Java reserved keyword';
-        }
-        if (input.toLowerCase() === 'user' && context.applicationType === 'microservice') {
-          return "Your entity cannot have a relationship with User because it's a gateway entity";
-        }
-        return true;
-      },
-      message: 'What is the name of the other entity?',
+      message: 'What is the other entity?',
+      choices: () => [...this.getExistingEntityNames(), ...(application.generateBuiltInUserEntity ? ['User'] : [])],
     },
     {
-      when: response => response.relationshipAdd === true,
       type: 'input',
       name: 'relationshipName',
       validate: input => {
@@ -936,89 +792,63 @@ function askForRelationship() {
       default: response => _.lowerFirst(response.otherEntityName),
     },
     {
-      when: response => response.relationshipAdd === true,
       type: 'list',
       name: 'relationshipType',
       message: 'What is the type of the relationship?',
-      choices: response => {
-        const opts = [
-          {
-            value: 'many-to-one',
-            name: 'many-to-one',
-          },
-          {
-            value: 'many-to-many',
-            name: 'many-to-many',
-          },
-          {
-            value: 'one-to-one',
-            name: 'one-to-one',
-          },
-        ];
-        if (!this.isBuiltInUser(response.otherEntityName)) {
-          opts.unshift({
-            value: 'one-to-many',
-            name: 'one-to-many',
-          });
-        }
-        return opts;
-      },
+      choices: response => [
+        'many-to-one',
+        'many-to-many',
+        'one-to-one',
+        ...(this.isBuiltInUser(response.otherEntityName) ? [] : ['one-to-many']),
+      ],
       default: 0,
     },
     {
-      when: response =>
-        response.relationshipAdd === true &&
-        response.otherEntityName.toLowerCase() !== 'user' &&
-        (response.relationshipType === 'many-to-many' || response.relationshipType === 'one-to-one'),
-      type: 'confirm',
-      name: 'ownerSide',
-      message: 'Is this entity the owner of the relationship?',
-      default: false,
-    },
-    {
-      when: response =>
-        context.databaseType === SQL &&
-        response.relationshipAdd === true &&
-        response.relationshipType === 'one-to-one' &&
-        (response.ownerSide === true || response.otherEntityName.toLowerCase() === 'user'),
+      when: response => application.databaseType === SQL && response.relationshipType === 'one-to-one',
       type: 'confirm',
       name: 'id',
       message: 'Do you want to use JPA Derived Identifier - @MapsId?',
       default: false,
     },
     {
-      when: response =>
-        response.relationshipAdd === true &&
-        (response.relationshipType === 'one-to-many' ||
-          ((response.relationshipType === 'many-to-many' || response.relationshipType === 'one-to-one') &&
-            !this.isBuiltInUser(response.otherEntityName))),
+      when: answers => {
+        if (this.isBuiltInUser(answers.otherEntityName)) {
+          answers.bidirectional = false;
+          return false;
+        }
+
+        if (!application.databaseTypeNeo4j && answers.relationshipType !== 'many-to-one') {
+          // Relationships requires bidirectional.
+          answers.bidirectional = true;
+          return false;
+        }
+
+        return true;
+      },
+      type: 'input',
+      name: 'bidirectional',
+      message: 'Do you want to generate a bidirectional relationship',
+      default: true,
+    },
+    {
+      when: response => response.bidirectional,
       type: 'input',
       name: 'otherEntityRelationshipName',
       message: 'What is the name of this relationship in the other entity?',
       default: () => _.lowerFirst(name),
     },
     {
-      when: response =>
-        response.relationshipAdd === true &&
-        response.otherEntityName.toLowerCase() !== 'user' &&
-        (response.relationshipType === 'many-to-one' ||
-          (response.relationshipType === 'many-to-many' && response.ownerSide === true) ||
-          (response.relationshipType === 'one-to-one' && response.ownerSide === true)),
       type: 'input',
       name: 'otherEntityField',
       message: response =>
         `When you display this relationship on client-side, which field from '${response.otherEntityName}' do you want to use? This field will be displayed as a String, so it cannot be a Blob`,
-      default: 'id',
+      default: answers => (answers.otherEntityName === 'User' ? 'login' : 'id'),
     },
     {
       when: response =>
-        response.relationshipAdd === true &&
-        response.otherEntityName.toLowerCase() !== context.name.toLowerCase() &&
-        (response.relationshipType === 'many-to-one' ||
-          (response.relationshipType === 'many-to-many' &&
-            (response.ownerSide === true || response.otherEntityName.toLowerCase() === 'user')) ||
-          (response.relationshipType === 'one-to-one' &&
-            (response.ownerSide === true || response.otherEntityName.toLowerCase() === 'user'))),
+        (response.otherEntityName.toLowerCase() !== context.name.toLowerCase() && response.relationshipType === 'many-to-one') ||
+        response.relationshipType === 'many-to-many' ||
+        response.relationshipType === 'one-to-one',
       type: 'confirm',
       name: 'relationshipValidate',
       message: 'Do you want to add any validation rules to this relationship?',
@@ -1037,42 +867,34 @@ function askForRelationship() {
       ],
       default: 0,
     },
-  ];
-  return this.prompt(prompts).then(props => {
-    if (props.relationshipAdd) {
-      const relationship = {
-        relationshipName: props.relationshipName,
-        otherEntityName: _.lowerFirst(props.otherEntityName),
-        relationshipType: props.relationshipType,
-        relationshipValidateRules: props.relationshipValidateRules,
-        otherEntityField: props.otherEntityField,
-        ownerSide: props.ownerSide,
-        id: props.id,
-        otherEntityRelationshipName: props.otherEntityRelationshipName,
-      };
+  ]);
+
+  const relationship = {
+    relationshipSide: 'left',
+    relationshipName: answers.relationshipName,
+    otherEntityName: _.lowerFirst(answers.otherEntityName),
+    relationshipType: answers.relationshipType,
+    relationshipValidateRules: answers.relationshipValidateRules,
+    otherEntityField: answers.otherEntityField,
+    ownerSide: answers.ownerSide,
+    id: answers.id,
+    otherEntityRelationshipName: answers.otherEntityRelationshipName,
+  };
+
+  if (this.isBuiltInUser(answers.otherEntityName)) {
+    relationship.otherEntityRelationshipName = _.lowerFirst(name);
+  }
 
-      if (props.otherEntityName.toLowerCase() === 'user') {
-        relationship.ownerSide = true;
-        relationship.otherEntityField = 'login';
-        relationship.otherEntityRelationshipName = _.lowerFirst(name);
-      }
+  this.entityConfig.relationships = this.entityConfig.relationships.concat(relationship);
 
-      this.entityConfig.relationships = this.entityConfig.relationships.concat(relationship);
-    }
-    logFieldsAndRelationships.call(this);
-    if (props.relationshipAdd) {
-      return askForRelationship.call(this);
-    }
-    this.log.log('\n');
-    return undefined;
-  });
+  await askForRelationship.call(this, ...args);
 }
 
 /**
  * Show the entity and it's fields and relationships in console
  */
 function logFieldsAndRelationships() {
-  const context = this.context;
+  const context = this.entityData;
   if (this.entityConfig.fields.length > 0 || this.entityConfig.relationships.length > 0) {
     this.log.log(chalk.red(chalk.white('\n================= ') + context.name + chalk.white(' =================')));
   }
@@ -1125,7 +947,7 @@ function logFieldsAndRelationships() {
       if (relationship.relationshipValidateRules && relationship.relationshipValidateRules.includes(REQUIRED)) {
         validationDetails.push(REQUIRED);
       }
-      this.log.verboseInfo(
+      this.log.log(
         `${chalk.red(relationship.relationshipName)} ${chalk.white(`(${_.upperFirst(relationship.otherEntityName)})`)} ${chalk.cyan(
           relationship.relationshipType,
         )} ${chalk.cyan(validationDetails.join(' '))}`,
diff --git a/generators/export-jdl/export-jdl.spec.mts b/generators/export-jdl/export-jdl.spec.mts
index c65cc4027f4e..6a8c1fe0cf1b 100644
--- a/generators/export-jdl/export-jdl.spec.mts
+++ b/generators/export-jdl/export-jdl.spec.mts
@@ -20,7 +20,7 @@ const files = {
       {
         fieldName: 'countryId',
         fieldType: 'Long',
-        javadoc: 'The country Id',
+        documentation: 'The country Id',
       },
       {
         fieldName: 'countryName',
@@ -106,7 +106,7 @@ const files = {
       },
       {
         fieldName: 'firstName',
-        javadoc: 'The firstname attribute.',
+        documentation: 'The firstname attribute.',
         fieldType: 'String',
       },
       {
@@ -138,7 +138,7 @@ const files = {
       },
     ],
     changelogDate: '20160926083805',
-    javadoc: 'The Employee entity.',
+    documentation: 'The Employee entity.',
     entityTableName: 'emp',
     dto: 'mapstruct',
     pagination: 'infinite-scroll',
diff --git a/generators/gatling/entity-files.mts b/generators/gatling/entity-files.mts
index ba16aa7ec15a..d836b0101313 100644
--- a/generators/gatling/entity-files.mts
+++ b/generators/gatling/entity-files.mts
@@ -25,7 +25,7 @@ export const gatlingFiles = {
       path: TEST_DIR,
       templates: [
         {
-          file: 'java/gatling/simulations/_EntityClass_GatlingTest.java',
+          file: 'java/gatling/simulations/_entityClass_GatlingTest.java',
           renameTo: generator => `java/gatling/simulations/${generator.entityClass}GatlingTest.java`,
         },
       ],
diff --git a/generators/gatling/files.mts b/generators/gatling/files.mts
index 67554b9e2377..76682abe1ef6 100644
--- a/generators/gatling/files.mts
+++ b/generators/gatling/files.mts
@@ -23,6 +23,9 @@ import { SpringBootApplication } from '../server/types.mjs';
 
 const gatlingFiles: WriteFileSection<Generator, SpringBootApplication> = {
   gatlingFiles: [
+    {
+      templates: ['README.md.jhi.gatling'],
+    },
     {
       path: TEST_DIR,
       templates: [
diff --git a/generators/gatling/generator.mts b/generators/gatling/generator.mts
index c0e406195a1e..cb33fc55d551 100644
--- a/generators/gatling/generator.mts
+++ b/generators/gatling/generator.mts
@@ -24,10 +24,13 @@ import writeEntityTask, { cleanupEntitiesTask } from './entity-files.mjs';
 
 export default class GatlingGenerator extends BaseApplicationGenerator {
   async beforeQueue() {
-    await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
     if (!this.fromBlueprint) {
       await this.composeWithBlueprints(GENERATOR_GATLING);
     }
+
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+    }
   }
 
   get writing() {
diff --git a/generators/gatling/templates/README.md.jhi.gatling.ejs b/generators/gatling/templates/README.md.jhi.gatling.ejs
new file mode 100644
index 000000000000..93d0bfe31a8c
--- /dev/null
+++ b/generators/gatling/templates/README.md.jhi.gatling.ejs
@@ -0,0 +1,19 @@
+<&_ if (fragment.testingSection) { -&>
+### Gatling
+
+Performance tests are run by [Gatling][] and written in Scala. They're located in [src/test/java/gatling/simulations](src/test/java/gatling/simulations).
+
+You can execute all Gatling tests with
+```
+<%_ if (buildToolMaven) { _%>
+./mvnw gatling:test
+<%_ } else { _%>
+./gradlew gatlingRun.
+<%_ } _%>
+```
+
+<&_ } -&>
+
+<&_ if (fragment.referenceSection) { -&>
+[Gatling]: https://gatling.io/
+<&_ } -&>
diff --git a/generators/gatling/templates/src/test/java/gatling/simulations/_EntityClass_GatlingTest.java.ejs b/generators/gatling/templates/src/test/java/gatling/simulations/_entityClass_GatlingTest.java.ejs
similarity index 100%
rename from generators/gatling/templates/src/test/java/gatling/simulations/_EntityClass_GatlingTest.java.ejs
rename to generators/gatling/templates/src/test/java/gatling/simulations/_entityClass_GatlingTest.java.ejs
diff --git a/generators/generate-blueprint/__snapshots__/generator.spec.mjs.snap b/generators/generate-blueprint/__snapshots__/generator.spec.mjs.snap
index 4dc4cc808d7f..84c73532b66e 100644
--- a/generators/generate-blueprint/__snapshots__/generator.spec.mjs.snap
+++ b/generators/generate-blueprint/__snapshots__/generator.spec.mjs.snap
@@ -599,36 +599,6 @@ exports[`generator - generate-blueprint with all option should match snapshot 1`
   "generators/maven/templates/template-file-maven.ejs": {
     "stateCleared": "modified",
   },
-  "generators/openapi-client/command.mjs": {
-    "stateCleared": "modified",
-  },
-  "generators/openapi-client/generator.mjs": {
-    "stateCleared": "modified",
-  },
-  "generators/openapi-client/generator.spec.mjs": {
-    "stateCleared": "modified",
-  },
-  "generators/openapi-client/index.mjs": {
-    "stateCleared": "modified",
-  },
-  "generators/openapi-client/templates/template-file-openapi-client.ejs": {
-    "stateCleared": "modified",
-  },
-  "generators/page/command.mjs": {
-    "stateCleared": "modified",
-  },
-  "generators/page/generator.mjs": {
-    "stateCleared": "modified",
-  },
-  "generators/page/generator.spec.mjs": {
-    "stateCleared": "modified",
-  },
-  "generators/page/index.mjs": {
-    "stateCleared": "modified",
-  },
-  "generators/page/templates/template-file-page.ejs": {
-    "stateCleared": "modified",
-  },
   "generators/project-name/command.mjs": {
     "stateCleared": "modified",
   },
diff --git a/generators/generate-blueprint/generator.mjs b/generators/generate-blueprint/generator.mjs
index cc3b1a6c1e68..23f549ded765 100644
--- a/generators/generate-blueprint/generator.mjs
+++ b/generators/generate-blueprint/generator.mjs
@@ -46,17 +46,20 @@ import { files, generatorFiles } from './files.mjs';
 import { packageJson } from '../../lib/index.mjs';
 import { SKIP_COMMIT_HOOK } from '../init/constants.mjs';
 import command from './command.mjs';
-import { NODE_VERSION } from '../generator-constants.mjs';
+import { BLUEPRINT_API_VERSION, NODE_VERSION } from '../generator-constants.mjs';
 
 const { camelCase, upperFirst, snakeCase } = lodash;
 const { GENERATOR_PROJECT_NAME, GENERATOR_INIT, GENERATOR_GENERATE_BLUEPRINT } = GENERATOR_LIST;
 
 export default class extends BaseGenerator {
   async _beforeQueue() {
-    await this.dependsOnJHipster(GENERATOR_PROJECT_NAME);
     if (!this.fromBlueprint) {
       await this.composeWithBlueprints(GENERATOR_GENERATE_BLUEPRINT);
     }
+
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_PROJECT_NAME);
+    }
   }
 
   get initializing() {
@@ -249,7 +252,7 @@ export default class extends BaseGenerator {
         );
         this.packageJson.merge({
           name: `generator-jhipster-${this.jhipsterConfig.baseName}`,
-          keywords: ['yeoman-generator', 'jhipster-blueprint', 'jhipster-7'],
+          keywords: ['yeoman-generator', 'jhipster-blueprint', BLUEPRINT_API_VERSION],
           type: 'module',
           files: ['generators'],
           scripts: {
diff --git a/generators/generate-blueprint/resources/package.json b/generators/generate-blueprint/resources/package.json
index 232053536e45..c2dadba1a35f 100644
--- a/generators/generate-blueprint/resources/package.json
+++ b/generators/generate-blueprint/resources/package.json
@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "vitest": "0.34.4"
+    "vitest": "0.34.6"
   }
 }
diff --git a/generators/generate-blueprint/templates/.blueprint/generate-sample/generator.mjs.ejs b/generators/generate-blueprint/templates/.blueprint/generate-sample/generator.mjs.ejs
index 357ba1c93110..72617afde117 100644
--- a/generators/generate-blueprint/templates/.blueprint/generate-sample/generator.mjs.ejs
+++ b/generators/generate-blueprint/templates/.blueprint/generate-sample/generator.mjs.ejs
@@ -54,6 +54,9 @@ export default class extends BaseGenerator {
           },
         });
       },
+      async jhipsterInfo() {
+        await this.composeWithJHipster('info');
+      },
     });
   }
 }
diff --git a/generators/generate-blueprint/templates/.github/workflows/generator.yml.ejs b/generators/generate-blueprint/templates/.github/workflows/generator.yml.ejs
index d819e520a02b..31f09a9ffd42 100644
--- a/generators/generate-blueprint/templates/.github/workflows/generator.yml.ejs
+++ b/generators/generate-blueprint/templates/.github/workflows/generator.yml.ejs
@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
           node-version: <%- nodeVersion.split('.', 2)[0] %>
diff --git a/generators/generate-blueprint/templates/cli/cli.cjs.ejs b/generators/generate-blueprint/templates/cli/cli.cjs.ejs
index e46fe889d684..7e249bb66095 100755
--- a/generators/generate-blueprint/templates/cli/cli.cjs.ejs
+++ b/generators/generate-blueprint/templates/cli/cli.cjs.ejs
@@ -8,6 +8,7 @@ const { version, bin } = require('../package.json');
 const packagePath = dirname(__dirname);
 const packageFolderName = basename(packagePath);
 const devBlueprintPath = join(packagePath, '.blueprint');
+const blueprint = packageFolderName.startsWith('jhipster-') ? `generator-${packageFolderName}` : packageFolderName;
 
 (async () => {
   const { runJHipster, done, logger } = await import('generator-jhipster/cli');
@@ -19,7 +20,7 @@ const devBlueprintPath = join(packagePath, '.blueprint');
     defaultCommand: 'app',
     devBlueprintPath,
     blueprints: {
-      [packageFolderName]: version,
+      [blueprint]: version,
     },
     printBlueprintLogo: () => {
       console.log('===================== JHipster <%= baseName %> =====================');
diff --git a/generators/generate-blueprint/templates/generators/generator/generator.mjs.jhi.ejs b/generators/generate-blueprint/templates/generators/generator/generator.mjs.jhi.ejs
index b8f82ab3158d..cd48c8e72b93 100644
--- a/generators/generate-blueprint/templates/generators/generator/generator.mjs.jhi.ejs
+++ b/generators/generate-blueprint/templates/generators/generator/generator.mjs.jhi.ejs
@@ -28,7 +28,7 @@
 import <%= generatorClass %>Generator from 'generator-jhipster/generators/<%= jhipsterGenerator %>';
 <%_ } _%>
 <%_ if (priorities.find(priority => priority.name === 'initializing')) { _%>
-import command from './command.mjs';
+import command from './command.<%- js ? '' : 'm' %>js';
 <%_ } _%>
 
 <%_ if (application.dynamic) { _%>
@@ -57,6 +57,10 @@ export default class extends <%= generatorClass %>Generator {
     });
   }
 
+  async beforeQueue() {
+    await super.beforeQueue();
+  }
+
 <%_ } _%>
 <% for (const priority of priorities) { %>
 <&- fragments.<%- priority.name %>Section() -&>
diff --git a/generators/generate-blueprint/templates/vitest.config.ts.ejs b/generators/generate-blueprint/templates/vitest.config.ts.ejs
index f8790202bbbf..fcba4731fcac 100644
--- a/generators/generate-blueprint/templates/vitest.config.ts.ejs
+++ b/generators/generate-blueprint/templates/vitest.config.ts.ejs
@@ -3,7 +3,7 @@ import { defineConfig, defaultExclude } from 'vitest/config';
 export default defineConfig({
   test: {
     threads: false,
-    hookTimeout: 15000,
-    exclude: [...defaultExclude, '**/templates/**', '**/resources/**'],
+    hookTimeout: 20000,
+    exclude: [...defaultExclude.filter(val => val !== '**/cypress/**'), '**/templates/**', '**/resources/**'],
   },
 });
diff --git a/generators/generator-constants.mts b/generators/generator-constants.mts
index 10511845b64d..161a48296c47 100644
--- a/generators/generator-constants.mts
+++ b/generators/generator-constants.mts
@@ -16,6 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+export const BLUEPRINT_API_VERSION = 'jhipster-8';
 // jhipster-bom version
 export const JHIPSTER_DEPENDENCIES_VERSION = '8.0.0-SNAPSHOT';
 // Version of Java
@@ -25,19 +26,19 @@ export const JAVA_COMPATIBLE_VERSIONS = ['17', '18', '19', '20', '21'];
 export const ADD_SPRING_MILESTONE_REPOSITORY = false;
 
 // Version of Node, NPM
-export const NODE_VERSION = '18.17.1';
+export const NODE_VERSION = '18.18.2';
 export const OPENAPI_GENERATOR_CLI_VERSION = '2.7.0';
 
 export const javaDependencies: Record<string, string> = {
   /**
    * spring-boot version should match the one managed by https://mvnrepository.com/artifact/tech.jhipster/jhipster-dependencies/JHIPSTER_DEPENDENCIES_VERSION
    */
-  'spring-boot': '3.1.3',
+  'spring-boot': '3.1.5',
   /*
    * hibernate version should match the one managed by https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/SPRING_BOOT_VERSION
    * Required due to hibernate-jpamodelgen annotation processor.
    */
-  hibernate: '6.2.7.Final',
+  hibernate: '6.2.13.Final',
   /*
    * cassandra driver version should match the one managed by https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/SPRING_BOOT_VERSION
    * Required due to java-driver-mapper-processor annotation processor.
@@ -100,7 +101,8 @@ export const GENERATOR_JHIPSTER = 'generator-jhipster';
 export const YO_RC_FILE = '.yo-rc.json';
 
 export const JHIPSTER_CONFIG_DIR = '.jhipster';
-export const DOCKER_DIR = `${MAIN_DIR}docker/`;
+export const TEMPLATES_DOCKER_DIR = 'docker/';
+export const JAVA_DOCKER_DIR = `${MAIN_DIR}docker/`;
 export const LINE_LENGTH = 180;
 export const CLIENT_MAIN_SRC_DIR = `${MAIN_DIR}webapp/`;
 export const CLIENT_TEST_SRC_DIR = `${TEST_DIR}javascript/`;
@@ -109,4 +111,4 @@ export const SERVER_MAIN_SRC_DIR = `${MAIN_DIR}java/`;
 export const SERVER_MAIN_RES_DIR = `${MAIN_DIR}resources/`;
 export const SERVER_TEST_SRC_DIR = `${TEST_DIR}java/`;
 export const SERVER_TEST_RES_DIR = `${TEST_DIR}resources/`;
-export const PRETTIER_EXTENSIONS = 'md,json,yml,html,cjs,mjs,js,ts,tsx,css,scss,vue,svelte,java';
+export const PRETTIER_EXTENSIONS = 'md,json,yml,html,cjs,mjs,js,ts,tsx,css,scss,vue,java';
diff --git a/generators/generator-list.mjs b/generators/generator-list.mjs
index 73ceea3c452d..518067be085d 100644
--- a/generators/generator-list.mjs
+++ b/generators/generator-list.mjs
@@ -55,8 +55,6 @@ export const GENERATOR_KUBERNETES_KNATIVE = 'kubernetes-knative';
 export const GENERATOR_LANGUAGES = 'languages';
 export const GENERATOR_LIQUIBASE = 'liquibase';
 export const GENERATOR_MAVEN = 'maven';
-export const GENERATOR_OPENAPI_CLIENT = 'openapi-client';
-export const GENERATOR_PAGE = 'page';
 export const GENERATOR_PROJECT_NAME = 'project-name';
 export const GENERATOR_REACT = 'react';
 export const GENERATOR_SERVER = 'server';
diff --git a/generators/git/generator.mts b/generators/git/generator.mts
index 6ae8751aff42..3ed1c5e8ccdc 100644
--- a/generators/git/generator.mts
+++ b/generators/git/generator.mts
@@ -35,10 +35,13 @@ export default class InitGenerator extends BaseGenerator {
   skipGit;
 
   async beforeQueue() {
-    await this.dependsOnJHipster(GENERATOR_PROJECT_NAME);
     if (!this.fromBlueprint) {
       await this.composeWithBlueprints(GENERATOR_GIT);
     }
+
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_PROJECT_NAME);
+    }
   }
 
   get initializing() {
diff --git a/generators/gradle/constants.mjs b/generators/gradle/constants.mjs
index 83bc07684e4a..45ee3fc4c2e5 100644
--- a/generators/gradle/constants.mjs
+++ b/generators/gradle/constants.mjs
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export const GRADLE_VERSION = '8.3';
+export const GRADLE_VERSION = '8.4';
 export const GRADLE = 'gradle';
 export const GRADLE_DESCRIPTION = 'Gradle';
 export const BUILD_DESTINATION_VALUE = 'build';
diff --git a/generators/gradle/files.mjs b/generators/gradle/files.mts
similarity index 77%
rename from generators/gradle/files.mjs
rename to generators/gradle/files.mts
index 7c7925e5d139..89644403eb11 100644
--- a/generators/gradle/files.mjs
+++ b/generators/gradle/files.mts
@@ -20,12 +20,11 @@
 export default {
   gradle: [
     {
-      templates: [
-        { file: 'gradlew', noEjs: true },
-        { file: 'gradlew.bat', noEjs: true },
-        { file: 'gradle/wrapper/gradle-wrapper.jar', noEjs: true },
-        'gradle/wrapper/gradle-wrapper.properties',
-      ],
+      templates: ['.prettierignore.jhi.gradle', 'gradle/wrapper/gradle-wrapper.properties'],
+    },
+    {
+      transform: false,
+      templates: ['gradlew', 'gradlew.bat', 'gradle/wrapper/gradle-wrapper.jar'],
     },
   ],
 };
diff --git a/generators/gradle/generator.mts b/generators/gradle/generator.mts
index a36b3b14fc8e..cede53a46bb2 100644
--- a/generators/gradle/generator.mts
+++ b/generators/gradle/generator.mts
@@ -37,9 +37,12 @@ import {
 export default class GradleGenerator extends BaseApplicationGenerator {
   async beforeQueue() {
     if (!this.fromBlueprint) {
-      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_SERVER);
       await this.composeWithBlueprints(GENERATOR_GRADLE);
     }
+
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_SERVER);
+    }
   }
 
   get configuring() {
diff --git a/generators/gradle/templates/.prettierignore.jhi.gradle.ejs b/generators/gradle/templates/.prettierignore.jhi.gradle.ejs
new file mode 100644
index 000000000000..76e6e997be2e
--- /dev/null
+++ b/generators/gradle/templates/.prettierignore.jhi.gradle.ejs
@@ -0,0 +1,24 @@
+<%#
+ Copyright 2013-2023 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+<&_ if (!fragment.section) { -&>
+# Generated by jhipster:gradle
+build
+gradle
+.gradle
+<&_ } -&>
diff --git a/generators/heroku/generator.mjs b/generators/heroku/generator.mjs
index 7e8718ab80d5..3e472fc72f0f 100644
--- a/generators/heroku/generator.mjs
+++ b/generators/heroku/generator.mjs
@@ -21,7 +21,7 @@ import crypto from 'crypto';
 import fs from 'fs';
 import ChildProcess from 'child_process';
 import util from 'util';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import chalk from 'chalk';
 import { glob } from 'glob';
 import runAsync from 'run-async';
@@ -43,7 +43,6 @@ import { mavenProfileContent } from './templates.mjs';
 import { createPomStorage } from '../maven/support/pom-store.mjs';
 import { addGradlePluginCallback, applyFromGradleCallback } from '../gradle/internal/needles.mjs';
 import { getFrontendAppName } from '../base/support/index.mjs';
-import { buildApplication } from '../server/internal/index.mjs';
 import { loadAppConfig, loadDerivedAppConfig } from '../app/support/index.mjs';
 import { loadDerivedPlatformConfig, loadDerivedServerConfig, loadPlatformConfig, loadServerConfig } from '../server/support/index.mjs';
 import { loadLanguagesConfig } from '../languages/support/index.mjs';
@@ -629,7 +628,7 @@ export default class HerokuGenerator extends BaseGenerator {
   }
 
   get end() {
-    return {
+    return this.asEndTaskGroup({
       makeScriptExecutable() {
         if (this.abort) return;
         if (this.useOkta) {
@@ -644,7 +643,7 @@ export default class HerokuGenerator extends BaseGenerator {
           }
         }
       },
-      productionBuild: runAsync(function () {
+      async productionBuild() {
         if (this.abort) return;
 
         if (this.herokuSkipBuild || this.herokuDeployType === 'git') {
@@ -652,23 +651,11 @@ export default class HerokuGenerator extends BaseGenerator {
           return;
         }
 
-        const done = this.async();
         this.log.log(chalk.bold('\nBuilding application'));
 
-        const child = buildApplication(this.buildTool, 'prod', false, err => {
-          if (err) {
-            this.abort = true;
-            this.log.error(err);
-          }
-          done();
-        });
-
-        this.buildCmd = child.buildCmd;
-
-        child.stdout.on('data', data => {
-          process.stdout.write(data.toString());
-        });
-      }),
+        // Use npm script so blueprints just need to override it.
+        await this.spawnCommand('npm run java:jar:prod', { stdio: 'inherit' });
+      },
 
       async productionDeploy() {
         if (this.abort) return;
@@ -889,7 +876,7 @@ export default class HerokuGenerator extends BaseGenerator {
           }
         }
       },
-    };
+    });
   }
 
   get [BaseGenerator.END]() {
diff --git a/generators/heroku/templates/application-heroku.yml.ejs b/generators/heroku/templates/application-heroku.yml.ejs
index 9f6d2437c203..9389d89bbf07 100644
--- a/generators/heroku/templates/application-heroku.yml.ejs
+++ b/generators/heroku/templates/application-heroku.yml.ejs
@@ -65,7 +65,7 @@ jhipster:
   <%_ } _%>
 <%_ } _%>
 spring:
-<%_ if (prodDatabaseTypePostgres || prodDatabaseTypeMysql || prodDatabaseTypeMariadb) { _%>
+<%_ if (prodDatabaseTypePostgresql || prodDatabaseTypeMysql || prodDatabaseTypeMariadb) { _%>
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     url: ${JDBC_DATABASE_URL}
diff --git a/generators/index.ts b/generators/index.ts
index 2de112198e37..deee5cad8466 100644
--- a/generators/index.ts
+++ b/generators/index.ts
@@ -13,14 +13,14 @@ export {
   SERVER_TEST_RES_DIR as JAVA_SERVER_TEST_RESOURCES_DIR,
   CLIENT_MAIN_SRC_DIR as JAVA_WEBAPP_SOURCES_DIR,
   CLIENT_TEST_SRC_DIR as JAVA_JAVASCRIPT_TEST_DIR,
-  DOCKER_DIR as JAVA_DOCKER_DIR,
+  JAVA_DOCKER_DIR,
+  TEMPLATES_DOCKER_DIR,
   SERVER_MAIN_SRC_DIR as TEMPLATES_MAIN_SOURCES_DIR,
   SERVER_MAIN_RES_DIR as TEMPLATES_MAIN_RESOURCES_DIR,
   SERVER_TEST_SRC_DIR as TEMPLATES_TEST_SOURCES_DIR,
   SERVER_TEST_RES_DIR as TEMPLATES_TEST_RESOURCES_DIR,
   CLIENT_MAIN_SRC_DIR as TEMPLATES_WEBAPP_SOURCES_DIR,
   CLIENT_TEST_SRC_DIR as TEMPLATES_JAVASCRIPT_TEST_DIR,
-  DOCKER_DIR as TEMPLATES_DOCKER_DIR,
 } from './generator-constants.mjs';
 
 export type { JHipsterCommandDefinition } from './base/api.mjs';
diff --git a/generators/info/generator.mts b/generators/info/generator.mts
index d16dbc46ca42..131cce89441b 100644
--- a/generators/info/generator.mts
+++ b/generators/info/generator.mts
@@ -29,13 +29,15 @@ import type { JHipsterGeneratorFeatures, JHipsterGeneratorOptions } from '../bas
 import { YO_RC_FILE } from '../generator-constants.mjs';
 import { replaceSensitiveConfig } from './support/utils.mjs';
 
+const isInfoCommand = commandName => commandName === 'info' || undefined;
+
 export default class InfoGenerator extends BaseApplicationGenerator {
   constructor(args: string | string[], options: JHipsterGeneratorOptions, features: JHipsterGeneratorFeatures) {
     super(args, options, {
       jhipsterBootstrap: false,
       storeJHipsterVersion: false,
-      customInstallTask: true,
-      customCommitTask: true,
+      customInstallTask: isInfoCommand(options.commandName),
+      customCommitTask: isInfoCommand(options.commandName),
       ...features,
     });
   }
@@ -47,12 +49,8 @@ export default class InfoGenerator extends BaseApplicationGenerator {
       },
 
       async checkJHipster() {
-        try {
-          const { stdout } = await this.spawnCommand('npm list generator-jhipster', { stdio: 'pipe' });
-          console.log(`\n\`\`\`\n${stdout}\`\`\`\n`);
-        } catch (error) {
-          console.log(`\n\`\`\`\n${(error as any).stdout}\`\`\`\n`);
-        }
+        const { stdout } = await this.spawnCommand('npm list generator-jhipster', { stdio: 'pipe', reject: false });
+        console.log(`\n\`\`\`\n${stdout}\`\`\`\n`);
       },
 
       displayConfiguration() {
@@ -66,8 +64,9 @@ export default class InfoGenerator extends BaseApplicationGenerator {
           console.log('\n##### **JHipster configuration not found**\n');
         }
 
-        if (this.jhipsterConfig.packages && this.jhipsterConfig.packages.length > 0) {
-          for (const pkg of this.jhipsterConfig.packages) {
+        const packages = this.jhipsterConfig.appsFolders ?? this.jhipsterConfig.packages ?? [];
+        if (packages.length > 0) {
+          for (const pkg of packages) {
             const yoRc = this.readDestinationJSON(this.destinationPath(pkg, YO_RC_FILE));
             if (yoRc) {
               const result = JSON.stringify(replaceSensitiveConfig(yoRc), null, 2);
@@ -121,7 +120,7 @@ export default class InfoGenerator extends BaseApplicationGenerator {
 
   async checkCommand(command: string, args: string[], printInfo = ({ stdout }: ExecaReturnValue<string>) => console.log(stdout)) {
     try {
-      printInfo(await this.spawnCommand(command, args, { stdio: 'pipe' }));
+      printInfo(await this.spawn(command, args, { stdio: 'pipe' }));
     } catch (_error) {
       console.log(chalk.red(`'${command}' command could not be found`));
     }
diff --git a/generators/init/generator.mjs b/generators/init/generator.mjs
index a0f96ee2e95c..5829d80fca1c 100644
--- a/generators/init/generator.mjs
+++ b/generators/init/generator.mjs
@@ -30,10 +30,13 @@ import { packageJson } from '../../lib/index.mjs';
  */
 export default class InitGenerator extends BaseApplicationGenerator {
   async beforeQueue() {
-    await this.dependsOnJHipster(GENERATOR_PROJECT_NAME);
     if (!this.fromBlueprint) {
       await this.composeWithBlueprints(GENERATOR_INIT);
     }
+
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_PROJECT_NAME);
+    }
   }
 
   get initializing() {
@@ -103,6 +106,21 @@ export default class InitGenerator extends BaseApplicationGenerator {
 
   get postWriting() {
     return this.asPostWritingTaskGroup({
+      addPrettierDependencies({ application }) {
+        this.packageJson.merge({
+          scripts: {
+            'prettier-check': 'prettier --check "{,**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}"',
+            'prettier-format': 'prettier --write "{,**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}"',
+          },
+          devDependencies: {
+            prettier: application.nodeDependencies.prettier,
+            'prettier-plugin-packagejson': application.nodeDependencies['prettier-plugin-packagejson'],
+          },
+          engines: {
+            node: application.applicationNodeEngine,
+          },
+        });
+      },
       addCommitHookDependencies({ application }) {
         if (application.skipCommitHook) return;
         this.packageJson.merge({
diff --git a/generators/init/templates/package.json.ejs b/generators/init/templates/package.json.ejs
index 0a20a1829ff4..8c4535ec7b7d 100644
--- a/generators/init/templates/package.json.ejs
+++ b/generators/init/templates/package.json.ejs
@@ -26,16 +26,9 @@
     "node_modules"
   ],
   "dependencies": {},
-  "devDependencies": {
-    "prettier": "<%= nodeDependencies['prettier'] %>",
-    "prettier-plugin-java": "<%= nodeDependencies['prettier-plugin-java'] %>",
-    "prettier-plugin-packagejson": "<%= nodeDependencies['prettier-plugin-packagejson'] %>"
-  },
+  "devDependencies": {},
   "engines": {
     "node": "<%= applicationNodeEngine %>"
   },
-  "scripts": {
-    "prettier-check": "prettier --check \"{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}\"",
-    "prettier-format": "prettier --write \"{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}\""
-  }
+  "scripts": {}
 }
diff --git a/generators/java/__snapshots__/generator.spec.mts.snap b/generators/java/__snapshots__/generator.spec.mts.snap
index 72a6926b1fd7..fc5219c05efa 100644
--- a/generators/java/__snapshots__/generator.spec.mts.snap
+++ b/generators/java/__snapshots__/generator.spec.mts.snap
@@ -2,14 +2,41 @@
 
 exports[`generator - java with default config should match files snapshot 1`] = `
 {
+  ".jhipster/Bar.json": {
+    "stateCleared": "modified",
+  },
+  ".jhipster/Foo.json": {
+    "stateCleared": "modified",
+  },
   ".yo-rc.json": {
     "stateCleared": "modified",
   },
   "src/main/java/com/mycompany/myapp/GeneratedByJHipster.java": {
     "stateCleared": "modified",
   },
+  "src/main/java/com/mycompany/myapp/domain/Bar.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/domain/Foo.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/domain/enumeration/MyEnum.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/domain/enumeration/package-info.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/domain/package-info.java": {
+    "stateCleared": "modified",
+  },
   "src/main/java/com/mycompany/myapp/package-info.java": {
     "stateCleared": "modified",
   },
+  "src/test/java/com/mycompany/myapp/domain/BarTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/domain/FooTest.java": {
+    "stateCleared": "modified",
+  },
 }
 `;
diff --git a/generators/java/command.mts b/generators/java/command.mts
index da1894f3e8fb..d4e2588c613b 100644
--- a/generators/java/command.mts
+++ b/generators/java/command.mts
@@ -28,6 +28,25 @@ const command: JHipsterCommandDefinition = {
     packageInfoFile: {
       description: 'write package-info.java file for every package',
       type: Boolean,
+      default: true,
+      scope: 'generator',
+      hide: true,
+    },
+    generateEntities: {
+      type: Boolean,
+      default: true,
+      scope: 'generator',
+      hide: true,
+    },
+    useJakartaValidation: {
+      type: Boolean,
+      default: true,
+      scope: 'generator',
+      hide: true,
+    },
+    generateEnums: {
+      type: Boolean,
+      default: true,
       scope: 'generator',
       hide: true,
     },
diff --git a/generators/java/entity-files.mts b/generators/java/entity-files.mts
new file mode 100644
index 000000000000..81ba42e610a3
--- /dev/null
+++ b/generators/java/entity-files.mts
@@ -0,0 +1,48 @@
+/**
+ * Copyright 2013-2023 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { WriteFileSection } from '../base/api.mjs';
+import { javaMainPackageTemplatesBlock, javaTestPackageTemplatesBlock } from './support/index.mjs';
+
+export const entityServerFiles: WriteFileSection = {
+  model: [
+    javaMainPackageTemplatesBlock({
+      templates: ['_entityPackage_/domain/_persistClass_.java.jhi'],
+    }),
+  ],
+  modelTestFiles: [
+    javaTestPackageTemplatesBlock({
+      templates: ['_entityPackage_/domain/_persistClass_Test.java'],
+    }),
+  ],
+  server: [
+    javaMainPackageTemplatesBlock({
+      condition: ctx => ctx.useJakartaValidation,
+      templates: ['_entityPackage_/domain/_persistClass_.java.jhi.jakarta_validation'],
+    }),
+  ],
+};
+
+export const enumFiles: WriteFileSection = {
+  enumFiles: [
+    javaMainPackageTemplatesBlock({
+      renameTo: (data, filepath) => filepath.replace('_enumName_', data.enumName),
+      templates: ['_entityPackage_/domain/enumeration/_enumName_.java'],
+    }),
+  ],
+};
diff --git a/generators/java/generator.mts b/generators/java/generator.mts
index d1877eaedb49..8c4d6b7b28ca 100644
--- a/generators/java/generator.mts
+++ b/generators/java/generator.mts
@@ -29,24 +29,32 @@ import { GenericSourceTypeDefinition } from '../base/tasks.mjs';
 import command from './command.mjs';
 import { JAVA_COMPATIBLE_VERSIONS } from '../generator-constants.mjs';
 import { matchMainJavaFiles } from './support/package-info-transform.mjs';
+import { entityServerFiles, enumFiles } from './entity-files.mjs';
+import { getEnumInfo } from '../base-application/support/index.mjs';
 
 export type ApplicationDefinition = GenericApplicationDefinition<JavaApplication>;
 export type GeneratorDefinition = BaseApplicationGeneratorDefinition<ApplicationDefinition & GenericSourceTypeDefinition>;
 
 export default class JavaGenerator extends BaseApplicationGenerator<GeneratorDefinition> {
-  packageInfoFile = true;
+  packageInfoFile!: boolean;
+  generateEntities!: boolean;
+  useJakartaValidation!: boolean;
+  generateEnums!: boolean;
 
   async beforeQueue() {
-    await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
     if (!this.fromBlueprint) {
       await this.composeWithBlueprints(GENERATOR_JAVA);
     }
+
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+    }
   }
 
   get initializing() {
     return this.asInitializingTaskGroup({
       loadConfig() {
-        this.parseJHipsterOptions(command.options);
+        this.parseJHipsterCommand(command);
       },
 
       validateJava() {
@@ -115,6 +123,47 @@ export default class JavaGenerator extends BaseApplicationGenerator<GeneratorDef
     return this.delegateTasksToBlueprint(() => this.writing);
   }
 
+  get writingEntities() {
+    return this.asWritingEntitiesTaskGroup({
+      async writeServerFiles({ application, entities }) {
+        if (!this.generateEntities) return;
+
+        const { useJakartaValidation } = this;
+        for (const entity of entities.filter(entity => !entity.skipServer && !entity.builtIn)) {
+          await this.writeFiles({
+            sections: entityServerFiles,
+            context: { ...application, ...entity, useJakartaValidation },
+          });
+        }
+      },
+
+      async writeEnumFiles({ application, entities }) {
+        if (!this.generateEnums || !this.generateEntities) return;
+
+        for (const entity of entities.filter(entity => !entity.skipServer)) {
+          for (const field of entity.fields.filter(field => field.fieldIsEnum)) {
+            const enumInfo = {
+              ...getEnumInfo(field, (entity as any).clientRootFolder),
+              frontendAppName: (entity as any).frontendAppName,
+              packageName: application.packageName,
+              javaPackageSrcDir: application.javaPackageSrcDir,
+              entityJavaPackageFolder: (entity as any).entityJavaPackageFolder,
+              entityAbsolutePackage: (entity as any).entityAbsolutePackage || application.packageName,
+            };
+            await this.writeFiles({
+              sections: enumFiles,
+              context: enumInfo,
+            });
+          }
+        }
+      },
+    });
+  }
+
+  get [BaseApplicationGenerator.WRITING_ENTITIES]() {
+    return this.delegateTasksToBlueprint(() => this.writingEntities);
+  }
+
   /**
    * Check if a supported Java is installed
    *
diff --git a/generators/java/generator.spec.mts b/generators/java/generator.spec.mts
index 4fda49efedc2..d20d91dcedaa 100644
--- a/generators/java/generator.spec.mts
+++ b/generators/java/generator.spec.mts
@@ -25,11 +25,122 @@ describe(`generator - ${generator}`, () => {
 
   describe('with default config', () => {
     before(async () => {
-      await helpers.runJHipster(GENERATOR_JAVA).withJHipsterConfig();
+      await helpers.runJHipster(GENERATOR_JAVA).withJHipsterConfig({}, [
+        {
+          name: 'Foo',
+          fields: [
+            { fieldName: 'name', documentation: 'My Name', fieldType: 'String', fieldValidateRules: ['required'] },
+            { fieldName: 'myEnum', fieldType: 'MyEnum', fieldValues: 'FRENCH,ENGLISH', fieldTypeDocumentation: 'Enum Doc' },
+          ],
+        },
+        {
+          name: 'Bar',
+          documentation: 'Custom Bar',
+          fields: [{ fieldName: 'name2', fieldType: 'String', fieldValidateRules: ['required'] }],
+        },
+      ]);
     });
 
     it('should match files snapshot', () => {
       expect(result.getStateSnapshot()).toMatchSnapshot();
     });
+
+    it('should generate entities containing jakarta', () => {
+      result.assertFileContent('src/main/java/com/mycompany/myapp/domain/Foo.java.jhi', 'jakarta');
+    });
+
+    it('should generate javadocs', () => {
+      result.assertFileContent('src/main/java/com/mycompany/myapp/domain/Foo.java.jhi', '* A Foo');
+      result.assertFileContent('src/main/java/com/mycompany/myapp/domain/Foo.java.jhi', '* My Name');
+      result.assertFileContent('src/main/java/com/mycompany/myapp/domain/Bar.java.jhi', '* Custom Bar');
+    });
+
+    it('should generate openapi @Schema', () => {
+      result.assertFileContent('src/main/java/com/mycompany/myapp/domain/Bar.java.jhi', '@Schema(description = "Custom Bar")');
+    });
+
+    it('should write enum files', () => {
+      result.assertFile('src/main/java/com/mycompany/myapp/domain/enumeration/MyEnum.java');
+      expect(Object.keys(result.getStateSnapshot('**/enumeration/**')).length).toBe(2);
+    });
+
+    it('should generate enum javadoc', () => {
+      result.assertFileContent('src/main/java/com/mycompany/myapp/domain/enumeration/MyEnum.java', '* Enum Doc');
+    });
+
+    it('should have options defaults set', () => {
+      expect(result.generator.generateEntities).toBe(true);
+      expect(result.generator.generateEnums).toBe(true);
+      expect(result.generator.useJakartaValidation).toBe(true);
+    });
+  });
+
+  describe('with jakarta and enums disabled', () => {
+    before(async () => {
+      await helpers
+        .runJHipster(GENERATOR_JAVA)
+        .withJHipsterConfig({}, [
+          {
+            name: 'Foo',
+            fields: [
+              { fieldName: 'name', fieldType: 'String', fieldValidateRules: ['required'] },
+              { fieldName: 'myEnum', fieldType: 'MyEnum', fieldValues: 'FRENCH,ENGLISH' },
+            ],
+          },
+        ])
+        .withOptions({ useJakartaValidation: false, generateEnums: false });
+    });
+
+    it('should generate entities not containing jakarta', () => {
+      result.assertNoFileContent('src/main/java/com/mycompany/myapp/domain/Foo.java.jhi', 'jakarta');
+    });
+
+    it('should not write enum files', () => {
+      expect(Object.keys(result.getStateSnapshot('**/enumeration/**')).length).toBe(0);
+    });
+  });
+
+  describe('with entities disabled', () => {
+    before(async () => {
+      await helpers
+        .runJHipster(GENERATOR_JAVA)
+        .withJHipsterConfig({}, [
+          {
+            name: 'Foo',
+            fields: [
+              { fieldName: 'name', fieldType: 'String', fieldValidateRules: ['required'] },
+              { fieldName: 'myEnum', fieldType: 'MyEnum', fieldValues: 'FRENCH,ENGLISH' },
+            ],
+          },
+        ])
+        .withOptions({ generateEntities: false });
+    });
+
+    it('should not contain jakarta', () => {
+      result.assertNoFile('src/main/java/com/mycompany/myapp/domain/Foo.java.jhi');
+    });
+
+    it('should not write enum files', () => {
+      expect(Object.keys(result.getStateSnapshot('**/enumeration/**')).length).toBe(0);
+    });
+  });
+
+  describe('with custom properties values', () => {
+    before(async () => {
+      await helpers
+        .runJHipster(GENERATOR_JAVA)
+        .withJHipsterConfig({})
+        .onGenerator(generator => {
+          generator.generateEntities = false;
+          generator.generateEnums = false;
+          generator.useJakartaValidation = false;
+        });
+    });
+
+    it('should not override custom values', () => {
+      expect(result.generator.generateEntities).toBe(false);
+      expect(result.generator.generateEnums).toBe(false);
+      expect(result.generator.useJakartaValidation).toBe(false);
+    });
   });
 });
diff --git a/generators/java/support/files.mts b/generators/java/support/files.mts
index e9de14db87a7..22633c17d05b 100644
--- a/generators/java/support/files.mts
+++ b/generators/java/support/files.mts
@@ -17,17 +17,18 @@
  * limitations under the License.
  */
 
+import type { WriteFileBlock } from '../../base/api.mjs';
+import type CoreGenerator from '../../base-core/generator.mjs';
 import { SERVER_TEST_SRC_DIR, SERVER_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_TEST_RES_DIR } from '../../generator-constants.mjs';
 
-export const replaceFilePathVariables = (data: any, filePath: string) =>
-  filePath?.replace(/_package_/, data.packageName)?.replace(/_\w*/, '');
-
 export const replaceEntityFilePathVariables = (data: any, filePath: string) => {
   filePath = filePath
-    ?.replace(/_package_/, data.entityJavaPackageFolder)
-    ?.replace(/_PersistClass_/, data.persistClass)
-    ?.replace(/_EntityClass_/, data.entityClass)
-    ?.replace(/_DtoClass_/, data.dtoClass);
+    ?.replace(/_package_/, data.packageFolder)
+    ?.replace(/_entityPackage_/, data.entityJavaPackageFolder)
+    ?.replace(/_mainClass_/, data.mainClass)
+    ?.replace(/_persistClass_/, data.persistClass)
+    ?.replace(/_entityClass_/, data.entityClass)
+    ?.replace(/_dtoClass_/, data.dtoClass);
   return filePath?.includes('.jhi.') ? filePath : filePath?.replace(/_\w*/, '');
 };
 
@@ -36,14 +37,14 @@ export const replaceEntityFilePathVariables = (data: any, filePath: string) => {
  * Removes trailing specifiers.
  */
 export const moveToJavaPackageSrcDir = (data: any, filePath: string) =>
-  `${data.javaPackageSrcDir}${replaceFilePathVariables(data, filePath) ?? ''}`;
+  `${data.javaPackageSrcDir}${replaceEntityFilePathVariables(data, filePath) ?? ''}`;
 
 /**
  * Move the template to `javaPackageTestDir` (defaults to`src/main/java/${packageFolder}/${filePath}`).
  * Removes trailing specifiers.
  */
 export const moveToJavaPackageTestDir = (data: any, filePath: string) =>
-  `${data.javaPackageTestDir}${replaceFilePathVariables(data, filePath) ?? ''}`;
+  `${data.javaPackageTestDir}${replaceEntityFilePathVariables(data, filePath) ?? ''}`;
 
 export const moveToJavaEntityPackageSrcDir = (data: any, filePath: string) =>
   `${data.srcMainJava}${data.entityAbsoluteFolder}${replaceEntityFilePathVariables(data, filePath) ?? ''}`;
@@ -57,46 +58,75 @@ export const moveToSrcMainResourcesDir = (data: any, filePath: string) =>
 export const moveToSrcTestResourcesDir = (data: any, filePath: string) =>
   `${data.srcTestResources}${replaceEntityFilePathVariables(data, filePath) ?? ''}`;
 
-export const javaMainPackageTemplatesBlock = (relativePath: string | any = '') => {
-  relativePath = typeof relativePath === 'object' ? relativePath.relativePath : relativePath;
-  return {
-    path: `${SERVER_MAIN_SRC_DIR}_package_/${relativePath}`,
-    renameTo: (data: any, filePath: string) =>
-      `${data.javaPackageSrcDir}${relativePath}${data.entityJavaPackageFolder ?? ''}${
-        replaceEntityFilePathVariables(data, filePath) ?? ''
-      }`,
-    ...(typeof relativePath === 'object' ? relativePath : undefined),
-  };
-};
+type RelativeWriteFileBlock = WriteFileBlock & { relativePath?: string };
 
-export const javaMainResourceTemplatesBlock = (relativePath: string | any = '') => {
-  relativePath = typeof relativePath === 'object' ? relativePath.relativePath : relativePath;
-  return {
-    path: `${SERVER_MAIN_RES_DIR}${relativePath}`,
-    renameTo: (data: any, filePath: string) =>
-      `${data.srcMainResources}${relativePath}${replaceEntityFilePathVariables(data, filePath) ?? ''}`,
-    ...(typeof relativePath === 'object' ? relativePath : undefined),
-  };
-};
+export function javaMainPackageTemplatesBlock(blockOrRelativePath?: string): Pick<WriteFileBlock, 'path' | 'renameTo'>;
+export function javaMainPackageTemplatesBlock(blockOrRelativePath: RelativeWriteFileBlock): WriteFileBlock;
+export function javaMainPackageTemplatesBlock(
+  blockOrRelativePath: string | RelativeWriteFileBlock = '',
+): WriteFileBlock | Pick<WriteFileBlock, 'path' | 'renameTo'> {
+  return javaBlock({
+    srcPath: `${SERVER_MAIN_SRC_DIR}_package_/`,
+    destProperty: 'javaPackageSrcDir',
+    blockOrRelativePath,
+  });
+}
 
-export const javaTestResourceTemplatesBlock = (relativePath: string | any = '') => {
-  relativePath = typeof relativePath === 'object' ? relativePath.relativePath : relativePath;
-  return {
-    path: `${SERVER_TEST_RES_DIR}${relativePath}`,
-    renameTo: (data: any, filePath: string) =>
-      `${data.srcTestResources}${relativePath}${replaceEntityFilePathVariables(data, filePath) ?? ''}`,
-    ...(typeof relativePath === 'object' ? relativePath : undefined),
-  };
-};
+export function javaMainResourceTemplatesBlock(blockOrRelativePath?: string): Pick<WriteFileBlock, 'path' | 'renameTo'>;
+export function javaMainResourceTemplatesBlock(blockOrRelativePath: RelativeWriteFileBlock): WriteFileBlock;
+export function javaMainResourceTemplatesBlock(
+  blockOrRelativePath: string | RelativeWriteFileBlock = '',
+): WriteFileBlock | Pick<WriteFileBlock, 'path' | 'renameTo'> {
+  return javaBlock({
+    srcPath: SERVER_MAIN_RES_DIR,
+    destProperty: 'srcMainResources',
+    blockOrRelativePath,
+  });
+}
 
-export const javaTestPackageTemplatesBlock = (relativePath: string | any = '') => {
-  relativePath = typeof relativePath === 'object' ? relativePath.relativePath : relativePath;
+export function javaTestResourceTemplatesBlock(blockOrRelativePath?: string): Pick<WriteFileBlock, 'path' | 'renameTo'>;
+export function javaTestResourceTemplatesBlock(blockOrRelativePath: RelativeWriteFileBlock): WriteFileBlock;
+export function javaTestResourceTemplatesBlock(
+  blockOrRelativePath: string | RelativeWriteFileBlock = '',
+): WriteFileBlock | Pick<WriteFileBlock, 'path' | 'renameTo'> {
+  return javaBlock({
+    srcPath: SERVER_TEST_RES_DIR,
+    destProperty: 'srcTestResources',
+    blockOrRelativePath,
+  });
+}
+
+export function javaTestPackageTemplatesBlock(blockOrRelativePath?: string): Pick<WriteFileBlock, 'path' | 'renameTo'>;
+export function javaTestPackageTemplatesBlock(blockOrRelativePath: RelativeWriteFileBlock): WriteFileBlock;
+export function javaTestPackageTemplatesBlock(
+  blockOrRelativePath: string | RelativeWriteFileBlock = '',
+): WriteFileBlock | Pick<WriteFileBlock, 'path' | 'renameTo'> {
+  return javaBlock({
+    srcPath: `${SERVER_TEST_SRC_DIR}_package_/`,
+    destProperty: 'javaPackageTestDir',
+    blockOrRelativePath,
+  });
+}
+
+function javaBlock({
+  srcPath,
+  destProperty,
+  blockOrRelativePath = '',
+}: {
+  srcPath: string;
+  destProperty: string;
+  blockOrRelativePath: string | RelativeWriteFileBlock;
+}): WriteFileBlock | Pick<WriteFileBlock, 'path' | 'renameTo'> {
+  const block: RelativeWriteFileBlock | undefined = typeof blockOrRelativePath !== 'string' ? blockOrRelativePath : undefined;
+  const blockRenameTo = typeof block?.renameTo === 'function' ? block.renameTo : undefined;
+  const relativePath: string = typeof blockOrRelativePath === 'string' ? blockOrRelativePath : blockOrRelativePath.relativePath ?? '';
   return {
-    path: `${SERVER_TEST_SRC_DIR}_package_/${relativePath}`,
-    renameTo: (data: any, filePath: string) =>
-      `${data.javaPackageTestDir}${relativePath}${data.entityJavaPackageFolder ?? ''}${
-        replaceEntityFilePathVariables(data, filePath) ?? ''
-      }`,
-    ...(typeof relativePath === 'object' ? relativePath : undefined),
+    path: `${srcPath}${relativePath}`,
+    ...block,
+    renameTo(this: CoreGenerator, data: any, filePath: string) {
+      return `${data[destProperty]}${replaceEntityFilePathVariables(data, relativePath) ?? ''}${
+        replaceEntityFilePathVariables(data, blockRenameTo?.call?.(this, data, filePath) ?? filePath) ?? ''
+      }`;
+    },
   };
-};
+}
diff --git a/generators/java/support/util.mts b/generators/java/support/util.mts
index 1d445ca1cfee..d6b33f751017 100644
--- a/generators/java/support/util.mts
+++ b/generators/java/support/util.mts
@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { getMicroserviceAppName } from '../../base/support/index.mjs';
 
 const { upperFirst } = _;
diff --git a/generators/server/templates/entity/src/main/java/package/common/field_validators.ejs b/generators/java/templates/_global_partials_entity_/field_validators.ejs
similarity index 100%
rename from generators/server/templates/entity/src/main/java/package/common/field_validators.ejs
rename to generators/java/templates/_global_partials_entity_/field_validators.ejs
diff --git a/generators/server/templates/entity/src/main/java/package/domain/_PersistClass_.java.jhi.ejs b/generators/java/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.ejs
similarity index 94%
rename from generators/server/templates/entity/src/main/java/package/domain/_PersistClass_.java.jhi.ejs
rename to generators/java/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.ejs
index 6b43cb79f981..854b375aadf8 100644
--- a/generators/server/templates/entity/src/main/java/package/domain/_PersistClass_.java.jhi.ejs
+++ b/generators/java/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.ejs
@@ -54,7 +54,7 @@ package <%= entityAbsolutePackage %>.domain;
 <%_ if (relationshipsContainOtherSideIgnore) { _%>
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 <%_ } _%>
-<%_ if (!dtoMapstruct && (typeof javadoc !== 'undefined' || importApiModelProperty)) { _%>
+<%_ if (!dtoMapstruct && (entityApiDescription || importApiModelProperty)) { _%>
 import io.swagger.v3.oas.annotations.media.Schema;
 <%_ } _%>
 
@@ -85,15 +85,15 @@ import <%= entityAbsolutePackage %>.domain.enumeration.<%= element %>;
 import <%= otherEntity.entityAbsoluteClass %>;
 <%_ } _%>
 
-<%_ if (typeof javadoc === 'undefined') { _%>
+<%_ if (entityJavadoc) { _%>
+<%- entityJavadoc %>
+<%_ } else { _%>
 /**
  * A <%= persistClass %>.
  */
-<%_ } else { _%>
-<%- this.formatAsClassJavadoc(javadoc) %>
-  <%_ if (!dtoMapstruct) { _%>
-@Schema(description = "<%- this.formatAsApiDescription(javadoc) %>")
-  <%_ } _%>
+<%_ } _%>
+<%_ if (!dtoMapstruct && entityApiDescription) { _%>
+@Schema(description = "<%- entityApiDescription %>")
 <%_ } _%>
 <&- fragments.annotationSection() -&>
 @SuppressWarnings("common-java:DuplicatedBlocks")
@@ -111,11 +111,11 @@ public class <%= persistClass %> <&- fragments.extendsSection() -&>implements Se
 <%_ for (const field of fields.filter(field => !field.javaInherited && !field.transient && (embedded || !field.id || !primaryKey.composite))) { _%>
 <&- fragments.field<%- field.fieldNameCapitalized %>CustomDeclarationSection() -&>
 <&_ if (!fragments.field<%- field.fieldNameCapitalized %>CustomDeclarationSection()) { -&>
-  <%_ if (typeof field.javadoc !== 'undefined') { _%>
-<%- this.formatAsFieldJavadoc(field.javadoc) %>
+  <%_ if (field.fieldJavadoc) { _%>
+<%- field.fieldJavadoc %>
   <%_ } _%>
-  <%_ if (!dtoMapstruct && typeof field.javadoc !== 'undefined') { _%>
-    @Schema(description = "<%- this.formatAsApiDescription(field.javadoc) %>"<% if (field.fieldValidationRequired) { %>, required = true<% } %>)
+  <%_ if (!dtoMapstruct && field.fieldApiDescription) { _%>
+    @Schema(description = "<%- field.fieldApiDescription %>"<% if (field.fieldValidationRequired) { %>, required = true<% } %>)
   <%_ } _%>
 <&- fragments.field<%- field.fieldNameCapitalized %>AnnotationSection() -&>
     private <%= field.javaFieldType %> <%= field.fieldName %>;
@@ -132,10 +132,10 @@ public class <%= persistClass %> <&- fragments.extendsSection() -&>implements Se
 <%_
 // An embedded entity should not reference entities that embed it, unless the other entities are also embedded
 for (relationship of relationships.filter(relationship => !relationship.embedded || relationship.otherEntity.embedded || relationship.ownerSide)) {
-  if (typeof relationship.javadoc !== 'undefined') { _%>
-<%- this.formatAsFieldJavadoc(relationship.javadoc) %>
-    <%_ if (!dtoMapstruct) { _%>
-    @Schema(description = "<%- this.formatAsApiDescription(relationship.javadoc) %>")
+  if (typeof relationship.fieldApiDescription) { _%>
+<%- relationship.relationshipJavadoc %>
+    <%_ if (!dtoMapstruct && relationship.relationshipyApiDescription) { _%>
+    @Schema(description = "<%- relationship.relationshipyApiDescription %>")
     <%_ } _%>
   <%_ } _%>
 <&- fragments.relationship<%- relationship.relationshipNameCapitalized %>AnnotationSection() -&>
@@ -343,7 +343,7 @@ _%>
             return false;
         }
 <%_ if (!embedded) { _%>
-        return <%= primaryKey.name %> != null && <%= primaryKey.name %>.equals(((<%= persistClass %>) o).<%= primaryKey.name %>);
+        return get<%= primaryKey.nameCapitalized %>() != null && get<%= primaryKey.nameCapitalized %>().equals(((<%= persistClass %>) o).get<%= primaryKey.nameCapitalized %>());
 <%_ } else { _%>
         return false;
 <%_ } _%>
diff --git a/generators/server/templates/entity/src/main/java/package/domain/_PersistClass_.java.jhi.jakarta_validation.ejs b/generators/java/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.jakarta_validation.ejs
similarity index 95%
rename from generators/server/templates/entity/src/main/java/package/domain/_PersistClass_.java.jhi.jakarta_validation.ejs
rename to generators/java/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.jakarta_validation.ejs
index 59f38bae736b..7487ff860b9e 100644
--- a/generators/server/templates/entity/src/main/java/package/domain/_PersistClass_.java.jhi.jakarta_validation.ejs
+++ b/generators/java/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.jakarta_validation.ejs
@@ -32,7 +32,7 @@ import jakarta.validation.constraints.*;
 <%_ for (const field of fields) { _%>
 <&_ if (fragment.field<%- field.fieldNameCapitalized %>AnnotationSection) { -&>
   <%_ if (field.fieldValidate === true) { -%>
-    <%- include('../common/field_validators', {field, reactive}); -%>
+    <%- include('/_global_partials_entity_/field_validators', {field, reactive}); -%>
   <%_ } _%>
 <&_ } -&>
 <%_ } -%>
diff --git a/generators/server/templates/entity/src/main/java/package/domain/enumeration/Enum.java.ejs b/generators/java/templates/src/main/java/_package_/_entityPackage_/domain/enumeration/_enumName_.java.ejs
similarity index 97%
rename from generators/server/templates/entity/src/main/java/package/domain/enumeration/Enum.java.ejs
rename to generators/java/templates/src/main/java/_package_/_entityPackage_/domain/enumeration/_enumName_.java.ejs
index 563c495690c4..06826d7f299a 100644
--- a/generators/server/templates/entity/src/main/java/package/domain/enumeration/Enum.java.ejs
+++ b/generators/java/templates/src/main/java/_package_/_entityPackage_/domain/enumeration/_enumName_.java.ejs
@@ -18,12 +18,12 @@
 -%>
 package <%= entityAbsolutePackage %>.domain.enumeration;
 
-<%_ if (typeof javadoc === 'undefined') { _%>
+<%_ if (enumJavadoc) { _%>
+<%- enumJavadoc %>
+<%_ } else { _%>
 /**
  * The <%= enumName %> enumeration.
  */
-<%_ } else { _%>
-<%= javadoc %>
 <%_ } _%>
 public enum <%= enumName %> {
 <%_ if (withoutCustomValues) { _%>
diff --git a/generators/server/templates/entity/src/test/java/package/domain/_PersistClass_Test.java.ejs b/generators/java/templates/src/test/java/_package_/_entityPackage_/domain/_persistClass_Test.java.ejs
similarity index 100%
rename from generators/server/templates/entity/src/test/java/package/domain/_PersistClass_Test.java.ejs
rename to generators/java/templates/src/test/java/_package_/_entityPackage_/domain/_persistClass_Test.java.ejs
diff --git a/generators/jdl/__snapshots__/generator.spec.mts.snap b/generators/jdl/__snapshots__/generator.spec.mts.snap
index 5f8085fbb017..0e854ed7aeed 100644
--- a/generators/jdl/__snapshots__/generator.spec.mts.snap
+++ b/generators/jdl/__snapshots__/generator.spec.mts.snap
@@ -173,28 +173,21 @@ Options:
   --force-install                          Fail on install dependencies error (default: false)
   --ask-answered                           Show prompts for already configured options (default: false)
   --defaults                               Execute jhipster with default config
-  --application-type <value>               Application type to generate
   --skip-client                            Skip the client-side application generation
   --skip-server                            Skip the server-side application generation
-  --skip-commit-hook                       Skip adding husky commit hooks
-  --skip-check-length-of-identifier        Skip check the length of the identifier, only for recent Oracle databases that support 30+ characters metadata
-  --skip-fake-data                         Skip generation of fake data for development
   --jhi-prefix <value>                     Add prefix before services, controllers and states name
   --entity-suffix <value>                  Add suffix after entities name
   --dto-suffix <value>                     Add suffix after dtos name
-  --auth <value>                           Provide authentication type for the application when skipping server side generation
-  --db <value>                             Provide DB name for the application when skipping server side generation
   --blueprint <value...>                   DEPRECATED: Specify a generator blueprint to use for the sub generators
   --blueprints <value>                     A comma separated list of one or more generator blueprints to use for the sub generators, e.g. --blueprints kotlin,vuejs
-  --incremental-changelog                  Creates incremental database changelogs
-  --recreate-initial-changelog             Recreate the initial database changelog based on the current config
   --ignore-errors                          Don't fail on prettier errors.
-  --enable-translation                     Enable translation
-  -l, --language <value...>                Language to be added to application (existing languages are not removed)
   --pk-type <value>                        Default primary key type (beta)
   --client-package-manager <value>         Force an unsupported client package manager
-  --microfrontend                          Force generation of experimental microfrontend support
   --test-frameworks <value...>             Test frameworks to be generated
+  --auth <value>                           Provide authentication type for the application when skipping server side generation
+  --db <value>                             Provide DB name for the application when skipping server side generation
+  --incremental-changelog                  Creates incremental database changelogs
+  --recreate-initial-changelog             Recreate the initial database changelog based on the current config
   --build <value>                          Provide build tool for the application when skipping server side generation
   --cache-provider <value>                 Cache provider
   --enable-swagger-codegen                 API first development using OpenAPI-generator
@@ -202,20 +195,31 @@ Options:
   --message-broker <value>                 message broker
   --reactive                               Generate a reactive backend
   --search-engine <value>                  Provide search engine for the application when skipping server side generation
+  --skip-check-length-of-identifier        Skip check the length of the identifier, only for recent Oracle databases that support 30+ characters metadata
   --skip-db-changelog                      Skip the generation of database migrations
+  --skip-fake-data                         Skip generation of fake data for development
   --websocket <value>                      Provide websocket option for the application when skipping server side generation
   --project-version <value>                project version to use, this option is not persisted (env: JHI_PROJECT_VERSION)
   --jhipster-dependencies-version <value>  jhipster-dependencies version to use, this option is not persisted (env: JHIPSTER_DEPENDENCIES_VERSION)
+  --application-type <value>               Application type to generate (choices: "monolith", "gateway", "microservice")
   --with-generated-flag                    Add a GeneratedByJHipster annotation to all generated java classes and interfaces
   --dev-database-type <value>              Development database
-  --client-framework <value>               Provide client framework for the application
-  --prettier-tab-width <value>             Default tab width for prettier
+  --client-framework <value>               Provide client framework for the application (choices: "angular", "react", "vue", "no")
+  --microfrontend                          Enable microfrontend support
+  --microfrontends <value>                 Microfrontends to load
   --with-admin-ui                          Generate administrative user interface
+  --client-root-dir <value>                Client root
+  --prettier-tab-width <value>             Default tab width for prettier
+  --skip-commit-hook                       Skip adding husky commit hooks
   --skip-git                               Skip git repository initialization
   --monorepository                         Use monorepository
   --cypress-coverage                       Enable Cypress code coverage report generation
   --cypress-audit                          Enable cypress-audit/lighthouse report generation
-  --workspaces-folders <value...>          Folders to use as monorepository workspace (default: [])
+  --enable-translation                     Enable translation
+  -l, --language <value...>                Language to be added to application (existing languages are not removed)
+  -n, --native-language [value]            Set application native language
+  --regenerate-languages                   Regenerate languages
+  --workspaces-folders <value...>          Folders to use as monorepository workspace
   --workspaces                             Generate workspaces for multiples applications
   -h, --help                               display help for command
 "
diff --git a/generators/jdl/generator.mts b/generators/jdl/generator.mts
index 59fbb3c1ec55..ab0c53644e3e 100644
--- a/generators/jdl/generator.mts
+++ b/generators/jdl/generator.mts
@@ -18,10 +18,11 @@
  */
 import { extname } from 'path';
 import { QueuedAdapter } from '@yeoman/adapter';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { create as createMemFs, type Store as MemFs } from 'mem-fs';
 import { create as createMemFsEditor, type MemFsEditor } from 'mem-fs-editor';
 
+import { readFile } from 'fs/promises';
 import BaseGenerator from '../base/index.mjs';
 import command from './command.mjs';
 import { downloadJdlFile } from '../../cli/download.mjs';
@@ -105,9 +106,14 @@ export default class JdlGenerator extends BaseGenerator {
         if (this.jdlFiles) {
           this.jdlFiles = await Promise.all(
             this.jdlFiles.map(toJdlFile).map(async filename => {
-              if (!this.readDestination(filename)) {
+              try {
+                this.readDestination(filename);
+              } catch {
                 this.log.warn(`File not found: ${filename}. Attempting download from jdl-samples repository`);
-                return downloadJdlFile(filename, { skipSampleRepository: this.skipSampleRepository });
+                const downloadedFile = await downloadJdlFile(filename, { skipSampleRepository: this.skipSampleRepository });
+                // The file has null content at mem-fs, update with actual content.
+                this.writeDestination(downloadedFile, (await readFile(downloadedFile)).toString());
+                return downloadedFile;
               }
               return filename;
             }),
diff --git a/generators/kubernetes-helm/templates/app/Chart.yml.ejs b/generators/kubernetes-helm/templates/app/Chart.yml.ejs
index 9ddb553937ae..bc6a0ee6ffc3 100644
--- a/generators/kubernetes-helm/templates/app/Chart.yml.ejs
+++ b/generators/kubernetes-helm/templates/app/Chart.yml.ejs
@@ -21,7 +21,7 @@ dependencies:
   version: <%= HELM_MYSQL %>
   repository: https://charts.helm.sh/stable
   condition: mysql.enabled
-<%_ } else if (app.prodDatabaseTypePostgres) { _%>
+<%_ } else if (app.prodDatabaseTypePostgresql) { _%>
 - name: postgresql
   version: <%= HELM_POSTGRESQL %>
   repository: https://charts.bitnami.com/bitnami
diff --git a/generators/kubernetes-helm/templates/app/helpers.tpl.ejs b/generators/kubernetes-helm/templates/app/helpers.tpl.ejs
index c49ce6d556f8..8c425e9fdb43 100644
--- a/generators/kubernetes-helm/templates/app/helpers.tpl.ejs
+++ b/generators/kubernetes-helm/templates/app/helpers.tpl.ejs
@@ -21,7 +21,7 @@ mysql customisation
 {{- define "mysql.fullname" -}}
 {{- default "<%= app.baseName.toLowerCase() %>-mysql" -}}
 {{- end -}}
-<%_ } else if (app.prodDatabaseTypePostgres) { _%>
+<%_ } else if (app.prodDatabaseTypePostgresql) { _%>
 {{/*
 postgresql customisation
 */}}
diff --git a/generators/kubernetes-helm/templates/app/requirements.yml.ejs b/generators/kubernetes-helm/templates/app/requirements.yml.ejs
index 65f4387242f8..3ba511b50855 100644
--- a/generators/kubernetes-helm/templates/app/requirements.yml.ejs
+++ b/generators/kubernetes-helm/templates/app/requirements.yml.ejs
@@ -4,7 +4,7 @@ dependencies:
     version: <%= HELM_MYSQL %>
     repository: https://charts.helm.sh/stable
     condition: mysql.enabled
-<%_ } else if (app.prodDatabaseTypePostgres) { _%>
+<%_ } else if (app.prodDatabaseTypePostgresql) { _%>
   - name: postgresql
     version: <%= HELM_POSTGRESQL %>
     repository: https://charts.bitnami.com/bitnami
diff --git a/generators/kubernetes-helm/templates/app/values.yml.ejs b/generators/kubernetes-helm/templates/app/values.yml.ejs
index 0b9e9e698921..78d78a3f319b 100644
--- a/generators/kubernetes-helm/templates/app/values.yml.ejs
+++ b/generators/kubernetes-helm/templates/app/values.yml.ejs
@@ -10,7 +10,7 @@ mysql:
   initializationFiles:
     grant.sql: |-
       grant all privileges on *.* to root@'%' identified by '' with grant option;
-<%_ } else if (app.prodDatabaseTypePostgres) { _%>
+<%_ } else if (app.prodDatabaseTypePostgresql) { _%>
 postgresql:
   enabled: true
   postgresqlUsername: <%= app.baseName.toLowerCase() %>
diff --git a/generators/kubernetes-knative/generator.mjs b/generators/kubernetes-knative/generator.mjs
index f1fdc1f46e3e..5a23a539c01c 100644
--- a/generators/kubernetes-knative/generator.mjs
+++ b/generators/kubernetes-knative/generator.mjs
@@ -19,8 +19,6 @@
 /* eslint-disable consistent-return */
 import fs from 'fs';
 import chalk from 'chalk';
-import shelljs from 'shelljs';
-import runAsync from 'run-async';
 
 import BaseWorkspacesGenerator from '../base-workspaces/index.mjs';
 
@@ -62,7 +60,7 @@ export default class KubernetesKnativeGenerator extends BaseWorkspacesGenerator
   }
 
   get initializing() {
-    return {
+    return this.asInitializingTaskGroup({
       sayHello() {
         this.log.log(chalk.white(`${chalk.bold('☸')} Welcome to the JHipster Kubernetes Knative Generator ${chalk.bold('☸')}`));
         this.log.log(chalk.white(`Files will be generated in the folder: ${chalk.yellow(this.destinationRoot())}`));
@@ -74,23 +72,19 @@ export default class KubernetesKnativeGenerator extends BaseWorkspacesGenerator
       checkDocker,
       checkKubernetes,
       checkHelm,
-      checkKnative: runAsync(function () {
+      async checkKnative() {
         if (this.skipChecks) return;
-        const done = this.async();
-        shelljs.exec(
-          'kubectl get deploy -n knative-serving --label-columns=serving.knative.dev/release | grep -E "v0\\.[8-9]{1,3}\\.[0-9]*',
-          { silent: true },
-          (code, stdout, stderr) => {
-            if (stderr || code !== 0) {
-              this.log.warn(
-                'Knative 0.8.* or later is not installed on your computer.\n' +
-                  'Make sure you have Knative and Istio installed. Read https://knative.dev/docs/install/\n',
-              );
-            }
-            done();
-          },
-        );
-      }),
+        try {
+          await this.spawnCommand(
+            'kubectl get deploy -n knative-serving --label-columns=serving.knative.dev/release | grep -E "v0\\.[8-9]{1,3}\\.[0-9]*',
+          );
+        } catch (error) {
+          this.log.warn(
+            'Knative 0.8.* or later is not installed on your computer.\n' +
+              'Make sure you have Knative and Istio installed. Read https://knative.dev/docs/install/\n',
+          );
+        }
+      },
       loadConfig,
       localInit() {
         this.deploymentApplicationType = 'microservice';
@@ -98,7 +92,7 @@ export default class KubernetesKnativeGenerator extends BaseWorkspacesGenerator
       },
       setupKubernetesConstants,
       setupHelmConstants,
-    };
+    });
   }
 
   get [BaseWorkspacesGenerator.INITIALIZING]() {
diff --git a/generators/kubernetes-knative/templates/service.yml.ejs b/generators/kubernetes-knative/templates/service.yml.ejs
index 43e9d25e055e..59556d3056b8 100644
--- a/generators/kubernetes-knative/templates/service.yml.ejs
+++ b/generators/kubernetes-knative/templates/service.yml.ejs
@@ -94,7 +94,7 @@ spec:
                   name: <%= app.baseName.toLowerCase() %>-mariadb
                   key: mariadb-root-password
 <%_ } _%>
-<%_ if (app.prodDatabaseTypePostgres) { _%>
+<%_ if (app.prodDatabaseTypePostgresql) { _%>
             - name: SPRING_DATASOURCE_URL
               value: <%- this.getJDBCUrl(app.prodDatabaseType, { hostname: `${app.baseName.toLowerCase()}-${app.prodDatabaseType}.${kubernetesNamespace}.svc.cluster.local`, databaseName: app.baseName }) %>
             - name: SPRING_DATASOURCE_USERNAME
diff --git a/generators/kubernetes/__snapshots__/kubernetes.spec.mts.snap b/generators/kubernetes/__snapshots__/kubernetes.spec.mts.snap
index 19821ee3f19c..10af06f7567c 100644
--- a/generators/kubernetes/__snapshots__/kubernetes.spec.mts.snap
+++ b/generators/kubernetes/__snapshots__/kubernetes.spec.mts.snap
@@ -483,6 +483,8 @@ deploy:
 }
 `;
 
+exports[`generator - Kubernetes Kafka application should match spawn calls snapshot 1`] = `[]`;
+
 exports[`generator - Kubernetes MySQL and PostgreSQL microservices without gateway should match files snapshot 1`] = `
 {
   ".yo-rc.json": {
@@ -1442,6 +1444,8 @@ deploy:
 }
 `;
 
+exports[`generator - Kubernetes MySQL and PostgreSQL microservices without gateway should match spawn calls snapshot 1`] = `[]`;
+
 exports[`generator - Kubernetes gateway and ingress should match files snapshot 1`] = `
 {
   ".yo-rc.json": {
@@ -2132,6 +2136,8 @@ deploy:
 }
 `;
 
+exports[`generator - Kubernetes gateway and ingress should match spawn calls snapshot 1`] = `[]`;
+
 exports[`generator - Kubernetes gateway and ingressType gke should match files snapshot 1`] = `
 {
   ".yo-rc.json": {
@@ -5658,6 +5664,8 @@ deploy:
 }
 `;
 
+exports[`generator - Kubernetes gateway and ingressType gke should match spawn calls snapshot 1`] = `[]`;
+
 exports[`generator - Kubernetes gateway and ingressType nginx should match files snapshot 1`] = `
 {
   ".yo-rc.json": {
@@ -9096,6 +9104,8 @@ deploy:
 }
 `;
 
+exports[`generator - Kubernetes gateway and ingressType nginx should match spawn calls snapshot 1`] = `[]`;
+
 exports[`generator - Kubernetes gateway and mysql microservice should match files snapshot 1`] = `
 {
   ".yo-rc.json": {
@@ -9948,6 +9958,8 @@ deploy:
 }
 `;
 
+exports[`generator - Kubernetes gateway and mysql microservice should match spawn calls snapshot 1`] = `[]`;
+
 exports[`generator - Kubernetes gateway with istio routing should match files snapshot 1`] = `
 {
   ".yo-rc.json": {
@@ -10930,6 +10942,18 @@ deploy:
 }
 `;
 
+exports[`generator - Kubernetes gateway with istio routing should match spawn calls snapshot 1`] = `
+[
+  [
+    "spawnCommandSync",
+    "kubectl -n istio-system get svc istio-ingressgateway -o jsonpath='{.status.loadBalancer.ingress[0].ip}'",
+    {
+      "stdio": "pipe",
+    },
+  ],
+]
+`;
+
 exports[`generator - Kubernetes gateway, mysql, psql, mongodb, mariadb, mssql microservices should match files snapshot 1`] = `
 {
   ".yo-rc.json": {
@@ -12938,6 +12962,8 @@ deploy:
 }
 `;
 
+exports[`generator - Kubernetes gateway, mysql, psql, mongodb, mariadb, mssql microservices should match spawn calls snapshot 1`] = `[]`;
+
 exports[`generator - Kubernetes monolith application should match files snapshot 1`] = `
 {
   ".yo-rc.json": {
@@ -13393,6 +13419,8 @@ deploy:
 }
 `;
 
+exports[`generator - Kubernetes monolith application should match spawn calls snapshot 1`] = `[]`;
+
 exports[`generator - Kubernetes mysql microservice with custom namespace and jhipster prometheus monitoring should match files snapshot 1`] = `
 {
   ".yo-rc.json": {
@@ -16747,6 +16775,8 @@ deploy:
 }
 `;
 
+exports[`generator - Kubernetes mysql microservice with custom namespace and jhipster prometheus monitoring should match spawn calls snapshot 1`] = `[]`;
+
 exports[`generator - Kubernetes mysql microservice with custom namespace should match files snapshot 1`] = `
 {
   ".yo-rc.json": {
@@ -17424,6 +17454,8 @@ deploy:
 }
 `;
 
+exports[`generator - Kubernetes mysql microservice with custom namespace should match spawn calls snapshot 1`] = `[]`;
+
 exports[`generator - Kubernetes mysql, psql, mongodb, mariadb, mssql microservices with dynamic storage provisioning should match files snapshot 1`] = `
 {
   ".yo-rc.json": {
@@ -19432,6 +19464,8 @@ deploy:
 }
 `;
 
+exports[`generator - Kubernetes mysql, psql, mongodb, mariadb, mssql microservices with dynamic storage provisioning should match spawn calls snapshot 1`] = `[]`;
+
 exports[`generator - Kubernetes only gateway should match files snapshot 1`] = `
 {
   ".yo-rc.json": {
@@ -20107,6 +20141,8 @@ deploy:
 }
 `;
 
+exports[`generator - Kubernetes only gateway should match spawn calls snapshot 1`] = `[]`;
+
 exports[`generator - Kubernetes only gateway with eureka should match files snapshot 1`] = `
 {
   ".yo-rc.json": {
@@ -20670,3 +20706,5 @@ deploy:
   },
 }
 `;
+
+exports[`generator - Kubernetes only gateway with eureka should match spawn calls snapshot 1`] = `[]`;
diff --git a/generators/kubernetes/kubernetes-base.mjs b/generators/kubernetes/kubernetes-base.mjs
index 94368c3c70a4..962800fa68ff 100644
--- a/generators/kubernetes/kubernetes-base.mjs
+++ b/generators/kubernetes/kubernetes-base.mjs
@@ -17,10 +17,8 @@
  * limitations under the License.
  */
 import crypto from 'crypto';
-import _ from 'lodash';
-import runAsync from 'run-async';
+import * as _ from 'lodash-es';
 
-import shelljs from 'shelljs';
 import { defaultKubernetesConfig } from './kubernetes-constants.mjs';
 import { loadFromYoRc } from '../base-workspaces/internal/docker-base.mjs';
 import {
@@ -50,39 +48,31 @@ const { INGRESS } = ServiceTypes;
 const { GKE, NGINX } = IngressTypes;
 const { K8S, HELM } = GeneratorTypes;
 
-export const checkKubernetes = runAsync(function () {
+export const checkKubernetes = async function () {
   if (this.skipChecks) return;
-  const done = this.async();
 
-  shelljs.exec('kubectl version', { silent: true }, (code, stdout, stderr) => {
-    if (stderr) {
-      this.log.warn(
-        'kubectl 1.2 or later is not installed on your computer.\n' +
-          'Make sure you have Kubernetes installed. Read https://kubernetes.io/docs/setup/\n',
-      );
-    }
-    done();
-  });
-});
+  try {
+    await this.spawnCommand('kubectl version');
+  } catch {
+    this.log.warn(
+      'kubectl 1.2 or later is not installed on your computer.\n' +
+        'Make sure you have Kubernetes installed. Read https://kubernetes.io/docs/setup/\n',
+    );
+  }
+};
 
-export const checkHelm = runAsync(function () {
+export const checkHelm = async function () {
   if (this.skipChecks) return;
-  const done = this.async();
 
-  shelljs.exec(
-    'helm version --client | grep -E "(v2\\.1[2-9]{1,2}\\.[0-9]{1,3})|(v3\\.[0-9]{1,2}\\.[0-9]{1,3})"',
-    { silent: true },
-    (code, stdout, stderr) => {
-      if (stderr || code !== 0) {
-        this.log.warn(
-          'helm 2.12.x or later is not installed on your computer.\n' +
-            'Make sure you have helm installed. Read https://github.com/helm/helm/\n',
-        );
-      }
-      done();
-    },
-  );
-});
+  try {
+    await this.spawnCommand('helm version --client | grep -E "(v2\\.1[2-9]{1,2}\\.[0-9]{1,3})|(v3\\.[0-9]{1,2}\\.[0-9]{1,3})"');
+  } catch {
+    this.log.warn(
+      'helm 2.12.x or later is not installed on your computer.\n' +
+        'Make sure you have helm installed. Read https://github.com/helm/helm/\n',
+    );
+  }
+};
 
 export function loadConfig() {
   loadFromYoRc.call(this);
diff --git a/generators/kubernetes/kubernetes.spec.mts b/generators/kubernetes/kubernetes.spec.mts
index bc7bdfcd2f03..35c31d07659e 100644
--- a/generators/kubernetes/kubernetes.spec.mts
+++ b/generators/kubernetes/kubernetes.spec.mts
@@ -1,6 +1,6 @@
 import { expect } from 'esmocha';
 
-import { basicHelpers as helpers, getGenerator } from '../../test/support/index.mjs';
+import { basicHelpers as helpers, getGenerator, runResult } from '../../test/support/index.mjs';
 import { GENERATOR_KUBERNETES } from '../generator-list.mjs';
 
 const expectedFiles = {
@@ -56,6 +56,7 @@ describe('generator - Kubernetes', () => {
 
       runResult = await runResult
         .create(getGenerator(GENERATOR_KUBERNETES))
+        .withSpawnMock()
         .withOptions({
           askAnswered: true,
         })
@@ -78,6 +79,9 @@ describe('generator - Kubernetes', () => {
     it('should match files snapshot', function () {
       expect(runResult.getSnapshot()).toMatchSnapshot();
     });
+    it('should match spawn calls snapshot', function () {
+      expect(runResult.getSpawnArgsUsingDefaultImplementation()).toMatchSnapshot();
+    });
     it('creates expected registry files and content', () => {
       runResult.assertFile(expectedFiles.consulregistry);
       runResult.assertFileContent('./registry-k8s/consul.yml', /a 24 chars base64 encoded string/);
@@ -104,6 +108,7 @@ describe('generator - Kubernetes', () => {
 
       runResult = await runResult
         .create(getGenerator(GENERATOR_KUBERNETES))
+        .withSpawnMock()
         .withOptions({
           askAnswered: true,
         })
@@ -125,6 +130,9 @@ describe('generator - Kubernetes', () => {
     it('should match files snapshot', function () {
       expect(runResult.getSnapshot()).toMatchSnapshot();
     });
+    it('should match spawn calls snapshot', function () {
+      expect(runResult.getSpawnArgsUsingDefaultImplementation()).toMatchSnapshot();
+    });
     it('creates expected registry files and content', () => {
       runResult.assertFile(expectedFiles.eurekaregistry);
       runResult.assertFileContent('./registry-k8s/jhipster-registry.yml', /# base64 encoded "meetup"/);
@@ -151,6 +159,7 @@ describe('generator - Kubernetes', () => {
 
       runResult = await runResult
         .create(getGenerator(GENERATOR_KUBERNETES))
+        .withSpawnMock()
         .withOptions({
           askAnswered: true,
         })
@@ -172,6 +181,9 @@ describe('generator - Kubernetes', () => {
     it('should match files snapshot', function () {
       expect(runResult.getSnapshot()).toMatchSnapshot();
     });
+    it('should match spawn calls snapshot', function () {
+      expect(runResult.getSpawnArgsUsingDefaultImplementation()).toMatchSnapshot();
+    });
     it('creates expected registry files', () => {
       runResult.assertFile(expectedFiles.consulregistry);
     });
@@ -187,17 +199,17 @@ describe('generator - Kubernetes', () => {
   });
 
   describe('mysql microservice with custom namespace', () => {
-    let runResult;
     before(async () => {
       const chosenApps = ['02-mysql'];
 
-      runResult = await helpers
+      await helpers
         .generateDeploymentWorkspaces()
         .withWorkspacesSamples(...chosenApps)
         .withGenerateWorkspaceApplications();
 
-      runResult = await runResult
+      await runResult
         .create(getGenerator(GENERATOR_KUBERNETES))
+        .withSpawnMock()
         .withOptions({
           askAnswered: true,
         })
@@ -219,6 +231,9 @@ describe('generator - Kubernetes', () => {
     it('should match files snapshot', function () {
       expect(runResult.getSnapshot()).toMatchSnapshot();
     });
+    it('should match spawn calls snapshot', function () {
+      expect(runResult.getSpawnArgsUsingDefaultImplementation()).toMatchSnapshot();
+    });
     it('creates expected registry files', () => {
       runResult.assertFile(expectedFiles.consulregistry);
     });
@@ -245,6 +260,7 @@ describe('generator - Kubernetes', () => {
 
       runResult = await runResult
         .create(getGenerator(GENERATOR_KUBERNETES))
+        .withSpawnMock()
         .withOptions({
           askAnswered: true,
         })
@@ -266,6 +282,9 @@ describe('generator - Kubernetes', () => {
     it('should match files snapshot', function () {
       expect(runResult.getSnapshot()).toMatchSnapshot();
     });
+    it('should match spawn calls snapshot', function () {
+      expect(runResult.getSpawnArgsUsingDefaultImplementation()).toMatchSnapshot();
+    });
     it('creates expected registry files', () => {
       runResult.assertFile(expectedFiles.consulregistry);
     });
@@ -292,6 +311,7 @@ describe('generator - Kubernetes', () => {
 
       runResult = await runResult
         .create(getGenerator(GENERATOR_KUBERNETES))
+        .withSpawnMock()
         .withOptions({
           askAnswered: true,
         })
@@ -314,6 +334,9 @@ describe('generator - Kubernetes', () => {
     it('should match files snapshot', function () {
       expect(runResult.getSnapshot()).toMatchSnapshot();
     });
+    it('should match spawn calls snapshot', function () {
+      expect(runResult.getSpawnArgsUsingDefaultImplementation()).toMatchSnapshot();
+    });
     it('creates expected registry files', () => {
       runResult.assertFile(expectedFiles.consulregistry);
     });
@@ -346,6 +369,7 @@ describe('generator - Kubernetes', () => {
 
       runResult = await runResult
         .create(getGenerator(GENERATOR_KUBERNETES))
+        .withSpawnMock()
         .withOptions({
           askAnswered: true,
         })
@@ -367,6 +391,9 @@ describe('generator - Kubernetes', () => {
     it('should match files snapshot', function () {
       expect(runResult.getSnapshot()).toMatchSnapshot();
     });
+    it('should match spawn calls snapshot', function () {
+      expect(runResult.getSpawnArgsUsingDefaultImplementation()).toMatchSnapshot();
+    });
     it('creates expected registry files', () => {
       runResult.assertFile(expectedFiles.consulregistry);
     });
@@ -399,6 +426,7 @@ describe('generator - Kubernetes', () => {
 
       runResult = await runResult
         .create(getGenerator(GENERATOR_KUBERNETES))
+        .withSpawnMock()
         .withOptions({
           askAnswered: true,
         })
@@ -420,6 +448,9 @@ describe('generator - Kubernetes', () => {
     it('should match files snapshot', function () {
       expect(runResult.getSnapshot()).toMatchSnapshot();
     });
+    it('should match spawn calls snapshot', function () {
+      expect(runResult.getSpawnArgsUsingDefaultImplementation()).toMatchSnapshot();
+    });
     it('creates expected registry files', () => {
       runResult.assertFile(expectedFiles.consulregistry);
     });
@@ -449,6 +480,7 @@ describe('generator - Kubernetes', () => {
 
       runResult = await runResult
         .create(getGenerator(GENERATOR_KUBERNETES))
+        .withSpawnMock()
         .withOptions({
           askAnswered: true,
         })
@@ -470,6 +502,9 @@ describe('generator - Kubernetes', () => {
     it('should match files snapshot', function () {
       expect(runResult.getSnapshot()).toMatchSnapshot();
     });
+    it('should match spawn calls snapshot', function () {
+      expect(runResult.getSpawnArgsUsingDefaultImplementation()).toMatchSnapshot();
+    });
     it('creates expected registry files', () => {
       runResult.assertFile(expectedFiles.consulregistry);
     });
@@ -508,6 +543,7 @@ describe('generator - Kubernetes', () => {
 
       runResult = await runResult
         .create(getGenerator(GENERATOR_KUBERNETES))
+        .withSpawnMock()
         .withOptions({
           askAnswered: true,
         })
@@ -529,6 +565,9 @@ describe('generator - Kubernetes', () => {
     it('should match files snapshot', function () {
       expect(runResult.getSnapshot()).toMatchSnapshot();
     });
+    it('should match spawn calls snapshot', function () {
+      expect(runResult.getSpawnArgsUsingDefaultImplementation()).toMatchSnapshot();
+    });
     it("doesn't creates registry files", () => {
       runResult.assertNoFile(expectedFiles.eurekaregistry);
       runResult.assertNoFile(expectedFiles.consulregistry);
@@ -553,6 +592,7 @@ describe('generator - Kubernetes', () => {
 
       runResult = await runResult
         .create(getGenerator(GENERATOR_KUBERNETES))
+        .withSpawnMock()
         .withOptions({
           askAnswered: true,
         })
@@ -574,6 +614,9 @@ describe('generator - Kubernetes', () => {
     it('should match files snapshot', function () {
       expect(runResult.getSnapshot()).toMatchSnapshot();
     });
+    it('should match spawn calls snapshot', function () {
+      expect(runResult.getSpawnArgsUsingDefaultImplementation()).toMatchSnapshot();
+    });
     it("doesn't creates registry files", () => {
       runResult.assertNoFile(expectedFiles.eurekaregistry);
       runResult.assertNoFile(expectedFiles.consulregistry);
@@ -598,6 +641,7 @@ describe('generator - Kubernetes', () => {
 
       runResult = await runResult
         .create(getGenerator(GENERATOR_KUBERNETES))
+        .withSpawnMock()
         .withOptions({
           askAnswered: true,
         })
@@ -618,6 +662,9 @@ describe('generator - Kubernetes', () => {
     it('should match files snapshot', function () {
       expect(runResult.getSnapshot()).toMatchSnapshot();
     });
+    it('should match spawn calls snapshot', function () {
+      expect(runResult.getSpawnArgsUsingDefaultImplementation()).toMatchSnapshot();
+    });
     it('creates expected registry files', () => {
       runResult.assertFile(expectedFiles.consulregistry);
     });
@@ -647,6 +694,7 @@ describe('generator - Kubernetes', () => {
 
       runResult = await runResult
         .create(getGenerator(GENERATOR_KUBERNETES))
+        .withSpawnMock()
         .withOptions({
           askAnswered: true,
         })
@@ -668,6 +716,9 @@ describe('generator - Kubernetes', () => {
     it('should match files snapshot', function () {
       expect(runResult.getSnapshot()).toMatchSnapshot();
     });
+    it('should match spawn calls snapshot', function () {
+      expect(runResult.getSpawnArgsUsingDefaultImplementation()).toMatchSnapshot();
+    });
     it('creates expected registry files', () => {
       runResult.assertFile(expectedFiles.consulregistry);
     });
@@ -694,6 +745,7 @@ describe('generator - Kubernetes', () => {
 
       runResult = await runResult
         .create(getGenerator(GENERATOR_KUBERNETES))
+        .withSpawnMock()
         .withOptions({
           askAnswered: true,
         })
@@ -715,6 +767,9 @@ describe('generator - Kubernetes', () => {
     it('should match files snapshot', function () {
       expect(runResult.getSnapshot()).toMatchSnapshot();
     });
+    it('should match spawn calls snapshot', function () {
+      expect(runResult.getSpawnArgsUsingDefaultImplementation()).toMatchSnapshot();
+    });
     it('creates expected registry files', () => {
       runResult.assertFile(expectedFiles.consulregistry);
     });
diff --git a/generators/kubernetes/prompts.mjs b/generators/kubernetes/prompts.mjs
index d2052de51f61..0620463ea1a4 100644
--- a/generators/kubernetes/prompts.mjs
+++ b/generators/kubernetes/prompts.mjs
@@ -131,10 +131,8 @@ export async function askForIngressDomain() {
   } else if (istio) {
     // If it's Istio, and no previous domain is configured, try to determine the default value
     try {
-      if (!this.skipChecks) {
-        const { stdout: istioIngressIp } = this.spawnCommandSync(istioIpCommand, { stdio: 'pipe' });
-        defaultValue = `${istioIngressIp}.nip.io`;
-      }
+      const { stdout: istioIngressIp } = this.spawnCommandSync(istioIpCommand, { stdio: 'pipe' });
+      defaultValue = `${istioIngressIp}.nip.io`;
     } catch (ex) {
       istioMessage = `Unable to determine Istio Ingress IP address. You can find the Istio Ingress IP address by running the command line:\n    ${istioIpCommand}`;
     }
diff --git a/generators/kubernetes/templates/deployment.yml.ejs b/generators/kubernetes/templates/deployment.yml.ejs
index b0a25895f27c..5bbed1055248 100644
--- a/generators/kubernetes/templates/deployment.yml.ejs
+++ b/generators/kubernetes/templates/deployment.yml.ejs
@@ -60,7 +60,7 @@ spec:
 <%_ if (app.prodDatabaseTypeMariadb) { _%>
                   rt=$(nc -z -w 1 <%= app.baseName.toLowerCase() %>-mariadb 3306)
 <%_ } _%>
-<%_ if (app.prodDatabaseTypePostgres) { _%>
+<%_ if (app.prodDatabaseTypePostgresql) { _%>
                   rt=$(nc -z -w 1 <%= app.baseName.toLowerCase() %>-postgresql 5432)
 <%_ } _%>
 <%_ if (app.databaseTypeMongodb) { _%>
@@ -144,7 +144,7 @@ spec:
               name: <%= app.baseName.toLowerCase() %>-mariadb
               key: mariadb-root-password
 <%_ } _%>
-<%_ if (app.prodDatabaseTypePostgres) { _%>
+<%_ if (app.prodDatabaseTypePostgresql) { _%>
         - name: SPRING_DATASOURCE_URL
           value: <%- this.getJDBCUrl(app.prodDatabaseType, { hostname: `${app.baseName.toLowerCase()}-${app.prodDatabaseType}.${kubernetesNamespace}.svc.cluster.local`, databaseName: app.baseName }) %>
         - name: SPRING_DATASOURCE_USERNAME
diff --git a/generators/languages/command.mts b/generators/languages/command.mts
index 08c7f98129af..d6a60bce3cdd 100644
--- a/generators/languages/command.mts
+++ b/generators/languages/command.mts
@@ -27,15 +27,27 @@ const command: JHipsterCommandDefinition = {
     },
   },
   options: {
+    enableTranslation: {
+      description: 'Enable translation',
+      type: Boolean,
+      required: false,
+      scope: 'storage',
+    },
+    language: {
+      alias: 'l',
+      description: 'Language to be added to application (existing languages are not removed)',
+      type: Array,
+    },
     nativeLanguage: {
       alias: 'n',
       description: 'Set application native language',
       type: String,
       required: false,
     },
-    regenerate: {
-      description: 'Regenerate languages files',
+    regenerateLanguages: {
+      description: 'Regenerate languages',
       type: Boolean,
+      scope: 'generator',
     },
   },
 };
diff --git a/generators/languages/generator.mjs b/generators/languages/generator.mjs
index d77ea77e01be..3bb3800a8097 100644
--- a/generators/languages/generator.mjs
+++ b/generators/languages/generator.mjs
@@ -18,7 +18,7 @@
  */
 /* eslint-disable consistent-return */
 import chalk from 'chalk';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 
 import BaseApplicationGenerator from '../base-application/index.mjs';
 import { askForLanguages, askI18n } from './prompts.mjs';
@@ -33,7 +33,6 @@ import { updateLanguagesTask as updateLanguagesInReact } from '../react/support/
 import { updateLanguagesTask as updateLanguagesInVue } from '../vue/support/index.mjs';
 import { updateLanguagesTask as updateLanguagesInJava } from '../server/support/index.mjs';
 import { SERVER_MAIN_RES_DIR, SERVER_TEST_RES_DIR } from '../generator-constants.mjs';
-import upgradeFilesTask from './upgrade-files-task.mjs';
 import command from './command.mjs';
 import { QUEUES } from '../base-application/priorities.mjs';
 
@@ -55,16 +54,27 @@ export default class LanguagesGenerator extends BaseApplicationGenerator {
    */
   languagesToApply;
   composedBlueprints;
+  languageCommand;
+  writeJavaLanguageFiles;
+  regenerateLanguages;
 
-  async beforeQueue() {
-    await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+  constructor(args, options, features) {
+    super(args, options, features);
+
+    this.languageCommand = this.options.commandName === 'languages';
+  }
 
+  async beforeQueue() {
     if (!this.fromBlueprint) {
       this.supportedLanguages = supportedLanguages;
       this.composedBlueprints = await this.composeWithBlueprints('languages', {
         generatorArgs: this.options.languages,
       });
     }
+
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+    }
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -123,7 +133,7 @@ export default class LanguagesGenerator extends BaseApplicationGenerator {
     return this.asPromptingTaskGroup({
       checkPrompts({ control }) {
         const { enableTranslation, languages } = this.jhipsterConfig;
-        const showPrompts = this.options.askAnswered || this.env.rootGenerator() === this;
+        const showPrompts = this.options.askAnswered || this.languageCommand;
         this.askForNativeLanguage = showPrompts || (!control.existingProject && !this.jhipsterConfig.nativeLanguage);
         this.askForMoreLanguages =
           enableTranslation !== false && (showPrompts || (!control.existingProject && (languages?.length ?? 0) < 1));
@@ -182,7 +192,7 @@ export default class LanguagesGenerator extends BaseApplicationGenerator {
     return this.asPreparingTaskGroup({
       prepareForTemplates({ application, source }) {
         if (application.enableTranslation) {
-          if (this.options.regenerate) {
+          if (!this.languageCommand || this.regenerateLanguages) {
             this.languagesToApply = application.languages;
           } else {
             this.languagesToApply = [...new Set(this.languagesToApply || [])];
@@ -238,8 +248,7 @@ export default class LanguagesGenerator extends BaseApplicationGenerator {
 
   // Public API method used by the getter and also by Blueprints
   get writing() {
-    return {
-      upgradeFilesTask,
+    return this.asWritingTaskGroup({
       async writeClientTranslations({ application }) {
         if (application.skipClient) return;
         const languagesToApply = application.enableTranslation ? this.languagesToApply : [...new Set([application.nativeLanguage, 'en'])];
@@ -256,7 +265,12 @@ export default class LanguagesGenerator extends BaseApplicationGenerator {
         );
       },
       async translateFile({ application }) {
-        if (!application.enableTranslation || application.skipServer) return;
+        if (
+          !application.enableTranslation ||
+          application.skipServer ||
+          (!application.backendTypeSpringBoot && !this.writeJavaLanguageFiles)
+        )
+          return;
         await Promise.all(
           this.languagesToApply.map(async lang => {
             const language = findLanguageForTag(lang);
@@ -289,7 +303,7 @@ export default class LanguagesGenerator extends BaseApplicationGenerator {
           }),
         );
       },
-    };
+    });
   }
 
   get [BaseApplicationGenerator.WRITING]() {
@@ -297,9 +311,9 @@ export default class LanguagesGenerator extends BaseApplicationGenerator {
   }
 
   get writingEntities() {
-    return {
+    return this.asWritingEntitiesTaskGroup({
       ...writeEntityFiles(),
-    };
+    });
   }
 
   get [BaseApplicationGenerator.WRITING_ENTITIES]() {
@@ -307,7 +321,7 @@ export default class LanguagesGenerator extends BaseApplicationGenerator {
   }
 
   get postWriting() {
-    return {
+    return this.asPostWritingTaskGroup({
       write({ application, control }) {
         if (application.enableTranslation && !application.skipClient) {
           if (application.clientFrameworkAngular) {
@@ -320,11 +334,16 @@ export default class LanguagesGenerator extends BaseApplicationGenerator {
             updateLanguagesInVue.call(this, { application, control });
           }
         }
-        if (application.enableTranslation && application.generateUserManagement && !application.skipServer) {
+        if (
+          application.enableTranslation &&
+          application.generateUserManagement &&
+          !application.skipServer &&
+          (application.backendTypeSpringBoot || this.writeJavaLanguageFiles)
+        ) {
           updateLanguagesInJava.call(this, { application, control });
         }
       },
-    };
+    });
   }
 
   get [BaseApplicationGenerator.POST_WRITING]() {
diff --git a/generators/languages/index.mts b/generators/languages/index.mts
index 709452a8f58e..855a438fcc02 100644
--- a/generators/languages/index.mts
+++ b/generators/languages/index.mts
@@ -17,4 +17,4 @@
  * limitations under the License.
  */
 export { default } from './generator.mjs';
-export { default as upgradeFilesTask } from './upgrade-files-task.mjs';
+export { default as command } from './command.mjs';
diff --git a/generators/languages/languages.spec.mjs b/generators/languages/languages.spec.mjs
index 7bc4b6722627..38b6f5f88392 100644
--- a/generators/languages/languages.spec.mjs
+++ b/generators/languages/languages.spec.mjs
@@ -125,7 +125,7 @@ describe('generator - languages', () => {
         helpers
           .run(generatorPath)
           .withJHipsterConfig({ enableTranslation: true, nativeLanguage: 'fr', languages: ['fr'], baseName: 'jhipster' })
-          .withOptions({ ignoreNeedlesError: true }),
+          .withOptions({ commandName: 'languages', ignoreNeedlesError: true }),
       );
       noLanguageFiles('fr');
     });
@@ -134,7 +134,7 @@ describe('generator - languages', () => {
         helpers
           .run(generatorPath)
           .withJHipsterConfig({ enableTranslation: true, nativeLanguage: 'fr', languages: ['en', 'fr'] })
-          .withOptions({ ignoreNeedlesError: true, skipPrompts: true, baseName: 'jhipster' }),
+          .withOptions({ commandName: 'languages', ignoreNeedlesError: true }),
       );
       noLanguageFiles('fr');
       noLanguageFiles('en');
@@ -257,6 +257,9 @@ describe('generator - languages', () => {
           .withAnswers({
             languages: ['fr', 'de'],
           })
+          .withOptions({
+            commandName: 'languages',
+          })
           .run();
       });
       describe('for native language translation', () => {
diff --git a/generators/languages/templates/entity/i18n/entity_al.json.ejs b/generators/languages/templates/entity/i18n/entity_al.json.ejs
index da6a5a6c7cda..2a64c01af06a 100644
--- a/generators/languages/templates/entity/i18n/entity_al.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_al.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<%for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_ar-ly.json.ejs b/generators/languages/templates/entity/i18n/entity_ar-ly.json.ejs
index cd0626f0aa41..4dfd8405a38e 100644
--- a/generators/languages/templates/entity/i18n/entity_ar-ly.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_ar-ly.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_az-Latn-az.json.ejs b/generators/languages/templates/entity/i18n/entity_az-Latn-az.json.ejs
index 04564e50784d..176830831fd2 100644
--- a/generators/languages/templates/entity/i18n/entity_az-Latn-az.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_az-Latn-az.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_bg.json.ejs b/generators/languages/templates/entity/i18n/entity_bg.json.ejs
index df0440ff841d..9de2fc2eb236 100644
--- a/generators/languages/templates/entity/i18n/entity_bg.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_bg.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_bn.json.ejs b/generators/languages/templates/entity/i18n/entity_bn.json.ejs
index cd0626f0aa41..4dfd8405a38e 100644
--- a/generators/languages/templates/entity/i18n/entity_bn.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_bn.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_by.json.ejs b/generators/languages/templates/entity/i18n/entity_by.json.ejs
index 9295a87748e9..6773fa526fdd 100644
--- a/generators/languages/templates/entity/i18n/entity_by.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_by.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_ca.json.ejs b/generators/languages/templates/entity/i18n/entity_ca.json.ejs
index cd0626f0aa41..4dfd8405a38e 100644
--- a/generators/languages/templates/entity/i18n/entity_ca.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_ca.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_cs.json.ejs b/generators/languages/templates/entity/i18n/entity_cs.json.ejs
index a0997481b189..93ba08145795 100644
--- a/generators/languages/templates/entity/i18n/entity_cs.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_cs.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_da.json.ejs b/generators/languages/templates/entity/i18n/entity_da.json.ejs
index cd0626f0aa41..4dfd8405a38e 100644
--- a/generators/languages/templates/entity/i18n/entity_da.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_da.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_de.json.ejs b/generators/languages/templates/entity/i18n/entity_de.json.ejs
index c656571cc409..52931eace603 100644
--- a/generators/languages/templates/entity/i18n/entity_de.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_de.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_el.json.ejs b/generators/languages/templates/entity/i18n/entity_el.json.ejs
index 3e381f710014..5494ec6a6b32 100644
--- a/generators/languages/templates/entity/i18n/entity_el.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_el.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_en.json.ejs b/generators/languages/templates/entity/i18n/entity_en.json.ejs
index b6f71ab12168..fb17972d822a 100644
--- a/generators/languages/templates/entity/i18n/entity_en.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_en.json.ejs
@@ -52,13 +52,13 @@
             ,
             "<%= relationship.relationshipName %>": "<%= relationship.relationshipNameHumanized %>"
 <%_ } -%>
-<%_ const fieldsWithDoc = fields.filter(field => field.javadoc); -%>
+<%_ const fieldsWithDoc = fields.filter(field => field.documentation); -%>
 <%_ if (fieldsWithDoc.length > 0) { -%>
   <%_ const lastField = fieldsWithDoc[fieldsWithDoc.length - 1]; -%>
             ,
             "help": {
   <%_ for (const field of fieldsWithDoc) { _%>
-                "<%= field.fieldName %>": "<%= field.javadoc %>"<% if (field !== lastField) { %>,<% } %>
+                "<%= field.fieldName %>": "<%= field.documentation %>"<% if (field !== lastField) { %>,<% } %>
   <%_ } _%>
             }
 <%_ } _%>
diff --git a/generators/languages/templates/entity/i18n/entity_es.json.ejs b/generators/languages/templates/entity/i18n/entity_es.json.ejs
index 7a9cf8a606d7..9861f85f6f81 100644
--- a/generators/languages/templates/entity/i18n/entity_es.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_es.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_et.json.ejs b/generators/languages/templates/entity/i18n/entity_et.json.ejs
index baf0ee0c2185..08a4006b2018 100644
--- a/generators/languages/templates/entity/i18n/entity_et.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_et.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_fa.json.ejs b/generators/languages/templates/entity/i18n/entity_fa.json.ejs
index cd0626f0aa41..4dfd8405a38e 100644
--- a/generators/languages/templates/entity/i18n/entity_fa.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_fa.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_fi.json.ejs b/generators/languages/templates/entity/i18n/entity_fi.json.ejs
index 3064d62bf08b..317c225c514f 100644
--- a/generators/languages/templates/entity/i18n/entity_fi.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_fi.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_fr.json.ejs b/generators/languages/templates/entity/i18n/entity_fr.json.ejs
index e13f3499e0f0..edf103b79dae 100644
--- a/generators/languages/templates/entity/i18n/entity_fr.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_fr.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_gl.json.ejs b/generators/languages/templates/entity/i18n/entity_gl.json.ejs
index e847813f5ae1..d99f49694d96 100644
--- a/generators/languages/templates/entity/i18n/entity_gl.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_gl.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_hi.json.ejs b/generators/languages/templates/entity/i18n/entity_hi.json.ejs
index 766b26a197e3..bd069a71167f 100644
--- a/generators/languages/templates/entity/i18n/entity_hi.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_hi.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_hr.json.ejs b/generators/languages/templates/entity/i18n/entity_hr.json.ejs
index 791f6dda6072..788f5e8c58b9 100644
--- a/generators/languages/templates/entity/i18n/entity_hr.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_hr.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_hu.json.ejs b/generators/languages/templates/entity/i18n/entity_hu.json.ejs
index 787df5d7d017..2dfb5dd33c42 100644
--- a/generators/languages/templates/entity/i18n/entity_hu.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_hu.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_hy.json.ejs b/generators/languages/templates/entity/i18n/entity_hy.json.ejs
index d6d9f8d9f1a8..95f7cfa1bc22 100644
--- a/generators/languages/templates/entity/i18n/entity_hy.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_hy.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_id.json.ejs b/generators/languages/templates/entity/i18n/entity_id.json.ejs
index af3c6e739ccd..1802424c9a15 100644
--- a/generators/languages/templates/entity/i18n/entity_id.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_id.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_it.json.ejs b/generators/languages/templates/entity/i18n/entity_it.json.ejs
index 63898b4f3067..3d319ebe4b87 100644
--- a/generators/languages/templates/entity/i18n/entity_it.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_it.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_ja.json.ejs b/generators/languages/templates/entity/i18n/entity_ja.json.ejs
index 26d4315ea6ab..9820b094fdb8 100644
--- a/generators/languages/templates/entity/i18n/entity_ja.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_ja.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_ko.json.ejs b/generators/languages/templates/entity/i18n/entity_ko.json.ejs
index d980231acd13..10386355bf7e 100644
--- a/generators/languages/templates/entity/i18n/entity_ko.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_ko.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_kr-Latn-kr.json.ejs b/generators/languages/templates/entity/i18n/entity_kr-Latn-kr.json.ejs
index 0cd9c110ef93..dd4cdd109896 100644
--- a/generators/languages/templates/entity/i18n/entity_kr-Latn-kr.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_kr-Latn-kr.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_mr.json.ejs b/generators/languages/templates/entity/i18n/entity_mr.json.ejs
index 657f1c2fd9c9..c9394588e69a 100644
--- a/generators/languages/templates/entity/i18n/entity_mr.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_mr.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_my.json.ejs b/generators/languages/templates/entity/i18n/entity_my.json.ejs
index b1bba5492106..07dcc8bdd8c2 100644
--- a/generators/languages/templates/entity/i18n/entity_my.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_my.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_nl.json.ejs b/generators/languages/templates/entity/i18n/entity_nl.json.ejs
index f48b42b295ec..94fd85987031 100644
--- a/generators/languages/templates/entity/i18n/entity_nl.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_nl.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_pa.json.ejs b/generators/languages/templates/entity/i18n/entity_pa.json.ejs
index 3297d87c28c3..57df70d782df 100644
--- a/generators/languages/templates/entity/i18n/entity_pa.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_pa.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_pl.json.ejs b/generators/languages/templates/entity/i18n/entity_pl.json.ejs
index 058f5ad491e6..9958605cc8a2 100644
--- a/generators/languages/templates/entity/i18n/entity_pl.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_pl.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_pt-br.json.ejs b/generators/languages/templates/entity/i18n/entity_pt-br.json.ejs
index 703e7f334ea1..12bddf34ee89 100644
--- a/generators/languages/templates/entity/i18n/entity_pt-br.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_pt-br.json.ejs
@@ -62,13 +62,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_pt-pt.json.ejs b/generators/languages/templates/entity/i18n/entity_pt-pt.json.ejs
index 8500fc2b3a97..cf6727bca3dd 100644
--- a/generators/languages/templates/entity/i18n/entity_pt-pt.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_pt-pt.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_ro.json.ejs b/generators/languages/templates/entity/i18n/entity_ro.json.ejs
index 0923ee6cc604..187eaa881c3e 100644
--- a/generators/languages/templates/entity/i18n/entity_ro.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_ro.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_ru.json.ejs b/generators/languages/templates/entity/i18n/entity_ru.json.ejs
index 1690321eadcb..0b6069edeec0 100644
--- a/generators/languages/templates/entity/i18n/entity_ru.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_ru.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_si.json.ejs b/generators/languages/templates/entity/i18n/entity_si.json.ejs
index bcd8dff837d0..0d36f61d563d 100644
--- a/generators/languages/templates/entity/i18n/entity_si.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_si.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_sk.json.ejs b/generators/languages/templates/entity/i18n/entity_sk.json.ejs
index 8bbb49c06e74..61e31ac4f19a 100644
--- a/generators/languages/templates/entity/i18n/entity_sk.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_sk.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_sr.json.ejs b/generators/languages/templates/entity/i18n/entity_sr.json.ejs
index 0dab5072f1a6..19e50ed41718 100644
--- a/generators/languages/templates/entity/i18n/entity_sr.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_sr.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_sv.json.ejs b/generators/languages/templates/entity/i18n/entity_sv.json.ejs
index a90bf3fb3aff..1553b202e8e2 100644
--- a/generators/languages/templates/entity/i18n/entity_sv.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_sv.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_ta.json.ejs b/generators/languages/templates/entity/i18n/entity_ta.json.ejs
index b0262a9a3508..19950f4b9e79 100644
--- a/generators/languages/templates/entity/i18n/entity_ta.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_ta.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_te.json.ejs b/generators/languages/templates/entity/i18n/entity_te.json.ejs
index b1f0307585a1..5fd1a3d21482 100644
--- a/generators/languages/templates/entity/i18n/entity_te.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_te.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_th.json.ejs b/generators/languages/templates/entity/i18n/entity_th.json.ejs
index 3dbb434d35ed..1a6eaaecf94d 100644
--- a/generators/languages/templates/entity/i18n/entity_th.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_th.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_tr.json.ejs b/generators/languages/templates/entity/i18n/entity_tr.json.ejs
index 35862bce89e9..16fedb3153e9 100644
--- a/generators/languages/templates/entity/i18n/entity_tr.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_tr.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_ua.json.ejs b/generators/languages/templates/entity/i18n/entity_ua.json.ejs
index c93892de80b1..e63b01d57659 100644
--- a/generators/languages/templates/entity/i18n/entity_ua.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_ua.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_uz-Cyrl-uz.json.ejs b/generators/languages/templates/entity/i18n/entity_uz-Cyrl-uz.json.ejs
index 9f92e7e416c1..d8281e0fbcfd 100644
--- a/generators/languages/templates/entity/i18n/entity_uz-Cyrl-uz.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_uz-Cyrl-uz.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_uz-Latn-uz.json.ejs b/generators/languages/templates/entity/i18n/entity_uz-Latn-uz.json.ejs
index afd631ef1b8d..0497109837c4 100644
--- a/generators/languages/templates/entity/i18n/entity_uz-Latn-uz.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_uz-Latn-uz.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_vi.json.ejs b/generators/languages/templates/entity/i18n/entity_vi.json.ejs
index 01f243275642..c8b9bd4a8fb4 100644
--- a/generators/languages/templates/entity/i18n/entity_vi.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_vi.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_zh-cn.json.ejs b/generators/languages/templates/entity/i18n/entity_zh-cn.json.ejs
index 5ce91fc850ff..908cc8579891 100644
--- a/generators/languages/templates/entity/i18n/entity_zh-cn.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_zh-cn.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/entity/i18n/entity_zh-tw.json.ejs b/generators/languages/templates/entity/i18n/entity_zh-tw.json.ejs
index c660c8d240c7..a7327961b8e2 100644
--- a/generators/languages/templates/entity/i18n/entity_zh-tw.json.ejs
+++ b/generators/languages/templates/entity/i18n/entity_zh-tw.json.ejs
@@ -45,13 +45,13 @@ let helpBlocks = 0; %>
             "detail": {
                 "title": "<%= entityClassHumanized %>"
             }<% for (idx in fields) {
-            if (typeof fields[idx].javadoc !== 'undefined') ++helpBlocks; %>,
+            if (typeof fields[idx].documentation !== 'undefined') ++helpBlocks; %>,
             "<%= fields[idx].fieldName %>": "<%= fields[idx].fieldNameHumanized %>"<% } %><% for (idx in relationships) { %>,
             "<%= relationships[idx].relationshipName %>": "<%= relationships[idx].relationshipNameHumanized %>"<% } if (helpBlocks > 0) { %>,
             "help": {<% for (idx in fields) {
-                if (fields[idx].javadoc) {
+                if (fields[idx].documentation) {
                     --helpBlocks; %>
-                "<%= fields[idx].fieldName %>": "<%= fields[idx].javadoc %>"<% if (helpBlocks > 0) { %>,<% }
+                "<%= fields[idx].fieldName %>": "<%= fields[idx].documentation %>"<% if (helpBlocks > 0) { %>,<% }
                 }
             } %>
             }<% } %>
diff --git a/generators/languages/templates/src/main/webapp/i18n/pl/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/pl/global.json.ejs
index 54da68bb9f60..c35a867915e3 100644
--- a/generators/languages/templates/src/main/webapp/i18n/pl/global.json.ejs
+++ b/generators/languages/templates/src/main/webapp/i18n/pl/global.json.ejs
@@ -119,7 +119,7 @@
             "open": "Otwórz",
             "save": "Zapisz",
             "view": "Widok",
-            "show": "Show {{otherEntity}}"
+            "show": "Wyświetl {{otherEntity}}"
         },
         "detail": {
             "field": "Pole",
@@ -141,9 +141,9 @@
             "datetimelocal": "Wartość powinna zawierać datę i czas."
         },
         "filters": {
-          "set": "Following filters are set",
-          "clear": "Clear filter",
-          "clearAll": "Clear all filters"
+          "set": "Ustawiono wymienione filtry",
+          "clear": "Wyczyść filtr",
+          "clearAll": "Wyczyść wszystkie filtry"
         }
     },
     "error": {
@@ -155,12 +155,15 @@
         "userexists": "Użytkownik o takiej nazwie już istnieje!",
         "emailexists": "Użytkownik z takim adresem email już istnieje!",
         "idexists": "Nowy {{entityName}} nie może jeszcze mieć przypisanego ID",
-        "idnull": "Błędne ID",
-        "idinvalid": "Invalid Id",
-        "idnotfound": "ID cannot be found",
+        "idnull": "Brakujące ID",
+        "idinvalid": "Niepoprawne ID",
+        "idnotfound": "ID nie może zostać znalezione",
+<%_ if (searchEngineElasticsearch) { _%>
+        "querySyntaxError": "Szukana fraza jest niepoprawna",
+<%_ } _%>
         "file": {
-            "could.not.extract": "Could not extract file",
-            "not.image": "File was expected to be an image but was found to be \"{{ fileType }}\""
+            "could.not.extract": "Nie można wypakować pliku.",
+            "not.image": "Oczekiwany format pliku to zdjęcie, obecny format pliku to \"{{ fileType }}\""
         }
     },
     "footer": "To jest stopka"
diff --git a/generators/languages/templates/src/main/webapp/i18n/pl/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/pl/health.json.ejs
index 19cfc8809aeb..5a91fc2cb699 100644
--- a/generators/languages/templates/src/main/webapp/i18n/pl/health.json.ejs
+++ b/generators/languages/templates/src/main/webapp/i18n/pl/health.json.ejs
@@ -38,7 +38,8 @@
             "clientConfigServer": "Serwer konfiguracyjny mikroserwisów",
             "hystrix": "Hystrix",
   <%_ if (serviceDiscoveryConsul) { _%>
-            "consul": "Consul",
+            "consul": "Consul",<% } else if (reactive) { %>
+            "reactiveDiscoveryClients": "Microservice Discovery Clients",
   <%_ } _%>
 <%_ } _%>
 <%_ if (cacheProviderHazelcast) { _%>
@@ -46,8 +47,8 @@
 <%_ } _%>
             "diskSpace": "Przestrzeń dyskowa",
             "mail": "Email",
-            "livenessState": "Liveness state",
-            "readinessState": "Readiness state",
+            "livenessState": "Stan żywotności",
+            "readinessState": "Stan gotowości",
             "ping": "Application"<% if (searchEngineElasticsearch) { %>,
             "elasticsearch": "Elasticsearch"<% } %><% if (databaseTypeSql && !reactive) { %>,
             "db": "Baza danych"<% } %><% if (databaseTypeSql && reactive) { %>,
@@ -64,6 +65,9 @@
         "status": {
             "UNKNOWN": "NIEZNANY",
             "UP": "DOSTĘPNA",
+<%_ if (clientFrameworkAngular) { _%>
+            "OUT_OF_SERVICE": "WYŁĄCZONE Z UŻYTKU",
+<%_ } _%>
             "DOWN": "NIEDOSTĘPNA"
         }
     }
diff --git a/generators/languages/templates/src/main/webapp/i18n/pl/register.json b/generators/languages/templates/src/main/webapp/i18n/pl/register.json
index a5c6b7e7679b..66fcf757c404 100644
--- a/generators/languages/templates/src/main/webapp/i18n/pl/register.json
+++ b/generators/languages/templates/src/main/webapp/i18n/pl/register.json
@@ -10,7 +10,7 @@
                     "required": "Twój login jest wymagany.",
                     "minlength": "Twój login musi mieć długość co najmniej 1 znaku",
                     "maxlength": "Twój login nie może być dłuższy niż 50 znaków",
-                    "pattern": "Your username is invalid."
+                    "pattern": "Niewłaściwa nazwa użytkownika."
                 }
             },
             "success": "<strong>Rejestracja udała się!</strong> Wysłaliśmy do Ciebie email z linkiem do weryfikacji konta i prosimy abyś sprawdził swoją skrzynkę pocztową.",
diff --git a/generators/languages/templates/src/main/webapp/i18n/pl/user-management.json b/generators/languages/templates/src/main/webapp/i18n/pl/user-management.json
index 9e5336e48215..e6b193981e51 100644
--- a/generators/languages/templates/src/main/webapp/i18n/pl/user-management.json
+++ b/generators/languages/templates/src/main/webapp/i18n/pl/user-management.json
@@ -2,7 +2,7 @@
     "userManagement": {
         "home": {
             "title": "Użytkownicy",
-            "refreshListLabel": "Refresh list",
+            "refreshListLabel": "Odśwież listę",
             "createLabel": "Stwórz nowego użytkownika",
             "createOrEditLabel": "Stwórz lub edytuj użytkownika"
         },
diff --git a/generators/languages/translation-data.mjs b/generators/languages/translation-data.mjs
index e9699687b35f..f40c316481ee 100644
--- a/generators/languages/translation-data.mjs
+++ b/generators/languages/translation-data.mjs
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import { inspect } from 'node:util';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { passthrough } from '@yeoman/transform';
 import { Minimatch } from 'minimatch';
 import { clearFileState } from 'mem-fs-editor/state';
diff --git a/generators/languages/upgrade-files-task.mts b/generators/languages/upgrade-files-task.mts
deleted file mode 100644
index d9f19f8840f6..000000000000
--- a/generators/languages/upgrade-files-task.mts
+++ /dev/null
@@ -1,52 +0,0 @@
-import shelljs from 'shelljs';
-
-import BaseGenerator from '../base/index.mjs';
-import { SERVER_MAIN_RES_DIR } from '../generator-constants.mjs';
-import { languageSnakeCase, languageToJavaLanguage } from './support/index.mjs';
-
-/**
- * Execute a git mv.
- * A git mv operation is required due to file casing change eg: en_us -> en_US at a case insensitive OS.
- *
- * @param source
- * @param dest
- * @returns {boolean} true if success; false otherwise
- */
-function gitMove(this: BaseGenerator, from: string, to: string) {
-  const source = this.destinationPath(from);
-  const dest = this.destinationPath(to);
-  if (source && dest && shelljs.test('-f', source)) {
-    this.log.verboseInfo(`Renaming the file - ${source} to ${dest}`);
-    return !shelljs.exec(`git mv -f ${source} ${dest}`).code;
-  }
-  return true;
-}
-
-/**
- * Upgrade files.
- */
-export default function upgradeFilesTask(this: BaseGenerator) {
-  let atLeastOneSuccess = false;
-  if (this.isJhipsterVersionLessThan('6.1.0')) {
-    const languages = this.config.get<string[]>('languages');
-    if (languages) {
-      const langNameDiffer = function (lang) {
-        const langProp = languageSnakeCase(lang);
-        const langJavaProp = languageToJavaLanguage(lang);
-        return langProp !== langJavaProp ? [langProp, langJavaProp] : undefined;
-      };
-      languages
-        .map(langNameDiffer)
-        .filter(props => props)
-        .forEach(props => {
-          const code = gitMove.call(
-            this,
-            `${SERVER_MAIN_RES_DIR}i18n/messages_${props![0]}.properties`,
-            `${SERVER_MAIN_RES_DIR}i18n/messages_${props![1]}.properties`,
-          );
-          atLeastOneSuccess = atLeastOneSuccess || code;
-        });
-    }
-  }
-  return atLeastOneSuccess;
-}
diff --git a/generators/liquibase/files.mts b/generators/liquibase/files.mts
index 49b5ca4a2c6c..b455616e061f 100644
--- a/generators/liquibase/files.mts
+++ b/generators/liquibase/files.mts
@@ -26,7 +26,8 @@ import { CommonClientServerApplication } from '../base-application/types.mjs';
 export const liquibaseFiles: WriteFileSection<LiquibaseGenerator, CommonClientServerApplication> = {
   liquibase: [
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      condition: ctx => ctx.backendTypeSpringBoot,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['config/LiquibaseConfiguration.java'],
     },
diff --git a/generators/liquibase/generator.mts b/generators/liquibase/generator.mts
index f6758ee6e6e6..5ed35f1dc6b9 100644
--- a/generators/liquibase/generator.mts
+++ b/generators/liquibase/generator.mts
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import fs from 'fs';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 
 import BaseEntityChangesGenerator from '../base-entity-changes/index.mjs';
 import { GENERATOR_LIQUIBASE, GENERATOR_BOOTSTRAP_APPLICATION_SERVER } from '../generator-list.mjs';
@@ -70,10 +70,13 @@ export default class LiquibaseGenerator extends BaseEntityChangesGenerator {
   }
 
   async beforeQueue() {
-    await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_SERVER);
     if (!this.fromBlueprint) {
       await this.composeWithBlueprints(GENERATOR_LIQUIBASE);
     }
+
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_SERVER);
+    }
   }
 
   get initializing() {
@@ -92,6 +95,9 @@ export default class LiquibaseGenerator extends BaseEntityChangesGenerator {
     return this.asPreparingTaskGroup({
       preparing({ application }) {
         application.liquibaseDefaultSchemaName = '';
+        // Generate h2 properties at master.xml for blueprints that uses h2 for tests or others purposes.
+        (application as any).liquibaseAddH2Properties =
+          (application as any).liquibaseAddH2Properties ?? (application as any).devDatabaseTypeH2Any;
       },
       checkDatabaseCompatibility({ application }) {
         if (!application.databaseTypeSql && !application.databaseTypeNeo4j) {
@@ -332,6 +338,7 @@ export default class LiquibaseGenerator extends BaseEntityChangesGenerator {
               // eslint-disable-next-line no-template-curly-in-string
               version: '${liquibase.version}',
               additionalContent: mavenPlugin({
+                backendTypeSpringBoot: application.backendTypeSpringBoot,
                 reactive: application.reactive,
                 packageName: application.packageName,
                 srcMainResources: application.srcMainResources,
@@ -370,8 +377,10 @@ export default class LiquibaseGenerator extends BaseEntityChangesGenerator {
         }
 
         if (applicationAny.databaseTypeNeo4j) {
+          if (applicationAny.backendTypeSpringBoot) {
+            source.addMavenDependency?.([{ groupId: 'org.springframework', artifactId: 'spring-jdbc' }]);
+          }
           source.addMavenDependency?.([
-            { groupId: 'org.springframework', artifactId: 'spring-jdbc' },
             {
               groupId: 'org.liquibase.ext',
               artifactId: 'liquibase-neo4j',
diff --git a/generators/liquibase/support/maven-plugin.mts b/generators/liquibase/support/maven-plugin.mts
index 88906d41d0a3..2a1507c78456 100644
--- a/generators/liquibase/support/maven-plugin.mts
+++ b/generators/liquibase/support/maven-plugin.mts
@@ -1,4 +1,5 @@
 export default function mavenPluginContent({
+  backendTypeSpringBoot,
   reactive,
   packageName,
   srcMainResources,
@@ -20,7 +21,7 @@ export default function mavenPluginContent({
       <url>${url}</url>
       <defaultSchemaName>${defaultSchemaName}</defaultSchemaName>
       <username>${username}</username>
-      <password>${password}</password>${reactive ? '' : `
+      <password>${password}</password>${reactive || !backendTypeSpringBoot ? '' : `
       <referenceUrl>hibernate:spring:${packageName}.domain?dialect=${hibernateDialect}&amp;hibernate.physical_naming_strategy=org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy</referenceUrl>`}
       <verbose>true</verbose>
       <logging>debug</logging>
@@ -37,7 +38,7 @@ export default function mavenPluginContent({
         <groupId>org.liquibase.ext</groupId>
         <artifactId>liquibase-hibernate6</artifactId>
         <version>\${liquibase.version}</version>
-      </dependency>
+      </dependency>${backendTypeSpringBoot ? `
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -47,7 +48,7 @@ export default function mavenPluginContent({
         <groupId>jakarta.validation</groupId>
         <artifactId>jakarta.validation-api</artifactId>
         <version>\${validation-api.version}</version>
-      </dependency>${devDatabaseTypeH2Any? `
+      </dependency>` : ''}${devDatabaseTypeH2Any? `
       <dependency>
         <groupId>com.h2database</groupId>
         <artifactId>h2</artifactId>
diff --git a/generators/liquibase/support/prepare-field.mjs b/generators/liquibase/support/prepare-field.mjs
index fc8f606f14a8..217d0792d86c 100644
--- a/generators/liquibase/support/prepare-field.mjs
+++ b/generators/liquibase/support/prepare-field.mjs
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 
 import { databaseTypes, fieldTypes } from '../../../jdl/jhipster/index.mjs';
 
diff --git a/generators/liquibase/support/relationship.mts b/generators/liquibase/support/relationship.mts
index 8b54b432efc9..276c51984e34 100644
--- a/generators/liquibase/support/relationship.mts
+++ b/generators/liquibase/support/relationship.mts
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { getFKConstraintName } from '../../server/support/index.mjs';
 
 function relationshipBaseDataEquals(relationshipA, relationshipB) {
diff --git a/generators/liquibase/templates/gradle/liquibase.gradle.ejs b/generators/liquibase/templates/gradle/liquibase.gradle.ejs
index 8b96e5c6ce75..43544750c0f9 100644
--- a/generators/liquibase/templates/gradle/liquibase.gradle.ejs
+++ b/generators/liquibase/templates/gradle/liquibase.gradle.ejs
@@ -18,7 +18,7 @@ dependencies {
   <%_ if (prodDatabaseTypeMysql) { _%>
   liquibaseRuntime "com.mysql:mysql-connector-j"
   <%_ } _%>
-  <%_ if (prodDatabaseTypePostgres) { _%>
+  <%_ if (prodDatabaseTypePostgresql) { _%>
   liquibaseRuntime "org.postgresql:postgresql"
   <%_ } _%>
   <%_ if (prodDatabaseTypeMariadb) { _%>
@@ -69,7 +69,7 @@ liquibase {
       password "<%- devDatabasePassword %>"
 <%_ } _%>
       changelogFile project.ext.diffChangelogFile
-<%_ if (!reactive) { _%>
+<%_ if (!reactive && backendTypeSpringBoot) { _%>
       referenceUrl "hibernate:spring:<%= packageName %>.domain?dialect=<%= devHibernateDialect %>&hibernate.physical_naming_strategy=org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy&hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy"
 <%_ } _%>
 <%_ if (liquibaseDefaultSchemaName) { _%>
@@ -98,9 +98,11 @@ configurations {
     }
   }
 }
+<%_ if (backendTypeSpringBoot) { _%>
 
 ext {
   if (project.hasProperty("no-liquibase")) {
     springProfiles += ",no-liquibase"
   }
 }
+<%_ } _%>
diff --git a/generators/liquibase/templates/src/main/java/package/config/LiquibaseConfiguration.java.ejs b/generators/liquibase/templates/src/main/java/_package_/config/LiquibaseConfiguration.java.ejs
similarity index 100%
rename from generators/liquibase/templates/src/main/java/package/config/LiquibaseConfiguration.java.ejs
rename to generators/liquibase/templates/src/main/java/_package_/config/LiquibaseConfiguration.java.ejs
diff --git a/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/added_entity.xml.ejs b/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/added_entity.xml.ejs
index 7d7edc2bdbbb..fe846d223eff 100644
--- a/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/added_entity.xml.ejs
+++ b/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/added_entity.xml.ejs
@@ -34,9 +34,9 @@
         Added the entity <%= entity.entityClass %>.
     -->
     <changeSet id="<%= changelogDate %>-1" author="jhipster">
-        <createTable tableName="<%= entity.entityTableName %>"<%- this.formatAsLiquibaseRemarks(entity.javadoc, true) %>>
+        <createTable tableName="<%= entity.entityTableName %>"<%- this.formatAsLiquibaseRemarks(entity.documentation, true) %>>
 <%_ for (field of fields) { _%>
-            <column name="<%= field.columnName %>" type="<%= field.columnType %>"<%- this.formatAsLiquibaseRemarks(field.javadoc, true) %><% if (field.id && field.liquibaseAutoIncrement) { %> autoIncrement="true" startWith="1500"<%_ } %>>
+            <column name="<%= field.columnName %>" type="<%= field.columnType %>"<%- this.formatAsLiquibaseRemarks(field.documentation, true) %><% if (field.id && field.liquibaseAutoIncrement) { %> autoIncrement="true" startWith="1500"<%_ } %>>
     <%_ if (field.id) { _%>
                 <constraints primaryKey="true" nullable="false"/>
     <%_ } else if (field.unique) { _%>
diff --git a/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/initial_schema_sql.xml.ejs b/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/initial_schema_sql.xml.ejs
index c8d708e70cff..7a00bdd34a70 100644
--- a/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/initial_schema_sql.xml.ejs
+++ b/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/initial_schema_sql.xml.ejs
@@ -161,7 +161,7 @@ _%>
                   separator=";"
                   tableName="<%= user.entityTableName %>"
                   usePreparedStatements="true">
-    <%_ if (prodDatabaseTypePostgres) { _%>
+    <%_ if (prodDatabaseTypePostgresql) { _%>
             <column name="id" type="<%= idField.loadColumnType %>"/>
     <%_ } _%>
             <column name="activated" type="boolean"/>
diff --git a/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity.xml.ejs b/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity.xml.ejs
index 3438e5e1b3dc..d2f33b652092 100644
--- a/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity.xml.ejs
+++ b/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity.xml.ejs
@@ -31,7 +31,7 @@
     <changeSet id="<%= changelogDate %>-1-add-columns" author="jhipster">
         <addColumn tableName="<%= entity.entityTableName %>">
     <%_ for (field of addedFields) { _%>
-            <column name="<%= field.columnName %>" type="<%= field.columnType %>"<%- this.formatAsLiquibaseRemarks(field.javadoc, true) %>/>
+            <column name="<%= field.columnName %>" type="<%= field.columnType %>"<%- this.formatAsLiquibaseRemarks(field.documentation, true) %>/>
         <%_ if (field.shouldCreateContentType) { _%>
             <column name="<%= field.columnName %>_content_type" type="varchar(255)"/>
         <%_ }
diff --git a/generators/liquibase/templates/src/main/resources/config/liquibase/master.xml.ejs b/generators/liquibase/templates/src/main/resources/config/liquibase/master.xml.ejs
index d2b809c0c0c3..e9be8cf68ced 100644
--- a/generators/liquibase/templates/src/main/resources/config/liquibase/master.xml.ejs
+++ b/generators/liquibase/templates/src/main/resources/config/liquibase/master.xml.ejs
@@ -3,7 +3,7 @@
     xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
-<%_ if (devDatabaseTypeH2Any) { _%>
+<%_ if (liquibaseAddH2Properties) { _%>
     <property name="now" value="now()" dbms="h2"/>
     <property name="floatType" value="float4" dbms="h2"/>
   <%_ if (prodDatabaseTypeMysql || prodDatabaseTypeMariadb) { _%>
@@ -12,7 +12,7 @@
     <property name="uuidType" value="uuid" dbms="h2"/>
   <%_ } _%>
     <property name="datetimeType" value="datetime(6)" dbms="h2"/>
-  <%_ if (prodDatabaseTypePostgres) { _%>
+  <%_ if (prodDatabaseTypePostgresql) { _%>
     <property name="clobType" value="longvarchar" dbms="h2"/>
   <%_ } else { _%>
     <property name="clobType" value="clob" dbms="h2"/>
@@ -35,7 +35,7 @@
     <property name="uuidType" value="varchar(36)" dbms="mariadb"/>
     <property name="datetimeType" value="datetime(6)" dbms="mariadb"/>
 <%_ } _%>
-<%_ if (prodDatabaseTypePostgres) { _%>
+<%_ if (prodDatabaseTypePostgresql) { _%>
     <property name="now" value="current_timestamp" dbms="postgresql"/>
     <property name="floatType" value="float4" dbms="postgresql"/>
     <property name="clobType" value="clob" dbms="postgresql"/>
diff --git a/generators/maven/files.mjs b/generators/maven/files.mjs
index 288e0249824c..25783b871dae 100644
--- a/generators/maven/files.mjs
+++ b/generators/maven/files.mjs
@@ -20,13 +20,11 @@
 export default {
   maven: [
     {
-      templates: [
-        { file: 'mvnw', noEjs: true },
-        { file: 'mvnw.cmd', noEjs: true },
-        { file: '.mvn/wrapper/maven-wrapper.jar', noEjs: true },
-        { file: '.mvn/wrapper/maven-wrapper.properties', noEjs: true },
-        { file: '.mvn/jvm.config', noEjs: true },
-      ],
+      templates: ['.prettierignore.jhi.maven'],
+    },
+    {
+      transform: false,
+      templates: ['mvnw', 'mvnw.cmd', '.mvn/wrapper/maven-wrapper.jar', '.mvn/wrapper/maven-wrapper.properties', '.mvn/jvm.config'],
     },
   ],
 };
diff --git a/generators/maven/generator.mts b/generators/maven/generator.mts
index ff7d4bcf95bb..6c529d31fff0 100644
--- a/generators/maven/generator.mts
+++ b/generators/maven/generator.mts
@@ -32,12 +32,25 @@ export default class MavenGenerator extends BaseApplicationGenerator<SpringBootG
   pomStorage!: PomStorage;
 
   async beforeQueue() {
-    this.pomStorage = createPomStorage(this);
-
     if (!this.fromBlueprint) {
-      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_SERVER);
       await this.composeWithBlueprints(GENERATOR_MAVEN);
     }
+
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_SERVER);
+    }
+  }
+
+  get initializing() {
+    return this.asInitializingTaskGroup({
+      pomStorage() {
+        this.pomStorage = createPomStorage(this);
+      },
+    });
+  }
+
+  get [BaseApplicationGenerator.INITIALIZING]() {
+    return this.delegateTasksToBlueprint(() => this.initializing);
   }
 
   get configuring() {
diff --git a/generators/maven/generator.spec.mts b/generators/maven/generator.spec.mts
index 8bc3b0659883..44086664f3c3 100644
--- a/generators/maven/generator.spec.mts
+++ b/generators/maven/generator.spec.mts
@@ -65,8 +65,8 @@ describe(`generator - ${generator}`, () => {
         .withGenerators([
           [
             class extends MavenGenerator {
-              get [MavenGenerator.PREPARING]() {
-                return super.preparing;
+              constructor(args, options, features) {
+                super(args, options, { ...features, sbsBlueprint: true });
               }
 
               get [MavenGenerator.POST_WRITING]() {
diff --git a/generators/maven/internal/xml-store.mts b/generators/maven/internal/xml-store.mts
index a719c9fc3b8a..82a478de649a 100644
--- a/generators/maven/internal/xml-store.mts
+++ b/generators/maven/internal/xml-store.mts
@@ -19,7 +19,7 @@
 
 import assert from 'assert';
 import { XMLParser, XMLBuilder, XmlBuilderOptions, X2jOptions } from 'fast-xml-parser';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 
 const { merge } = _;
 
@@ -43,6 +43,7 @@ const defaultXmlBuildOptions: Partial<XmlBuilderOptions> = {
 };
 
 export default class XmlStorage {
+  sortFile: boolean = true;
   protected readonly saveFile: (string) => void;
   protected readonly loadFile: () => string;
 
@@ -75,14 +76,16 @@ export default class XmlStorage {
     delete this._cachedStore;
   }
 
-  public save() {
-    this.sort();
+  public save(sort = this.sortFile) {
+    if (sort) {
+      this.sort();
+    }
     this.persist(false);
   }
 
   protected sort() {}
 
-  protected persist(sort = true) {
+  protected persist(sort = this.sortFile) {
     if (this._cachedStore) {
       if (sort) {
         this.sort();
diff --git a/generators/maven/support/pom-store.mts b/generators/maven/support/pom-store.mts
index 6eb1be5cfd0f..cf6688dc33f3 100644
--- a/generators/maven/support/pom-store.mts
+++ b/generators/maven/support/pom-store.mts
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import sortKeys from 'sort-keys';
 
 import CoreGenerator from '../../base-core/index.mjs';
@@ -43,6 +43,7 @@ const rootOrder = [
   'packaging',
   'name',
   'description',
+  'parent',
   'repositories',
   'pluginRepositories',
   'distributionManagement',
@@ -147,9 +148,17 @@ const ensureProfile = (project, profileId: string) => {
 const groupIdOrder = ['tech.jhipster', 'org.springframework.boot', 'org.springframework.security', 'org.springdoc'];
 
 const sortArtifacts = (artifacts: MavenArtifact[]) =>
-  artifacts.sort((a, b) => {
-    const groupIdCompared = sortWithTemplate(groupIdOrder, a.groupId, b.groupId);
-    if (groupIdCompared) return groupIdCompared;
+  artifacts.sort((a: MavenArtifact, b: MavenArtifact) => {
+    if (a.groupId !== b.groupId) {
+      if (a.groupId === undefined) {
+        return -1;
+      }
+      if (b.groupId === undefined) {
+        return 1;
+      }
+      const groupIdCompared = sortWithTemplate(groupIdOrder, a.groupId, b.groupId);
+      if (groupIdCompared) return groupIdCompared;
+    }
     return a.artifactId.localeCompare(b.artifactId);
   });
 
diff --git a/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties b/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties
index ac184013fc0d..eacdc9ed17a1 100644
--- a/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties
+++ b/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
diff --git a/generators/maven/templates/.prettierignore.jhi.maven.ejs b/generators/maven/templates/.prettierignore.jhi.maven.ejs
new file mode 100644
index 000000000000..f18d67771920
--- /dev/null
+++ b/generators/maven/templates/.prettierignore.jhi.maven.ejs
@@ -0,0 +1,23 @@
+<%#
+ Copyright 2013-2023 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+<&_ if (!fragment.section) { -&>
+# Generated by jhipster:maven
+target
+.mvn
+<&_ } -&>
diff --git a/generators/maven/types.d.mts b/generators/maven/types.d.mts
index 3284fbda3973..aba3f9b61025 100644
--- a/generators/maven/types.d.mts
+++ b/generators/maven/types.d.mts
@@ -18,7 +18,7 @@
  */
 
 export type MavenArtifact = {
-  groupId: string;
+  groupId?: string;
   artifactId: string;
   version?: string;
   inProfile?: string;
@@ -77,8 +77,8 @@ export type MavenDefinition = {
 
 export type MavenSourceType = {
   addMavenAnnotationProcessor?(artifact: MavenAnnotationProcessor | MavenAnnotationProcessor[]): void;
-  addMavenDependency?(dependecy: MavenDependency | MavenDependency[]): void;
-  addMavenDependencyManagement?(dependecy: MavenDependency | MavenDependency[]): void;
+  addMavenDependency?(dependency: MavenDependency | MavenDependency[]): void;
+  addMavenDependencyManagement?(dependency: MavenDependency | MavenDependency[]): void;
   addMavenDistributionManagement?(distributionManagement: MavenDistributionManagement | MavenDistributionManagement[]): void;
   addMavenPlugin?(plugin: MavenPlugin | MavenPlugin[]): void;
   addMavenPluginManagement?(plugin: MavenPlugin | MavenPlugin[]): void;
diff --git a/generators/openapi-client/USAGE b/generators/openapi-client/USAGE
deleted file mode 100644
index 53935d5a365a..000000000000
--- a/generators/openapi-client/USAGE
+++ /dev/null
@@ -1,5 +0,0 @@
-Description:
-    Generates java client code from an OpenAPI/Swagger definition
-
-Example:
-    jhipster openapi-client
diff --git a/generators/openapi-client/__snapshots__/openapi-client.spec.mts.snap b/generators/openapi-client/__snapshots__/openapi-client.spec.mts.snap
deleted file mode 100644
index d0f6837e4d12..000000000000
--- a/generators/openapi-client/__snapshots__/openapi-client.spec.mts.snap
+++ /dev/null
@@ -1,224 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`generator - OpenAPI Client Spring: microservice petstore custom endpoint  should match files snapshot 1`] = `
-{
-  ".openapi-generator-ignore": {
-    "contents": "pom.xml
-README.md
-package.json
-",
-    "stateCleared": "modified",
-  },
-  ".yo-rc.json": {
-    "contents": "{
-  "generator-jhipster": {
-    "applicationType": "microservice",
-    "baseName": "sampleOpenApiClient",
-    "enableSwaggerCodegen": true
-  }
-}
-",
-    "stateCleared": "modified",
-  },
-  "package.json": {
-    "contents": "{
-  "scripts": {
-    "openapi-client:petstore": "openapi-generator-cli generate -g spring -i petstore-openapi-3.yml -p library=spring-cloud -p apiPackage=com.mycompany.myapp.client.petstore.api -p modelPackage=com.mycompany.myapp.client.petstore.model -p basePackage=com.mycompany.myapp.client -p configPackage=com.mycompany.myapp.client.petstore -p title=petstore -p artifactId=petstore -p supportingFiles=ApiKeyRequestInterceptor.java --skip-validate-spec"
-  },
-  "dependencies": {
-    "@openapitools/openapi-generator-cli": "2.7.0"
-  }
-}
-",
-    "stateCleared": "modified",
-  },
-  "pom.xml": {
-    "contents": "<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-oauth2</artifactId>
-        </dependency>
-    </dependencies>
-</project>
-",
-    "stateCleared": "modified",
-  },
-}
-`;
-
-exports[`generator - OpenAPI Client Spring: microservice petstore regenerate  should match files snapshot 1`] = `
-{
-  ".openapi-generator-ignore": {
-    "contents": "pom.xml
-README.md
-package.json
-",
-    "stateCleared": "modified",
-  },
-  ".yo-rc.json": {
-    "contents": "{
-  "generator-jhipster": {
-    "baseName": "sampleOpenApiClient",
-    "applicationType": "microservice",
-    "enableSwaggerCodegen": true,
-    "openApiClients": {
-      "petstore": {
-        "spec": "petstore-openapi-3.yml",
-        "generatorName": "spring"
-      }
-    }
-  }
-}
-",
-    "stateCleared": "modified",
-  },
-  "package.json": {
-    "contents": "{
-  "scripts": {
-    "openapi-client:petstore": "openapi-generator-cli generate -g spring -i petstore-openapi-3.yml -p library=spring-cloud -p apiPackage=com.mycompany.myapp.client.petstore.api -p modelPackage=com.mycompany.myapp.client.petstore.model -p basePackage=com.mycompany.myapp.client -p configPackage=com.mycompany.myapp.client.petstore -p title=petstore -p artifactId=petstore -p supportingFiles=ApiKeyRequestInterceptor.java --skip-validate-spec"
-  },
-  "dependencies": {
-    "@openapitools/openapi-generator-cli": "2.7.0"
-  }
-}
-",
-    "stateCleared": "modified",
-  },
-  "petstore-openapi-3.yml": {
-    "contents": "openapi: "3.0.0"
-info:
-  version: 1.0.0
-  title: Swagger Petstore
-  license:
-    name: MIT
-servers:
-  - url: http://petstore.swagger.io/v1
-paths:
-  /pets:
-    get:
-      summary: List all pets
-      operationId: listPets
-      tags:
-        - pets
-      parameters:
-        - name: limit
-          in: query
-          description: How many items to return at one time (max 100)
-          required: false
-          schema:
-            type: integer
-            format: int32
-      responses:
-        '200':
-          description: A paged array of pets
-          headers:
-            x-next:
-              description: A link to the next page of responses
-              schema:
-                type: string
-          content:
-            application/json:    
-              schema:
-                $ref: "#/components/schemas/Pets"
-        default:
-          description: unexpected error
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Error"
-    post:
-      summary: Create a pet
-      operationId: createPets
-      tags:
-        - pets
-      responses:
-        '201':
-          description: Null response
-        default:
-          description: unexpected error
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Error"
-  /pets/{petId}:
-    get:
-      summary: Info for a specific pet
-      operationId: showPetById
-      tags:
-        - pets
-      parameters:
-        - name: petId
-          in: path
-          required: true
-          description: The id of the pet to retrieve
-          schema:
-            type: string
-      responses:
-        '200':
-          description: Expected response to a valid request
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Pets"
-        default:
-          description: unexpected error
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Error"
-components:
-  schemas:
-    Pet:
-      required:
-        - id
-        - name
-      properties:
-        id:
-          type: integer
-          format: int64
-        name:
-          type: string
-        tag:
-          type: string
-    Pets:
-      type: array
-      items:
-        $ref: "#/components/schemas/Pet"
-    Error:
-      required:
-        - code
-        - message
-      properties:
-        code:
-          type: integer
-          format: int32
-        message:
-          type: string",
-    "stateCleared": "modified",
-  },
-  "pom.xml": {
-    "contents": "<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-oauth2</artifactId>
-        </dependency>
-    </dependencies>
-</project>
-",
-    "stateCleared": "modified",
-  },
-  "src/main/java/com/mycompany/myapp/client/petstore/api/PetsApiClientOld.java": {
-    "contents": null,
-    "state": "deleted",
-    "stateCleared": "modified",
-  },
-}
-`;
diff --git a/generators/openapi-client/files.mjs b/generators/openapi-client/files.mjs
deleted file mode 100644
index bd5671418e02..000000000000
--- a/generators/openapi-client/files.mjs
+++ /dev/null
@@ -1,239 +0,0 @@
-/**
- * Copyright 2013-2023 the original author or authors from the JHipster project.
- *
- * This file is part of the JHipster project, see https://www.jhipster.tech/
- * for more information.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import path from 'path';
-import _ from 'lodash';
-import chalk from 'chalk';
-import { SERVER_MAIN_SRC_DIR, OPENAPI_GENERATOR_CLI_VERSION } from '../generator-constants.mjs';
-import { applicationOptions, buildToolTypes, applicationTypes, authenticationTypes } from '../../jdl/jhipster/index.mjs';
-import { addGradleDependencyCallback, addGradlePropertyCallback } from '../gradle/internal/needles.mjs';
-import { getPomVersionProperties } from '../server/support/dependabot-maven.mjs';
-import { getMainClassName } from '../java/support/index.mjs';
-
-const { OptionNames } = applicationOptions;
-const { GRADLE, MAVEN } = buildToolTypes;
-const { GATEWAY, MICROSERVICE } = applicationTypes;
-const { JWT, SESSION } = authenticationTypes;
-
-const { REACTIVE } = OptionNames;
-
-export function writeFiles() {
-  return {
-    addOpenAPIIgnoreFile() {
-      const basePath = this.config.get(REACTIVE) ? 'java' : 'spring';
-      this.copyTemplate(`${basePath}/.openapi-generator-ignore`, '.openapi-generator-ignore');
-    },
-  };
-}
-
-export function customizeFiles() {
-  return {
-    callOpenApiGenerator() {
-      if (Object.keys(this.clientsToGenerate).length === 0) {
-        this.log.warn('No openapi client configured. Please run "jhipster openapi-client" to generate your first OpenAPI client.');
-        return;
-      }
-
-      Object.keys(this.clientsToGenerate).forEach(cliName => {
-        const baseCliPackage = `${this.packageName}.client.`;
-        const cliPackage = `${baseCliPackage}${_.toLower(cliName)}`;
-        const snakeCaseCliPackage = `${baseCliPackage}${_.snakeCase(cliName)}`;
-        this.removeFolder(path.resolve(SERVER_MAIN_SRC_DIR, ...cliPackage.split('.')));
-        this.removeFolder(path.resolve(SERVER_MAIN_SRC_DIR, ...snakeCaseCliPackage.split('.')));
-
-        const inputSpec = this.clientsToGenerate[cliName].spec;
-        const generatorName = this.clientsToGenerate[cliName].generatorName;
-
-        const openApiCmd = ['openapi-generator-cli generate'];
-        let openApiGeneratorName;
-        let openApiGeneratorLibrary;
-        const additionalParameters = [];
-
-        if (generatorName === 'spring') {
-          openApiGeneratorName = 'spring';
-          openApiGeneratorLibrary = 'spring-cloud';
-
-          additionalParameters.push('-p supportingFiles=ApiKeyRequestInterceptor.java');
-        } else if (generatorName === 'java') {
-          openApiGeneratorName = 'java';
-          openApiGeneratorLibrary = 'webclient';
-
-          additionalParameters.push('-p dateLibrary=java8');
-        }
-        this.log.log(chalk.green(`\n\nGenerating npm script for generating client code ${cliName} (${inputSpec})`));
-
-        openApiCmd.push(
-          `-g ${openApiGeneratorName}`,
-          `-i ${inputSpec}`,
-          `-p library=${openApiGeneratorLibrary}`,
-          `-p apiPackage=${cliPackage}.api`,
-          `-p modelPackage=${cliPackage}.model`,
-          `-p basePackage=${this.packageName}.client`,
-          `-p configPackage=${cliPackage}`,
-          `-p title=${_.camelCase(cliName)}`,
-          `-p artifactId=${_.camelCase(cliName)}`,
-        );
-
-        openApiCmd.push(additionalParameters.join(','));
-        openApiCmd.push('--skip-validate-spec');
-        if (this.clientsToGenerate[cliName].useServiceDiscovery) {
-          openApiCmd.push('--additional-properties ribbon=true');
-        }
-        this.packageJson.merge({
-          scripts: {
-            [`openapi-client:${cliName}`]: openApiCmd.join(' '),
-          },
-        });
-      });
-    },
-
-    addBackendDependencies() {
-      if (!_.map(this.clientsToGenerate, 'generatorName').includes('spring')) {
-        return;
-      }
-
-      if (this.buildTool === MAVEN) {
-        if (![MICROSERVICE, GATEWAY].includes(this.applicationType)) {
-          let exclusions;
-          if (this.authenticationType === SESSION) {
-            exclusions = `
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.cloud</groupId>
-                    <artifactId>spring-cloud-starter-ribbon</artifactId>
-                </exclusion>
-            </exclusions>`;
-          }
-          this.addMavenDependency('org.springframework.cloud', 'spring-cloud-starter-openfeign', null, exclusions);
-        }
-        this.addMavenDependency('org.springframework.cloud', 'spring-cloud-starter-oauth2');
-      } else if (this.buildTool === GRADLE) {
-        if (![MICROSERVICE, GATEWAY].includes(this.applicationType)) {
-          if (this.authenticationType === SESSION) {
-            const content =
-              "compile 'org.springframework.cloud:spring-cloud-starter-openfeign', { exclude group: 'org.springframework.cloud', module: 'spring-cloud-starter-ribbon' }";
-            this.rewriteFile('./build.gradle', 'jhipster-needle-gradle-dependency', content);
-          } else {
-            // TODO addGradleDependencyCallback is an internal api, switch to source api when converted to BaseApplicationGenerator
-            this.editFile(
-              'build.gradle',
-              addGradleDependencyCallback({
-                groupId: 'org.springframework.cloud',
-                artifactId: 'spring-cloud-starter-openfeign',
-                scope: 'compile',
-              }),
-            );
-          }
-        }
-
-        // TODO addGradleDependencyCallback is an internal api, switch to source api when converted to BaseApplicationGenerator
-        this.editFile(
-          'build.gradle',
-          addGradleDependencyCallback({
-            groupId: 'org.springframework.cloud',
-            artifactId: 'spring-cloud-starter-oauth2',
-            scope: 'compile',
-          }),
-        );
-      }
-    },
-
-    /* This is a hack to avoid non compiling generated code from openapi generator when the
-     * enableSwaggerCodegen option is not selected (otherwise the jackson-databind-nullable dependency is already added).
-     * Related to this issue https://github.com/OpenAPITools/openapi-generator/issues/2901 - remove this code when it's fixed.
-     */
-    addJacksonDataBindNullable() {
-      if (!this.enableSwaggerCodegen) {
-        const pomFile = this.readTemplate(this.jhipsterTemplatePath('../../server/templates/pom.xml'));
-        // TODO use application.javaDependencies
-        const versions = getPomVersionProperties(pomFile);
-        const jacksonDatabindNullableVersion = versions['jackson-databind-nullable'];
-        if (this.buildTool === MAVEN) {
-          this.addMavenProperty('jackson-databind-nullable.version', jacksonDatabindNullableVersion);
-          // eslint-disable-next-line no-template-curly-in-string
-          this.addMavenDependency('org.openapitools', 'jackson-databind-nullable', '${jackson-databind-nullable.version}');
-        } else if (this.buildTool === GRADLE) {
-          // TODO addGradlePropertyCallback is an internal api, switch to source api when converted to BaseApplicationGenerator
-          this.editFile(
-            'gradle.properties',
-            addGradlePropertyCallback({ property: 'jacksonDatabindNullableVersion', value: jacksonDatabindNullableVersion }),
-          );
-          // TODO addGradleDependencyCallback is an internal api, switch to source api when converted to BaseApplicationGenerator
-          this.editFile(
-            'build.gradle',
-            addGradleDependencyCallback({
-              groupId: 'org.openapitools',
-              artifactId: 'jackson-databind-nullable',
-              // eslint-disable-next-line no-template-curly-in-string
-              version: '${jacksonDatabindNullableVersion}',
-              scope: 'compile',
-            }),
-          );
-        }
-      }
-    },
-
-    enableFeignClients() {
-      if (!_.map(this.clientsToGenerate, 'generatorName').includes('spring')) {
-        return;
-      }
-
-      this.javaDir = `${SERVER_MAIN_SRC_DIR + this.packageFolder}/`;
-      const mainClassFile = `${this.javaDir + getMainClassName({ baseName: this.jhipsterConfig.baseName })}.java`;
-
-      if (this.applicationType !== MICROSERVICE || ![JWT].includes(this.authenticationType)) {
-        this.rewriteFile(
-          mainClassFile,
-          'import org.springframework.core.env.Environment;',
-          'import org.springframework.cloud.openfeign.EnableFeignClients;',
-        );
-        this.rewriteFile(mainClassFile, '@SpringBootApplication', '@EnableFeignClients');
-      }
-    },
-
-    handleComponentScanExclusion() {
-      if (!_.map(this.clientsToGenerate, 'generatorName').includes('spring')) {
-        return;
-      }
-
-      this.javaDir = `${SERVER_MAIN_SRC_DIR + this.packageFolder}/`;
-      const mainClassFile = `${this.javaDir + getMainClassName({ baseName: this.jhipsterConfig.baseName })}.java`;
-
-      this.rewriteFile(
-        mainClassFile,
-        'import org.springframework.core.env.Environment;',
-        'import org.springframework.context.annotation.ComponentScan;\nimport org.springframework.context.annotation.FilterType;',
-      );
-
-      const componentScan =
-        '@ComponentScan( excludeFilters = {\n' +
-        '   @ComponentScan.Filter(type = FilterType.REGEX, ' +
-        `pattern = "${this.packageName}.client.*.ClientConfiguration")\n})`;
-      this.rewriteFile(mainClassFile, '@SpringBootApplication', componentScan);
-    },
-
-    customizePackageJson() {
-      this.packageJson.merge({
-        dependencies: {
-          '@openapitools/openapi-generator-cli': OPENAPI_GENERATOR_CLI_VERSION,
-        },
-      });
-    },
-  };
-}
diff --git a/generators/openapi-client/generator.mjs b/generators/openapi-client/generator.mjs
deleted file mode 100644
index 832a3ae6fe21..000000000000
--- a/generators/openapi-client/generator.mjs
+++ /dev/null
@@ -1,219 +0,0 @@
-/**
- * Copyright 2013-2023 the original author or authors from the JHipster project.
- *
- * This file is part of the JHipster project, see https://www.jhipster.tech/
- * for more information.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* eslint-disable consistent-return */
-import shelljs from 'shelljs';
-import chalk from 'chalk';
-
-import BaseGenerator from '../base/index.mjs';
-
-import { GENERATOR_OPENAPI_CLIENT } from '../generator-list.mjs';
-import { askActionType, askExistingAvailableDocs, askGenerationInfos } from './prompts.mjs';
-import { writeFiles, customizeFiles } from './files.mjs';
-import { openapiOptions } from '../../jdl/jhipster/index.mjs';
-import { createPomStorage } from '../maven/support/index.mjs';
-import { loadAppConfig, loadDerivedAppConfig } from '../app/support/index.mjs';
-import { loadDerivedPlatformConfig, loadDerivedServerConfig, loadPlatformConfig, loadServerConfig } from '../server/support/index.mjs';
-import { loadLanguagesConfig } from '../languages/support/index.mjs';
-
-const { OpenAPIOptionsNames, OpenAPIDefaultValues } = openapiOptions;
-
-export default class OpenapiClientGenerator extends BaseGenerator {
-  constructor(args, options, features) {
-    super(args, options, features);
-    this.option(OpenAPIOptionsNames.REGEN, {
-      description: 'Regenerates all saved clients',
-      type: Boolean,
-      default: OpenAPIDefaultValues.REGEN,
-    });
-  }
-
-  async beforeQueue() {
-    if (!this.fromBlueprint) {
-      await this.composeWithBlueprints(GENERATOR_OPENAPI_CLIENT);
-    }
-  }
-
-  get initializing() {
-    return {
-      ...super.initializing,
-      sayHello() {
-        // Have Yeoman greet the user.
-        this.log.log(chalk.white('Welcome to the JHipster OpenApi client Sub-Generator'));
-      },
-      getConfig() {
-        this.openApiClients = this.config.get('openApiClients') || {};
-        loadAppConfig({ config: this.jhipsterConfigWithDefaults, application: this, useVersionPlaceholders: this.useVersionPlaceholders });
-        loadServerConfig({ config: this.jhipsterConfigWithDefaults, application: this });
-        loadLanguagesConfig({ application: this, config: this.jhipsterConfigWithDefaults });
-        loadPlatformConfig({ config: this.jhipsterConfigWithDefaults, application: this });
-
-        loadDerivedAppConfig({ application: this });
-        loadDerivedPlatformConfig({ application: this });
-        loadDerivedServerConfig({ application: this });
-      },
-    };
-  }
-
-  get [BaseGenerator.INITIALIZING]() {
-    return this.delegateTasksToBlueprint(() => this.initializing);
-  }
-
-  get prompting() {
-    return {
-      askActionType,
-      askExistingAvailableDocs,
-      askGenerationInfos,
-    };
-  }
-
-  get [BaseGenerator.PROMPTING]() {
-    return this.delegateTasksToBlueprint(() => this.prompting);
-  }
-
-  get configuring() {
-    return {
-      determineApisToGenerate() {
-        this.clientsToGenerate = {};
-        if (this.options.regen || this.props.action === 'all') {
-          this.clientsToGenerate = this.openApiClients;
-        } else if (this.props.action === 'new' || this.props.action === undefined) {
-          this.clientsToGenerate[this.props.cliName] = {
-            spec: this.props.inputSpec,
-            useServiceDiscovery: this.props.useServiceDiscovery,
-            generatorName: this.props.generatorName,
-          };
-        } else if (this.props.action === 'select') {
-          this.props.selected.forEach(selection => {
-            this.clientsToGenerate[selection.cliName] = selection.spec;
-          });
-        }
-      },
-
-      saveConfig() {
-        if (!this.options.regen && this.props.saveConfig) {
-          this.openApiClients[this.props.cliName] = this.clientsToGenerate[this.props.cliName];
-          this.config.set('openApiClients', this.openApiClients);
-        }
-      },
-    };
-  }
-
-  get [BaseGenerator.CONFIGURING]() {
-    return this.delegateTasksToBlueprint(() => this.configuring);
-  }
-
-  get writing() {
-    return writeFiles();
-  }
-
-  get [BaseGenerator.WRITING]() {
-    return this.delegateTasksToBlueprint(() => this.writing);
-  }
-
-  get postWriting() {
-    return customizeFiles();
-  }
-
-  get [BaseGenerator.POST_WRITING]() {
-    return this.delegateTasksToBlueprint(() => this.postWriting);
-  }
-
-  get install() {
-    return {
-      executeOpenApiClient() {
-        this.clientPackageManager = this.config.get('clientPackageManager');
-        const { stdout, stderr } = shelljs.exec(`${this.clientPackageManager} install`, { silent: this.silent });
-        if (stderr) {
-          this.log.error(`Something went wrong while running npm install: ${stdout} ${stderr}`);
-        }
-        Object.keys(this.clientsToGenerate).forEach(cliName => {
-          this.log.log(chalk.green(`\nGenerating client for ${cliName}`));
-          const generatorName = this.clientsToGenerate[cliName].generatorName;
-          const { stdout, stderr } = shelljs.exec(`${this.clientPackageManager} run openapi-client:${cliName}`, { silent: this.silent });
-          if (!stderr) {
-            this.log.ok(`Succesfully generated ${cliName} ${generatorName} client`);
-          } else {
-            this.log.error(`Something went wrong while generating client ${cliName}: ${stdout} ${stderr}`);
-          }
-        });
-      },
-    };
-  }
-
-  get [BaseGenerator.INSTALL]() {
-    return this.delegateTasksToBlueprint(() => this.install);
-  }
-
-  get end() {
-    return {
-      tearDown() {
-        this.log.verboseInfo('End of openapi-client generator');
-      },
-    };
-  }
-
-  get [BaseGenerator.END]() {
-    return this.delegateTasksToBlueprint(() => this.end);
-  }
-
-  /**
-   * TODO drop when dropped from openapi-client generator
-   * @private
-   * Add a new Maven property.
-   *
-   * @param {string} name - property name
-   * @param {string} value - property value
-   */
-  addMavenProperty(name, value) {
-    createPomStorage(this).addProperty({ property: name, value });
-  }
-
-  /**
-   * TODO drop when dropped from gae and openapi-client generators
-   * @private
-   * Add a new Maven dependency.
-   *
-   * @param {string} groupId - dependency groupId
-   * @param {string} artifactId - dependency artifactId
-   * @param {string} version - (optional) explicit dependency version number
-   * @param {string} other - (optional) explicit other thing: scope, exclusions...
-   */
-  addMavenDependency(groupId, artifactId, version, other) {
-    createPomStorage(this).addDependency({
-      groupId,
-      artifactId,
-      version,
-      additionalContent: other,
-    });
-  }
-
-  /**
-   * @private
-   * Rewrite the specified file with provided content at the needle location
-   *
-   * @param {string} filePath - path of the source file to rewrite
-   * @param {string} needle - needle to look for where content will be inserted
-   * @param {string} content - content to be written
-   * @returns {boolean} true if the body has changed.
-   */
-  rewriteFile(filePath, needle, content) {
-    const rewriteFileModel = this.needleApi.base.generateFileModel(filePath, needle, content);
-    return this.needleApi.base.addBlockContentToFile(rewriteFileModel);
-  }
-}
diff --git a/generators/openapi-client/generator.spec.mjs b/generators/openapi-client/generator.spec.mjs
deleted file mode 100644
index 8569ef76601a..000000000000
--- a/generators/openapi-client/generator.spec.mjs
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright 2013-2023 the original author or authors from the JHipster project.
- *
- * This file is part of the JHipster project, see https://www.jhipster.tech/
- * for more information.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { basename, dirname } from 'path';
-import { fileURLToPath } from 'url';
-import { expect } from 'esmocha';
-import lodash from 'lodash';
-
-import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.mjs';
-import Generator from './index.mjs';
-
-const { snakeCase } = lodash;
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-const generator = basename(__dirname);
-
-describe(`generator - ${generator}`, () => {
-  it('generator-list constant matches folder name', async () => {
-    await expect((await import('../generator-list.mjs'))[`GENERATOR_${snakeCase(generator).toUpperCase()}`]).toBe(generator);
-  });
-  shouldSupportFeatures(Generator);
-  describe('blueprint support', () => testBlueprintSupport(generator));
-});
diff --git a/generators/openapi-client/index.mts b/generators/openapi-client/index.mts
deleted file mode 100644
index cfcecfbd2954..000000000000
--- a/generators/openapi-client/index.mts
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright 2013-2023 the original author or authors from the JHipster project.
- *
- * This file is part of the JHipster project, see https://www.jhipster.tech/
- * for more information.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-export { default } from './generator.mjs';
diff --git a/generators/openapi-client/openapi-client.spec.mts b/generators/openapi-client/openapi-client.spec.mts
deleted file mode 100644
index 012a48b1770f..000000000000
--- a/generators/openapi-client/openapi-client.spec.mts
+++ /dev/null
@@ -1,178 +0,0 @@
-import { expect } from 'esmocha';
-
-import { dryRunHelpers as helpers } from '../../test/support/index.mjs';
-import { GENERATOR_OPENAPI_CLIENT } from '../generator-list.mjs';
-
-const basePackage = 'src/main/java/com/mycompany/myapp';
-
-const openapiFile = `openapi: "3.0.0"
-info:
-  version: 1.0.0
-  title: Swagger Petstore
-  license:
-    name: MIT
-servers:
-  - url: http://petstore.swagger.io/v1
-paths:
-  /pets:
-    get:
-      summary: List all pets
-      operationId: listPets
-      tags:
-        - pets
-      parameters:
-        - name: limit
-          in: query
-          description: How many items to return at one time (max 100)
-          required: false
-          schema:
-            type: integer
-            format: int32
-      responses:
-        '200':
-          description: A paged array of pets
-          headers:
-            x-next:
-              description: A link to the next page of responses
-              schema:
-                type: string
-          content:
-            application/json:    
-              schema:
-                $ref: "#/components/schemas/Pets"
-        default:
-          description: unexpected error
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Error"
-    post:
-      summary: Create a pet
-      operationId: createPets
-      tags:
-        - pets
-      responses:
-        '201':
-          description: Null response
-        default:
-          description: unexpected error
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Error"
-  /pets/{petId}:
-    get:
-      summary: Info for a specific pet
-      operationId: showPetById
-      tags:
-        - pets
-      parameters:
-        - name: petId
-          in: path
-          required: true
-          description: The id of the pet to retrieve
-          schema:
-            type: string
-      responses:
-        '200':
-          description: Expected response to a valid request
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Pets"
-        default:
-          description: unexpected error
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Error"
-components:
-  schemas:
-    Pet:
-      required:
-        - id
-        - name
-      properties:
-        id:
-          type: integer
-          format: int64
-        name:
-          type: string
-        tag:
-          type: string
-    Pets:
-      type: array
-      items:
-        $ref: "#/components/schemas/Pet"
-    Error:
-      required:
-        - code
-        - message
-      properties:
-        code:
-          type: integer
-          format: int32
-        message:
-          type: string`;
-
-describe('generator - OpenAPI Client', () => {
-  //--------------------------------------------------
-  // Spring Cloud Client tests
-  //--------------------------------------------------
-  describe('Spring: microservice petstore custom endpoint ', () => {
-    let runResult;
-    before(async () => {
-      runResult = await helpers
-        .runJHipster(GENERATOR_OPENAPI_CLIENT)
-        .withJHipsterConfig({
-          applicationType: 'microservice',
-          baseName: 'sampleOpenApiClient',
-          enableSwaggerCodegen: true,
-        })
-        .withAnswers({
-          action: 'new',
-          specOrigin: 'custom-endpoint',
-          customEndpoint: 'petstore-openapi-3.yml',
-          cliName: 'petstore',
-        });
-    });
-    it('should match files snapshot', function () {
-      expect(runResult.getSnapshot()).toMatchSnapshot();
-    });
-    it('creates .openapi-generator-ignore-file', () => {
-      runResult.assertFile('.openapi-generator-ignore');
-    });
-  });
-
-  describe('Spring: microservice petstore regenerate ', () => {
-    let runResult;
-    before(async () => {
-      runResult = await helpers
-        .runJHipster(GENERATOR_OPENAPI_CLIENT)
-        .withJHipsterConfig({
-          applicationType: 'microservice',
-          baseName: 'sampleOpenApiClient',
-          enableSwaggerCodegen: true,
-          openApiClients: {
-            petstore: {
-              spec: 'petstore-openapi-3.yml',
-              generatorName: 'spring',
-            },
-          },
-        })
-        .withFiles({
-          [`${basePackage}/client/petstore/api/PetsApiClientOld.java`]: '',
-          'petstore-openapi-3.yml': openapiFile,
-        })
-        .commitFiles()
-        .withOptions({ regen: true });
-    });
-
-    it('should match files snapshot', function () {
-      expect(runResult.getSnapshot()).toMatchSnapshot();
-    });
-    it('has removed old client file', () => {
-      runResult.assertNoFile(`${basePackage}/client/petstore/api/PetsApiClientOld.java`);
-    });
-  });
-});
diff --git a/generators/openapi-client/prompts.mjs b/generators/openapi-client/prompts.mjs
deleted file mode 100644
index ebb741fb64f4..000000000000
--- a/generators/openapi-client/prompts.mjs
+++ /dev/null
@@ -1,266 +0,0 @@
-/**
- * Copyright 2013-2023 the original author or authors from the JHipster project.
- *
- * This file is part of the JHipster project, see https://www.jhipster.tech/
- * for more information.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import path from 'path';
-import shelljs from 'shelljs';
-import axios from 'axios';
-import { applicationOptions, serviceDiscoveryTypes } from '../../jdl/jhipster/index.mjs';
-
-const { EUREKA } = serviceDiscoveryTypes;
-
-const { OptionNames } = applicationOptions;
-const { REACTIVE, SERVICE_DISCOVERY_TYPE } = OptionNames;
-
-async function fetchSwaggerResources(input) {
-  const availableDocs = [];
-
-  const baseUrl = input.replace(/\/$/, '');
-  const axiosClient = axios.create({
-    baseURL: baseUrl,
-  });
-  const config = {
-    headers: {
-      Accept: 'application/json, text/javascript;',
-    },
-  };
-
-  const swaggerResources = await axiosClient.get('/swagger-resources', config);
-
-  JSON.parse(swaggerResources.getBody()).forEach(swaggerResource => {
-    const specPath = swaggerResource.location.replace(/^\/+/g, '');
-    availableDocs.push({
-      value: { url: `${baseUrl}/${specPath}`, name: swaggerResource.name },
-      name: `${swaggerResource.name} (${swaggerResource.location})`,
-    });
-  });
-
-  return availableDocs;
-}
-
-export function askActionType() {
-  if (this.options.regen) {
-    return undefined;
-  }
-
-  const hasExistingApis = Object.keys(this.openApiClients).length !== 0;
-
-  const actionList = [
-    {
-      value: 'new',
-      name: 'Generate a new API client',
-    },
-  ];
-
-  if (hasExistingApis) {
-    actionList.push({ value: 'all', name: 'Generate all stored API clients' });
-    actionList.push({ value: 'select', name: 'Select stored API clients to generate' });
-  }
-
-  const newClient = actionList.length === 1;
-
-  const prompts = [
-    {
-      when: !newClient,
-      type: 'list',
-      name: 'action',
-      message: 'What do you want to do ?',
-      choices: actionList,
-    },
-    {
-      when: response => response.action === 'new' || newClient,
-      type: 'list',
-      name: 'specOrigin',
-      message: 'Where do you want to import your OpenAPI/Swagger specification from ?',
-      choices: [
-        { value: 'jhipster-endpoint', name: 'From a Jhipster /swagger-resources live doc endpoint' },
-        { value: 'jhipster-directory', name: 'From the api.yml spec of an existing Jhipster project' },
-        { value: 'custom-endpoint', name: 'From a custom specification file or endpoint' },
-      ],
-    },
-    {
-      when: response => response.specOrigin === 'jhipster-endpoint',
-      type: 'input',
-      name: 'jhipsterEndpoint',
-      message: 'Enter the URL of the running Jhipster instance',
-      default: 'http://localhost:8080',
-      validate: async input => {
-        try {
-          const availableDocs = await fetchSwaggerResources(input);
-
-          if (availableDocs.length === 0) {
-            return `No live doc found at ${input}`;
-          }
-          return true;
-        } catch (err) {
-          return `Error while fetching live doc from '${input}'. "${err.message}"`;
-        }
-      },
-    },
-    {
-      when: response => response.specOrigin === 'jhipster-directory',
-      type: 'input',
-      name: 'jhipsterDirectory',
-      message: 'Enter the path to the jhipster project root directory',
-      default: '../',
-      validate: input => {
-        let fromPath;
-        if (path.isAbsolute(input)) {
-          fromPath = `${input}/src/main/resources/swagger/api.yml`;
-        } else {
-          fromPath = this.destinationPath(`${input}/src/main/resources/swagger/api.yml`);
-        }
-
-        if (shelljs.test('-f', fromPath)) {
-          return true;
-        }
-        return `api.yml not found in ${input}/`;
-      },
-    },
-    {
-      when: response => response.specOrigin === 'custom-endpoint',
-      type: 'input',
-      name: 'customEndpoint',
-      message: 'Where is your Swagger/OpenAPI spec (URL or path) ?',
-      default: 'http://petstore.swagger.io/v2/swagger.json',
-      store: true,
-      validate: async input => {
-        try {
-          if (/^((http|https):\/\/)/.test(input)) {
-            const axiosClient = axios.create({ baseURL: input });
-            await axiosClient.get('/');
-          } else if (!shelljs.test('-f', input)) {
-            return `file '${input}' not found`;
-          }
-          return true;
-        } catch (err) {
-          return `Cannot read from ${input}. ${err.message}`;
-        }
-      },
-    },
-  ];
-
-  return this.prompt(prompts).then(props => {
-    if (newClient) {
-      props.action = 'new';
-    }
-
-    props.generatorName = this.config.get(REACTIVE) ? 'java' : 'spring';
-
-    this.props = props;
-    if (props.jhipsterEndpoint !== undefined) {
-      return fetchSwaggerResources(props.jhipsterEndpoint).then(availableDocs => {
-        props.availableDocs = availableDocs;
-      });
-    }
-    if (props.jhipsterDirectory !== undefined) {
-      props.inputSpec = `${props.jhipsterDirectory}/src/main/resources/swagger/api.yml`;
-    } else if (props.customEndpoint !== undefined) {
-      props.inputSpec = props.customEndpoint;
-    }
-    return undefined;
-  });
-}
-
-export function askExistingAvailableDocs() {
-  if (this.options.regen) {
-    return undefined;
-  }
-
-  const prompts = [
-    {
-      when: !this.options.regen && this.props.availableDocs !== undefined,
-      type: 'list',
-      name: 'availableDoc',
-      message: 'Select the doc for which you want to create a client',
-      choices: this.props.availableDocs,
-    },
-  ];
-
-  return this.prompt(prompts).then(props => {
-    if (props.availableDoc !== undefined) {
-      this.props.inputSpec = props.availableDoc.url;
-      this.props.cliName = props.availableDoc.name === 'default' ? 'apidocs' : props.availableDoc.name; // "default" cannot be used as it's a keyword in java
-    }
-  });
-}
-
-export function askGenerationInfos() {
-  if (this.options.regen) {
-    return undefined;
-  }
-
-  const prompts = [
-    {
-      when:
-        this.props.specOrigin === 'jhipster-endpoint' &&
-        this.config.get(SERVICE_DISCOVERY_TYPE) === EUREKA &&
-        this.props.generatorName === 'spring',
-      type: 'confirm',
-      name: 'useServiceDiscovery',
-      message: 'Do you want to use Eureka service discovery ?',
-      default: true,
-    },
-    {
-      when: response => this.props.action === 'new' && !response.useServiceDiscovery,
-      type: 'input',
-      name: 'cliName',
-      message: 'What is the unique name for your API client (please avoid using Java keywords) ?',
-      default: this.props.cliName || 'petstore',
-      validate: input => {
-        if (!/^([a-zA-Z0-9_]*)$/.test(input)) {
-          return 'Your API client name cannot contain special characters or a blank space';
-        }
-        if (input === '') {
-          return 'Your API client name cannot be empty';
-        }
-        return true;
-      },
-    },
-    {
-      when: this.props.action === 'new',
-      type: 'confirm',
-      name: 'saveConfig',
-      message: 'Do you want to save this config for future reuse ?',
-      default: false,
-    },
-    {
-      when: this.props.action === 'select',
-      type: 'checkbox',
-      name: 'selected',
-      message: 'Select which APIs you want to generate',
-      choices: () => {
-        const choices = [];
-        Object.keys(this.openApiClients).forEach(cliName => {
-          choices.push({
-            name: `${cliName} (${this.openApiClients[cliName].spec})`,
-            value: { cliName, spec: this.openApiClients[cliName] },
-          });
-        });
-        return choices;
-      },
-    },
-  ];
-
-  return this.prompt(prompts).then(props => {
-    if (props.cliName !== undefined) {
-      this.props.cliName = props.cliName;
-    }
-    this.props.saveConfig = props.saveConfig;
-    this.props.selected = props.selected;
-  });
-}
diff --git a/generators/openapi-client/templates/java/.openapi-generator-ignore b/generators/openapi-client/templates/java/.openapi-generator-ignore
deleted file mode 100644
index 26ff834645f7..000000000000
--- a/generators/openapi-client/templates/java/.openapi-generator-ignore
+++ /dev/null
@@ -1,18 +0,0 @@
-pom.xml
-README.md
-.travis.yml
-build.sbt
-git_push.sh
-.gitignore
-src/main/AndroidManifest.xml
-
-# Ignore default generator Gradle files
-build.gradle
-gradle.properties
-settings.gradle
-gradlew
-gradlew.bat
-gradle/**
-
-# Ignore test files while they are generated with JUnit 4
-/src/test/***
diff --git a/generators/openapi-client/templates/spring/.openapi-generator-ignore b/generators/openapi-client/templates/spring/.openapi-generator-ignore
deleted file mode 100644
index 9fcd6f8fb9e7..000000000000
--- a/generators/openapi-client/templates/spring/.openapi-generator-ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-pom.xml
-README.md
-package.json
diff --git a/generators/openapi-client/types-export.d.ts b/generators/openapi-client/types-export.d.ts
deleted file mode 100644
index 91ec213d25dd..000000000000
--- a/generators/openapi-client/types-export.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type { default } from '../base-application/types-export.js';
diff --git a/generators/page/files-vue.mjs b/generators/page/files-vue.mjs
deleted file mode 100644
index a87017539f0d..000000000000
--- a/generators/page/files-vue.mjs
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * Copyright 2013-2023 the original author or authors from the JHipster project.
- *
- * This file is part of the JHipster project, see https://www.jhipster.tech/
- * for more information.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { CLIENT_TEST_SRC_DIR } from '../generator-constants.mjs';
-import { vueAddPageToRouterImport, vueAddPageToRouter, vueAddPageServiceToMainImport, vueAddPageServiceToMain } from './support/index.mjs';
-
-/* Constants use throughout */
-const VUE_DIR = 'src/main/webapp/app/';
-
-export const vueFiles = {
-  client: [
-    {
-      path: VUE_DIR,
-      templates: [
-        {
-          override: generator => generator.recreate,
-          file: 'pages/page.vue',
-          renameTo: generator => `pages/${generator.pageFolderName}/${generator.pageFilename}.vue`,
-        },
-        {
-          override: generator => generator.recreate,
-          file: 'pages/page.service.ts',
-          renameTo: generator => `pages/${generator.pageFolderName}/${generator.pageFilename}.service.ts`,
-        },
-        {
-          override: generator => generator.recreate,
-          file: 'pages/page.component.ts',
-          renameTo: generator => `pages/${generator.pageFolderName}/${generator.pageFilename}.component.ts`,
-        },
-      ],
-    },
-  ],
-  test: [
-    {
-      path: CLIENT_TEST_SRC_DIR,
-      templates: [
-        {
-          override: generator => generator.recreate,
-          file: 'spec/app/pages/page.component.spec.ts',
-          renameTo: generator => `spec/app/pages/${generator.pageFolderName}/${generator.pageFilename}.component.spec.ts`,
-        },
-        {
-          override: generator => generator.recreate,
-          file: 'spec/app/pages/page.service.spec.ts',
-          renameTo: generator => `spec/app/pages/${generator.pageFolderName}/${generator.pageFilename}.service.spec.ts`,
-        },
-      ],
-    },
-  ],
-};
-
-export function customizeFiles(data) {
-  // Add page paths to routing system
-  vueAddPageToRouterImport(this, data);
-  vueAddPageToRouter(this, data);
-  // Add page services to main
-  vueAddPageServiceToMainImport(this, data);
-  vueAddPageServiceToMain(this, data);
-}
diff --git a/generators/page/generator.mjs b/generators/page/generator.mjs
deleted file mode 100644
index 3da6c4fb9994..000000000000
--- a/generators/page/generator.mjs
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * Copyright 2013-2023 the original author or authors from the JHipster project.
- *
- * This file is part of the JHipster project, see https://www.jhipster.tech/
- * for more information.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* eslint-disable consistent-return */
-import chalk from 'chalk';
-
-import BaseApplicationGenerator from '../base-application/index.mjs';
-
-import { askForPage } from './prompts.mjs';
-import { customizeFiles as customizeVueFiles, vueFiles } from './files-vue.mjs';
-import { GENERATOR_BOOTSTRAP_APPLICATION_CLIENT, GENERATOR_PAGE } from '../generator-list.mjs';
-
-/**
- * @class
- * @extends {BaseApplicationGenerator<import('../client/types.mjs').ClientApplication>}
- */
-export default class PageGenerator extends BaseApplicationGenerator {
-  constructor(args, options, features) {
-    super(args, options, { skipParseOptions: false, ...features });
-
-    // This makes it possible to pass `pageName` by argument
-    this.argument('pageName', {
-      type: String,
-      required: false,
-      description: 'Page name',
-    });
-
-    this.option('skip-prompts', {
-      description: 'Skip prompts',
-      type: Boolean,
-      hide: true,
-    });
-    this.option('recreate', {
-      type: Boolean,
-      required: false,
-      description: 'Recreate the page',
-    });
-
-    if (this.options.help) {
-      return;
-    }
-    this.pageName = this.options.pageName;
-    this.page = this.options.page || {};
-  }
-
-  async beforeQueue() {
-    await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_CLIENT);
-    if (!this.fromBlueprint) {
-      await this.composeWithBlueprints(GENERATOR_PAGE);
-    }
-  }
-
-  get prompting() {
-    return {
-      askForPage,
-    };
-  }
-
-  get [BaseApplicationGenerator.PROMPTING]() {
-    return this.delegateTasksToBlueprint(() => this.prompting);
-  }
-
-  get configuring() {
-    return {
-      save() {
-        const pages = this.jhipsterConfig.pages || [];
-        const page = pages.find(page => page.name === this.pageName);
-        if (page) {
-          return;
-        }
-        this.jhipsterConfig.pages = pages.concat({ name: this.pageName });
-      },
-    };
-  }
-
-  get [BaseApplicationGenerator.CONFIGURING]() {
-    return this.delegateTasksToBlueprint(() => this.configuring);
-  }
-
-  get writing() {
-    return this.asWritingTaskGroup({
-      writeClientPageFiles({ application }) {
-        const jhiPrefix = this.page.jhiPrefix || this.jhipsterConfig.jhiPrefix;
-        const { pageName } = this;
-
-        const pageNameDashed = this._.kebabCase(pageName);
-        const pageInstance = this._.lowerFirst(pageName);
-        const jhiPrefixDashed = this._.kebabCase(jhiPrefix);
-
-        const pageFilename = this.page.pageFilename || pageNameDashed;
-        const pageFolderName = this.page.pageFilename || pageFilename;
-
-        const recreate = this.options.recreate;
-
-        this.data = {
-          jhiPrefix,
-          pageNameDashed,
-          pageInstance,
-          jhiPrefixDashed,
-          pageFilename,
-          pageFolderName,
-          recreate,
-          pageName,
-        };
-
-        if (!application.clientFrameworkVue) {
-          throw new Error(`The page sub-generator is not supported for client ${application.clientFramework}`);
-        }
-        return this.writeFiles({
-          sections: vueFiles,
-          rootTemplatesPath: ['vue'],
-          context: {
-            ...application,
-            ...this.data,
-          },
-        });
-      },
-    });
-  }
-
-  get [BaseApplicationGenerator.WRITING]() {
-    return this.delegateTasksToBlueprint(() => this.writing);
-  }
-
-  // Public API method used by the getter and also by Blueprints
-  get postWriting() {
-    return {
-      customizeFiles({ application }) {
-        if (application.clientFrameworkVue) {
-          return customizeVueFiles.call(this, { ...application, ...this.data });
-        }
-        return undefined;
-      },
-    };
-  }
-
-  get [BaseApplicationGenerator.POST_WRITING]() {
-    return this.delegateTasksToBlueprint(() => this.postWriting);
-  }
-
-  get end() {
-    return {
-      success() {
-        if (this.env.rootGenerator() !== this) return;
-        this.log.log(chalk.bold.green(`Page ${this.pageName} generated successfully.`));
-      },
-    };
-  }
-
-  get [BaseApplicationGenerator.END]() {
-    return this.delegateTasksToBlueprint(() => this.end);
-  }
-}
diff --git a/generators/page/generator.spec.mjs b/generators/page/generator.spec.mjs
deleted file mode 100644
index a866847690ec..000000000000
--- a/generators/page/generator.spec.mjs
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright 2013-2023 the original author or authors from the JHipster project.
- *
- * This file is part of the JHipster project, see https://www.jhipster.tech/
- * for more information.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { basename, dirname } from 'path';
-import { fileURLToPath } from 'url';
-import { expect } from 'esmocha';
-import lodash from 'lodash';
-
-import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.mjs';
-import Generator from './generator.mjs';
-
-const { snakeCase } = lodash;
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-const generator = basename(__dirname);
-
-describe(`generator - ${generator}`, () => {
-  it('generator-list constant matches folder name', async () => {
-    await expect((await import('../generator-list.mjs'))[`GENERATOR_${snakeCase(generator).toUpperCase()}`]).toBe(generator);
-  });
-  shouldSupportFeatures(Generator);
-  describe.skip('blueprint support', () => testBlueprintSupport(generator));
-});
diff --git a/generators/page/index.mts b/generators/page/index.mts
deleted file mode 100644
index cfcecfbd2954..000000000000
--- a/generators/page/index.mts
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright 2013-2023 the original author or authors from the JHipster project.
- *
- * This file is part of the JHipster project, see https://www.jhipster.tech/
- * for more information.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-export { default } from './generator.mjs';
diff --git a/generators/page/page.spec.mts b/generators/page/page.spec.mts
deleted file mode 100644
index 8fdfb34ca69e..000000000000
--- a/generators/page/page.spec.mts
+++ /dev/null
@@ -1,75 +0,0 @@
-import { basicHelpers as helpers } from '../../test/support/index.mjs';
-
-import { CLIENT_MAIN_SRC_DIR, CLIENT_TEST_SRC_DIR } from '../generator-constants.mjs';
-
-const CLIENT_SPEC_SRC_DIR = `${CLIENT_TEST_SRC_DIR}spec/`;
-
-const pageName = 'MyTestPage';
-const pageFolderName = 'my-test-page';
-const pageInstance = 'myTestPage';
-
-const createClientProject = () =>
-  helpers.runJHipster('app').withJHipsterConfig({
-    skipServer: true, // We don't need server for this test
-  });
-
-const createPage = runResult =>
-  runResult
-    .create('jhipster:page')
-    .withAnswers({
-      pageName,
-    })
-    .run();
-
-describe('generator - page', () => {
-  it.skip('with angular client framework');
-
-  it.skip('with react client framework');
-
-  describe('with vue client framework', () => {
-    let runResult;
-    const containsVueFiles = () => {
-      it('creates expected files', () => {
-        runResult.assertFile([
-          `${CLIENT_MAIN_SRC_DIR}app/pages/${pageFolderName}/${pageFolderName}.vue`,
-          `${CLIENT_MAIN_SRC_DIR}app/pages/${pageFolderName}/${pageFolderName}.service.ts`,
-          `${CLIENT_MAIN_SRC_DIR}app/pages/${pageFolderName}/${pageFolderName}.component.ts`,
-          `${CLIENT_SPEC_SRC_DIR}app/pages/${pageFolderName}/${pageFolderName}.component.spec.ts`,
-          `${CLIENT_SPEC_SRC_DIR}app/pages/${pageFolderName}/${pageFolderName}.service.spec.ts`,
-        ]);
-      });
-      it('adds page path, service', () => {
-        runResult.assertFileContent(
-          `${CLIENT_MAIN_SRC_DIR}/app/router/pages.ts`,
-          `const ${pageName} = () => import('@/pages/${pageFolderName}/${pageFolderName}.vue');`,
-        );
-        runResult.assertFileContent(`${CLIENT_MAIN_SRC_DIR}/app/router/pages.ts`, `path: '/pages/${pageFolderName}',`);
-        runResult.assertFileContent(
-          `${CLIENT_MAIN_SRC_DIR}/app/main.ts`,
-          `import ${pageName}Service from '@/pages/${pageFolderName}/${pageFolderName}.service';`,
-        );
-        runResult.assertFileContent(
-          `${CLIENT_MAIN_SRC_DIR}/app/main.ts`,
-          `provide('${pageInstance}Service', () => new ${pageName}Service());`,
-        );
-      });
-    };
-
-    describe('creating a new page', () => {
-      before(async () => {
-        runResult = await createClientProject().withJHipsterConfig({ clientFramework: 'vue' });
-        runResult = await createPage(runResult);
-      });
-
-      containsVueFiles();
-    });
-
-    describe('regenerating an existing page', () => {
-      before(async () => {
-        runResult = await createClientProject().withJHipsterConfig({ clientFramework: 'vue', pages: [{ name: pageName }] });
-      });
-
-      containsVueFiles();
-    });
-  });
-});
diff --git a/generators/page/prompts.mjs b/generators/page/prompts.mjs
deleted file mode 100644
index f6ee72d515fc..000000000000
--- a/generators/page/prompts.mjs
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Copyright 2013-2023 the original author or authors from the JHipster project.
- *
- * This file is part of the JHipster project, see https://www.jhipster.tech/
- * for more information.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// eslint-disable-next-line import/prefer-default-export
-export async function askForPage() {
-  if (this.pageName) return;
-
-  await this.prompt({
-    type: 'input',
-    name: 'pageName',
-    message: 'What is the name of your page?',
-    default: 'MyPage',
-    validate: input => (/^([A-Z][a-zA-Z]*)$/.test(input) ? true : 'This is not a valid page name (ex: MyPage).'),
-  }).then(answers => {
-    this.pageName = answers.pageName;
-  });
-}
diff --git a/generators/page/support/index.mts b/generators/page/support/index.mts
deleted file mode 100644
index 3b39a3827c52..000000000000
--- a/generators/page/support/index.mts
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright 2013-2023 the original author or authors from the JHipster project.
- *
- * This file is part of the JHipster project, see https://www.jhipster.tech/
- * for more information.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-export * from './needles.mjs';
diff --git a/generators/page/support/needles.mts b/generators/page/support/needles.mts
deleted file mode 100644
index e346aba5d3ff..000000000000
--- a/generators/page/support/needles.mts
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * Copyright 2013-2023 the original author or authors from the JHipster project.
- *
- * This file is part of the JHipster project, see https://www.jhipster.tech/
- * for more information.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { stripMargin } from '../../base/support/index.mjs';
-import { createNeedleCallback } from '../../base/support/needles.mjs';
-
-export function vueAddPageToRouterImport(generator, { clientSrcDir, pageName, pageFolderName, pageFilename = pageFolderName }) {
-  const file = `${clientSrcDir}/app/router/pages.ts`;
-
-  generator.editFile(
-    file,
-    { ignoreNonExisting: true },
-    createNeedleCallback({
-      needle: 'jhipster-needle-add-entity-to-router-import',
-      contentToAdd: stripMargin(
-        `|// prettier-ignore
-                |const ${pageName} = () => import('@/pages/${pageFolderName}/${pageFilename}.vue');`,
-      ),
-      ignoreWhitespaces: true,
-      autoIndent: false,
-    }),
-  );
-}
-
-export function vueAddPageToRouter(generator, { clientSrcDir, pageName, pageFilename }) {
-  const file = `${clientSrcDir}/app/router/pages.ts`;
-
-  generator.editFile(
-    file,
-    { ignoreNonExisting: true },
-    createNeedleCallback({
-      needle: 'jhipster-needle-add-entity-to-router',
-      contentToAdd: stripMargin(
-        `|{
-                  |    path: '/pages/${pageFilename}',
-                  |    name: '${pageName}',
-                  |    component: ${pageName},
-                  |    meta: { authorities: [Authority.USER] }
-                  |  },`,
-      ),
-      ignoreWhitespaces: true,
-      autoIndent: false,
-    }),
-  );
-}
-
-export function vueAddPageServiceToMainImport(generator, { clientSrcDir, pageName, pageFolderName, pageFilename = pageFolderName }) {
-  const file = `${clientSrcDir}/app/main.ts`;
-
-  generator.editFile(
-    file,
-    { ignoreNonExisting: true },
-    createNeedleCallback({
-      needle: 'jhipster-needle-add-entity-service-to-main-import',
-      contentToAdd: stripMargin(
-        // prettier-ignore
-        `|import ${pageName}Service from '@/pages/${pageFolderName}/${pageFilename}.service';`,
-      ),
-      ignoreWhitespaces: true,
-    }),
-  );
-}
-
-export function vueAddPageServiceToMain(generator, { clientSrcDir, pageName, pageInstance }) {
-  const file = `${clientSrcDir}/app/main.ts`;
-
-  generator.editFile(
-    file,
-    { ignoreNonExisting: true },
-    createNeedleCallback({
-      needle: 'jhipster-needle-add-entity-service-to-main',
-      contentToAdd: `provide('${pageInstance}Service', () => new ${pageName}Service());`,
-      ignoreWhitespaces: true,
-    }),
-  );
-}
diff --git a/generators/page/templates/vue/src/main/webapp/app/pages/page.component.ts.ejs b/generators/page/templates/vue/src/main/webapp/app/pages/page.component.ts.ejs
deleted file mode 100644
index 0e89713ee3c8..000000000000
--- a/generators/page/templates/vue/src/main/webapp/app/pages/page.component.ts.ejs
+++ /dev/null
@@ -1,17 +0,0 @@
-import { defineComponent, inject, onMounted } from 'vue';
-import <%= pageName %>Service from './<%= pageFolderName %>.service';
-
-export default defineComponent({
-  name: '<%= pageName %>',
-  setup() {
-    const <%= pageInstance %>Service = inject('<%= pageInstance %>Service', () => new <%= pageName %>Service(), true);
-
-    onMounted(() => {
-      <%= pageInstance %>Service().method();
-    });
-
-    return {
-      <%= pageInstance %>Service,
-    };
-  },
-});
diff --git a/generators/page/templates/vue/src/main/webapp/app/pages/page.service.ts.ejs b/generators/page/templates/vue/src/main/webapp/app/pages/page.service.ts.ejs
deleted file mode 100644
index 31da2c5ee686..000000000000
--- a/generators/page/templates/vue/src/main/webapp/app/pages/page.service.ts.ejs
+++ /dev/null
@@ -1,6 +0,0 @@
-export default class <%= pageName %>Service {
-  public method(): boolean {
-    // This method was generated
-    return true;
-  }
-}
diff --git a/generators/page/templates/vue/src/main/webapp/app/pages/page.vue.ejs b/generators/page/templates/vue/src/main/webapp/app/pages/page.vue.ejs
deleted file mode 100644
index 2aa5a49d4c53..000000000000
--- a/generators/page/templates/vue/src/main/webapp/app/pages/page.vue.ejs
+++ /dev/null
@@ -1,8 +0,0 @@
-<template>
-  <div>
-    <h2 id="page-heading">This page was generated, please edit!</h2>
-  </div>
-</template>
-
-<script lang="ts" src="./<%= pageFolderName %>.component.ts">
-</script>
diff --git a/generators/page/templates/vue/src/test/javascript/spec/app/pages/page.component.spec.ts.ejs b/generators/page/templates/vue/src/test/javascript/spec/app/pages/page.component.spec.ts.ejs
deleted file mode 100644
index be270a2b6b2e..000000000000
--- a/generators/page/templates/vue/src/test/javascript/spec/app/pages/page.component.spec.ts.ejs
+++ /dev/null
@@ -1,63 +0,0 @@
-<%#
- Copyright 2013-2023 the original author or authors from the JHipster project.
-
- This file is part of the JHipster project, see https://www.jhipster.tech/
- for more information.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--%>
-import { createLocalVue, shallowMount, Wrapper } from '@vue/test-utils';
-import sinon, { SinonStubbedInstance } from 'sinon';
-
-import { useStore } from '@/store';
-import * as config from '@/shared/config/config';
-import <%= pageName %>Component from '@/pages/<%= pageFolderName %>/<%= pageFolderName %>.vue';
-import <%= pageName %>Class from '@/pages/<%= pageFolderName %>/<%= pageFolderName %>.component';
-import <%= pageName %>Service from '@/pages/<%= pageFolderName %>/<%= pageFolderName %>.service';
-
-const localVue = createLocalVue();
-
-config.initVueApp(localVue);
-<%_ if (enableTranslation) { _%>
-const i18n = config.initI18N(localVue);
-<%_ } _%>
-const store = useStore();
-
-describe('Component Tests', () => {
-  describe('<%= pageName %> Component', () => {
-    let wrapper: Wrapper<<%= pageName %>Class>;
-    let comp: <%= pageName %>Class;
-    let <%= pageInstance %>ServiceStub: SinonStubbedInstance<<%= pageName %>Service>;
-
-    beforeEach(() => {
-      <%= pageInstance %>ServiceStub = sinon.createStubInstance<<%= pageName %>Service>(<%= pageName %>Service);
-
-      wrapper = shallowMount<<%= pageName %>Class>(<%= pageName %>Component, {
-        store,
-        <%_ if (enableTranslation) { _%>
-        i18n,
-        <%_ } _%>
-        localVue,
-        provide: {
-          <%= pageInstance %>Service: () => <%= pageInstance %>ServiceStub
-        }
-      });
-      comp = wrapper.vm;
-    });
-
-    it('Should call "method" on init', async () => {
-      // THEN
-      expect(<%= pageInstance %>ServiceStub.method.called).toBeTruthy();
-    });
-  });
-});
diff --git a/generators/page/types-export.d.ts b/generators/page/types-export.d.ts
deleted file mode 100644
index 91ec213d25dd..000000000000
--- a/generators/page/types-export.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type { default } from '../base-application/types-export.js';
diff --git a/generators/project-name/generator.mjs b/generators/project-name/generator.mjs
index 6faa483c8335..511686321f04 100644
--- a/generators/project-name/generator.mjs
+++ b/generators/project-name/generator.mjs
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 /* eslint-disable consistent-return */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { getDefaultAppName } from './support/index.mjs';
 import BaseApplicationGenerator from '../base-application/index.mjs';
 
diff --git a/generators/react/__snapshots__/generator.spec.mts.snap b/generators/react/__snapshots__/generator.spec.mts.snap
index 5142b355e859..ebb17182992c 100644
--- a/generators/react/__snapshots__/generator.spec.mts.snap
+++ b/generators/react/__snapshots__/generator.spec.mts.snap
@@ -1,13 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`generator - react gateway-jwt-skipUserManagement(true)-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-src/-websocket(true) should match generated files snapshot 1`] = `
+exports[`generator - react gateway-jwt-skipUserManagement(true)-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-clientRoot/-websocket(true) should match generated files snapshot 1`] = `
 {
-  ".eslintignore": {
-    "stateCleared": "modified",
-  },
-  ".eslintrc.json": {
-    "stateCleared": "modified",
-  },
   ".jhipster/EntityWithCustomId.json": {
     "stateCleared": "modified",
   },
@@ -23,407 +17,407 @@ exports[`generator - react gateway-jwt-skipUserManagement(true)-withAdminUi(fals
   ".yo-rc.json": {
     "stateCleared": "modified",
   },
-  "jest.conf.js": {
+  "clientRoot/.eslintignore": {
     "stateCleared": "modified",
   },
-  "package.json": {
+  "clientRoot/.eslintrc.json": {
     "stateCleared": "modified",
   },
-  "postcss.config.js": {
+  "clientRoot/jest.conf.js": {
     "stateCleared": "modified",
   },
-  "src/404.html": {
+  "clientRoot/package.json": {
     "stateCleared": "modified",
   },
-  "src/WEB-INF/web.xml": {
+  "clientRoot/postcss.config.js": {
     "stateCleared": "modified",
   },
-  "src/app/_bootstrap-variables.scss": {
+  "clientRoot/src/main/webapp/404.html": {
     "stateCleared": "modified",
   },
-  "src/app/app.scss": {
+  "clientRoot/src/main/webapp/WEB-INF/web.xml": {
     "stateCleared": "modified",
   },
-  "src/app/app.tsx": {
+  "clientRoot/src/main/webapp/app/_bootstrap-variables.scss": {
     "stateCleared": "modified",
   },
-  "src/app/config/axios-interceptor.spec.ts": {
+  "clientRoot/src/main/webapp/app/app.scss": {
     "stateCleared": "modified",
   },
-  "src/app/config/axios-interceptor.ts": {
+  "clientRoot/src/main/webapp/app/app.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/config/constants.ts": {
+  "clientRoot/src/main/webapp/app/config/axios-interceptor.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/dayjs.ts": {
+  "clientRoot/src/main/webapp/app/config/axios-interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/error-middleware.ts": {
+  "clientRoot/src/main/webapp/app/config/constants.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/icon-loader.ts": {
+  "clientRoot/src/main/webapp/app/config/dayjs.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/logger-middleware.ts": {
+  "clientRoot/src/main/webapp/app/config/error-middleware.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/notification-middleware.spec.ts": {
+  "clientRoot/src/main/webapp/app/config/icon-loader.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/notification-middleware.ts": {
+  "clientRoot/src/main/webapp/app/config/logger-middleware.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/store.ts": {
+  "clientRoot/src/main/webapp/app/config/notification-middleware.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-delete-dialog.tsx": {
+  "clientRoot/src/main/webapp/app/config/notification-middleware.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-detail.tsx": {
+  "clientRoot/src/main/webapp/app/config/store.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-reducer.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-delete-dialog.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-update.tsx": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-detail.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.reducer.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-reducer.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.tsx": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-update.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/index.tsx": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.reducer.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/menu.tsx": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/index.tsx": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-delete-dialog.tsx": {
+  "clientRoot/src/main/webapp/app/entities/menu.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-detail.tsx": {
+  "clientRoot/src/main/webapp/app/entities/microservice/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-reducer.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-delete-dialog.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-update.tsx": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-detail.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.reducer.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-reducer.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.tsx": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-update.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/reducers.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.reducer.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/routes.tsx": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/index.tsx": {
+  "clientRoot/src/main/webapp/app/entities/reducers.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-delete-dialog.tsx": {
+  "clientRoot/src/main/webapp/app/entities/routes.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-detail.tsx": {
+  "clientRoot/src/main/webapp/app/entities/simple/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-reducer.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-delete-dialog.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-update.tsx": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-detail.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.reducer.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-reducer.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.tsx": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-update.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/index.tsx": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.reducer.ts": {
     "stateCleared": "modified",
   },
-  "src/app/modules/administration/administration.reducer.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/modules/administration/administration.reducer.ts": {
+  "clientRoot/src/main/webapp/app/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/modules/administration/docs/docs.scss": {
+  "clientRoot/src/main/webapp/app/modules/administration/administration.reducer.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/modules/administration/docs/docs.tsx": {
+  "clientRoot/src/main/webapp/app/modules/administration/administration.reducer.ts": {
     "stateCleared": "modified",
   },
-  "src/app/modules/administration/gateway/gateway.tsx": {
+  "clientRoot/src/main/webapp/app/modules/administration/docs/docs.scss": {
     "stateCleared": "modified",
   },
-  "src/app/modules/administration/index.tsx": {
+  "clientRoot/src/main/webapp/app/modules/administration/docs/docs.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/modules/home/home.scss": {
+  "clientRoot/src/main/webapp/app/modules/administration/gateway/gateway.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/modules/home/home.tsx": {
+  "clientRoot/src/main/webapp/app/modules/administration/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/modules/login/login-modal.tsx": {
+  "clientRoot/src/main/webapp/app/modules/home/home.scss": {
     "stateCleared": "modified",
   },
-  "src/app/modules/login/login.tsx": {
+  "clientRoot/src/main/webapp/app/modules/home/home.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/modules/login/logout.tsx": {
+  "clientRoot/src/main/webapp/app/modules/login/login-modal.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/routes.tsx": {
+  "clientRoot/src/main/webapp/app/modules/login/login.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/setup-tests.ts": {
+  "clientRoot/src/main/webapp/app/modules/login/logout.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/DurationFormat.tsx": {
+  "clientRoot/src/main/webapp/app/routes.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/auth/private-route.spec.tsx": {
+  "clientRoot/src/main/webapp/app/setup-tests.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/auth/private-route.tsx": {
+  "clientRoot/src/main/webapp/app/shared/DurationFormat.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/error/error-boundary-routes.spec.tsx": {
+  "clientRoot/src/main/webapp/app/shared/auth/private-route.spec.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/error/error-boundary-routes.tsx": {
+  "clientRoot/src/main/webapp/app/shared/auth/private-route.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/error/error-boundary.spec.tsx": {
+  "clientRoot/src/main/webapp/app/shared/error/error-boundary-routes.spec.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/error/error-boundary.tsx": {
+  "clientRoot/src/main/webapp/app/shared/error/error-boundary-routes.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/error/page-not-found.tsx": {
+  "clientRoot/src/main/webapp/app/shared/error/error-boundary.spec.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/footer/footer.scss": {
+  "clientRoot/src/main/webapp/app/shared/error/error-boundary.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/footer/footer.tsx": {
+  "clientRoot/src/main/webapp/app/shared/error/page-not-found.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/header/header-components.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/footer/footer.scss": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/header/header.scss": {
+  "clientRoot/src/main/webapp/app/shared/layout/footer/footer.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/header/header.spec.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/header/header-components.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/header/header.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/header/header.scss": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/menus/account.spec.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/header/header.spec.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/menus/account.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/header/header.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/menus/admin.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/menus/account.spec.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/menus/entities.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/menus/account.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/menus/index.ts": {
+  "clientRoot/src/main/webapp/app/shared/layout/menus/admin.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/menus/menu-components.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/menus/entities.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/menus/menu-item.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/menus/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/password/password-strength-bar.scss": {
+  "clientRoot/src/main/webapp/app/shared/layout/menus/menu-components.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/password/password-strength-bar.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/menus/menu-item.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/model/entity-with-custom-id.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/layout/password/password-strength-bar.scss": {
     "stateCleared": "modified",
   },
-  "src/app/shared/model/microservice.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/layout/password/password-strength-bar.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/model/simple.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/model/entity-with-custom-id.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/model/user.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/model/microservice.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/reducers/application-profile.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/model/simple.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/reducers/application-profile.ts": {
+  "clientRoot/src/main/webapp/app/shared/model/user.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/reducers/authentication.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/reducers/application-profile.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/reducers/authentication.ts": {
+  "clientRoot/src/main/webapp/app/shared/reducers/application-profile.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/reducers/index.ts": {
+  "clientRoot/src/main/webapp/app/shared/reducers/authentication.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/reducers/reducer.utils.ts": {
+  "clientRoot/src/main/webapp/app/shared/reducers/authentication.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/util/date-utils.ts": {
+  "clientRoot/src/main/webapp/app/shared/reducers/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/util/entity-utils.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/reducers/reducer.utils.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/util/entity-utils.ts": {
+  "clientRoot/src/main/webapp/app/shared/util/date-utils.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/util/pagination.constants.ts": {
+  "clientRoot/src/main/webapp/app/shared/util/entity-utils.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/typings.d.ts": {
+  "clientRoot/src/main/webapp/app/shared/util/entity-utils.ts": {
     "stateCleared": "modified",
   },
-  "src/content/css/loading.css": {
+  "clientRoot/src/main/webapp/app/shared/util/pagination.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0.svg": {
+  "clientRoot/src/main/webapp/app/typings.d.ts": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-192.png": {
+  "clientRoot/src/main/webapp/content/css/loading.css": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/logo-jhipster.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/favicon.ico": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/index.html": {
+  "clientRoot/src/main/webapp/content/images/logo-jhipster.png": {
     "stateCleared": "modified",
   },
-  "src/manifest.webapp": {
+  "clientRoot/src/main/webapp/favicon.ico": {
     "stateCleared": "modified",
   },
-  "src/robots.txt": {
+  "clientRoot/src/main/webapp/index.html": {
     "stateCleared": "modified",
   },
-  "src/swagger-ui/dist/images/throbber.gif": {
+  "clientRoot/src/main/webapp/manifest.webapp": {
     "stateCleared": "modified",
   },
-  "src/swagger-ui/index.html": {
+  "clientRoot/src/main/webapp/robots.txt": {
     "stateCleared": "modified",
   },
-  "tsconfig.json": {
+  "clientRoot/src/main/webapp/swagger-ui/dist/images/throbber.gif": {
     "stateCleared": "modified",
   },
-  "tsconfig.test.json": {
+  "clientRoot/src/main/webapp/swagger-ui/index.html": {
     "stateCleared": "modified",
   },
-  "webpack/environment.js": {
+  "clientRoot/tsconfig.json": {
     "stateCleared": "modified",
   },
-  "webpack/logo-jhipster.png": {
+  "clientRoot/tsconfig.test.json": {
     "stateCleared": "modified",
   },
-  "webpack/utils.js": {
+  "clientRoot/webpack/environment.js": {
     "stateCleared": "modified",
   },
-  "webpack/webpack.common.js": {
+  "clientRoot/webpack/logo-jhipster.png": {
     "stateCleared": "modified",
   },
-  "webpack/webpack.dev.js": {
+  "clientRoot/webpack/utils.js": {
     "stateCleared": "modified",
   },
-  "webpack/webpack.prod.js": {
+  "clientRoot/webpack/webpack.common.js": {
     "stateCleared": "modified",
   },
-}
-`;
-
-exports[`generator - react gateway-oauth2-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)-src/-websocket(true) should match generated files snapshot 1`] = `
-{
-  ".eslintignore": {
+  "clientRoot/webpack/webpack.dev.js": {
     "stateCleared": "modified",
   },
-  ".eslintrc.json": {
+  "clientRoot/webpack/webpack.prod.js": {
     "stateCleared": "modified",
   },
+}
+`;
+
+exports[`generator - react gateway-oauth2-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)-clientRoot/-websocket(true) should match generated files snapshot 1`] = `
+{
   ".jhipster/EntityWithCustomId.json": {
     "stateCleared": "modified",
   },
@@ -439,440 +433,440 @@ exports[`generator - react gateway-oauth2-withAdminUi(true)-skipJhipsterDependen
   ".yo-rc.json": {
     "stateCleared": "modified",
   },
-  "jest.conf.js": {
+  "clientRoot/.eslintignore": {
     "stateCleared": "modified",
   },
-  "package.json": {
+  "clientRoot/.eslintrc.json": {
     "stateCleared": "modified",
   },
-  "postcss.config.js": {
+  "clientRoot/jest.conf.js": {
     "stateCleared": "modified",
   },
-  "src/404.html": {
+  "clientRoot/package.json": {
     "stateCleared": "modified",
   },
-  "src/WEB-INF/web.xml": {
+  "clientRoot/postcss.config.js": {
     "stateCleared": "modified",
   },
-  "src/app/_bootstrap-variables.scss": {
+  "clientRoot/src/main/webapp/404.html": {
     "stateCleared": "modified",
   },
-  "src/app/app.scss": {
+  "clientRoot/src/main/webapp/WEB-INF/web.xml": {
     "stateCleared": "modified",
   },
-  "src/app/app.tsx": {
+  "clientRoot/src/main/webapp/app/_bootstrap-variables.scss": {
     "stateCleared": "modified",
   },
-  "src/app/config/axios-interceptor.spec.ts": {
+  "clientRoot/src/main/webapp/app/app.scss": {
     "stateCleared": "modified",
   },
-  "src/app/config/axios-interceptor.ts": {
+  "clientRoot/src/main/webapp/app/app.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/config/constants.ts": {
+  "clientRoot/src/main/webapp/app/config/axios-interceptor.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/dayjs.ts": {
+  "clientRoot/src/main/webapp/app/config/axios-interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/error-middleware.ts": {
+  "clientRoot/src/main/webapp/app/config/constants.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/icon-loader.ts": {
+  "clientRoot/src/main/webapp/app/config/dayjs.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/logger-middleware.ts": {
+  "clientRoot/src/main/webapp/app/config/error-middleware.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/notification-middleware.spec.ts": {
+  "clientRoot/src/main/webapp/app/config/icon-loader.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/notification-middleware.ts": {
+  "clientRoot/src/main/webapp/app/config/logger-middleware.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/store.ts": {
+  "clientRoot/src/main/webapp/app/config/notification-middleware.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/translation.ts": {
+  "clientRoot/src/main/webapp/app/config/notification-middleware.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-delete-dialog.tsx": {
+  "clientRoot/src/main/webapp/app/config/store.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-detail.tsx": {
+  "clientRoot/src/main/webapp/app/config/translation.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-reducer.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-delete-dialog.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-update.tsx": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-detail.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.reducer.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-reducer.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.tsx": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-update.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/index.tsx": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.reducer.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/menu.tsx": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/index.tsx": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-delete-dialog.tsx": {
+  "clientRoot/src/main/webapp/app/entities/menu.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-detail.tsx": {
+  "clientRoot/src/main/webapp/app/entities/microservice/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-reducer.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-delete-dialog.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-update.tsx": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-detail.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.reducer.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-reducer.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.tsx": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-update.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/reducers.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.reducer.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/routes.tsx": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/index.tsx": {
+  "clientRoot/src/main/webapp/app/entities/reducers.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-delete-dialog.tsx": {
+  "clientRoot/src/main/webapp/app/entities/routes.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-detail.tsx": {
+  "clientRoot/src/main/webapp/app/entities/simple/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-reducer.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-delete-dialog.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-update.tsx": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-detail.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.reducer.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-reducer.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.tsx": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-update.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/index.tsx": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.reducer.ts": {
     "stateCleared": "modified",
   },
-  "src/app/modules/administration/administration.reducer.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/modules/administration/administration.reducer.ts": {
+  "clientRoot/src/main/webapp/app/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/modules/administration/configuration/configuration.tsx": {
+  "clientRoot/src/main/webapp/app/modules/administration/administration.reducer.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/modules/administration/docs/docs.scss": {
+  "clientRoot/src/main/webapp/app/modules/administration/administration.reducer.ts": {
     "stateCleared": "modified",
   },
-  "src/app/modules/administration/docs/docs.tsx": {
+  "clientRoot/src/main/webapp/app/modules/administration/configuration/configuration.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/modules/administration/gateway/gateway.tsx": {
+  "clientRoot/src/main/webapp/app/modules/administration/docs/docs.scss": {
     "stateCleared": "modified",
   },
-  "src/app/modules/administration/health/health-modal.tsx": {
+  "clientRoot/src/main/webapp/app/modules/administration/docs/docs.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/modules/administration/health/health.tsx": {
+  "clientRoot/src/main/webapp/app/modules/administration/gateway/gateway.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/modules/administration/index.tsx": {
+  "clientRoot/src/main/webapp/app/modules/administration/health/health-modal.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/modules/administration/logs/logs.tsx": {
+  "clientRoot/src/main/webapp/app/modules/administration/health/health.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/modules/administration/metrics/metrics.tsx": {
+  "clientRoot/src/main/webapp/app/modules/administration/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/modules/home/home.scss": {
+  "clientRoot/src/main/webapp/app/modules/administration/logs/logs.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/modules/home/home.tsx": {
+  "clientRoot/src/main/webapp/app/modules/administration/metrics/metrics.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/modules/login/login-redirect.tsx": {
+  "clientRoot/src/main/webapp/app/modules/home/home.scss": {
     "stateCleared": "modified",
   },
-  "src/app/modules/login/logout.tsx": {
+  "clientRoot/src/main/webapp/app/modules/home/home.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/routes.tsx": {
+  "clientRoot/src/main/webapp/app/modules/login/login-redirect.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/setup-tests.ts": {
+  "clientRoot/src/main/webapp/app/modules/login/logout.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/DurationFormat.tsx": {
+  "clientRoot/src/main/webapp/app/routes.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/auth/private-route.spec.tsx": {
+  "clientRoot/src/main/webapp/app/setup-tests.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/auth/private-route.tsx": {
+  "clientRoot/src/main/webapp/app/shared/DurationFormat.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/error/error-boundary-routes.spec.tsx": {
+  "clientRoot/src/main/webapp/app/shared/auth/private-route.spec.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/error/error-boundary-routes.tsx": {
+  "clientRoot/src/main/webapp/app/shared/auth/private-route.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/error/error-boundary.spec.tsx": {
+  "clientRoot/src/main/webapp/app/shared/error/error-boundary-routes.spec.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/error/error-boundary.tsx": {
+  "clientRoot/src/main/webapp/app/shared/error/error-boundary-routes.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/error/page-not-found.tsx": {
+  "clientRoot/src/main/webapp/app/shared/error/error-boundary.spec.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/footer/footer.scss": {
+  "clientRoot/src/main/webapp/app/shared/error/error-boundary.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/footer/footer.tsx": {
+  "clientRoot/src/main/webapp/app/shared/error/page-not-found.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/header/header-components.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/footer/footer.scss": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/header/header.scss": {
+  "clientRoot/src/main/webapp/app/shared/layout/footer/footer.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/header/header.spec.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/header/header-components.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/header/header.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/header/header.scss": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/menus/account.spec.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/header/header.spec.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/menus/account.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/header/header.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/menus/admin.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/menus/account.spec.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/menus/entities.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/menus/account.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/menus/index.ts": {
+  "clientRoot/src/main/webapp/app/shared/layout/menus/admin.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/menus/locale.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/menus/entities.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/menus/menu-components.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/menus/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/menus/menu-item.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/menus/locale.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/password/password-strength-bar.scss": {
+  "clientRoot/src/main/webapp/app/shared/layout/menus/menu-components.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/password/password-strength-bar.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/menus/menu-item.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/model/entity-with-custom-id.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/layout/password/password-strength-bar.scss": {
     "stateCleared": "modified",
   },
-  "src/app/shared/model/microservice.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/layout/password/password-strength-bar.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/model/simple.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/model/entity-with-custom-id.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/model/user.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/model/microservice.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/reducers/application-profile.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/model/simple.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/reducers/application-profile.ts": {
+  "clientRoot/src/main/webapp/app/shared/model/user.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/reducers/authentication.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/reducers/application-profile.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/reducers/authentication.ts": {
+  "clientRoot/src/main/webapp/app/shared/reducers/application-profile.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/reducers/index.ts": {
+  "clientRoot/src/main/webapp/app/shared/reducers/authentication.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/reducers/locale.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/reducers/authentication.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/reducers/locale.ts": {
+  "clientRoot/src/main/webapp/app/shared/reducers/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/reducers/reducer.utils.ts": {
+  "clientRoot/src/main/webapp/app/shared/reducers/locale.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/reducers/user-management.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/reducers/locale.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/reducers/user-management.ts": {
+  "clientRoot/src/main/webapp/app/shared/reducers/reducer.utils.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/util/date-utils.ts": {
+  "clientRoot/src/main/webapp/app/shared/reducers/user-management.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/util/entity-utils.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/reducers/user-management.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/util/entity-utils.ts": {
+  "clientRoot/src/main/webapp/app/shared/util/date-utils.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/util/pagination.constants.ts": {
+  "clientRoot/src/main/webapp/app/shared/util/entity-utils.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/util/url-utils.ts": {
+  "clientRoot/src/main/webapp/app/shared/util/entity-utils.ts": {
     "stateCleared": "modified",
   },
-  "src/app/typings.d.ts": {
+  "clientRoot/src/main/webapp/app/shared/util/pagination.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/content/css/loading.css": {
+  "clientRoot/src/main/webapp/app/shared/util/url-utils.ts": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0.svg": {
+  "clientRoot/src/main/webapp/app/typings.d.ts": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-192.png": {
+  "clientRoot/src/main/webapp/content/css/loading.css": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/logo-jhipster.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/favicon.ico": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/index.html": {
+  "clientRoot/src/main/webapp/content/images/logo-jhipster.png": {
     "stateCleared": "modified",
   },
-  "src/manifest.webapp": {
+  "clientRoot/src/main/webapp/favicon.ico": {
     "stateCleared": "modified",
   },
-  "src/robots.txt": {
+  "clientRoot/src/main/webapp/index.html": {
     "stateCleared": "modified",
   },
-  "src/swagger-ui/dist/images/throbber.gif": {
+  "clientRoot/src/main/webapp/manifest.webapp": {
     "stateCleared": "modified",
   },
-  "src/swagger-ui/index.html": {
+  "clientRoot/src/main/webapp/robots.txt": {
     "stateCleared": "modified",
   },
-  "tsconfig.json": {
+  "clientRoot/src/main/webapp/swagger-ui/dist/images/throbber.gif": {
     "stateCleared": "modified",
   },
-  "tsconfig.test.json": {
+  "clientRoot/src/main/webapp/swagger-ui/index.html": {
     "stateCleared": "modified",
   },
-  "webpack/environment.js": {
+  "clientRoot/tsconfig.json": {
     "stateCleared": "modified",
   },
-  "webpack/logo-jhipster.png": {
+  "clientRoot/tsconfig.test.json": {
     "stateCleared": "modified",
   },
-  "webpack/utils.js": {
+  "clientRoot/webpack/environment.js": {
     "stateCleared": "modified",
   },
-  "webpack/webpack.common.js": {
+  "clientRoot/webpack/logo-jhipster.png": {
     "stateCleared": "modified",
   },
-  "webpack/webpack.dev.js": {
+  "clientRoot/webpack/utils.js": {
     "stateCleared": "modified",
   },
-  "webpack/webpack.prod.js": {
+  "clientRoot/webpack/webpack.common.js": {
     "stateCleared": "modified",
   },
-}
-`;
-
-exports[`generator - react microservice-jwt-skipUserManagement(false)-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-src/-websocket(false) should match generated files snapshot 1`] = `
-{
-  ".eslintignore": {
+  "clientRoot/webpack/webpack.dev.js": {
     "stateCleared": "modified",
   },
-  ".eslintrc.json": {
+  "clientRoot/webpack/webpack.prod.js": {
     "stateCleared": "modified",
   },
+}
+`;
+
+exports[`generator - react microservice-jwt-skipUserManagement(false)-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-clientRoot/-websocket(false) should match generated files snapshot 1`] = `
+{
   ".jhipster/EntityWithCustomId.json": {
     "stateCleared": "modified",
   },
@@ -888,406 +882,412 @@ exports[`generator - react microservice-jwt-skipUserManagement(false)-withAdminU
   ".yo-rc.json": {
     "stateCleared": "modified",
   },
-  "jest.conf.js": {
+  "clientRoot/.eslintignore": {
     "stateCleared": "modified",
   },
-  "package.json": {
+  "clientRoot/.eslintrc.json": {
     "stateCleared": "modified",
   },
-  "postcss.config.js": {
+  "clientRoot/jest.conf.js": {
     "stateCleared": "modified",
   },
-  "src/404.html": {
+  "clientRoot/package.json": {
     "stateCleared": "modified",
   },
-  "src/WEB-INF/web.xml": {
+  "clientRoot/postcss.config.js": {
     "stateCleared": "modified",
   },
-  "src/app/_bootstrap-variables.scss": {
+  "clientRoot/src/main/webapp/404.html": {
     "stateCleared": "modified",
   },
-  "src/app/app.scss": {
+  "clientRoot/src/main/webapp/WEB-INF/web.xml": {
     "stateCleared": "modified",
   },
-  "src/app/app.tsx": {
+  "clientRoot/src/main/webapp/app/_bootstrap-variables.scss": {
     "stateCleared": "modified",
   },
-  "src/app/config/axios-interceptor.spec.ts": {
+  "clientRoot/src/main/webapp/app/app.scss": {
     "stateCleared": "modified",
   },
-  "src/app/config/axios-interceptor.ts": {
+  "clientRoot/src/main/webapp/app/app.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/config/constants.ts": {
+  "clientRoot/src/main/webapp/app/config/axios-interceptor.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/dayjs.ts": {
+  "clientRoot/src/main/webapp/app/config/axios-interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/error-middleware.ts": {
+  "clientRoot/src/main/webapp/app/config/constants.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/icon-loader.ts": {
+  "clientRoot/src/main/webapp/app/config/dayjs.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/logger-middleware.ts": {
+  "clientRoot/src/main/webapp/app/config/error-middleware.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/notification-middleware.spec.ts": {
+  "clientRoot/src/main/webapp/app/config/icon-loader.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/notification-middleware.ts": {
+  "clientRoot/src/main/webapp/app/config/logger-middleware.ts": {
     "stateCleared": "modified",
   },
-  "src/app/config/store.ts": {
+  "clientRoot/src/main/webapp/app/config/notification-middleware.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-delete-dialog.tsx": {
+  "clientRoot/src/main/webapp/app/config/notification-middleware.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-detail.tsx": {
+  "clientRoot/src/main/webapp/app/config/store.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-reducer.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-delete-dialog.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-update.tsx": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-detail.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.reducer.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-reducer.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.tsx": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-update.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/index.tsx": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.reducer.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/menu.tsx": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/index.tsx": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-delete-dialog.tsx": {
+  "clientRoot/src/main/webapp/app/entities/menu.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-detail.tsx": {
+  "clientRoot/src/main/webapp/app/entities/microservice/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-reducer.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-delete-dialog.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-update.tsx": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-detail.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.reducer.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-reducer.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.tsx": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-update.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/reducers.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.reducer.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/routes.tsx": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/index.tsx": {
+  "clientRoot/src/main/webapp/app/entities/reducers.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-delete-dialog.tsx": {
+  "clientRoot/src/main/webapp/app/entities/routes.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-detail.tsx": {
+  "clientRoot/src/main/webapp/app/entities/simple/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-reducer.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-delete-dialog.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-update.tsx": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-detail.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.reducer.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-reducer.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.tsx": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-update.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/index.tsx": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.reducer.ts": {
     "stateCleared": "modified",
   },
-  "src/app/main.tsx": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/modules/administration/administration.reducer.spec.ts": {
+  "clientRoot/src/main/webapp/app/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/modules/administration/administration.reducer.ts": {
+  "clientRoot/src/main/webapp/app/main.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/modules/administration/docs/docs.scss": {
+  "clientRoot/src/main/webapp/app/modules/administration/administration.reducer.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/modules/administration/docs/docs.tsx": {
+  "clientRoot/src/main/webapp/app/modules/administration/administration.reducer.ts": {
     "stateCleared": "modified",
   },
-  "src/app/modules/administration/index.tsx": {
+  "clientRoot/src/main/webapp/app/modules/administration/docs/docs.scss": {
     "stateCleared": "modified",
   },
-  "src/app/modules/home/home.scss": {
+  "clientRoot/src/main/webapp/app/modules/administration/docs/docs.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/modules/home/home.tsx": {
+  "clientRoot/src/main/webapp/app/modules/administration/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/modules/login/login-modal.tsx": {
+  "clientRoot/src/main/webapp/app/modules/home/home.scss": {
     "stateCleared": "modified",
   },
-  "src/app/modules/login/login.tsx": {
+  "clientRoot/src/main/webapp/app/modules/home/home.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/modules/login/logout.tsx": {
+  "clientRoot/src/main/webapp/app/modules/login/login-modal.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/routes.tsx": {
+  "clientRoot/src/main/webapp/app/modules/login/login.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/setup-tests.ts": {
+  "clientRoot/src/main/webapp/app/modules/login/logout.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/DurationFormat.tsx": {
+  "clientRoot/src/main/webapp/app/routes.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/auth/private-route.spec.tsx": {
+  "clientRoot/src/main/webapp/app/setup-tests.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/auth/private-route.tsx": {
+  "clientRoot/src/main/webapp/app/shared/DurationFormat.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/error/error-boundary-routes.spec.tsx": {
+  "clientRoot/src/main/webapp/app/shared/auth/private-route.spec.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/error/error-boundary-routes.tsx": {
+  "clientRoot/src/main/webapp/app/shared/auth/private-route.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/error/error-boundary.spec.tsx": {
+  "clientRoot/src/main/webapp/app/shared/error/error-boundary-routes.spec.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/error/error-boundary.tsx": {
+  "clientRoot/src/main/webapp/app/shared/error/error-boundary-routes.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/error/error-loading.tsx": {
+  "clientRoot/src/main/webapp/app/shared/error/error-boundary.spec.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/error/page-not-found.tsx": {
+  "clientRoot/src/main/webapp/app/shared/error/error-boundary.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/footer/footer.scss": {
+  "clientRoot/src/main/webapp/app/shared/error/error-loading.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/footer/footer.tsx": {
+  "clientRoot/src/main/webapp/app/shared/error/page-not-found.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/header/header-components.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/footer/footer.scss": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/header/header.scss": {
+  "clientRoot/src/main/webapp/app/shared/layout/footer/footer.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/header/header.spec.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/header/header-components.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/header/header.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/header/header.scss": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/menus/account.spec.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/header/header.spec.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/menus/account.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/header/header.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/menus/admin.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/menus/account.spec.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/menus/entities.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/menus/account.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/menus/index.ts": {
+  "clientRoot/src/main/webapp/app/shared/layout/menus/admin.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/menus/menu-components.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/menus/entities.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/menus/menu-item.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/menus/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/password/password-strength-bar.scss": {
+  "clientRoot/src/main/webapp/app/shared/layout/menus/menu-components.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/layout/password/password-strength-bar.tsx": {
+  "clientRoot/src/main/webapp/app/shared/layout/menus/menu-item.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/model/entity-with-custom-id.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/layout/password/password-strength-bar.scss": {
     "stateCleared": "modified",
   },
-  "src/app/shared/model/microservice.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/layout/password/password-strength-bar.tsx": {
     "stateCleared": "modified",
   },
-  "src/app/shared/model/simple.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/model/entity-with-custom-id.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/model/user.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/model/microservice.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/reducers/application-profile.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/model/simple.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/reducers/application-profile.ts": {
+  "clientRoot/src/main/webapp/app/shared/model/user.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/reducers/authentication.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/reducers/application-profile.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/reducers/authentication.ts": {
+  "clientRoot/src/main/webapp/app/shared/reducers/application-profile.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/reducers/index.ts": {
+  "clientRoot/src/main/webapp/app/shared/reducers/authentication.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/reducers/reducer.utils.ts": {
+  "clientRoot/src/main/webapp/app/shared/reducers/authentication.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/util/date-utils.ts": {
+  "clientRoot/src/main/webapp/app/shared/reducers/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/util/entity-utils.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/reducers/reducer.utils.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/util/entity-utils.ts": {
+  "clientRoot/src/main/webapp/app/shared/util/date-utils.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/util/pagination.constants.ts": {
+  "clientRoot/src/main/webapp/app/shared/util/entity-utils.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/typings.d.ts": {
+  "clientRoot/src/main/webapp/app/shared/util/entity-utils.ts": {
     "stateCleared": "modified",
   },
-  "src/content/css/loading.css": {
+  "clientRoot/src/main/webapp/app/shared/util/pagination.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0.svg": {
+  "clientRoot/src/main/webapp/app/typings.d.ts": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-192.png": {
+  "clientRoot/src/main/webapp/content/css/loading.css": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/logo-jhipster.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/favicon.ico": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/index.html": {
+  "clientRoot/src/main/webapp/content/images/logo-jhipster.png": {
     "stateCleared": "modified",
   },
-  "src/manifest.webapp": {
+  "clientRoot/src/main/webapp/favicon.ico": {
     "stateCleared": "modified",
   },
-  "src/robots.txt": {
+  "clientRoot/src/main/webapp/index.html": {
     "stateCleared": "modified",
   },
-  "src/swagger-ui/dist/images/throbber.gif": {
+  "clientRoot/src/main/webapp/manifest.webapp": {
     "stateCleared": "modified",
   },
-  "src/swagger-ui/index.html": {
+  "clientRoot/src/main/webapp/robots.txt": {
     "stateCleared": "modified",
   },
-  "tsconfig.json": {
+  "clientRoot/src/main/webapp/swagger-ui/dist/images/throbber.gif": {
     "stateCleared": "modified",
   },
-  "tsconfig.test.json": {
+  "clientRoot/src/main/webapp/swagger-ui/index.html": {
     "stateCleared": "modified",
   },
-  "webpack/environment.js": {
+  "clientRoot/tsconfig.json": {
     "stateCleared": "modified",
   },
-  "webpack/logo-jhipster.png": {
+  "clientRoot/tsconfig.test.json": {
     "stateCleared": "modified",
   },
-  "webpack/utils.js": {
+  "clientRoot/webpack/environment.js": {
     "stateCleared": "modified",
   },
-  "webpack/webpack.common.js": {
+  "clientRoot/webpack/logo-jhipster.png": {
     "stateCleared": "modified",
   },
-  "webpack/webpack.dev.js": {
+  "clientRoot/webpack/utils.js": {
     "stateCleared": "modified",
   },
-  "webpack/webpack.microfrontend.js": {
+  "clientRoot/webpack/webpack.common.js": {
     "stateCleared": "modified",
   },
-  "webpack/webpack.prod.js": {
+  "clientRoot/webpack/webpack.dev.js": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/webpack/webpack.microfrontend.js": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/webpack/webpack.prod.js": {
     "stateCleared": "modified",
   },
 }
 `;
 
-exports[`generator - react microservice-oauth2-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)-src/main/webapp2/-websocket(false) should match generated files snapshot 1`] = `
+exports[`generator - react microservice-oauth2-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)--websocket(false) should match generated files snapshot 1`] = `
 {
   ".eslintignore": {
     "stateCleared": "modified",
@@ -1319,382 +1319,382 @@ exports[`generator - react microservice-oauth2-withAdminUi(true)-skipJhipsterDep
   "postcss.config.js": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/404.html": {
+  "src/main/webapp/404.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/WEB-INF/web.xml": {
+  "src/main/webapp/WEB-INF/web.xml": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/_bootstrap-variables.scss": {
+  "src/main/webapp/app/_bootstrap-variables.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/app.scss": {
+  "src/main/webapp/app/app.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/app.tsx": {
+  "src/main/webapp/app/app.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/axios-interceptor.spec.ts": {
+  "src/main/webapp/app/config/axios-interceptor.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/axios-interceptor.ts": {
+  "src/main/webapp/app/config/axios-interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/constants.ts": {
+  "src/main/webapp/app/config/constants.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/dayjs.ts": {
+  "src/main/webapp/app/config/dayjs.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/error-middleware.ts": {
+  "src/main/webapp/app/config/error-middleware.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/icon-loader.ts": {
+  "src/main/webapp/app/config/icon-loader.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/logger-middleware.ts": {
+  "src/main/webapp/app/config/logger-middleware.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/notification-middleware.spec.ts": {
+  "src/main/webapp/app/config/notification-middleware.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/notification-middleware.ts": {
+  "src/main/webapp/app/config/notification-middleware.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/store.ts": {
+  "src/main/webapp/app/config/store.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/translation.ts": {
+  "src/main/webapp/app/config/translation.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id-delete-dialog.tsx": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-delete-dialog.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id-detail.tsx": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-detail.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id-reducer.spec.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-reducer.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id-update.tsx": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-update.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id.reducer.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.reducer.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id.tsx": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/index.tsx": {
+  "src/main/webapp/app/entities/entity-with-custom-id/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/menu.tsx": {
+  "src/main/webapp/app/entities/menu.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/index.tsx": {
+  "src/main/webapp/app/entities/microservice/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice-delete-dialog.tsx": {
+  "src/main/webapp/app/entities/microservice/microservice-delete-dialog.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice-detail.tsx": {
+  "src/main/webapp/app/entities/microservice/microservice-detail.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice-reducer.spec.ts": {
+  "src/main/webapp/app/entities/microservice/microservice-reducer.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice-update.tsx": {
+  "src/main/webapp/app/entities/microservice/microservice-update.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice.reducer.ts": {
+  "src/main/webapp/app/entities/microservice/microservice.reducer.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice.tsx": {
+  "src/main/webapp/app/entities/microservice/microservice.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/reducers.ts": {
+  "src/main/webapp/app/entities/reducers.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/routes.tsx": {
+  "src/main/webapp/app/entities/routes.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/index.tsx": {
+  "src/main/webapp/app/entities/simple/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple-delete-dialog.tsx": {
+  "src/main/webapp/app/entities/simple/simple-delete-dialog.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple-detail.tsx": {
+  "src/main/webapp/app/entities/simple/simple-detail.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple-reducer.spec.ts": {
+  "src/main/webapp/app/entities/simple/simple-reducer.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple-update.tsx": {
+  "src/main/webapp/app/entities/simple/simple-update.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple.reducer.ts": {
+  "src/main/webapp/app/entities/simple/simple.reducer.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple.tsx": {
+  "src/main/webapp/app/entities/simple/simple.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/index.tsx": {
+  "src/main/webapp/app/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/main.tsx": {
+  "src/main/webapp/app/main.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/administration/administration.reducer.spec.ts": {
+  "src/main/webapp/app/modules/administration/administration.reducer.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/administration/administration.reducer.ts": {
+  "src/main/webapp/app/modules/administration/administration.reducer.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/administration/docs/docs.scss": {
+  "src/main/webapp/app/modules/administration/docs/docs.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/administration/docs/docs.tsx": {
+  "src/main/webapp/app/modules/administration/docs/docs.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/administration/index.tsx": {
+  "src/main/webapp/app/modules/administration/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/home/home.scss": {
+  "src/main/webapp/app/modules/home/home.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/home/home.tsx": {
+  "src/main/webapp/app/modules/home/home.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/login/login-redirect.tsx": {
+  "src/main/webapp/app/modules/login/login-redirect.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/login/logout.tsx": {
+  "src/main/webapp/app/modules/login/logout.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/routes.tsx": {
+  "src/main/webapp/app/routes.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/setup-tests.ts": {
+  "src/main/webapp/app/setup-tests.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/DurationFormat.tsx": {
+  "src/main/webapp/app/shared/DurationFormat.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/auth/private-route.spec.tsx": {
+  "src/main/webapp/app/shared/auth/private-route.spec.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/auth/private-route.tsx": {
+  "src/main/webapp/app/shared/auth/private-route.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/error/error-boundary-routes.spec.tsx": {
+  "src/main/webapp/app/shared/error/error-boundary-routes.spec.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/error/error-boundary-routes.tsx": {
+  "src/main/webapp/app/shared/error/error-boundary-routes.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/error/error-boundary.spec.tsx": {
+  "src/main/webapp/app/shared/error/error-boundary.spec.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/error/error-boundary.tsx": {
+  "src/main/webapp/app/shared/error/error-boundary.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/error/error-loading.tsx": {
+  "src/main/webapp/app/shared/error/error-loading.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/error/page-not-found.tsx": {
+  "src/main/webapp/app/shared/error/page-not-found.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/footer/footer.scss": {
+  "src/main/webapp/app/shared/layout/footer/footer.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/footer/footer.tsx": {
+  "src/main/webapp/app/shared/layout/footer/footer.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/header/header-components.tsx": {
+  "src/main/webapp/app/shared/layout/header/header-components.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/header/header.scss": {
+  "src/main/webapp/app/shared/layout/header/header.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/header/header.spec.tsx": {
+  "src/main/webapp/app/shared/layout/header/header.spec.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/header/header.tsx": {
+  "src/main/webapp/app/shared/layout/header/header.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/menus/account.spec.tsx": {
+  "src/main/webapp/app/shared/layout/menus/account.spec.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/menus/account.tsx": {
+  "src/main/webapp/app/shared/layout/menus/account.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/menus/admin.tsx": {
+  "src/main/webapp/app/shared/layout/menus/admin.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/menus/entities.tsx": {
+  "src/main/webapp/app/shared/layout/menus/entities.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/menus/index.ts": {
+  "src/main/webapp/app/shared/layout/menus/index.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/menus/locale.tsx": {
+  "src/main/webapp/app/shared/layout/menus/locale.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/menus/menu-components.tsx": {
+  "src/main/webapp/app/shared/layout/menus/menu-components.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/menus/menu-item.tsx": {
+  "src/main/webapp/app/shared/layout/menus/menu-item.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/password/password-strength-bar.scss": {
+  "src/main/webapp/app/shared/layout/password/password-strength-bar.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/password/password-strength-bar.tsx": {
+  "src/main/webapp/app/shared/layout/password/password-strength-bar.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/model/entity-with-custom-id.model.ts": {
+  "src/main/webapp/app/shared/model/entity-with-custom-id.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/model/microservice.model.ts": {
+  "src/main/webapp/app/shared/model/microservice.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/model/simple.model.ts": {
+  "src/main/webapp/app/shared/model/simple.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/model/user.model.ts": {
+  "src/main/webapp/app/shared/model/user.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/reducers/application-profile.spec.ts": {
+  "src/main/webapp/app/shared/reducers/application-profile.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/reducers/application-profile.ts": {
+  "src/main/webapp/app/shared/reducers/application-profile.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/reducers/authentication.spec.ts": {
+  "src/main/webapp/app/shared/reducers/authentication.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/reducers/authentication.ts": {
+  "src/main/webapp/app/shared/reducers/authentication.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/reducers/index.ts": {
+  "src/main/webapp/app/shared/reducers/index.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/reducers/locale.spec.ts": {
+  "src/main/webapp/app/shared/reducers/locale.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/reducers/locale.ts": {
+  "src/main/webapp/app/shared/reducers/locale.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/reducers/reducer.utils.ts": {
+  "src/main/webapp/app/shared/reducers/reducer.utils.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/reducers/user-management.spec.ts": {
+  "src/main/webapp/app/shared/reducers/user-management.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/reducers/user-management.ts": {
+  "src/main/webapp/app/shared/reducers/user-management.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/util/date-utils.ts": {
+  "src/main/webapp/app/shared/util/date-utils.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/util/entity-utils.spec.ts": {
+  "src/main/webapp/app/shared/util/entity-utils.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/util/entity-utils.ts": {
+  "src/main/webapp/app/shared/util/entity-utils.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/util/pagination.constants.ts": {
+  "src/main/webapp/app/shared/util/pagination.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/util/url-utils.ts": {
+  "src/main/webapp/app/shared/util/url-utils.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/typings.d.ts": {
+  "src/main/webapp/app/typings.d.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/css/loading.css": {
+  "src/main/webapp/content/css/loading.css": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0.svg": {
+  "src/main/webapp/content/images/jhipster_family_member_0.svg": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0_head-192.png": {
+  "src/main/webapp/content/images/jhipster_family_member_0_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0_head-256.png": {
+  "src/main/webapp/content/images/jhipster_family_member_0_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0_head-384.png": {
+  "src/main/webapp/content/images/jhipster_family_member_0_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0_head-512.png": {
+  "src/main/webapp/content/images/jhipster_family_member_0_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1.svg": {
+  "src/main/webapp/content/images/jhipster_family_member_1.svg": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1_head-192.png": {
+  "src/main/webapp/content/images/jhipster_family_member_1_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1_head-256.png": {
+  "src/main/webapp/content/images/jhipster_family_member_1_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1_head-384.png": {
+  "src/main/webapp/content/images/jhipster_family_member_1_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1_head-512.png": {
+  "src/main/webapp/content/images/jhipster_family_member_1_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2.svg": {
+  "src/main/webapp/content/images/jhipster_family_member_2.svg": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2_head-192.png": {
+  "src/main/webapp/content/images/jhipster_family_member_2_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2_head-256.png": {
+  "src/main/webapp/content/images/jhipster_family_member_2_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2_head-384.png": {
+  "src/main/webapp/content/images/jhipster_family_member_2_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2_head-512.png": {
+  "src/main/webapp/content/images/jhipster_family_member_2_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3.svg": {
+  "src/main/webapp/content/images/jhipster_family_member_3.svg": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3_head-192.png": {
+  "src/main/webapp/content/images/jhipster_family_member_3_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3_head-256.png": {
+  "src/main/webapp/content/images/jhipster_family_member_3_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3_head-384.png": {
+  "src/main/webapp/content/images/jhipster_family_member_3_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3_head-512.png": {
+  "src/main/webapp/content/images/jhipster_family_member_3_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/logo-jhipster.png": {
+  "src/main/webapp/content/images/logo-jhipster.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/favicon.ico": {
+  "src/main/webapp/favicon.ico": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/index.html": {
+  "src/main/webapp/index.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/manifest.webapp": {
+  "src/main/webapp/manifest.webapp": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/robots.txt": {
+  "src/main/webapp/robots.txt": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/swagger-ui/dist/images/throbber.gif": {
+  "src/main/webapp/swagger-ui/dist/images/throbber.gif": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/swagger-ui/index.html": {
+  "src/main/webapp/swagger-ui/index.html": {
     "stateCleared": "modified",
   },
   "tsconfig.json": {
@@ -1727,7 +1727,7 @@ exports[`generator - react microservice-oauth2-withAdminUi(true)-skipJhipsterDep
 }
 `;
 
-exports[`generator - react monolith-jwt-skipUserManagement(false)-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)-src/main/webapp2/-websocket(true) should match generated files snapshot 1`] = `
+exports[`generator - react monolith-jwt-skipUserManagement(false)-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)--websocket(true) should match generated files snapshot 1`] = `
 {
   ".eslintignore": {
     "stateCleared": "modified",
@@ -1759,454 +1759,454 @@ exports[`generator - react monolith-jwt-skipUserManagement(false)-withAdminUi(tr
   "postcss.config.js": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/404.html": {
+  "src/main/webapp/404.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/WEB-INF/web.xml": {
+  "src/main/webapp/WEB-INF/web.xml": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/_bootstrap-variables.scss": {
+  "src/main/webapp/app/_bootstrap-variables.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/app.scss": {
+  "src/main/webapp/app/app.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/app.tsx": {
+  "src/main/webapp/app/app.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/axios-interceptor.spec.ts": {
+  "src/main/webapp/app/config/axios-interceptor.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/axios-interceptor.ts": {
+  "src/main/webapp/app/config/axios-interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/constants.ts": {
+  "src/main/webapp/app/config/constants.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/dayjs.ts": {
+  "src/main/webapp/app/config/dayjs.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/error-middleware.ts": {
+  "src/main/webapp/app/config/error-middleware.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/icon-loader.ts": {
+  "src/main/webapp/app/config/icon-loader.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/logger-middleware.ts": {
+  "src/main/webapp/app/config/logger-middleware.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/notification-middleware.spec.ts": {
+  "src/main/webapp/app/config/notification-middleware.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/notification-middleware.ts": {
+  "src/main/webapp/app/config/notification-middleware.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/store.ts": {
+  "src/main/webapp/app/config/store.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/config/translation.ts": {
+  "src/main/webapp/app/config/translation.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id-delete-dialog.tsx": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-delete-dialog.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id-detail.tsx": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-detail.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id-reducer.spec.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-reducer.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id-update.tsx": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-update.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id.reducer.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.reducer.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id.tsx": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/index.tsx": {
+  "src/main/webapp/app/entities/entity-with-custom-id/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/menu.tsx": {
+  "src/main/webapp/app/entities/menu.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/index.tsx": {
+  "src/main/webapp/app/entities/microservice/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice-delete-dialog.tsx": {
+  "src/main/webapp/app/entities/microservice/microservice-delete-dialog.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice-detail.tsx": {
+  "src/main/webapp/app/entities/microservice/microservice-detail.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice-reducer.spec.ts": {
+  "src/main/webapp/app/entities/microservice/microservice-reducer.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice-update.tsx": {
+  "src/main/webapp/app/entities/microservice/microservice-update.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice.reducer.ts": {
+  "src/main/webapp/app/entities/microservice/microservice.reducer.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice.tsx": {
+  "src/main/webapp/app/entities/microservice/microservice.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/reducers.ts": {
+  "src/main/webapp/app/entities/reducers.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/routes.tsx": {
+  "src/main/webapp/app/entities/routes.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/index.tsx": {
+  "src/main/webapp/app/entities/simple/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple-delete-dialog.tsx": {
+  "src/main/webapp/app/entities/simple/simple-delete-dialog.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple-detail.tsx": {
+  "src/main/webapp/app/entities/simple/simple-detail.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple-reducer.spec.ts": {
+  "src/main/webapp/app/entities/simple/simple-reducer.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple-update.tsx": {
+  "src/main/webapp/app/entities/simple/simple-update.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple.reducer.ts": {
+  "src/main/webapp/app/entities/simple/simple.reducer.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple.tsx": {
+  "src/main/webapp/app/entities/simple/simple.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/index.tsx": {
+  "src/main/webapp/app/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/account/activate/activate.reducer.spec.ts": {
+  "src/main/webapp/app/modules/account/activate/activate.reducer.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/account/activate/activate.reducer.ts": {
+  "src/main/webapp/app/modules/account/activate/activate.reducer.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/account/activate/activate.tsx": {
+  "src/main/webapp/app/modules/account/activate/activate.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/account/index.tsx": {
+  "src/main/webapp/app/modules/account/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/account/password-reset/finish/password-reset-finish.tsx": {
+  "src/main/webapp/app/modules/account/password-reset/finish/password-reset-finish.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/account/password-reset/init/password-reset-init.tsx": {
+  "src/main/webapp/app/modules/account/password-reset/init/password-reset-init.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/account/password-reset/password-reset.reducer.ts": {
+  "src/main/webapp/app/modules/account/password-reset/password-reset.reducer.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/account/password/password.reducer.spec.ts": {
+  "src/main/webapp/app/modules/account/password/password.reducer.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/account/password/password.reducer.ts": {
+  "src/main/webapp/app/modules/account/password/password.reducer.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/account/password/password.tsx": {
+  "src/main/webapp/app/modules/account/password/password.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/account/register/register.reducer.spec.ts": {
+  "src/main/webapp/app/modules/account/register/register.reducer.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/account/register/register.reducer.ts": {
+  "src/main/webapp/app/modules/account/register/register.reducer.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/account/register/register.tsx": {
+  "src/main/webapp/app/modules/account/register/register.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/account/settings/settings.reducer.spec.ts": {
+  "src/main/webapp/app/modules/account/settings/settings.reducer.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/account/settings/settings.reducer.ts": {
+  "src/main/webapp/app/modules/account/settings/settings.reducer.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/account/settings/settings.tsx": {
+  "src/main/webapp/app/modules/account/settings/settings.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/administration/administration.reducer.spec.ts": {
+  "src/main/webapp/app/modules/administration/administration.reducer.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/administration/administration.reducer.ts": {
+  "src/main/webapp/app/modules/administration/administration.reducer.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/administration/configuration/configuration.tsx": {
+  "src/main/webapp/app/modules/administration/configuration/configuration.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/administration/docs/docs.scss": {
+  "src/main/webapp/app/modules/administration/docs/docs.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/administration/docs/docs.tsx": {
+  "src/main/webapp/app/modules/administration/docs/docs.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/administration/health/health-modal.tsx": {
+  "src/main/webapp/app/modules/administration/health/health-modal.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/administration/health/health.tsx": {
+  "src/main/webapp/app/modules/administration/health/health.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/administration/index.tsx": {
+  "src/main/webapp/app/modules/administration/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/administration/logs/logs.tsx": {
+  "src/main/webapp/app/modules/administration/logs/logs.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/administration/metrics/metrics.tsx": {
+  "src/main/webapp/app/modules/administration/metrics/metrics.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/administration/user-management/index.tsx": {
+  "src/main/webapp/app/modules/administration/user-management/index.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/administration/user-management/user-management-delete-dialog.tsx": {
+  "src/main/webapp/app/modules/administration/user-management/user-management-delete-dialog.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/administration/user-management/user-management-detail.tsx": {
+  "src/main/webapp/app/modules/administration/user-management/user-management-detail.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/administration/user-management/user-management-update.tsx": {
+  "src/main/webapp/app/modules/administration/user-management/user-management-update.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/administration/user-management/user-management.reducer.spec.ts": {
+  "src/main/webapp/app/modules/administration/user-management/user-management.reducer.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/administration/user-management/user-management.reducer.ts": {
+  "src/main/webapp/app/modules/administration/user-management/user-management.reducer.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/administration/user-management/user-management.tsx": {
+  "src/main/webapp/app/modules/administration/user-management/user-management.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/home/home.scss": {
+  "src/main/webapp/app/modules/home/home.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/home/home.tsx": {
+  "src/main/webapp/app/modules/home/home.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/login/login-modal.tsx": {
+  "src/main/webapp/app/modules/login/login-modal.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/login/login.tsx": {
+  "src/main/webapp/app/modules/login/login.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/modules/login/logout.tsx": {
+  "src/main/webapp/app/modules/login/logout.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/routes.tsx": {
+  "src/main/webapp/app/routes.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/setup-tests.ts": {
+  "src/main/webapp/app/setup-tests.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/DurationFormat.tsx": {
+  "src/main/webapp/app/shared/DurationFormat.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/auth/private-route.spec.tsx": {
+  "src/main/webapp/app/shared/auth/private-route.spec.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/auth/private-route.tsx": {
+  "src/main/webapp/app/shared/auth/private-route.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/error/error-boundary-routes.spec.tsx": {
+  "src/main/webapp/app/shared/error/error-boundary-routes.spec.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/error/error-boundary-routes.tsx": {
+  "src/main/webapp/app/shared/error/error-boundary-routes.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/error/error-boundary.spec.tsx": {
+  "src/main/webapp/app/shared/error/error-boundary.spec.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/error/error-boundary.tsx": {
+  "src/main/webapp/app/shared/error/error-boundary.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/error/page-not-found.tsx": {
+  "src/main/webapp/app/shared/error/page-not-found.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/footer/footer.scss": {
+  "src/main/webapp/app/shared/layout/footer/footer.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/footer/footer.tsx": {
+  "src/main/webapp/app/shared/layout/footer/footer.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/header/header-components.tsx": {
+  "src/main/webapp/app/shared/layout/header/header-components.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/header/header.scss": {
+  "src/main/webapp/app/shared/layout/header/header.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/header/header.spec.tsx": {
+  "src/main/webapp/app/shared/layout/header/header.spec.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/header/header.tsx": {
+  "src/main/webapp/app/shared/layout/header/header.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/menus/account.spec.tsx": {
+  "src/main/webapp/app/shared/layout/menus/account.spec.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/menus/account.tsx": {
+  "src/main/webapp/app/shared/layout/menus/account.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/menus/admin.tsx": {
+  "src/main/webapp/app/shared/layout/menus/admin.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/menus/entities.tsx": {
+  "src/main/webapp/app/shared/layout/menus/entities.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/menus/index.ts": {
+  "src/main/webapp/app/shared/layout/menus/index.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/menus/locale.tsx": {
+  "src/main/webapp/app/shared/layout/menus/locale.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/menus/menu-components.tsx": {
+  "src/main/webapp/app/shared/layout/menus/menu-components.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/menus/menu-item.tsx": {
+  "src/main/webapp/app/shared/layout/menus/menu-item.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/password/password-strength-bar.scss": {
+  "src/main/webapp/app/shared/layout/password/password-strength-bar.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/layout/password/password-strength-bar.tsx": {
+  "src/main/webapp/app/shared/layout/password/password-strength-bar.tsx": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/model/entity-with-custom-id.model.ts": {
+  "src/main/webapp/app/shared/model/entity-with-custom-id.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/model/microservice.model.ts": {
+  "src/main/webapp/app/shared/model/microservice.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/model/simple.model.ts": {
+  "src/main/webapp/app/shared/model/simple.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/model/user.model.ts": {
+  "src/main/webapp/app/shared/model/user.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/reducers/application-profile.spec.ts": {
+  "src/main/webapp/app/shared/reducers/application-profile.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/reducers/application-profile.ts": {
+  "src/main/webapp/app/shared/reducers/application-profile.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/reducers/authentication.spec.ts": {
+  "src/main/webapp/app/shared/reducers/authentication.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/reducers/authentication.ts": {
+  "src/main/webapp/app/shared/reducers/authentication.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/reducers/index.ts": {
+  "src/main/webapp/app/shared/reducers/index.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/reducers/locale.spec.ts": {
+  "src/main/webapp/app/shared/reducers/locale.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/reducers/locale.ts": {
+  "src/main/webapp/app/shared/reducers/locale.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/reducers/reducer.utils.ts": {
+  "src/main/webapp/app/shared/reducers/reducer.utils.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/util/date-utils.ts": {
+  "src/main/webapp/app/shared/util/date-utils.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/util/entity-utils.spec.ts": {
+  "src/main/webapp/app/shared/util/entity-utils.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/util/entity-utils.ts": {
+  "src/main/webapp/app/shared/util/entity-utils.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/util/pagination.constants.ts": {
+  "src/main/webapp/app/shared/util/pagination.constants.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/typings.d.ts": {
+  "src/main/webapp/app/typings.d.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/css/loading.css": {
+  "src/main/webapp/content/css/loading.css": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0.svg": {
+  "src/main/webapp/content/images/jhipster_family_member_0.svg": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0_head-192.png": {
+  "src/main/webapp/content/images/jhipster_family_member_0_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0_head-256.png": {
+  "src/main/webapp/content/images/jhipster_family_member_0_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0_head-384.png": {
+  "src/main/webapp/content/images/jhipster_family_member_0_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0_head-512.png": {
+  "src/main/webapp/content/images/jhipster_family_member_0_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1.svg": {
+  "src/main/webapp/content/images/jhipster_family_member_1.svg": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1_head-192.png": {
+  "src/main/webapp/content/images/jhipster_family_member_1_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1_head-256.png": {
+  "src/main/webapp/content/images/jhipster_family_member_1_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1_head-384.png": {
+  "src/main/webapp/content/images/jhipster_family_member_1_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1_head-512.png": {
+  "src/main/webapp/content/images/jhipster_family_member_1_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2.svg": {
+  "src/main/webapp/content/images/jhipster_family_member_2.svg": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2_head-192.png": {
+  "src/main/webapp/content/images/jhipster_family_member_2_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2_head-256.png": {
+  "src/main/webapp/content/images/jhipster_family_member_2_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2_head-384.png": {
+  "src/main/webapp/content/images/jhipster_family_member_2_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2_head-512.png": {
+  "src/main/webapp/content/images/jhipster_family_member_2_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3.svg": {
+  "src/main/webapp/content/images/jhipster_family_member_3.svg": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3_head-192.png": {
+  "src/main/webapp/content/images/jhipster_family_member_3_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3_head-256.png": {
+  "src/main/webapp/content/images/jhipster_family_member_3_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3_head-384.png": {
+  "src/main/webapp/content/images/jhipster_family_member_3_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3_head-512.png": {
+  "src/main/webapp/content/images/jhipster_family_member_3_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/logo-jhipster.png": {
+  "src/main/webapp/content/images/logo-jhipster.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/favicon.ico": {
+  "src/main/webapp/favicon.ico": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/index.html": {
+  "src/main/webapp/index.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/manifest.webapp": {
+  "src/main/webapp/manifest.webapp": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/robots.txt": {
+  "src/main/webapp/robots.txt": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/swagger-ui/dist/images/throbber.gif": {
+  "src/main/webapp/swagger-ui/dist/images/throbber.gif": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/swagger-ui/index.html": {
+  "src/main/webapp/swagger-ui/index.html": {
     "stateCleared": "modified",
   },
   "tsconfig.json": {
@@ -3070,12 +3070,11 @@ exports[`generator - react monolith-session-skipUserManagement(true)-withAdminUi
 
 exports[`generator - react samples matrix should match snapshot 1`] = `
 {
-  "gateway-jwt-skipUserManagement(true)-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-src/-websocket(true)": {
+  "gateway-jwt-skipUserManagement(true)-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-clientRoot/-websocket(true)": {
     "applicationType": "gateway",
     "authenticationType": "jwt",
     "clientFramework": "react",
-    "clientSrcDir": "src/",
-    "clientTestDir": "test/",
+    "clientRootDir": "clientRoot/",
     "enableTranslation": false,
     "languages": [
       "fr",
@@ -3087,12 +3086,11 @@ exports[`generator - react samples matrix should match snapshot 1`] = `
     "websocket": true,
     "withAdminUi": false,
   },
-  "gateway-oauth2-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)-src/-websocket(true)": {
+  "gateway-oauth2-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)-clientRoot/-websocket(true)": {
     "applicationType": "gateway",
     "authenticationType": "oauth2",
     "clientFramework": "react",
-    "clientSrcDir": "src/",
-    "clientTestDir": "test/",
+    "clientRootDir": "clientRoot/",
     "enableTranslation": true,
     "languages": [
       "fr",
@@ -3103,12 +3101,11 @@ exports[`generator - react samples matrix should match snapshot 1`] = `
     "websocket": true,
     "withAdminUi": true,
   },
-  "microservice-jwt-skipUserManagement(false)-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-src/-websocket(false)": {
+  "microservice-jwt-skipUserManagement(false)-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-clientRoot/-websocket(false)": {
     "applicationType": "microservice",
     "authenticationType": "jwt",
     "clientFramework": "react",
-    "clientSrcDir": "src/",
-    "clientTestDir": "test/",
+    "clientRootDir": "clientRoot/",
     "enableTranslation": false,
     "languages": [
       "fr",
@@ -3120,12 +3117,11 @@ exports[`generator - react samples matrix should match snapshot 1`] = `
     "websocket": false,
     "withAdminUi": false,
   },
-  "microservice-oauth2-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)-src/main/webapp2/-websocket(false)": {
+  "microservice-oauth2-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)--websocket(false)": {
     "applicationType": "microservice",
     "authenticationType": "oauth2",
     "clientFramework": "react",
-    "clientSrcDir": "src/main/webapp2/",
-    "clientTestDir": "src/test/javascript2/",
+    "clientRootDir": "",
     "enableTranslation": true,
     "languages": [
       "fr",
@@ -3136,12 +3132,11 @@ exports[`generator - react samples matrix should match snapshot 1`] = `
     "websocket": false,
     "withAdminUi": true,
   },
-  "monolith-jwt-skipUserManagement(false)-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)-src/main/webapp2/-websocket(true)": {
+  "monolith-jwt-skipUserManagement(false)-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)--websocket(true)": {
     "applicationType": "monolith",
     "authenticationType": "jwt",
     "clientFramework": "react",
-    "clientSrcDir": "src/main/webapp2/",
-    "clientTestDir": "src/test/javascript2/",
+    "clientRootDir": "",
     "enableTranslation": true,
     "languages": [
       "fr",
@@ -3157,7 +3152,7 @@ exports[`generator - react samples matrix should match snapshot 1`] = `
     "applicationType": "monolith",
     "authenticationType": "oauth2",
     "clientFramework": "react",
-    "clientSrcDir": undefined,
+    "clientRootDir": undefined,
     "enableTranslation": false,
     "languages": [
       "fr",
@@ -3172,7 +3167,7 @@ exports[`generator - react samples matrix should match snapshot 1`] = `
     "applicationType": "monolith",
     "authenticationType": "session",
     "clientFramework": "react",
-    "clientSrcDir": undefined,
+    "clientRootDir": undefined,
     "enableTranslation": false,
     "languages": [
       "fr",
diff --git a/generators/react/entity-files-react.mjs b/generators/react/entity-files-react.mjs
index 98724ff38426..97fd094a132e 100644
--- a/generators/react/entity-files-react.mjs
+++ b/generators/react/entity-files-react.mjs
@@ -24,28 +24,28 @@ export const reactFiles = {
       condition: generator => !generator.embedded,
       ...clientApplicationTemplatesBlock(),
       templates: [
-        'entities/_entityFolder/_entityFile-detail.tsx',
-        'entities/_entityFolder/_entityFile.tsx',
-        'entities/_entityFolder/_entityFile.reducer.ts',
-        'entities/_entityFolder/index.tsx',
+        'entities/_entityFolder_/_entityFile_-detail.tsx',
+        'entities/_entityFolder_/_entityFile_.tsx',
+        'entities/_entityFolder_/_entityFile_.reducer.ts',
+        'entities/_entityFolder_/index.tsx',
       ],
     },
     {
       ...clientApplicationTemplatesBlock(),
       renameTo: data => `${data.clientSrcDir}app/shared/model/${data.entityModelFileName}.model.ts`,
-      templates: ['entities/_entityFolder/_entityModel.model.ts'],
+      templates: ['entities/_entityFolder_/_entityModel_.model.ts'],
     },
     {
       condition: generator => !generator.readOnly && !generator.embedded,
       ...clientApplicationTemplatesBlock(),
-      templates: ['entities/_entityFolder/_entityFile-delete-dialog.tsx', 'entities/_entityFolder/_entityFile-update.tsx'],
+      templates: ['entities/_entityFolder_/_entityFile_-delete-dialog.tsx', 'entities/_entityFolder_/_entityFile_-update.tsx'],
     },
   ],
   test: [
     {
       condition: generator => !generator.embedded,
       ...clientApplicationTemplatesBlock(),
-      templates: ['entities/_entityFolder/_entityFile-reducer.spec.ts'],
+      templates: ['entities/_entityFolder_/_entityFile_-reducer.spec.ts'],
     },
   ],
 };
diff --git a/generators/react/files-react.mjs b/generators/react/files-react.mjs
index b03e4b392edd..5f936d139f83 100644
--- a/generators/react/files-react.mjs
+++ b/generators/react/files-react.mjs
@@ -16,11 +16,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { clientApplicationTemplatesBlock, clientSrcTemplatesBlock } from '../client/support/files.mjs';
+import { clientApplicationTemplatesBlock, clientRootTemplatesBlock, clientSrcTemplatesBlock } from '../client/support/files.mjs';
 
 export const files = {
   common: [
-    {
+    clientRootTemplatesBlock({
       templates: [
         'package.json',
         '.eslintrc.json',
@@ -34,12 +34,12 @@ export const files = {
         'webpack/utils.js',
         'webpack/logo-jhipster.png',
       ],
-    },
+    }),
   ],
   sass: [
-    {
+    clientRootTemplatesBlock({
       templates: ['postcss.config.js'],
-    },
+    }),
   ],
   reactApp: [
     {
@@ -245,10 +245,10 @@ export const files = {
     },
   ],
   microfrontend: [
-    {
+    clientRootTemplatesBlock({
       condition: generator => generator.microfrontend,
       templates: ['webpack/webpack.microfrontend.js.jhi.react'],
-    },
+    }),
     {
       condition: generator => generator.microfrontend,
       ...clientApplicationTemplatesBlock(),
diff --git a/generators/react/generator.mjs b/generators/react/generator.mjs
index 646d6486a931..43032bef3df9 100644
--- a/generators/react/generator.mjs
+++ b/generators/react/generator.mjs
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { isFilePending } from 'mem-fs-editor/state';
 import chalk from 'chalk';
 
@@ -46,25 +46,14 @@ const { REACT } = clientFrameworkTypes;
  */
 export default class ReactGenerator extends BaseApplicationGenerator {
   async beforeQueue() {
-    await this.dependsOnJHipster(GENERATOR_CLIENT);
     if (!this.fromBlueprint) {
       await this.composeWithBlueprints(GENERATOR_REACT);
     }
-  }
 
-  get composing() {
-    return this.asComposingTaskGroup({
-      async composing() {
-        const { enableTranslation } = this.jhipsterConfigWithDefaults;
-        if (!enableTranslation) {
-          await this.composeWithJHipster(GENERATOR_LANGUAGES);
-        }
-      },
-    });
-  }
-
-  get [BaseApplicationGenerator.COMPOSING]() {
-    return this.asComposingTaskGroup(this.delegateTasksToBlueprint(() => this.composing));
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_CLIENT);
+      await this.dependsOnJHipster(GENERATOR_LANGUAGES);
+    }
   }
 
   get loading() {
@@ -88,7 +77,7 @@ export default class ReactGenerator extends BaseApplicationGenerator {
         application.webappEnumerationsDir = `${application.clientSrcDir}app/shared/model/enumerations/`;
 
         source.addWebpackConfig = args => {
-          const webpackPath = 'webpack/webpack.common.js';
+          const webpackPath = `${application.clientRootDir}webpack/webpack.common.js`;
           const ignoreNonExisting = this.sharedData.getControl().ignoreNeedlesError && 'Webpack configuration file not found';
           this.editFile(
             webpackPath,
diff --git a/generators/react/generator.spec.mts b/generators/react/generator.spec.mts
index c2877c1ed7d7..b2eec37ebb35 100644
--- a/generators/react/generator.spec.mts
+++ b/generators/react/generator.spec.mts
@@ -61,6 +61,8 @@ describe(`generator - ${clientFramework}`, () => {
   });
 
   Object.entries(testSamples).forEach(([name, sampleConfig]) => {
+    const { clientRootDir = '' } = sampleConfig;
+
     describe(name, () => {
       let runResult;
 
@@ -81,26 +83,15 @@ describe(`generator - ${clientFramework}`, () => {
         runResult.assertFileContent('.yo-rc.json', new RegExp(`"clientFramework": "${clientFramework}"`));
       });
       it('should not contain version placeholders at package.json', () => {
-        runResult.assertNoFileContent('package.json', /VERSION_MANAGED_BY_CLIENT_COMMON/);
-        runResult.assertNoFileContent('package.json', /VERSION_MANAGED_BY_CLIENT_ANGULAR/);
-        runResult.assertNoFileContent('package.json', /VERSION_MANAGED_BY_CLIENT_REACT/);
-        runResult.assertNoFileContent('package.json', /VERSION_MANAGED_BY_CLIENT_VUE/);
-      });
-
-      describe('skipJhipsterDependencies', () => {
-        const { skipJhipsterDependencies } = sampleConfig;
-        const skipJhipsterDependenciesTitle = skipJhipsterDependencies
-          ? 'should not add generator-jhipster to package.json'
-          : 'should add generator-jhipster to package.json';
-        it(skipJhipsterDependenciesTitle, () => {
-          const assertion = (...args) =>
-            skipJhipsterDependencies ? runResult.assertNoFileContent(...args) : runResult.assertFileContent(...args);
-          assertion('package.json', 'generator-jhipster');
-        });
+        runResult.assertNoFileContent(`${clientRootDir}package.json`, /VERSION_MANAGED_BY_CLIENT_COMMON/);
+        runResult.assertNoFileContent(`${clientRootDir}package.json`, /VERSION_MANAGED_BY_CLIENT_ANGULAR/);
+        runResult.assertNoFileContent(`${clientRootDir}package.json`, /VERSION_MANAGED_BY_CLIENT_REACT/);
+        runResult.assertNoFileContent(`${clientRootDir}package.json`, /VERSION_MANAGED_BY_CLIENT_VUE/);
       });
 
       describe('withAdminUi', () => {
-        const { applicationType, withAdminUi, clientSrcDir = CLIENT_MAIN_SRC_DIR } = sampleConfig;
+        const { applicationType, withAdminUi } = sampleConfig;
+        const clientSrcDir = `${clientRootDir}${CLIENT_MAIN_SRC_DIR}`;
         const generateAdminUi = applicationType !== 'microservice' && withAdminUi;
         const adminUiComponents = generateAdminUi ? 'should generate admin ui components' : 'should not generate admin ui components';
 
diff --git a/generators/react/needle-api/needle-client-react.mts b/generators/react/needle-api/needle-client-react.mts
index e79556f40f77..bcbf847aca8d 100644
--- a/generators/react/needle-api/needle-client-react.mts
+++ b/generators/react/needle-api/needle-client-react.mts
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import chalk from 'chalk';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 
 import needleClientBase from '../../client/needle-api/needle-client.mjs';
 import { stripMargin } from '../../base/support/index.mjs';
diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json
index 0e6ded96f659..8471536d55f9 100644
--- a/generators/react/resources/package.json
+++ b/generators/react/resources/package.json
@@ -3,20 +3,20 @@
     "@fortawesome/fontawesome-svg-core": "6.4.2",
     "@fortawesome/free-solid-svg-icons": "6.4.2",
     "@fortawesome/react-fontawesome": "0.2.0",
-    "@reduxjs/toolkit": "1.9.5",
-    "axios": "1.5.0",
+    "@reduxjs/toolkit": "1.9.7",
+    "axios": "1.5.1",
     "bootstrap": "5.3.2",
-    "bootswatch": "5.3.1",
+    "bootswatch": "5.3.2",
     "lodash": "4.17.21",
     "path-browserify": "1.0.1",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-hook-form": "7.46.1",
+    "react-hook-form": "7.47.0",
     "react-jhipster": "0.25.3",
     "react-loadable": "5.5.0",
-    "react-redux": "8.1.2",
+    "react-redux": "8.1.3",
     "react-redux-loading-bar": "5.0.4",
-    "react-router-dom": "6.16.0",
+    "react-router-dom": "6.17.0",
     "react-toastify": "9.1.3",
     "react-transition-group": "4.4.5",
     "reactstrap": "9.2.0",
@@ -28,30 +28,30 @@
   },
   "devDependencies": {
     "@testing-library/react": "14.0.0",
-    "@types/jest": "29.5.5",
-    "@types/lodash": "4.14.198",
-    "@types/node": "18.17.17",
-    "@types/react": "18.2.21",
-    "@types/react-dom": "18.2.7",
-    "@types/react-redux": "7.1.26",
+    "@types/jest": "29.5.6",
+    "@types/lodash": "4.14.200",
+    "@types/node": "18.18.6",
+    "@types/react": "18.2.30",
+    "@types/react-dom": "18.2.14",
+    "@types/react-redux": "7.1.28",
     "@types/redux": "3.6.31",
-    "@types/webpack-env": "1.18.1",
-    "@typescript-eslint/eslint-plugin": "6.7.0",
-    "@typescript-eslint/parser": "6.7.0",
-    "autoprefixer": "10.4.15",
+    "@types/webpack-env": "1.18.3",
+    "@typescript-eslint/eslint-plugin": "6.8.0",
+    "@typescript-eslint/parser": "6.8.0",
+    "autoprefixer": "10.4.16",
     "browser-sync": "2.29.3",
     "browser-sync-webpack-plugin": "2.3.0",
     "copy-webpack-plugin": "11.0.0",
-    "core-js": "3.32.2",
+    "core-js": "3.33.0",
     "cross-env": "7.0.3",
     "css-loader": "6.8.1",
     "css-minimizer-webpack-plugin": "5.0.1",
-    "eslint": "8.49.0",
+    "eslint": "8.51.0",
     "eslint-config-prettier": "9.0.0",
     "eslint-plugin-react": "7.33.2",
     "eslint-webpack-plugin": "4.0.1",
     "folder-hash": "4.0.4",
-    "fork-ts-checker-webpack-plugin": "8.0.0",
+    "fork-ts-checker-webpack-plugin": "9.0.0",
     "html-webpack-plugin": "5.5.3",
     "identity-obj-proxy": "3.0.0",
     "jest": "29.7.0",
@@ -65,23 +65,23 @@
     "postcss-rtlcss": "4.0.8",
     "react-infinite-scroll-component": "6.1.0",
     "redux-mock-store": "1.5.4",
-    "rimraf": "5.0.1",
-    "sass": "1.67.0",
+    "rimraf": "5.0.5",
+    "sass": "1.69.4",
     "sass-loader": "13.3.2",
     "simple-progress-webpack-plugin": "2.0.0",
-    "sinon": "16.0.0",
+    "sinon": "16.1.3",
     "source-map-loader": "4.0.1",
     "sourcemap-istanbul-instrumenter-loader": "0.2.0",
     "style-loader": "3.3.3",
     "terser-webpack-plugin": "5.3.9",
     "thread-loader": "4.0.2",
     "ts-jest": "29.1.1",
-    "ts-loader": "9.4.4",
+    "ts-loader": "9.5.0",
     "typescript": "5.2.2",
-    "webpack": "5.88.2",
+    "webpack": "5.89.0",
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "4.15.1",
-    "webpack-merge": "5.9.0",
+    "webpack-merge": "5.10.0",
     "webpack-notifier": "1.15.0",
     "workbox-webpack-plugin": "7.0.0"
   }
diff --git a/generators/react/support/update-languages.mts b/generators/react/support/update-languages.mts
index 23afa67c381d..063765400a2c 100644
--- a/generators/react/support/update-languages.mts
+++ b/generators/react/support/update-languages.mts
@@ -34,18 +34,18 @@ function updateLanguagesInPipeTask(this: BaseGenerator, { application, control =
 }
 
 function updateLanguagesInWebpackReactTask(this: BaseGenerator, { application, control = {} }: UpdateClientLanguagesTaskParam) {
-  const { clientSrcDir, languages } = application;
+  const { clientRootDir, clientSrcDir, languages } = application;
   const { ignoreNeedlesError: ignoreNonExisting } = control;
   let newContent = 'groupBy: [\n';
   // prettier-ignore
   languages?.forEach((language) => {
-      newContent += `                    { pattern: "./${clientSrcDir}i18n/${language}/*.json", fileName: "./i18n/${language}.json" },\n`;
+      newContent += `                    { pattern: "./${this.relativeDir(clientRootDir, clientSrcDir)}i18n/${language}/*.json", fileName: "./i18n/${language}.json" },\n`;
           });
   newContent +=
     '                    // jhipster-needle-i18n-language-webpack - JHipster will add/remove languages in this array\n' +
     '                ]';
 
-  this.editFile('webpack/webpack.common.js', { ignoreNonExisting }, content =>
+  this.editFile(`${application.clientRootDir}webpack/webpack.common.js`, { ignoreNonExisting }, content =>
     content.replace(/groupBy:.*\[([^\]]*jhipster-needle-i18n-language-webpack[^\]]*)\]/g, newContent),
   );
 }
diff --git a/generators/react/templates/.eslintrc.json.ejs b/generators/react/templates/.eslintrc.json.ejs
index 116f7025becf..a6dc31a83063 100644
--- a/generators/react/templates/.eslintrc.json.ejs
+++ b/generators/react/templates/.eslintrc.json.ejs
@@ -37,7 +37,7 @@
     "project": [
       "./tsconfig.json",
 <%_ if (cypressTests) { _%>
-      "./<%= clientTestDir %>cypress/tsconfig.json",
+      "./<%= this.relativeDir(clientRootDir, clientTestDir) %>cypress/tsconfig.json",
 <%_ } _%>
       "./tsconfig.test.json"
     ]
diff --git a/generators/react/templates/jest.conf.js.ejs b/generators/react/templates/jest.conf.js.ejs
index 4fafd3a5829a..b34130e90dbb 100644
--- a/generators/react/templates/jest.conf.js.ejs
+++ b/generators/react/templates/jest.conf.js.ejs
@@ -12,12 +12,12 @@ module.exports = {
   testEnvironmentOptions: {
     url: 'http://localhost/',
   },
-  cacheDirectory: '<rootDir>/<%= temporaryDir %>jest-cache',
-  coverageDirectory: '<rootDir>/<%= temporaryDir %>test-results/',
-  testMatch: ['<rootDir>/<%= clientSrcDir %>app/**/@(*.)@(spec.ts?(x))'],
+  cacheDirectory: '<rootDir>/<%= this.relativeDir(clientRootDir, temporaryDir) %>jest-cache',
+  coverageDirectory: '<rootDir>/<%= this.relativeDir(clientRootDir, temporaryDir) %>test-results/',
+  testMatch: ['<rootDir>/<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/**/@(*.)@(spec.ts?(x))'],
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
   coveragePathIgnorePatterns: [
-    '<rootDir>/<%= clientTestDir %>'
+    '<rootDir>/<%= this.relativeDir(clientRootDir, clientTestDir) %>',
   ],
   moduleNameMapper: mapTypescriptAliasToJestAlias({
     '\\.(css|scss)$': 'identity-obj-proxy',
@@ -25,13 +25,13 @@ module.exports = {
   }),
   reporters: [
     'default',
-    ['jest-junit', { outputDirectory: './<%= temporaryDir %>test-results/', outputName: 'TESTS-results-jest.xml' }],
-    ['jest-sonar', { outputDirectory: './<%= temporaryDir %>test-results/jest', outputName: 'TESTS-results-sonar.xml' }],
+    ['jest-junit', { outputDirectory: './<%= this.relativeDir(clientRootDir, temporaryDir) %>test-results/', outputName: 'TESTS-results-jest.xml' }],
+    ['jest-sonar', { outputDirectory: './<%= this.relativeDir(clientRootDir, temporaryDir) %>test-results/jest', outputName: 'TESTS-results-sonar.xml' }],
   ],
   testPathIgnorePatterns: [
     '<rootDir>/node_modules/'
   ],
-  setupFiles: ['<rootDir>/<%= clientSrcDir %>app/setup-tests.ts'],
+  setupFiles: ['<rootDir>/<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/setup-tests.ts'],
   globals: {
 <%_ if (enableTranslation) { _%>
     I18N_HASH: 'generated_hash',
diff --git a/generators/react/templates/package.json.ejs b/generators/react/templates/package.json.ejs
index 491c577aea9f..f89a39c6d362 100644
--- a/generators/react/templates/package.json.ejs
+++ b/generators/react/templates/package.json.ejs
@@ -88,12 +88,6 @@
     "eslint-plugin-react": "<%= nodeDependencies['eslint-plugin-react'] %>",
     "eslint-webpack-plugin": "<%= nodeDependencies['eslint-webpack-plugin'] %>",
     "fork-ts-checker-webpack-plugin": "<%= nodeDependencies['fork-ts-checker-webpack-plugin'] %>",
-<%_ if (!skipJhipsterDependencies) { _%>
-    "generator-jhipster": "<%= jhipsterVersion %>",
-  <%_ blueprints.forEach(blueprint => { _%>
-    "<%= blueprint.name %>": "<%= blueprint.version %>",
-  <%_ }); _%>
-<%_ } _%>
     "html-webpack-plugin": "<%= nodeDependencies['html-webpack-plugin'] %>",
     "identity-obj-proxy": "<%= nodeDependencies['identity-obj-proxy'] %>",
     "jest": "<%= nodeDependencies['jest'] %>",
@@ -110,11 +104,6 @@
 <%_ if (enableI18nRTL) { _%>
     "postcss-rtlcss": "<%= nodeDependencies['postcss-rtlcss'] %>",
 <%_ } _%>
-    "prettier": "<%= nodeDependencies['prettier'] %>",
-<%_ if (!skipServer) { _%>
-    "prettier-plugin-java": "<%= nodeDependencies['prettier-plugin-java'] %>",
-<%_ } _%>
-    "prettier-plugin-packagejson": "<%= nodeDependencies['prettier-plugin-packagejson'] %>",
     "react-infinite-scroll-component": "<%= nodeDependencies['react-infinite-scroll-component'] %>",
     "redux-mock-store": "<%= nodeDependencies['redux-mock-store'] %>",
     "rimraf": "<%= nodeDependencies['rimraf'] %>",
@@ -152,8 +141,8 @@
     "prettier:format": "prettier --write \"{,src/**/,webpack/,.blueprint/**/}*.{<%= prettierExtensions %>}\"",
     "lint": "eslint . --ext .js,.ts,.jsx,.tsx",
     "lint:fix": "<%= clientPackageManager %> run lint -- --fix",
-    "cleanup": "rimraf <%= clientDistDir %>",
-    "clean-www": "rimraf <%= clientDistDir %>app/{src,<%= temporaryDir %>}",
+    "cleanup": "rimraf <%= this.relativeDir(clientRootDir, temporaryDir) %>",
+    "clean-www": "rimraf <%= this.relativeDir(clientRootDir, clientDistDir) %>",
     "build": "<%= clientPackageManager %> run webapp:prod --",
     "build-watch": "concurrently 'npm run webapp:build:dev -- --watch'<% if(!skipServer) { %> npm:backend:start<% } %>",
     "jest": "jest --coverage --logHeapUsage --maxWorkers=2 --config jest.conf.js",
diff --git a/generators/react/templates/src/main/webapp/app/entities/_entityFolder/_entityFile-delete-dialog.tsx.ejs b/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-delete-dialog.tsx.ejs
similarity index 97%
rename from generators/react/templates/src/main/webapp/app/entities/_entityFolder/_entityFile-delete-dialog.tsx.ejs
rename to generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-delete-dialog.tsx.ejs
index 582a771e077c..8d661f303447 100644
--- a/generators/react/templates/src/main/webapp/app/entities/_entityFolder/_entityFile-delete-dialog.tsx.ejs
+++ b/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-delete-dialog.tsx.ejs
@@ -28,7 +28,7 @@ import { getEntity, deleteEntity } from './<%= entityFileName %>.reducer';
 export const <%= entityReactName %>DeleteDialog = () => {
   const dispatch = useAppDispatch();
 
-  const location = useLocation();
+  const pageLocation = useLocation();
   const navigate = useNavigate();
   const { id } = useParams<'id'>();
 
@@ -43,7 +43,7 @@ export const <%= entityReactName %>DeleteDialog = () => {
   const updateSuccess = useAppSelector(state => state.<%= entityReactState %>.updateSuccess);
 
   const handleClose = () => {
-    navigate('/<%= entityPage %>'<%_ if (paginationPagination) { _%> + location.search<%_ } _%>);
+    navigate('/<%= entityPage %>'<%_ if (paginationPagination) { _%> + pageLocation.search<%_ } _%>);
   };
 
   useEffect(() => {
diff --git a/generators/react/templates/src/main/webapp/app/entities/_entityFolder/_entityFile-detail.tsx.ejs b/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-detail.tsx.ejs
similarity index 99%
rename from generators/react/templates/src/main/webapp/app/entities/_entityFolder/_entityFile-detail.tsx.ejs
rename to generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-detail.tsx.ejs
index a6c4ec26e611..8670b931666c 100644
--- a/generators/react/templates/src/main/webapp/app/entities/_entityFolder/_entityFile-detail.tsx.ejs
+++ b/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-detail.tsx.ejs
@@ -70,12 +70,12 @@ _%>
                   <%= fieldNameHumanized %>
                 </Translate>
               </span>
-  <%_ if (field.javadoc) { _%>
+  <%_ if (field.documentation) { _%>
               <UncontrolledTooltip target="<%= fieldName %>">
     <%_ if (enableTranslation) { _%>
                 <Translate contentKey="<%= i18nKeyPrefix %>.help.<%= fieldName %>"/>
     <%_ } else { _%>
-                <%= field.javadoc %>
+                <%= field.documentation %>
     <%_ } _%>
               </UncontrolledTooltip>
   <%_ } _%>
diff --git a/generators/react/templates/src/main/webapp/app/entities/_entityFolder/_entityFile-reducer.spec.ts.ejs b/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-reducer.spec.ts.ejs
similarity index 100%
rename from generators/react/templates/src/main/webapp/app/entities/_entityFolder/_entityFile-reducer.spec.ts.ejs
rename to generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-reducer.spec.ts.ejs
diff --git a/generators/react/templates/src/main/webapp/app/entities/_entityFolder/_entityFile-update.tsx.ejs b/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.tsx.ejs
similarity index 97%
rename from generators/react/templates/src/main/webapp/app/entities/_entityFolder/_entityFile-update.tsx.ejs
rename to generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.tsx.ejs
index 81ef827d9c1c..64edaa9a0040 100644
--- a/generators/react/templates/src/main/webapp/app/entities/_entityFolder/_entityFile-update.tsx.ejs
+++ b/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.tsx.ejs
@@ -148,13 +148,18 @@ export const <%= entityReactName %>Update = () => {
     }
   }, [updateSuccess]);
 
+  // eslint-disable-next-line complexity
   const saveEntity = values => {
-<%_ for (field of fields.filter(field => !field.id)) {
+<%_ for (field of fields) {
     const fieldName = field.fieldName;
 _%>
   <%_ if (field.fieldTypeTimed)  { _%>
     values.<%= fieldName %> = convertDateTimeToServer(values.<%= fieldName %>);
-  <%_ } _%>
+  <%_ } else if (field.fieldTypeNumeric) { _%>
+    if (values.<%= fieldName %> !== undefined && typeof values.<%= fieldName %> !== 'number') {
+      values.<%= fieldName %> = Number(values.<%= fieldName %>);
+    }
+  <%_ } _%>  
 <%_ } _%>
 
     const entity = {
@@ -305,12 +310,12 @@ _%>
            <%- include('react_validators'); %>
         />
   <%_ } _%>
-  <%_ if (field.javadoc) { _%>
+  <%_ if (field.documentation) { _%>
           <UncontrolledTooltip target="<%= fieldName %>Label">
     <%_ if (enableTranslation) { _%>
             <Translate contentKey="<%= i18nKeyPrefix %>.help.<%= fieldName %>"/>
     <%_ } else { _%>
-            <%= field.javadoc %>
+            <%= field.documentation %>
     <%_ } _%>
           </UncontrolledTooltip>
   <%_ } _%>
diff --git a/generators/react/templates/src/main/webapp/app/entities/_entityFolder/_entityFile.reducer.ts.ejs b/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.reducer.ts.ejs
similarity index 100%
rename from generators/react/templates/src/main/webapp/app/entities/_entityFolder/_entityFile.reducer.ts.ejs
rename to generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.reducer.ts.ejs
diff --git a/generators/react/templates/src/main/webapp/app/entities/_entityFolder/_entityFile.tsx.ejs b/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.tsx.ejs
similarity index 97%
rename from generators/react/templates/src/main/webapp/app/entities/_entityFolder/_entityFile.tsx.ejs
rename to generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.tsx.ejs
index dba3a91392d6..5207aa51df58 100644
--- a/generators/react/templates/src/main/webapp/app/entities/_entityFolder/_entityFile.tsx.ejs
+++ b/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.tsx.ejs
@@ -69,7 +69,7 @@ import {
 export const <%= entityReactName %> = () => {
   const dispatch = useAppDispatch();
 
-  const location = useLocation();
+  const pageLocation = useLocation();
 <%_ if (!paginationInfiniteScroll) { _%>
   const navigate = useNavigate();
 <%_ } _%>
@@ -78,9 +78,9 @@ export const <%= entityReactName %> = () => {
   const [search, setSearch] = useState('');
 <%_ } _%>
 <%_ if (paginationNo) { _%>
-  const [sortState, setSortState] = useState(overrideSortStateWithQueryParams(getSortState(location, '<%= primaryKey.name %>'), location.search));
+  const [sortState, setSortState] = useState(overrideSortStateWithQueryParams(getSortState(pageLocation, '<%= primaryKey.name %>'), pageLocation.search));
 <%_ } else { _%>
-  const [paginationState, setPaginationState] = useState(overridePaginationStateWithQueryParams(getPaginationState(location, ITEMS_PER_PAGE, '<%= primaryKey.name %>'), location.search));
+  const [paginationState, setPaginationState] = useState(overridePaginationStateWithQueryParams(getPaginationState(pageLocation, ITEMS_PER_PAGE, '<%= primaryKey.name %>'), pageLocation.search));
 <%_ } _%>
 <%_ if (paginationInfiniteScroll) { _%>
   const [sorting, setSorting] = useState(false);
@@ -231,8 +231,8 @@ export const <%= entityReactName %> = () => {
   <%_ } else { _%>
     const endURL = `?page=${paginationState.activePage}&sort=${paginationState.sort},${paginationState.order}`;
   <%_ } _%>
-    if (location.search !== endURL) {
-      navigate(`${location.pathname}${endURL}`);
+    if (pageLocation.search !== endURL) {
+      navigate(`${pageLocation.pathname}${endURL}`);
     }
   };
 <%_ } _%>
@@ -250,7 +250,7 @@ export const <%= entityReactName %> = () => {
 
 <%_ if (paginationPagination) { _%>
   useEffect(() => {
-    const params = new URLSearchParams(location.search);
+    const params = new URLSearchParams(pageLocation.search);
     const page = params.get('page');
     const sort = params.get(SORT);
     if (page && sort) {
@@ -262,7 +262,7 @@ export const <%= entityReactName %> = () => {
         order: sortSplit[1]
       });
     }
-  }, [location.search]);
+  }, [pageLocation.search]);
 <%_ } _%>
 
   const sort = p => () => {
diff --git a/generators/react/templates/src/main/webapp/app/entities/_entityFolder/_entityModel.model.ts.ejs b/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityModel_.model.ts.ejs
similarity index 100%
rename from generators/react/templates/src/main/webapp/app/entities/_entityFolder/_entityModel.model.ts.ejs
rename to generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityModel_.model.ts.ejs
diff --git a/generators/react/templates/src/main/webapp/app/entities/_entityFolder/index.tsx.ejs b/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/index.tsx.ejs
similarity index 100%
rename from generators/react/templates/src/main/webapp/app/entities/_entityFolder/index.tsx.ejs
rename to generators/react/templates/src/main/webapp/app/entities/_entityFolder_/index.tsx.ejs
diff --git a/generators/react/templates/src/main/webapp/app/entities/_entityFolder/react_validators.ejs b/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/react_validators.ejs
similarity index 100%
rename from generators/react/templates/src/main/webapp/app/entities/_entityFolder/react_validators.ejs
rename to generators/react/templates/src/main/webapp/app/entities/_entityFolder_/react_validators.ejs
diff --git a/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs b/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs
index 741a43ad54af..c0608874eec9 100644
--- a/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs
+++ b/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs
@@ -38,11 +38,11 @@ import { useAppDispatch, useAppSelector } from 'app/config/store';
 export const UserManagement = () => {
   const dispatch = useAppDispatch();
 
-  const location = useLocation();
+  const pageLocation = useLocation();
   const navigate = useNavigate();
 
   const [pagination, setPagination] = useState(
-    overridePaginationStateWithQueryParams(getPaginationState(location, ITEMS_PER_PAGE, 'id'), location.search)
+    overridePaginationStateWithQueryParams(getPaginationState(pageLocation, ITEMS_PER_PAGE, 'id'), pageLocation.search)
   );
 
   const getUsersFromProps = () => {
@@ -54,8 +54,8 @@ export const UserManagement = () => {
       })
     );
     const endURL = `?page=${pagination.activePage}&sort=${pagination.sort},${pagination.order}`;
-    if (location.search !== endURL) {
-      navigate(`${location.pathname}${endURL}`);
+    if (pageLocation.search !== endURL) {
+      navigate(`${pageLocation.pathname}${endURL}`);
     }
   };
 
@@ -64,7 +64,7 @@ export const UserManagement = () => {
   }, [pagination.activePage, pagination.order, pagination.sort]);
 
   useEffect(() => {
-    const params = new URLSearchParams(location.search);
+    const params = new URLSearchParams(pageLocation.search);
     const page = params.get('page');
     const sortParam = params.get(SORT);
     if (page && sortParam) {
@@ -76,7 +76,7 @@ export const UserManagement = () => {
         order: sortSplit[1]
       });
     }
-  }, [location.search]);
+  }, [pageLocation.search]);
 
   const sort = p => () =>
     setPagination({
diff --git a/generators/react/templates/src/main/webapp/app/modules/login/login-redirect.tsx.ejs b/generators/react/templates/src/main/webapp/app/modules/login/login-redirect.tsx.ejs
index c21f9e304014..fe8f2de6015a 100644
--- a/generators/react/templates/src/main/webapp/app/modules/login/login-redirect.tsx.ejs
+++ b/generators/react/templates/src/main/webapp/app/modules/login/login-redirect.tsx.ejs
@@ -3,10 +3,10 @@ import { REDIRECT_URL } from 'app/shared/util/url-utils';
 import { useLocation } from 'react-router';
 
 export const LoginRedirect = () => {
-  const location = useLocation();
+  const pageLocation = useLocation();
 
   useEffect(() => {
-    localStorage.setItem(REDIRECT_URL, location.state.from.pathname);
+    localStorage.setItem(REDIRECT_URL, pageLocation.state.from.pathname);
     window.location.reload();
   });
 
diff --git a/generators/react/templates/src/main/webapp/app/modules/login/login.tsx.ejs b/generators/react/templates/src/main/webapp/app/modules/login/login.tsx.ejs
index 721e0835f217..0b2084f0f772 100644
--- a/generators/react/templates/src/main/webapp/app/modules/login/login.tsx.ejs
+++ b/generators/react/templates/src/main/webapp/app/modules/login/login.tsx.ejs
@@ -30,7 +30,7 @@ export const Login = () => {
   const showModalLogin = useAppSelector(state => state.authentication.showModalLogin);
   const [showModal, setShowModal] = useState(showModalLogin);
   const navigate = useNavigate();
-  const location = useLocation();
+  const pageLocation = useLocation();
 
   useEffect(() => {
     setShowModal(true);
@@ -43,7 +43,7 @@ export const Login = () => {
     navigate('/');
   };
 
-  const { from } = location.state || { from: { pathname: '/', search: location.search } };
+  const { from } = pageLocation.state || { from: { pathname: '/', search: pageLocation.search } };
   if (isAuthenticated) {
     return <Navigate to={from} replace />;
   }
diff --git a/generators/react/templates/src/main/webapp/app/routes.tsx.ejs b/generators/react/templates/src/main/webapp/app/routes.tsx.ejs
index e11bebd7e43d..e448fb393057 100644
--- a/generators/react/templates/src/main/webapp/app/routes.tsx.ejs
+++ b/generators/react/templates/src/main/webapp/app/routes.tsx.ejs
@@ -65,10 +65,10 @@ const <%= remote.capitalizedBaseName %>Routes = React.lazy(() => import('@<%= re
 
 const AppRoutes = () => {
 <%_ if (communicationSpringWebsocket) { _%>
-  const location = useLocation();
+  const pageLocation = useLocation();
   React.useEffect(() => {
-    sendActivity(location.pathname);
-  }, [location]);
+    sendActivity(pageLocation.pathname);
+  }, [pageLocation]);
 <%_ } _%>
   return (
     <div className="view-routes">
diff --git a/generators/react/templates/src/main/webapp/app/shared/auth/private-route.tsx.ejs b/generators/react/templates/src/main/webapp/app/shared/auth/private-route.tsx.ejs
index 86edbcdc2fb7..32a8e106b471 100644
--- a/generators/react/templates/src/main/webapp/app/shared/auth/private-route.tsx.ejs
+++ b/generators/react/templates/src/main/webapp/app/shared/auth/private-route.tsx.ejs
@@ -15,7 +15,7 @@ export const PrivateRoute = ({ children, hasAnyAuthorities = [], ...rest }: IOwn
   const sessionHasBeenFetched = useAppSelector(state => state.authentication.sessionHasBeenFetched);
   const account = useAppSelector(state => state.authentication.account);
   const isAuthorized = hasAnyAuthority(account.authorities, hasAnyAuthorities);
-  const location = useLocation();
+  const pageLocation = useLocation();
 
   if (!children) {
     throw new Error(`A component needs to be specified for private route for path ${(rest as any).path}`);
@@ -43,10 +43,10 @@ export const PrivateRoute = ({ children, hasAnyAuthorities = [], ...rest }: IOwn
     <Navigate
       to={{
         pathname: '<%_ if (authenticationTypeOauth2) { _%>/oauth2/authorization/oidc<%_ } else {_%>/login<%_ } _%>',
-        search: location.search,
+        search: pageLocation.search,
       }}
       replace
-      state={{ from: location }}
+      state={{ from: pageLocation }}
     />
   );
 };
diff --git a/generators/react/templates/tsconfig.json.ejs b/generators/react/templates/tsconfig.json.ejs
index b8be82f59f0c..063cc267c97a 100644
--- a/generators/react/templates/tsconfig.json.ejs
+++ b/generators/react/templates/tsconfig.json.ejs
@@ -27,19 +27,19 @@
     "experimentalDecorators": true,
     "removeComments": false,
     "noImplicitAny": false,
-    "outDir": "<%= clientDistDir %>app",
+    "outDir": "<%= this.relativeDir(clientRootDir, clientDistDir) %>app",
     "lib": ["dom", "es2015", "es2016", "es2017", "es2019", "es2020"],
     "types": ["webpack-env"],
     "allowJs": true,
     "checkJs": false,
     "baseUrl": "./",
     "paths": {
-        "app/*": ["<%= clientSrcDir %>app/*"]
+        "app/*": ["<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/*"]
     },
     "importHelpers": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true
   },
-  "include": ["<%= clientSrcDir %>app"],
+  "include": ["<%= this.relativeDir(clientRootDir, clientSrcDir) %>app"],
   "exclude": ["node_modules", "**/*.spec.ts", "**/*.spec.tsx"]
 }
diff --git a/generators/react/templates/tsconfig.test.json.ejs b/generators/react/templates/tsconfig.test.json.ejs
index c311a1705408..5cb67b0aa06a 100644
--- a/generators/react/templates/tsconfig.test.json.ejs
+++ b/generators/react/templates/tsconfig.test.json.ejs
@@ -18,16 +18,16 @@
 -%>
 {
   "extends": "./tsconfig",
-  "include": ["<%= clientSrcDir %>app", "<%= clientSrcDir %>microfrontend"],
+  "include": ["<%= this.relativeDir(clientRootDir, clientSrcDir) %>app", "<%= this.relativeDir(clientRootDir, clientSrcDir) %>microfrontend"],
   "exclude": [],
   "compilerOptions": {
     "paths": {
 <%_ if (microfrontend && applicationTypeGateway) { _%>
   <%_ for (const remote of microfrontends) { _%>
-      "@<%= remote.lowercaseBaseName %>/*": ["<%= clientSrcDir %>microfrontends/*"],
+      "@<%= remote.lowercaseBaseName %>/*": ["<%= this.relativeDir(clientRootDir, clientSrcDir) %>microfrontends/*"],
   <%_ } _%>
 <%_ } _%>
-      "app/*": ["<%= clientSrcDir %>app/*"]
+      "app/*": ["<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/*"]
    },
     "types": ["jest", "webpack-env"]
   }
diff --git a/generators/react/templates/webpack/webpack.common.js.ejs b/generators/react/templates/webpack/webpack.common.js.ejs
index d685ecccc81a..b4b98a9e5174 100644
--- a/generators/react/templates/webpack/webpack.common.js.ejs
+++ b/generators/react/templates/webpack/webpack.common.js.ejs
@@ -55,7 +55,7 @@ const getTsLoaderRule = env => {
 module.exports = async options => {
   const development = options.env === 'development';
 <%_ if (enableTranslation) { _%>
-  const languagesHash = await hashElement(path.resolve(__dirname, '../<%= clientSrcDir %>i18n'), {
+  const languagesHash = await hashElement(path.resolve(__dirname, '../<%= this.relativeDir(clientRootDir, clientSrcDir) %>i18n'), {
     algo: 'md5',
     encoding: 'hex',
     files: { include: ['*.json'] },
@@ -67,7 +67,7 @@ return merge(
   cache: {
     // 1. Set cache type to filesystem
     type: 'filesystem',
-    cacheDirectory: path.resolve(__dirname, '../<%= temporaryDir %>webpack'),
+    cacheDirectory: path.resolve(__dirname, '../<%= this.relativeDir(clientRootDir, temporaryDir) %>webpack'),
     buildDependencies: {
       // 2. Add your config as buildDependency to get cache invalidation on config change
       config: [
@@ -95,7 +95,7 @@ return merge(
       {
         test: /\.tsx?$/,
         use: getTsLoaderRule(options.env),
-        include: [utils.root('./<%= clientSrcDir %>app')],
+        include: [utils.root('./<%= this.relativeDir(clientRootDir, clientSrcDir) %>app')],
         exclude: [utils.root('node_modules')]
       }
       /*
@@ -148,17 +148,17 @@ return merge(
           from: path.join(path.dirname(require.resolve('axios/package.json')), 'dist/axios.min.js'),
           to: 'swagger-ui/',
         },
-        { from: './<%= clientSrcDir %>swagger-ui/', to: 'swagger-ui/' },
+        { from: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>swagger-ui/', to: 'swagger-ui/' },
 <%_ } _%>
-        { from: './<%= clientSrcDir %>content/', to: 'content/' },
-        { from: './<%= clientSrcDir %>favicon.ico', to: 'favicon.ico' },
-        { from: './<%= clientSrcDir %>manifest.webapp', to: 'manifest.webapp' },
+        { from: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>content/', to: 'content/' },
+        { from: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>favicon.ico', to: 'favicon.ico' },
+        { from: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>manifest.webapp', to: 'manifest.webapp' },
         // jhipster-needle-add-assets-to-webpack - JHipster will add/remove third-party resources in this array
-        { from: './<%= clientSrcDir %>robots.txt', to: 'robots.txt' }
+        { from: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>robots.txt', to: 'robots.txt' }
       ],
     }),
     new HtmlWebpackPlugin({
-      template: './<%= clientSrcDir %>index.html',
+      template: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>index.html',
       chunksSortMode: 'auto',
       inject: 'body',
       base: '/',
diff --git a/generators/react/templates/webpack/webpack.dev.js.ejs b/generators/react/templates/webpack/webpack.dev.js.ejs
index 98fa86f87781..67de16b9ec93 100644
--- a/generators/react/templates/webpack/webpack.dev.js.ejs
+++ b/generators/react/templates/webpack/webpack.dev.js.ejs
@@ -36,10 +36,10 @@ module.exports = async (options) => webpackMerge(await commonConfig({ env: ENV }
   devtool: 'cheap-module-source-map', // https://reactjs.org/docs/cross-origin-errors.html
   mode: ENV,
   entry: [
-    './<%= clientSrcDir %>app/<%= microfrontend ? 'main' : 'index' %>'
+    './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/<%= microfrontend ? 'main' : 'index' %>'
   ],
   output: {
-    path: utils.root('<%= clientDistDir %>'),
+    path: utils.root('<%= this.relativeDir(clientRootDir, clientDistDir) %>'),
     filename: '[name].[contenthash:8].js',
     chunkFilename: '[name].[chunkhash:8].chunk.js'
   },
@@ -77,7 +77,7 @@ module.exports = async (options) => webpackMerge(await commonConfig({ env: ENV }
   devServer: {
     hot: <%= !microfrontend %>,
     static: {
-      directory: './<%= clientDistDir %>',
+      directory: './<%= this.relativeDir(clientRootDir, clientDistDir) %>',
     },
     port: <%= devServerPort %>,
     proxy: [{
diff --git a/generators/react/templates/webpack/webpack.microfrontend.js.jhi.react.ejs b/generators/react/templates/webpack/webpack.microfrontend.js.jhi.react.ejs
index a6e88bd37722..189203b5ffb5 100644
--- a/generators/react/templates/webpack/webpack.microfrontend.js.jhi.react.ejs
+++ b/generators/react/templates/webpack/webpack.microfrontend.js.jhi.react.ejs
@@ -31,8 +31,8 @@ const { DefinePlugin } = require('webpack');
 <%_ } _%>
 <%_ if (applicationTypeMicroservice) { _%>
         exposes: {
-          './entities-menu': './<%= clientSrcDir %>app/entities/menu',
-          './entities-routes': './<%= clientSrcDir %>app/entities/routes',
+          './entities-menu': './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/entities/menu',
+          './entities-routes': './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/entities/routes',
         },
 <%_ } _%>
         shared: {
diff --git a/generators/react/templates/webpack/webpack.prod.js.ejs b/generators/react/templates/webpack/webpack.prod.js.ejs
index 64db819c1069..9d24c6e90e27 100644
--- a/generators/react/templates/webpack/webpack.prod.js.ejs
+++ b/generators/react/templates/webpack/webpack.prod.js.ejs
@@ -36,10 +36,10 @@ module.exports = async () => webpackMerge(await commonConfig({ env: ENV }), {
   // devtool: 'source-map', // Enable source maps. Please note that this will slow down the build
   mode: ENV,
   entry: {
-    main: './<%= clientSrcDir %>app/<%= microfrontend ? 'main' : 'index' %>'
+    main: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/<%= microfrontend ? 'main' : 'index' %>'
   },
   output: {
-    path: utils.root('<%= clientDistDir %>'),
+    path: utils.root('<%= this.relativeDir(clientRootDir, clientDistDir) %>'),
     filename: '[name].[contenthash:8].js',
     chunkFilename: '[name].[chunkhash:8].chunk.js'
   },
diff --git a/generators/server/__snapshots__/generator.spec.mjs.snap b/generators/server/__snapshots__/generator.spec.mjs.snap
index 74dcdfbd34d8..af4ccadc7dff 100644
--- a/generators/server/__snapshots__/generator.spec.mjs.snap
+++ b/generators/server/__snapshots__/generator.spec.mjs.snap
@@ -683,3 +683,554 @@ exports[`generator - server composing databaseType option no with session should
   },
 }
 `;
+
+exports[`generator - server with entities should match files snapshot 1`] = `
+{
+  ".devcontainer/Dockerfile": {
+    "stateCleared": "modified",
+  },
+  ".devcontainer/devcontainer.json": {
+    "stateCleared": "modified",
+  },
+  ".editorconfig": {
+    "stateCleared": "modified",
+  },
+  ".gitattributes": {
+    "stateCleared": "modified",
+  },
+  ".gitignore": {
+    "stateCleared": "modified",
+  },
+  ".husky/pre-commit": {
+    "stateCleared": "modified",
+  },
+  ".jhipster/Bar.json": {
+    "stateCleared": "modified",
+  },
+  ".jhipster/Foo.json": {
+    "stateCleared": "modified",
+  },
+  ".lintstagedrc.cjs": {
+    "stateCleared": "modified",
+  },
+  ".mvn/jvm.config": {
+    "stateCleared": "modified",
+  },
+  ".mvn/wrapper/maven-wrapper.jar": {
+    "stateCleared": "modified",
+  },
+  ".mvn/wrapper/maven-wrapper.properties": {
+    "stateCleared": "modified",
+  },
+  ".prettierignore": {
+    "stateCleared": "modified",
+  },
+  ".prettierrc": {
+    "stateCleared": "modified",
+  },
+  ".yo-rc.json": {
+    "stateCleared": "modified",
+  },
+  "README.md": {
+    "stateCleared": "modified",
+  },
+  "checkstyle.xml": {
+    "stateCleared": "modified",
+  },
+  "mvnw": {
+    "stateCleared": "modified",
+  },
+  "mvnw.cmd": {
+    "stateCleared": "modified",
+  },
+  "package.json": {
+    "stateCleared": "modified",
+  },
+  "pom.xml": {
+    "stateCleared": "modified",
+  },
+  "sonar-project.properties": {
+    "stateCleared": "modified",
+  },
+  "src/main/docker/app.yml": {
+    "stateCleared": "modified",
+  },
+  "src/main/docker/grafana/provisioning/dashboards/JVM.json": {
+    "stateCleared": "modified",
+  },
+  "src/main/docker/grafana/provisioning/dashboards/dashboard.yml": {
+    "stateCleared": "modified",
+  },
+  "src/main/docker/grafana/provisioning/datasources/datasource.yml": {
+    "stateCleared": "modified",
+  },
+  "src/main/docker/jhipster-control-center.yml": {
+    "stateCleared": "modified",
+  },
+  "src/main/docker/jib/entrypoint.sh": {
+    "stateCleared": "modified",
+  },
+  "src/main/docker/monitoring.yml": {
+    "stateCleared": "modified",
+  },
+  "src/main/docker/postgresql.yml": {
+    "stateCleared": "modified",
+  },
+  "src/main/docker/prometheus/prometheus.yml": {
+    "stateCleared": "modified",
+  },
+  "src/main/docker/services.yml": {
+    "stateCleared": "modified",
+  },
+  "src/main/docker/sonar.yml": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/ApplicationWebXml.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/GeneratedByJHipster.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/JhipsterApp.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/aop/logging/LoggingAspect.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/aop/logging/package-info.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/config/ApplicationProperties.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/config/AsyncConfiguration.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/config/CRLFLogConverter.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/config/CacheConfiguration.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/config/Constants.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/config/DatabaseConfiguration.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/config/DateTimeFormatConfiguration.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/config/JacksonConfiguration.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/config/LiquibaseConfiguration.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/config/LocaleConfiguration.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/config/LoggingAspectConfiguration.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/config/LoggingConfiguration.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/config/SecurityConfiguration.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/config/SecurityJwtConfiguration.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/config/WebConfigurer.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/config/package-info.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/domain/AbstractAuditingEntity.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/domain/Authority.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/domain/Bar.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/domain/Foo.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/domain/User.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/domain/package-info.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/management/SecurityMetersService.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/management/package-info.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/package-info.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/repository/AuthorityRepository.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/repository/BarRepository.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/repository/FooRepository.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/repository/UserRepository.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/repository/package-info.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/security/AuthoritiesConstants.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/security/DomainUserDetailsService.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/security/SecurityUtils.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/security/SpringSecurityAuditorAware.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/security/UserNotActivatedException.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/security/package-info.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/service/EmailAlreadyUsedException.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/service/InvalidPasswordException.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/service/MailService.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/service/UserService.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/service/UsernameAlreadyUsedException.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/service/dto/AdminUserDTO.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/service/dto/BarDTO.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/service/dto/PasswordChangeDTO.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/service/dto/UserDTO.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/service/dto/package-info.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/service/mapper/BarMapper.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/service/mapper/EntityMapper.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/service/mapper/UserMapper.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/service/mapper/package-info.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/service/package-info.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/web/rest/AccountResource.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/web/rest/AuthenticateController.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/web/rest/BarResource.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/web/rest/FooResource.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/web/rest/PublicUserResource.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/web/rest/UserResource.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/web/rest/errors/BadRequestAlertException.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/web/rest/errors/EmailAlreadyUsedException.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/web/rest/errors/ErrorConstants.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/web/rest/errors/ExceptionTranslator.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/web/rest/errors/FieldErrorVM.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/web/rest/errors/InvalidPasswordException.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/web/rest/errors/LoginAlreadyUsedException.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/web/rest/errors/package-info.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/web/rest/package-info.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/web/rest/vm/KeyAndPasswordVM.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/web/rest/vm/LoginVM.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/web/rest/vm/ManagedUserVM.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/web/rest/vm/package-info.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/resources/banner.txt": {
+    "stateCleared": "modified",
+  },
+  "src/main/resources/config/application-dev.yml": {
+    "stateCleared": "modified",
+  },
+  "src/main/resources/config/application-prod.yml": {
+    "stateCleared": "modified",
+  },
+  "src/main/resources/config/application-tls.yml": {
+    "stateCleared": "modified",
+  },
+  "src/main/resources/config/application.yml": {
+    "stateCleared": "modified",
+  },
+  "src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml": {
+    "stateCleared": "modified",
+  },
+  "src/main/resources/config/liquibase/changelog/20160926101210_added_entity_Foo.xml": {
+    "stateCleared": "modified",
+  },
+  "src/main/resources/config/liquibase/changelog/20160926101211_added_entity_Bar.xml": {
+    "stateCleared": "modified",
+  },
+  "src/main/resources/config/liquibase/data/authority.csv": {
+    "stateCleared": "modified",
+  },
+  "src/main/resources/config/liquibase/data/user.csv": {
+    "stateCleared": "modified",
+  },
+  "src/main/resources/config/liquibase/data/user_authority.csv": {
+    "stateCleared": "modified",
+  },
+  "src/main/resources/config/liquibase/fake-data/bar.csv": {
+    "stateCleared": "modified",
+  },
+  "src/main/resources/config/liquibase/fake-data/foo.csv": {
+    "stateCleared": "modified",
+  },
+  "src/main/resources/config/liquibase/master.xml": {
+    "stateCleared": "modified",
+  },
+  "src/main/resources/config/tls/keystore.p12": {
+    "stateCleared": "modified",
+  },
+  "src/main/resources/i18n/messages.properties": {
+    "stateCleared": "modified",
+  },
+  "src/main/resources/i18n/messages_en.properties": {
+    "stateCleared": "modified",
+  },
+  "src/main/resources/i18n/messages_fr.properties": {
+    "stateCleared": "modified",
+  },
+  "src/main/resources/logback-spring.xml": {
+    "stateCleared": "modified",
+  },
+  "src/main/resources/templates/error.html": {
+    "stateCleared": "modified",
+  },
+  "src/main/resources/templates/mail/activationEmail.html": {
+    "stateCleared": "modified",
+  },
+  "src/main/resources/templates/mail/creationEmail.html": {
+    "stateCleared": "modified",
+  },
+  "src/main/resources/templates/mail/passwordResetEmail.html": {
+    "stateCleared": "modified",
+  },
+  "src/main/webapp/i18n/en/global.json": {
+    "stateCleared": "modified",
+  },
+  "src/main/webapp/i18n/fr/global.json": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/IntegrationTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/TechnicalStructureTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/config/AsyncSyncConfiguration.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/config/EmbeddedSQL.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/config/PostgreSqlTestContainer.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/config/SpringBootTestClassOrderer.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/config/SqlTestContainer.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/config/SqlTestContainersSpringContextCustomizerFactory.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/config/WebConfigurerTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/config/WebConfigurerTestController.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/config/timezone/HibernateTimeZoneIT.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/domain/BarTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/domain/FooTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/management/SecurityMetersServiceTests.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/repository/timezone/DateTimeWrapper.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/repository/timezone/DateTimeWrapperRepository.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/security/DomainUserDetailsServiceIT.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/security/SecurityUtilsUnitTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/security/jwt/AuthenticationIntegrationTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/security/jwt/JwtAuthenticationTestUtils.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/security/jwt/TokenAuthenticationIT.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/security/jwt/TokenAuthenticationSecurityMetersIT.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/service/MailServiceIT.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/service/UserServiceIT.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/service/dto/BarDTOTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/service/mapper/BarMapperTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/service/mapper/UserMapperTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/web/rest/AccountResourceIT.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/web/rest/AuthenticateControllerIT.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/web/rest/BarResourceIT.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/web/rest/FooResourceIT.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/web/rest/PublicUserResourceIT.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/web/rest/TestUtil.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/web/rest/UserResourceIT.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/web/rest/WithUnauthenticatedMockUser.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/web/rest/errors/ExceptionTranslatorIT.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/web/rest/errors/ExceptionTranslatorTestController.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/resources/META-INF/spring.factories": {
+    "stateCleared": "modified",
+  },
+  "src/test/resources/config/application-testdev.yml": {
+    "stateCleared": "modified",
+  },
+  "src/test/resources/config/application-testprod.yml": {
+    "stateCleared": "modified",
+  },
+  "src/test/resources/config/application.yml": {
+    "stateCleared": "modified",
+  },
+  "src/test/resources/i18n/messages_en.properties": {
+    "stateCleared": "modified",
+  },
+  "src/test/resources/i18n/messages_fr.properties": {
+    "stateCleared": "modified",
+  },
+  "src/test/resources/junit-platform.properties": {
+    "stateCleared": "modified",
+  },
+  "src/test/resources/logback.xml": {
+    "stateCleared": "modified",
+  },
+  "src/test/resources/templates/mail/activationEmail.html": {
+    "stateCleared": "modified",
+  },
+  "src/test/resources/templates/mail/creationEmail.html": {
+    "stateCleared": "modified",
+  },
+  "src/test/resources/templates/mail/passwordResetEmail.html": {
+    "stateCleared": "modified",
+  },
+  "src/test/resources/templates/mail/testEmail.html": {
+    "stateCleared": "modified",
+  },
+}
+`;
diff --git a/generators/server/cleanup.mts b/generators/server/cleanup.mts
index 8a090643b1f8..f6158d25ec26 100644
--- a/generators/server/cleanup.mts
+++ b/generators/server/cleanup.mts
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import cleanupOauth2 from './cleanup-oauth2.mjs';
-import { DOCKER_DIR } from '../generator-constants.mjs';
+import { JAVA_DOCKER_DIR } from '../generator-constants.mjs';
 
 import type BaseGenerator from '../base/index.mjs';
 import { GeneratorDefinition } from '../base-application/generator.mjs';
@@ -91,8 +91,8 @@ export default function cleanupOldServerFilesTask(this: BaseGenerator, taskParam
   }
   if (this.isJhipsterVersionLessThan('5.2.2')) {
     if (application.authenticationTypeOauth2 && application.applicationTypeMicroservice) {
-      this.removeFolder(`${DOCKER_DIR}realm-config`);
-      this.removeFile(`${DOCKER_DIR}keycloak.yml`);
+      this.removeFolder(`${JAVA_DOCKER_DIR}realm-config`);
+      this.removeFile(`${JAVA_DOCKER_DIR}keycloak.yml`);
     }
   }
   if (this.isJhipsterVersionLessThan('5.8.0')) {
@@ -159,7 +159,7 @@ export default function cleanupOldServerFilesTask(this: BaseGenerator, taskParam
     this.removeFile(`${application.javaPackageSrcDir}TestContainersSpringContextCustomizerFactory.java`);
   }
   if (this.isJhipsterVersionLessThan('7.8.2')) {
-    this.removeFile(`${DOCKER_DIR}realm-config/jhipster-users-0.json`);
+    this.removeFile(`${JAVA_DOCKER_DIR}realm-config/jhipster-users-0.json`);
     this.removeFile(`${application.javaPackageSrcDir}NoOpMailConfiguration.java`);
   }
   if (this.isJhipsterVersionLessThan('7.10.0')) {
diff --git a/generators/server/command.mts b/generators/server/command.mts
index b0d9645024e6..71c6417b164e 100644
--- a/generators/server/command.mts
+++ b/generators/server/command.mts
@@ -16,11 +16,37 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import chalk from 'chalk';
 import { JHipsterCommandDefinition } from '../base/api.mjs';
 import { GENERATOR_JAVA, GENERATOR_LIQUIBASE, GENERATOR_SPRING_DATA_RELATIONAL } from '../generator-list.mjs';
+import { APPLICATION_TYPE_GATEWAY, APPLICATION_TYPE_MICROSERVICE, APPLICATION_TYPE_MONOLITH } from '../../jdl/index.js';
 
 const command: JHipsterCommandDefinition = {
   options: {
+    authenticationType: {
+      name: 'auth',
+      description: 'Provide authentication type for the application when skipping server side generation',
+      type: String,
+      scope: 'storage',
+    },
+    db: {
+      description: 'Provide DB name for the application when skipping server side generation',
+      type: String,
+    },
+    incrementalChangelog: {
+      description: 'Creates incremental database changelogs',
+      type: Boolean,
+      scope: 'storage',
+    },
+    skipUserManagement: {
+      description: 'Skip the user management module during app generation',
+      type: Boolean,
+      scope: 'storage',
+    },
+    recreateInitialChangelog: {
+      description: 'Recreate the initial database changelog based on the current config',
+      type: Boolean,
+    },
     buildTool: {
       name: 'build',
       description: 'Provide build tool for the application when skipping server side generation',
@@ -57,10 +83,20 @@ const command: JHipsterCommandDefinition = {
       type: String,
       scope: 'storage',
     },
+    skipCheckLengthOfIdentifier: {
+      description: 'Skip check the length of the identifier, only for recent Oracle databases that support 30+ characters metadata',
+      type: Boolean,
+      scope: 'storage',
+    },
     skipDbChangelog: {
       description: 'Skip the generation of database migrations',
       type: Boolean,
     },
+    skipFakeData: {
+      description: 'Skip generation of fake data for development',
+      type: Boolean,
+      scope: 'storage',
+    },
     websocket: {
       description: 'Provide websocket option for the application when skipping server side generation',
       type: String,
@@ -86,6 +122,32 @@ const command: JHipsterCommandDefinition = {
       hide: true,
     },
   },
+  configs: {
+    applicationType: {
+      description: 'Application type to generate',
+      cli: {
+        type: String,
+      },
+      prompt: {
+        type: 'list',
+        message: `Which ${chalk.yellow('*type*')} of application would you like to create?`,
+      },
+      choices: [
+        {
+          value: APPLICATION_TYPE_MONOLITH,
+          name: 'Monolithic application (recommended for simple projects)',
+        },
+        {
+          value: APPLICATION_TYPE_GATEWAY,
+          name: 'Gateway application',
+        },
+        {
+          value: APPLICATION_TYPE_MICROSERVICE,
+          name: 'Microservice application',
+        },
+      ],
+    },
+  },
   import: [GENERATOR_JAVA, GENERATOR_LIQUIBASE, GENERATOR_SPRING_DATA_RELATIONAL],
 };
 
diff --git a/generators/server/entity-files.mjs b/generators/server/entity-files.mjs
index a200690a919f..fb3b63e3893c 100644
--- a/generators/server/entity-files.mjs
+++ b/generators/server/entity-files.mjs
@@ -17,63 +17,24 @@
  * limitations under the License.
  */
 import fs from 'fs';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import chalk from 'chalk';
 import { cleanupOldFiles } from './entity-cleanup.mjs';
-import {
-  moveToJavaEntityPackageSrcDir,
-  moveToJavaEntityPackageTestDir,
-  moveToJavaPackageSrcDir,
-  moveToJavaPackageTestDir,
-  replaceEntityFilePathVariables,
-} from './support/index.mjs';
-import { SERVER_MAIN_SRC_DIR, SERVER_TEST_SRC_DIR } from '../generator-constants.mjs';
+import { moveToJavaPackageSrcDir, javaMainPackageTemplatesBlock, javaTestPackageTemplatesBlock } from './support/index.mjs';
+import { SERVER_TEST_SRC_DIR } from '../generator-constants.mjs';
 import { databaseTypes, entityOptions } from '../../jdl/jhipster/index.mjs';
-import { getEnumInfo } from '../base-application/support/index.mjs';
 
 const { COUCHBASE, MONGODB, NEO4J, SQL } = databaseTypes;
 const { MapperTypes, ServiceTypes } = entityOptions;
 const { MAPSTRUCT } = MapperTypes;
 const { SERVICE_CLASS, SERVICE_IMPL } = ServiceTypes;
 
-export const modelFiles = {
-  model: [
-    {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
-      renameTo: moveToJavaEntityPackageSrcDir,
-      templates: ['domain/_PersistClass_.java.jhi'],
-    },
-  ],
-  modelTestFiles: [
-    {
-      path: `${SERVER_TEST_SRC_DIR}package/`,
-      renameTo: moveToJavaEntityPackageTestDir,
-      templates: ['domain/_PersistClass_Test.java'],
-    },
-  ],
-};
-
-/**
- * The default is to use a file path string. It implies use of the template method.
- * For any other config an object { file:.., method:.., template:.. } can be used
- */
-export const entityFiles = {
-  server: [
-    {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
-      renameTo: moveToJavaEntityPackageSrcDir,
-      templates: ['domain/_PersistClass_.java.jhi.jakarta_validation'],
-    },
-  ],
-};
-
 export const restFiles = {
   restFiles: [
     {
       condition: generator => !generator.embedded,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
-      renameTo: moveToJavaEntityPackageSrcDir,
-      templates: ['web/rest/_EntityClass_Resource.java'],
+      ...javaMainPackageTemplatesBlock('_entityPackage_/'),
+      templates: ['web/rest/_entityClass_Resource.java'],
     },
   ],
   restTestFiles: [
@@ -82,7 +43,7 @@ export const restFiles = {
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
-          file: 'package/web/rest/_EntityClass_ResourceIT.java',
+          file: '_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java',
           options: {
             context: {
               _,
@@ -102,9 +63,8 @@ export const filteringFiles = {
   filteringFiles: [
     {
       condition: generator => generator.jpaMetamodelFiltering && !generator.reactive,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
-      renameTo: moveToJavaEntityPackageSrcDir,
-      templates: ['service/criteria/_EntityClass_Criteria.java', 'service/_EntityClass_QueryService.java'],
+      ...javaMainPackageTemplatesBlock('_entityPackage_/'),
+      templates: ['service/criteria/_entityClass_Criteria.java', 'service/_entityClass_QueryService.java'],
     },
   ],
 };
@@ -113,13 +73,9 @@ const filteringReactiveFiles = {
   filteringReactiveFiles: [
     {
       condition: generator => generator.jpaMetamodelFiltering && generator.reactive,
-      path: SERVER_MAIN_SRC_DIR,
-      templates: [
-        {
-          file: 'package/service/criteria/_EntityClass_Criteria.java',
-          renameTo: generator => `${generator.entityAbsoluteFolder}/domain/criteria/${generator.entityClass}Criteria.java`,
-        },
-      ],
+      ...javaMainPackageTemplatesBlock('_entityPackage_/'),
+      renameTo: (data, file) => moveToJavaPackageSrcDir(data, file).replace('service/', 'domain/'),
+      templates: ['service/criteria/_entityClass_Criteria.java'],
     },
   ],
 };
@@ -128,15 +84,13 @@ export const respositoryFiles = {
   respositoryFiles: [
     {
       condition: generator => !generator.reactive && !generator.embedded && generator.databaseType !== COUCHBASE,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
-      renameTo: moveToJavaEntityPackageSrcDir,
-      templates: ['repository/_EntityClass_Repository.java'],
+      ...javaMainPackageTemplatesBlock('_entityPackage_/'),
+      templates: ['repository/_entityClass_Repository.java'],
     },
     {
       condition: generator => generator.reactive && !generator.embedded && generator.databaseType !== COUCHBASE,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
-      renameTo: moveToJavaEntityPackageSrcDir,
-      templates: ['repository/_EntityClass_Repository_reactive.java'],
+      ...javaMainPackageTemplatesBlock('_entityPackage_/'),
+      templates: ['repository/_entityClass_Repository_reactive.java'],
     },
   ],
 };
@@ -145,45 +99,43 @@ export const serviceFiles = {
   serviceFiles: [
     {
       condition: generator => generator.service === SERVICE_IMPL && !generator.embedded,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
-      renameTo: moveToJavaEntityPackageSrcDir,
-      templates: ['service/_EntityClass_Service.java', 'service/impl/_EntityClass_ServiceImpl.java'],
+      ...javaMainPackageTemplatesBlock('_entityPackage_/'),
+      templates: ['service/_entityClass_Service.java', 'service/impl/_entityClass_ServiceImpl.java'],
     },
-    {
+    javaMainPackageTemplatesBlock({
       condition: generator => generator.service === SERVICE_CLASS && !generator.embedded,
-      path: SERVER_MAIN_SRC_DIR,
-      templates: [
-        {
-          file: 'package/service/impl/_EntityClass_ServiceImpl.java',
-          renameTo: generator =>
-            replaceEntityFilePathVariables(generator, `${generator.entityAbsoluteFolder}/service/_EntityClass_Service.java`),
-        },
-      ],
-    },
+      relativePath: '_entityPackage_/',
+      renameTo: (_data, file) => file.replace('service/impl', 'service').replace('Impl.java', '.java'),
+      templates: ['service/impl/_entityClass_ServiceImpl.java'],
+    }),
   ],
 };
 
 export const dtoFiles = {
+  baseDtoFiles: [
+    {
+      condition: generator => generator.dto === MAPSTRUCT,
+      ...javaMainPackageTemplatesBlock('_entityPackage_/'),
+      templates: ['service/mapper/EntityMapper.java'],
+    },
+  ],
   dtoFiles: [
     {
       condition: generator => generator.dto === MAPSTRUCT,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
-      renameTo: moveToJavaEntityPackageSrcDir,
-      templates: ['service/dto/_DtoClass_.java', 'service/mapper/EntityMapper.java', 'service/mapper/_EntityClass_Mapper.java'],
+      ...javaMainPackageTemplatesBlock('_entityPackage_/'),
+      templates: ['service/dto/_dtoClass_.java', 'service/mapper/_entityClass_Mapper.java'],
     },
   ],
   dtoTestFiles: [
     {
       condition: generator => generator.dto === MAPSTRUCT,
-      path: `${SERVER_TEST_SRC_DIR}package/`,
-      renameTo: moveToJavaEntityPackageTestDir,
-      templates: ['service/dto/_DtoClass_Test.java'],
+      ...javaTestPackageTemplatesBlock('_entityPackage_/'),
+      templates: ['service/dto/_dtoClass_Test.java'],
     },
     {
       condition: generator => generator.dto === MAPSTRUCT && [SQL, MONGODB, COUCHBASE, NEO4J].includes(generator.databaseType),
-      path: `${SERVER_TEST_SRC_DIR}package/`,
-      renameTo: moveToJavaEntityPackageTestDir,
-      templates: ['service/mapper/_EntityClass_MapperTest.java'],
+      ...javaTestPackageTemplatesBlock('_entityPackage_/'),
+      templates: ['service/mapper/_entityClass_MapperTest.java'],
     },
   ],
 };
@@ -191,24 +143,23 @@ export const dtoFiles = {
 const userFiles = {
   userFiles: [
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      ...javaMainPackageTemplatesBlock(),
       renameTo: (data, file) => moveToJavaPackageSrcDir(data, file).replace('/User.java', `/${data.user.persistClass}.java`),
       templates: ['domain/User.java'],
     },
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      ...javaMainPackageTemplatesBlock(),
       renameTo: (data, file) => moveToJavaPackageSrcDir(data, file).replace('/UserDTO.java', `/${data.user.dtoClass}.java`),
       templates: ['service/dto/UserDTO.java'],
     },
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      ...javaMainPackageTemplatesBlock(),
       renameTo: (data, file) => moveToJavaPackageSrcDir(data, file).replace('/AdminUserDTO.java', `/${data.user.adminUserDto}.java`),
       templates: ['service/dto/AdminUserDTO.java'],
     },
     {
       condition: data => data.generateBuiltInUserEntity,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
-      renameTo: moveToJavaPackageSrcDir,
+      ...javaMainPackageTemplatesBlock(),
       templates: [
         'service/UserService.java',
         'service/mapper/UserMapper.java',
@@ -218,8 +169,7 @@ const userFiles = {
     },
     {
       condition: data => data.generateBuiltInUserEntity,
-      path: `${SERVER_TEST_SRC_DIR}package/`,
-      renameTo: moveToJavaPackageTestDir,
+      ...javaTestPackageTemplatesBlock(),
       templates: [
         'service/UserServiceIT.java',
         'service/mapper/UserMapperTest.java',
@@ -231,8 +181,6 @@ const userFiles = {
 };
 
 export const serverFiles = {
-  ...modelFiles,
-  ...entityFiles,
   ...restFiles,
   ...filteringFiles,
   ...filteringReactiveFiles,
@@ -259,35 +207,11 @@ export function writeFiles() {
         } else if (!entity.builtIn) {
           await this.writeFiles({
             sections: serverFiles,
-            rootTemplatesPath: application.reactive ? ['entity/reactive', 'entity'] : 'entity',
+            rootTemplatesPath: application.reactive ? ['reactive', '', '../../java/templates/'] : ['', '../../java/templates/'],
             context: { ...application, ...entity },
           });
         }
       }
     },
-
-    async writeEnumFiles({ application, entities }) {
-      for (const entity of entities.filter(entity => !entity.skipServer)) {
-        for (const field of entity.fields.filter(field => field.fieldIsEnum)) {
-          const fieldType = field.fieldType;
-          const enumInfo = {
-            ...getEnumInfo(field, entity.clientRootFolder),
-            frontendAppName: application.frontendAppName,
-            packageName: application.packageName,
-            entityAbsolutePackage: entity.entityAbsolutePackage || application.packageName,
-          };
-          await this.writeFiles({
-            templates: [
-              {
-                sourceFile: `${SERVER_MAIN_SRC_DIR}package/domain/enumeration/Enum.java.ejs`,
-                destinationFile: `${SERVER_MAIN_SRC_DIR}${entity.entityAbsoluteFolder}/domain/enumeration/${fieldType}.java`,
-              },
-            ],
-            rootTemplatesPath: application.reactive ? ['entity/reactive', 'entity'] : 'entity',
-            context: enumInfo,
-          });
-        }
-      }
-    },
   };
 }
diff --git a/generators/server/files.mjs b/generators/server/files.mjs
index d11ff93f32c5..67d3facffdff 100644
--- a/generators/server/files.mjs
+++ b/generators/server/files.mjs
@@ -24,12 +24,12 @@ import { moveToJavaPackageSrcDir, moveToJavaPackageTestDir, moveToSrcMainResourc
 const imperativeConfigFiles = {
   imperativeFiles: [
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['ApplicationWebXml.java'],
     },
     {
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: ['config/WebConfigurerTest.java', 'config/WebConfigurerTestController.java'],
     },
@@ -39,12 +39,12 @@ const imperativeConfigFiles = {
 const reactiveConfigFiles = {
   reactiveFiles: [
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['config/ReactorConfiguration.java'],
     },
     {
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: ['config/JHipsterBlockHoundIntegration.java'],
     },
@@ -58,13 +58,13 @@ const reactiveConfigFiles = {
 const feignFiles = {
   microserviceFeignFiles: [
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['config/FeignConfiguration.java'],
     },
     {
       condition: generator => generator.authenticationTypeOauth2,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: [
         'security/oauth2/AuthorizationHeaderUtil.java',
@@ -75,13 +75,13 @@ const feignFiles = {
     },
     {
       condition: generator => generator.authenticationTypeJwt,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['client/UserFeignClientInterceptor_jwt.java'],
     },
     {
       condition: generator => generator.authenticationTypeOauth2,
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: ['security/oauth2/AuthorizationHeaderUtilTest.java'],
     },
@@ -91,7 +91,7 @@ const feignFiles = {
 const oauth2Files = {
   oauth2Files: [
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: [
         'security/oauth2/AudienceValidator.java',
@@ -100,19 +100,19 @@ const oauth2Files = {
       ],
     },
     {
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: ['security/oauth2/AudienceValidatorTest.java', 'config/TestSecurityConfiguration.java'],
     },
     {
       condition: generator => generator.applicationTypeMonolith,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['config/OAuth2Configuration.java'],
     },
     {
       condition: generator => generator.generateAuthenticationApi,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['web/rest/AuthInfoResource.java', data => `web/rest/LogoutResource_${data.imperativeOrReactive}.java`],
     },
@@ -121,7 +121,7 @@ const oauth2Files = {
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
-          file: generator => `package/web/filter/OAuth2${generator.reactive ? 'Reactive' : ''}RefreshTokensWebFilter.java`,
+          file: generator => `_package_/web/filter/OAuth2${generator.reactive ? 'Reactive' : ''}RefreshTokensWebFilter.java`,
           renameTo: generator =>
             `${generator.packageFolder}web/filter/OAuth2${generator.reactive ? 'Reactive' : ''}RefreshTokensWebFilter.java`,
         },
@@ -129,19 +129,19 @@ const oauth2Files = {
     },
     {
       condition: generator => generator.generateAuthenticationApi,
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: ['test/util/OAuth2TestUtil.java', 'web/rest/LogoutResourceIT.java'],
     },
     {
       condition: generator => !generator.reactive && generator.generateAuthenticationApi,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['security/oauth2/CustomClaimConverter.java'],
     },
     {
       condition: generator => !generator.reactive && generator.generateAuthenticationApi,
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: ['security/oauth2/CustomClaimConverterIT.java'],
     },
@@ -151,7 +151,7 @@ const oauth2Files = {
 const accountFiles = {
   accountResource: [
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: [
         data => {
@@ -163,12 +163,12 @@ const accountFiles = {
     },
     {
       condition: data => data.generateUserManagement,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['web/rest/vm/ManagedUserVM.java'],
     },
     {
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: [
         data => {
@@ -184,7 +184,7 @@ const accountFiles = {
 const userManagementFiles = {
   userManagementFiles: [
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: [
         'security/DomainUserDetailsService.java',
@@ -202,7 +202,7 @@ const userManagementFiles = {
       ],
     },
     {
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: ['service/MailServiceIT.java', 'security/DomainUserDetailsServiceIT.java'],
     },
@@ -230,12 +230,12 @@ const userManagementFiles = {
 const jwtFiles = {
   jwtBaseFiles: [
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['config/SecurityJwtConfiguration.java', 'management/SecurityMetersService.java'],
     },
     {
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: [
         'management/SecurityMetersServiceTests.java',
@@ -250,19 +250,19 @@ const jwtFiles = {
   entrypointFiles: [
     {
       condition: data => !data.generateAuthenticationApi,
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: ['security/jwt/TestAuthenticationResource.java'],
     },
     {
       condition: generator => generator.generateAuthenticationApi,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['web/rest/vm/LoginVM.java', 'web/rest/AuthenticateController.java'],
     },
     {
       condition: generator => generator.generateAuthenticationApi,
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: ['web/rest/AuthenticateControllerIT.java'],
     },
@@ -273,19 +273,19 @@ const gatewayFiles = {
   gatewayFiles: [
     {
       condition: generator => generator.authenticationTypeJwt,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['security/jwt/JWTRelayGatewayFilterFactory.java'],
     },
     {
       condition: generator => generator.serviceDiscoveryAny,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['web/rest/vm/RouteVM.java', 'web/rest/GatewayResource.java', 'web/filter/ModifyServersOpenApiFilter.java'],
     },
     {
       condition: generator => generator.serviceDiscoveryAny,
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: ['web/filter/ModifyServersOpenApiFilterTest.java'],
     },
@@ -295,7 +295,7 @@ const gatewayFiles = {
 const swaggerFiles = {
   swagger: [
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['config/OpenApiConfiguration.java'],
     },
@@ -321,9 +321,14 @@ export const baseServerFiles = {
       templates: ['entrypoint.sh'],
     },
   ],
+  readme: [
+    {
+      templates: ['README.md.jhi.spring-boot'],
+    },
+  ],
   packageJson: [
     {
-      condition: generator => generator.skipClient,
+      condition: generator => generator.clientFrameworkNo,
       templates: ['package.json'],
     },
   ],
@@ -350,7 +355,7 @@ export const baseServerFiles = {
       templates: ['pom.xml'],
     },
     {
-      condition: generator => !generator.skipClient,
+      condition: generator => generator.useNpmWrapper,
       transform: false,
       templates: ['npmw', 'npmw.cmd'],
     },
@@ -380,41 +385,41 @@ export const baseServerFiles = {
     {
       condition: generator =>
         !generator.reactive && (generator.databaseTypeSql || generator.databaseTypeMongodb || generator.databaseTypeCouchbase),
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['security/SpringSecurityAuditorAware.java'],
     },
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['security/SecurityUtils.java', 'security/AuthoritiesConstants.java'],
     },
     {
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: [data => `security/SecurityUtilsUnitTest_${data.imperativeOrReactive}.java`],
     },
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: [data => `config/SecurityConfiguration_${data.imperativeOrReactive}.java`],
     },
     {
       condition: data => data.generateInMemoryUserCredentials && !data.reactive && data.authenticationTypeJwt,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['config/SecurityInMemoryConfiguration.java'],
     },
     {
       condition: generator => generator.generateUserManagement && generator.authenticationTypeSession && !generator.reactive,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['security/PersistentTokenRememberMeServices.java', 'domain/PersistentToken.java'],
     },
     {
       condition: generator =>
         generator.generateUserManagement && generator.authenticationTypeSession && !generator.reactive && !generator.databaseTypeCouchbase,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['repository/PersistentTokenRepository.java'],
     },
@@ -439,19 +444,19 @@ export const baseServerFiles = {
     },
     {
       condition: generator => generator.serviceDiscoveryAny && generator.serviceDiscoveryEureka,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['config/EurekaWorkaroundConfiguration.java'],
     },
   ],
   serverJavaApp: [
     {
-      path: `${SERVER_MAIN_SRC_DIR}package`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: (data, filename) => moveToJavaPackageSrcDir(data, filename.replace('Application.java', `${data.mainClass}.java`)),
       templates: ['Application.java'],
     },
     {
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: [
         'TechnicalStructureTest.java',
@@ -463,7 +468,7 @@ export const baseServerFiles = {
   ],
   serverJavaConfig: [
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: [
         'aop/logging/LoggingAspect.java',
@@ -484,12 +489,12 @@ export const baseServerFiles = {
         generator.databaseTypeSql ||
         generator.databaseTypeMongodb ||
         generator.databaseTypeCouchbase,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['config/Constants.java'],
     },
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: [data => `config/LocaleConfiguration_${data.imperativeOrReactive}.java`],
     },
@@ -498,14 +503,14 @@ export const baseServerFiles = {
     {
       condition: generator =>
         generator.databaseTypeSql || generator.databaseTypeMongodb || generator.databaseTypeNeo4j || generator.databaseTypeCouchbase,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['domain/AbstractAuditingEntity.java'],
     },
   ],
   serverJavaWebError: [
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: [
         'web/rest/errors/BadRequestAlertException.java',
@@ -517,45 +522,45 @@ export const baseServerFiles = {
   ],
   serverJavaWeb: [
     {
-      condition: generator => !generator.skipClient && !generator.reactive,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      condition: generator => generator.clientFrameworkAny && !generator.reactive,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['config/StaticResourcesWebConfiguration.java'],
     },
     {
       // TODO : add these tests to reactive
-      condition: generator => !generator.skipClient && !generator.reactive,
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      condition: generator => generator.clientFrameworkAny && !generator.reactive,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: ['config/StaticResourcesWebConfigurerTest.java'],
     },
     {
-      condition: generator => !generator.skipClient,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      condition: generator => generator.clientFrameworkAny,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: [data => `web/filter/SpaWebFilter_${data.imperativeOrReactive}.java`],
     },
     {
-      condition: generator => !generator.skipClient,
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      condition: generator => generator.clientFrameworkAny,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: [data => `web/filter/SpaWebFilterIT_${data.imperativeOrReactive}.java`],
     },
     {
-      condition: generator => !generator.skipClient && generator.reactive,
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      condition: generator => generator.clientFrameworkAny && generator.reactive,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: ['web/filter/SpaWebFilterTestController_reactive.java'],
     },
   ],
   serverTestFw: [
     {
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: ['web/rest/TestUtil.java', 'web/rest/errors/ExceptionTranslatorTestController.java'],
     },
     {
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: [data => `web/rest/errors/ExceptionTranslatorIT_${data.imperativeOrReactive}.java`],
     },
@@ -567,7 +572,7 @@ export const baseServerFiles = {
   serverJavaUserManagement: [
     {
       condition: generator => generator.generateBuiltInAuthorityEntity,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['domain/Authority.java', 'repository/AuthorityRepository.java'],
     },
@@ -577,12 +582,12 @@ export const baseServerFiles = {
         generator.searchEngineElasticsearch ||
         generator.databaseTypeCouchbase ||
         generator.searchEngineCouchbase,
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: ['config/TestContainersSpringContextCustomizerFactory.java'],
     },
     {
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: ['web/rest/WithUnauthenticatedMockUser.java'],
     },
diff --git a/generators/server/generator.mjs b/generators/server/generator.mjs
index 92671e9ca50b..96818b40fd69 100644
--- a/generators/server/generator.mjs
+++ b/generators/server/generator.mjs
@@ -29,8 +29,6 @@ import {
   javaBeanCase as javaBeanClassNameFormat,
   buildJavaGetter as javaGetter,
   buildJavaSetter as javaSetter,
-  formatDocAsApiDescription,
-  formatDocAsJavaDoc,
   getJavaValueGeneratorForType as getJavaValueForType,
   getPrimaryKeyValue as getPKValue,
   generateKeyStore,
@@ -144,54 +142,35 @@ const WAIT_TIMEOUT = 3 * 60000;
 const { NO: NO_PAGINATION } = PaginationTypes;
 const { NO: NO_SERVICE } = ServiceTypes;
 
-/**
- * @class
- * @extends {BaseApplicationGenerator<import('./index.mjs').GeneratorDefinition>}
- */
 export default class JHipsterServerGenerator extends BaseApplicationGenerator {
   /** @type {string} */
   jhipsterDependenciesVersion;
   /** @type {string} */
   projectVersion;
   fakeKeytool;
+  command = command;
 
-  async beforeQueue() {
-    loadStoredAppOptions.call(this);
-
-    // TODO depend on GENERATOR_BOOTSTRAP_APPLICATION_SERVER.
-    await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
-    await this.dependsOnJHipster(GENERATOR_COMMON);
-    await this.dependsOnJHipster(GENERATOR_JAVA);
-
+  async beforeQueue(useNpmWrapper = true) {
     if (!this.fromBlueprint) {
+      loadStoredAppOptions.call(this);
       await this.composeWithBlueprints(GENERATOR_SERVER);
     }
 
-    // Not using normal blueprints or this is a normal blueprint.
-    if ((!this.fromBlueprint && !this.delegateToBlueprint) || (this.fromBlueprint && this.sbsBlueprint)) {
-      this.setFeatures({
-        customInstallTask: async function customInstallTask(preferredPm, defaultInstallTask) {
-          const buildTool = this.jhipsterConfig.buildTool;
-          if ((preferredPm && preferredPm !== 'npm') || this.jhipsterConfig.skipClient || (buildTool !== GRADLE && buildTool !== MAVEN)) {
-            return defaultInstallTask();
-          }
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+      await this.dependsOnJHipster(GENERATOR_COMMON);
+      await this.dependsOnJHipster(GENERATOR_JAVA);
 
-          const npmCommand = process.platform === 'win32' ? 'npmw' : './npmw';
-          try {
-            await this.spawnCommand(npmCommand, ['install'], { preferLocal: true });
-          } catch (error) {
-            this.log.error(chalk.red(`Error executing '${npmCommand} install', please execute it yourself. (${error.shortMessage})`));
-          }
-          return true;
-        }.bind(this),
-      });
+      if (useNpmWrapper) {
+        this.useNpmWrapperInstallTask();
+      }
     }
   }
 
   get initializing() {
     return this.asInitializingTaskGroup({
       loadConfig() {
-        this.parseJHipsterOptions(command.options);
+        this.parseJHipsterCommand(this.command);
       },
     });
   }
@@ -202,6 +181,10 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
 
   get prompting() {
     return this.asPromptingTaskGroup({
+      async prompting({ control }) {
+        if (control.existingProject && this.options.askAnswered !== true) return;
+        await this.prompt(this.prepareQuestions(this.command.configs));
+      },
       askForServerTestOpts,
       askForServerSideOpts,
       askForOptionalItems,
@@ -252,7 +235,6 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
 
         await this.composeWithJHipster(GENERATOR_DOCKER);
 
-        // We don't expose client/server to cli, composing with languages is used for test purposes.
         if (enableTranslation) {
           await this.composeWithJHipster(GENERATOR_LANGUAGES);
         }
@@ -332,10 +314,11 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
 
         application.JAVA_VERSION = this.useVersionPlaceholders ? 'JAVA_VERSION' : JAVA_VERSION;
         application.JAVA_COMPATIBLE_VERSIONS = JAVA_COMPATIBLE_VERSIONS;
+        application.javaCompatibleVersions = JAVA_COMPATIBLE_VERSIONS;
 
         if (this.projectVersion) {
-          this.log.info(`Using projectVersion: ${application.projectVersion}`);
           application.projectVersion = this.projectVersion;
+          this.log.info(`Using projectVersion: ${application.projectVersion}`);
         } else {
           application.projectVersion = '0.0.1-SNAPSHOT';
         }
@@ -368,7 +351,8 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
       prepareForTemplates({ application }) {
         const SPRING_BOOT_VERSION = application.javaDependencies['spring-boot'];
         application.addSpringMilestoneRepository =
-          ADD_SPRING_MILESTONE_REPOSITORY || SPRING_BOOT_VERSION.includes('M') || SPRING_BOOT_VERSION.includes('RC');
+          (application.backendType ?? 'Java') === 'Java' &&
+          (ADD_SPRING_MILESTONE_REPOSITORY || SPRING_BOOT_VERSION.includes('M') || SPRING_BOOT_VERSION.includes('RC'));
       },
       registerSpringFactory({ source, application }) {
         source.addTestSpringFactory = ({ key, value }) => {
@@ -464,21 +448,17 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
         }
       },
       configureEntityTable({ application, entityName, entityConfig, entityStorage }) {
+        if ((application.applicationTypeGateway && entityConfig.microserviceName) || entityConfig.skipServer) return;
+
         entityConfig.entityTableName = entityConfig.entityTableName || hibernateSnakeCase(entityName);
 
-        const fixedEntityTableName = this._fixEntityTableName(
-          entityConfig.entityTableName,
-          entityConfig.prodDatabaseType ?? application.prodDatabaseType,
-          application.jhiTablePrefix,
-        );
+        const databaseType =
+          entityConfig.prodDatabaseType ?? application.prodDatabaseType ?? entityConfig.databaseType ?? application.databaseType;
+        const fixedEntityTableName = this._fixEntityTableName(entityConfig.entityTableName, databaseType, application.jhiTablePrefix);
         if (fixedEntityTableName !== entityConfig.entityTableName) {
           entityConfig.entityTableName = fixedEntityTableName;
         }
-        const validation = this._validateTableName(
-          entityConfig.entityTableName,
-          entityConfig.prodDatabaseType ?? application.prodDatabaseType,
-          entityConfig,
-        );
+        const validation = this._validateTableName(entityConfig.entityTableName, databaseType, entityConfig);
         if (validation !== true) {
           throw new Error(validation);
         }
@@ -970,6 +950,25 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
     }
   }
 
+  useNpmWrapperInstallTask() {
+    this.setFeatures({
+      customInstallTask: async function customInstallTask(preferredPm, defaultInstallTask) {
+        const buildTool = this.jhipsterConfig.buildTool;
+        if ((preferredPm && preferredPm !== 'npm') || this.jhipsterConfig.skipClient || (buildTool !== GRADLE && buildTool !== MAVEN)) {
+          return defaultInstallTask();
+        }
+
+        const npmCommand = process.platform === 'win32' ? 'npmw' : './npmw';
+        try {
+          await this.spawnCommand(npmCommand, ['install'], { preferLocal: true });
+        } catch (error) {
+          this.log.error(chalk.red(`Error executing '${npmCommand} install', please execute it yourself. (${error.shortMessage})`));
+        }
+        return true;
+      }.bind(this),
+    });
+  }
+
   _validateRelationship(entityName, relationship) {
     if (relationship.otherEntityName === undefined) {
       throw new Error(
@@ -999,39 +998,6 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
     return entityTableName;
   }
 
-  /**
-   * @private
-   * Format As Field Javadoc
-   *
-   * @param {string} text - text to format
-   * @returns field javadoc
-   */
-  formatAsFieldJavadoc(text) {
-    return formatDocAsJavaDoc(text, 4);
-  }
-
-  /**
-   * @private
-   * Format As Api Description
-   *
-   * @param {string} text - text to format
-   * @returns formatted api description
-   */
-  formatAsApiDescription(text) {
-    return formatDocAsApiDescription(text);
-  }
-
-  /**
-   * @private
-   * Format As Class Javadoc
-   *
-   * @param {string} text - text to format
-   * @returns class javadoc
-   */
-  formatAsClassJavadoc(text) {
-    return formatDocAsJavaDoc(text, 0);
-  }
-
   /**
    * @private
    * Return the method name which converts the filter to specification
diff --git a/generators/server/generator.spec.mjs b/generators/server/generator.spec.mjs
index e70c86590aeb..21e06c328fe5 100644
--- a/generators/server/generator.spec.mjs
+++ b/generators/server/generator.spec.mjs
@@ -196,4 +196,22 @@ describe(`generator - ${generator}`, () => {
       });
     });
   });
+
+  describe('with entities', () => {
+    before(async () => {
+      await helpers.runJHipster(GENERATOR_SERVER).withJHipsterConfig({ skipClient: true }, [
+        { name: 'Foo', changelogDate: '20160926101210', fields: [{ fieldName: 'name', fieldType: 'String' }] },
+        {
+          name: 'Bar',
+          changelogDate: '20160926101211',
+          dto: 'mapstruct',
+          fields: [{ fieldName: 'name', fieldType: 'String', fieldValidateRules: ['required'] }],
+        },
+      ]);
+    });
+
+    it('should match files snapshot', () => {
+      expect(runResult.getStateSnapshot()).toMatchSnapshot();
+    });
+  });
 });
diff --git a/generators/server/internal/build-application.mjs b/generators/server/internal/build-application.mjs
deleted file mode 100644
index b1a0e22dd99e..000000000000
--- a/generators/server/internal/build-application.mjs
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Copyright 2013-2023 the original author or authors from the JHipster project.
- *
- * This file is part of the JHipster project, see https://www.jhipster.tech/
- * for more information.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import os from 'os';
-import { exec } from 'child_process';
-import { buildToolTypes } from '../../../jdl/index.js';
-
-const { GRADLE } = buildToolTypes;
-const isWin32 = os.platform() === 'win32';
-
-/**
- * build a generated application.
- *
- * @param {String} buildTool - maven | gradle
- * @param {String} profile - dev | prod
- * @param {Boolean} buildWar - build a war instead of a jar
- * @param {Function} cb - callback when build is complete
- * @returns {object} the command line and its result
- */
-export const buildApplication = (buildTool, profile, buildWar, cb) => {
-  let buildCmd = 'mvnw -ntp verify -B';
-
-  if (buildTool === GRADLE) {
-    buildCmd = 'gradlew';
-    if (buildWar) {
-      buildCmd += ' bootWar';
-    } else {
-      buildCmd += ' bootJar';
-    }
-  }
-  if (buildWar) {
-    buildCmd += ' -Pwar';
-  }
-
-  if (!isWin32) {
-    buildCmd = `./${buildCmd}`;
-  }
-  buildCmd += ` -P${profile}`;
-  return {
-    stdout: exec(buildCmd, { maxBuffer: 1024 * 10000 }, cb).stdout,
-    buildCmd,
-  };
-};
diff --git a/generators/server/internal/index.mts b/generators/server/internal/index.mts
deleted file mode 100644
index 561117944595..000000000000
--- a/generators/server/internal/index.mts
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright 2013-2023 the original author or authors from the JHipster project.
- *
- * This file is part of the JHipster project, see https://www.jhipster.tech/
- * for more information.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-export * from './build-application.mjs';
diff --git a/generators/server/jdl/application-definition.mts b/generators/server/jdl/application-definition.mts
index bf42d158474e..6c159590be23 100644
--- a/generators/server/jdl/application-definition.mts
+++ b/generators/server/jdl/application-definition.mts
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { JDLApplicationConfig, JHipsterOptionDefinition } from '../../../jdl/types/types.mjs';
 import databaseMigrationOption from '../options/database-migration.mjs';
 import messageBrokerOption from '../options/message-broker.mjs';
diff --git a/generators/server/options/database-migration.spec.ts b/generators/server/options/database-migration.spec.ts
index c840140f6908..df0f769e0a0f 100644
--- a/generators/server/options/database-migration.spec.ts
+++ b/generators/server/options/database-migration.spec.ts
@@ -18,10 +18,4 @@ describe(`generators - server - jdl - ${optionName}`, () => {
       });
     });
   });
-  describe('with invalid value', () => {
-    it('should set expected value', () => {
-      const importer = createImporterFromContent(`application { config { ${optionName} foo } }`);
-      expect(() => importer.import()).toThrow(`Unknown value 'foo' for option '${optionName}'.`);
-    });
-  });
 });
diff --git a/generators/server/options/message-broker.spec.ts b/generators/server/options/message-broker.spec.ts
index 0e3192ef2c7f..9b4517a1b889 100644
--- a/generators/server/options/message-broker.spec.ts
+++ b/generators/server/options/message-broker.spec.ts
@@ -18,10 +18,4 @@ describe('generators - server - jdl - messageBroker', () => {
       });
     });
   });
-  describe('with invalid value', () => {
-    it('should set expected value', () => {
-      const importer = createImporterFromContent(`application { config { ${MESSAGE_BROKER} foo } }`);
-      expect(() => importer.import()).toThrow(/Unknown value 'foo' for option 'messageBroker'./);
-    });
-  });
 });
diff --git a/generators/server/prompts.mjs b/generators/server/prompts.mjs
index 0b8345ba650f..04ad88fb9fbe 100644
--- a/generators/server/prompts.mjs
+++ b/generators/server/prompts.mjs
@@ -18,7 +18,7 @@
  */
 
 import chalk from 'chalk';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 
 import {
   applicationOptions,
diff --git a/generators/server/resources/Dockerfile b/generators/server/resources/Dockerfile
index 0551f1fa4993..b6411455de76 100644
--- a/generators/server/resources/Dockerfile
+++ b/generators/server/resources/Dockerfile
@@ -13,17 +13,17 @@ LABEL ALIAS=consul-config-loader
 FROM postgres:16.0
 LABEL ALIAS=postgresql
 
-FROM quay.io/keycloak/keycloak:22.0.3
+FROM quay.io/keycloak/keycloak:22.0.4
 LABEL ALIAS=keycloak
 
 FROM mysql:8.1.0
 
 FROM mariadb:11.1.2
 
-FROM mongo:7.0.1
+FROM mongo:7.0.2
 LABEL ALIAS=mongodb
 
-FROM couchbase/server:7.2.0
+FROM couchbase/server:7.2.2
 LABEL ALIAS=couchbase
 
 FROM cassandra:3.11.14
@@ -33,29 +33,29 @@ LABEL ALIAS=mssql
 
 FROM neo4j:5.12.0
 
-FROM hazelcast/management-center:5.3.2
+FROM hazelcast/management-center:5.3.3
 LABEL ALIAS=hazelcast
 
-FROM memcached:1.6.21-alpine
+FROM memcached:1.6.22-alpine
 
-FROM redis:7.2.1
+FROM redis:7.2.2
 
-FROM confluentinc/cp-kafka:7.5.0
+FROM confluentinc/cp-kafka:7.5.1
 LABEL ALIAS=kafka
 
-FROM confluentinc/cp-zookeeper:7.5.0
+FROM confluentinc/cp-zookeeper:7.5.1
 LABEL ALIAS=zookeeper
 
 FROM apachepulsar/pulsar:3.0.1
 LABEL ALIAS=pulsar
 
-FROM sonarqube:10.2.0-community
+FROM sonarqube:10.2.1-community
 LABEL ALIAS=sonar
 
-FROM docker.io/bitnami/consul:1.16.1
+FROM docker.io/bitnami/consul:1.16.2
 LABEL ALIAS=consul
 
-FROM prom/prometheus:v2.47.0
+FROM prom/prometheus:v2.47.2
 LABEL ALIAS=prometheus
 
 FROM prom/alertmanager:v0.26.0
@@ -64,7 +64,7 @@ LABEL ALIAS=prometheus-alertmanager
 FROM quay.io/coreos/prometheus-operator:v0.42.1
 LABEL ALIAS=prometheus-operator
 
-FROM grafana/grafana:10.1.1
+FROM grafana/grafana:10.1.5
 LABEL ALIAS=grafana
 
 FROM quay.io/coreos/grafana-watcher:v0.0.8
diff --git a/generators/server/resources/gradle/libs.versions.toml b/generators/server/resources/gradle/libs.versions.toml
index a9259ab56bba..b52d6bcc6018 100644
--- a/generators/server/resources/gradle/libs.versions.toml
+++ b/generators/server/resources/gradle/libs.versions.toml
@@ -1,18 +1,18 @@
 [plugins]
 gradle-git-properties = { id = 'com.gorylenko.gradle-git-properties', version = '2.4.1' }
 
-node-gradle = { id = 'com.github.node-gradle.node', version = '7.0.0' }
+node-gradle = { id = 'com.github.node-gradle.node', version = '7.0.1' }
 
 gradle-liquibase = { id = 'org.liquibase.gradle', version = '2.2.0' }
 
-gradle-sonarqube = { id = 'org.sonarqube', version = '4.3.1.3277' }
+gradle-sonarqube = { id = 'org.sonarqube', version = '4.4.1.3373' }
 
-spotless-gradle-plugin = { id = 'com.diffplug.spotless', version = '6.21.0' }
+spotless-gradle-plugin = { id = 'com.diffplug.spotless', version = '6.22.0' }
 
-gradle-modernizer-plugin = { id = 'com.github.andygoossens.gradle-modernizer-plugin', version = '1.8.0' }
+gradle-modernizer-plugin = { id = 'com.github.andygoossens.gradle-modernizer-plugin', version = '1.9.0' }
 
-gradle-enterprise = { id = 'com.gradle.enterprise', version = '3.15' }
+gradle-enterprise = { id = 'com.gradle.enterprise', version = '3.15.1' }
 
-common-custom-user-data-gradle-plugin = { id = 'com.gradle.common-custom-user-data-gradle-plugin', version = '1.11.2' }
+common-custom-user-data-gradle-plugin = { id = 'com.gradle.common-custom-user-data-gradle-plugin', version = '1.11.3' }
 
-gatling-gradle = { id = 'io.gatling.gradle', version = '3.9.5.5' }
+gatling-gradle = { id = 'io.gatling.gradle', version = '3.9.5.6' }
diff --git a/generators/server/resources/pom.xml b/generators/server/resources/pom.xml
index 0f0d3428f2c2..26cc999cc1d7 100644
--- a/generators/server/resources/pom.xml
+++ b/generators/server/resources/pom.xml
@@ -13,29 +13,29 @@
         <blockhound-junit-platform.version>1.0.8.RELEASE</blockhound-junit-platform.version>
         <commons-beanutils.version>1.9.4</commons-beanutils.version>
         <gatling.version>3.9.5</gatling.version>
-        <h2.version>2.2.222</h2.version>
+        <h2.version>2.2.224</h2.version>
         <hazelcast-hibernate53.version>5.1.0</hazelcast-hibernate53.version>
         <hazelcast-spring.version>5.3.2</hazelcast-spring.version>
         <jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
         <jaxb-runtime.version>4.0.3</jaxb-runtime.version>
         <junit-platform-launcher.version>1.10.0</junit-platform-launcher.version>
-        <liquibase.version>4.23.2</liquibase.version>
+        <liquibase.version>4.24.0</liquibase.version>
         <mapstruct.version>1.5.5.Final</mapstruct.version>
-        <micrometer-context-propagation.version>1.0.5</micrometer-context-propagation.version>
+        <micrometer-context-propagation.version>1.0.6</micrometer-context-propagation.version>
         <picocli.version>4.7.5</picocli.version>
         <spring-pulsar.version>0.2.0</spring-pulsar.version>
-        <typesafe.version>1.4.2</typesafe.version>
+        <typesafe.version>1.4.3</typesafe.version>
         <validation-api.version>3.0.2</validation-api.version>
 
         <!-- Plugin versions -->
-        <checkstyle.version>10.12.3</checkstyle.version>
+        <checkstyle.version>10.12.4</checkstyle.version>
         <checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
         <frontend-maven-plugin.version>1.14.0</frontend-maven-plugin.version>
-        <gatling-maven-plugin.version>4.5.0</gatling-maven-plugin.version>
+        <gatling-maven-plugin.version>4.6.0</gatling-maven-plugin.version>
         <git-commit-id-maven-plugin.version>6.0.0</git-commit-id-maven-plugin.version>
-        <jib-maven-plugin.version>3.3.2</jib-maven-plugin.version>
+        <jib-maven-plugin.version>3.4.0</jib-maven-plugin.version>
         <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
-        <jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
+        <jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
         <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
         <maven-checkstyle-plugin.version>3.3.0</maven-checkstyle-plugin.version>
         <maven-clean-plugin.version>3.3.1</maven-clean-plugin.version>
@@ -50,12 +50,12 @@
         <maven-site-plugin.version>3.12.1</maven-site-plugin.version>
         <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
         <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
-        <modernizer-maven-plugin.version>2.6.0</modernizer-maven-plugin.version>
+        <modernizer-maven-plugin.version>2.7.0</modernizer-maven-plugin.version>
         <nohttp-checkstyle.version>0.0.11</nohttp-checkstyle.version>
-        <openapi-generator-maven-plugin.version>7.0.0</openapi-generator-maven-plugin.version>
+        <openapi-generator-maven-plugin.version>7.0.1</openapi-generator-maven-plugin.version>
         <properties-maven-plugin.version>1.2.0</properties-maven-plugin.version>
         <sonar-maven-plugin.version>3.10.0.2594</sonar-maven-plugin.version>
-        <spotless-maven-plugin.version>2.39.0</spotless-maven-plugin.version>
+        <spotless-maven-plugin.version>2.40.0</spotless-maven-plugin.version>
     </properties>
 
     <dependencyManagement>
diff --git a/generators/server/support/config.mts b/generators/server/support/config.mts
index 34722c1ea737..dd72581ce729 100644
--- a/generators/server/support/config.mts
+++ b/generators/server/support/config.mts
@@ -1,4 +1,4 @@
-import { normalizePathEnd } from '../../base/support/index.mjs';
+import { mutateData, normalizePathEnd, pickFields } from '../../base/support/index.mjs';
 
 import {
   databaseTypes,
@@ -42,44 +42,44 @@ const NO_SEARCH_ENGINE = searchEngineTypes.NO;
  * all variables should be referred from config,
  */
 export const loadServerConfig = ({ config, application }: { config: any; application: any }) => {
-  application.packageName = config.packageName;
-  application.packageFolder = config.packageFolder && normalizePathEnd(config.packageFolder);
-  (application as any).serverPort = config.serverPort;
-
-  application.srcMainJava = SERVER_MAIN_SRC_DIR;
-  application.srcMainResources = SERVER_MAIN_RES_DIR;
-  application.srcMainWebapp = CLIENT_MAIN_SRC_DIR;
-  application.srcTestJava = SERVER_TEST_SRC_DIR;
-  application.srcTestResources = SERVER_TEST_RES_DIR;
-  application.srcTestJavascript = CLIENT_TEST_SRC_DIR;
-
-  application.buildTool = config.buildTool;
-
-  application.databaseType = config.databaseType;
-  application.databaseMigration = config.databaseMigration;
-  application.devDatabaseType = config.devDatabaseType;
-  application.prodDatabaseType = config.prodDatabaseType;
-  application.incrementalChangelog = config.incrementalChangelog;
-  application.reactive = config.reactive;
-  application.searchEngine = config.searchEngine;
-  (application as any).cacheProvider = config.cacheProvider;
-  (application as any).enableHibernateCache = config.enableHibernateCache;
-  (application as any).serviceDiscoveryType = config.serviceDiscoveryType;
-
-  application.enableSwaggerCodegen = config.enableSwaggerCodegen;
-  application.messageBroker = config.messageBroker;
-  (application as any).websocket = config.websocket;
-  application.embeddableLaunchScript = config.embeddableLaunchScript;
-
-  application.enableGradleEnterprise = config.enableGradleEnterprise;
-
-  if (config.gradleEnterpriseHost) {
-    if (config.gradleEnterpriseHost.startsWith('https://')) {
-      (application as any).gradleEnterpriseHost = config.gradleEnterpriseHost;
-    } else {
-      (application as any).gradleEnterpriseHost = `https://${config.gradleEnterpriseHost}`;
-    }
-  }
+  mutateData(
+    application,
+    {
+      srcMainJava: SERVER_MAIN_SRC_DIR,
+      srcMainResources: SERVER_MAIN_RES_DIR,
+      srcMainWebapp: CLIENT_MAIN_SRC_DIR,
+      srcTestJava: SERVER_TEST_SRC_DIR,
+      srcTestResources: SERVER_TEST_RES_DIR,
+      srcTestJavascript: CLIENT_TEST_SRC_DIR,
+    },
+    pickFields(config, [
+      'packageName',
+      'packageFolder',
+      'serverPort',
+      'buildTool',
+      'databaseType',
+      'databaseMigration',
+      'devDatabaseType',
+      'prodDatabaseType',
+      'incrementalChangelog',
+      'reactive',
+      'searchEngine',
+      'cacheProvider',
+      'enableHibernateCache',
+      'serviceDiscoveryType',
+      'enableSwaggerCodegen',
+      'messageBroker',
+      'websocket',
+      'embeddableLaunchScript',
+      'enableGradleEnterprise',
+      'gradleEnterpriseHost',
+    ]),
+    {
+      packageFolder: ({ packageFolder }) => (packageFolder ? normalizePathEnd(packageFolder) : packageFolder),
+      gradleEnterpriseHost: ({ gradleEnterpriseHost }) =>
+        !gradleEnterpriseHost || gradleEnterpriseHost.startsWith('https://') ? gradleEnterpriseHost : `https://${gradleEnterpriseHost}`,
+    },
+  );
 };
 
 /**
@@ -87,8 +87,7 @@ export const loadServerConfig = ({ config, application }: { config: any; applica
  * @param {import('./base-application/types.js').PlatformApplication} dest - destination context to use default is context
  */
 export const loadPlatformConfig = ({ config, application }: { config: any; application: PlatformApplication }) => {
-  application.serviceDiscoveryType = config.serviceDiscoveryType;
-  application.monitoring = config.monitoring;
+  mutateData(application, pickFields(config, ['serviceDiscoveryType', 'monitoring']));
 };
 
 export const loadDerivedServerAndPlatformProperties = ({ application }: { application: any }) => {
@@ -114,18 +113,11 @@ export const loadDerivedPlatformConfig = ({ application }: { application: Platfo
  * @param {import('./bootstrap-application-server/types').SpringBootApplication} dest - destination context to use default is context
  */
 export const loadDerivedServerConfig = ({ application }: { application: any }) => {
-  if (!application.packageFolder) {
-    application.packageFolder = `${application.packageName.replace(/\./g, '/')}/`;
-  }
-
-  application.prodDatabaseTypePostgres = undefined;
+  application.prodDatabaseTypePostgresql = undefined;
   application.prodDatabaseTypeMssql = undefined;
   application.devDatabaseTypeH2Any = undefined;
   application.prodDatabaseTypeMariadb = undefined;
 
-  application.javaPackageSrcDir = normalizePathEnd(`${application.srcMainJava}${application.packageFolder}`);
-  application.javaPackageTestDir = normalizePathEnd(`${application.srcTestJava}${application.packageFolder}`);
-
   application.communicationSpringWebsocket = application.websocket === SPRING_WEBSOCKET;
 
   if (!application.searchEngine) {
@@ -147,10 +139,6 @@ export const loadDerivedServerConfig = ({ application }: { application: any }) =
   application.buildToolMaven = application.buildTool === MAVEN;
   application.buildToolUnknown = !application.buildToolGradle && !application.buildToolMaven;
 
-  application.temporaryDir = application.buildToolGradle ? 'build/' : 'target/';
-  const buildDestinationDir = `${application.temporaryDir}${application.buildToolGradle ? 'resources/main/' : 'classes/'}`;
-  application.clientDistDir = `${buildDestinationDir}${CLIENT_DIST_DIR}`;
-
   application.cacheProviderNo = !application.cacheProvider || application.cacheProvider === NO_CACHE;
   application.cacheProviderCaffeine = application.cacheProvider === CAFFEINE;
   application.cacheProviderEhcache = application.cacheProvider === EHCACHE;
@@ -172,9 +160,18 @@ export const loadDerivedServerConfig = ({ application }: { application: any }) =
     ? application.databaseMigration === 'liquibase'
     : application.databaseType === SQL;
 
-  application.imperativeOrReactive = application.reactive ? 'reactive' : 'imperative';
+  mutateData(application, {
+    packageFolder: ({ packageName }) => `${packageName.replace(/\./g, '/')}/`,
+    javaPackageSrcDir: ({ srcMainJava, packageFolder }) => normalizePathEnd(`${srcMainJava}${packageFolder}`),
+    javaPackageTestDir: ({ srcTestJava, packageFolder }) => normalizePathEnd(`${srcTestJava}${packageFolder}`),
+
+    temporaryDir: ({ buildToolGradle }) => (buildToolGradle ? 'build/' : 'target/'),
+    clientDistDir: ({ temporaryDir, buildToolGradle }) =>
+      `${temporaryDir}${buildToolGradle ? 'resources/main/' : 'classes/'}${CLIENT_DIST_DIR}`,
 
-  application.authenticationUsesCsrf = [OAUTH2, SESSION].includes(application.authenticationType);
+    authenticationUsesCsrf: ({ authenticationType }) => [OAUTH2, SESSION].includes(authenticationType),
+    imperativeOrReactive: ({ reactive }) => (reactive ? 'reactive' : 'imperative'),
+  });
 
   if (application.databaseTypeSql) {
     prepareSqlApplicationProperties({ application });
diff --git a/generators/server/support/dependabot-gradle.mts b/generators/server/support/dependabot-gradle.mts
index d3dd8c955091..e74feb1ffe25 100644
--- a/generators/server/support/dependabot-gradle.mts
+++ b/generators/server/support/dependabot-gradle.mts
@@ -25,5 +25,5 @@ type LibsToml = {
 // eslint-disable-next-line import/prefer-default-export
 export function getGradleLibsVersionsProperties(libsVersionsContent: string): Record<string, string> {
   const parsed = parse(libsVersionsContent) as LibsToml;
-  return Object.fromEntries(Object.entries(parsed.plugins).map(([dependecyName, dependency]) => [dependecyName, dependency.version]));
+  return Object.fromEntries(Object.entries(parsed.plugins).map(([dependencyName, dependency]) => [dependencyName, dependency.version]));
 }
diff --git a/generators/server/support/index.mts b/generators/server/support/index.mts
index 1e7da766915b..1e4621a2da87 100644
--- a/generators/server/support/index.mts
+++ b/generators/server/support/index.mts
@@ -28,6 +28,7 @@ export * from './needles.mjs';
 export { default as prepareEntity } from './prepare-entity.mjs';
 export * from './prepare-entity.mjs';
 export { default as prepareField } from './prepare-field.mjs';
+export * from './prepare-relationship.mjs';
 export * from './relationship.mjs';
 export * from './spring-factories.mjs';
 export * from './string.mjs';
diff --git a/generators/server/support/java-formatting.mjs b/generators/server/support/java-formatting.mjs
index 2e97f3a40a3a..f1c84a1d7e5b 100644
--- a/generators/server/support/java-formatting.mjs
+++ b/generators/server/support/java-formatting.mjs
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 
 /**
  * @private
diff --git a/generators/server/support/needles.mts b/generators/server/support/needles.mts
index 0c95b3fe020e..a326f09b08dd 100644
--- a/generators/server/support/needles.mts
+++ b/generators/server/support/needles.mts
@@ -45,7 +45,7 @@ type ApplicationPropertiesNeedles = {
  *   'ApplicationProperties.java',
  *   insertContentIntoApplicationProperties({
  *     property: 'private final bar = new Bar();',
- *     proppertyGetter: `
+ *     propertyGetter: `
  * public getBar() {
  *     return bar;
  * }`,
diff --git a/generators/server/support/prepare-entity.mjs b/generators/server/support/prepare-entity.mjs
index d5839df5e271..6af56fb24ce6 100644
--- a/generators/server/support/prepare-entity.mjs
+++ b/generators/server/support/prepare-entity.mjs
@@ -21,9 +21,10 @@ import path from 'path';
 import { databaseTypes, searchEngineTypes } from '../../../jdl/jhipster/index.mjs';
 
 import { isReservedTableName } from '../../../jdl/jhipster/reserved-keywords.js';
-import { normalizePathEnd } from '../../base/support/index.mjs';
+import { mutateData, normalizePathEnd } from '../../base/support/index.mjs';
 import { hibernateSnakeCase } from './string.mjs';
 import { getDatabaseTypeData } from './database.mjs';
+import { formatDocAsApiDescription, formatDocAsJavaDoc } from './doc.mjs';
 
 const { ELASTICSEARCH } = searchEngineTypes;
 const NO_SEARCH_ENGINE = searchEngineTypes.NO;
@@ -44,6 +45,11 @@ export default function prepareEntity(entity) {
   entity.entityAbsoluteFolder = entityAbsoluteFolder;
   entity.entityAbsoluteClass = `${entityAbsolutePackage}.domain.${persistClass}`;
 
+  mutateData(entity, {
+    entityJavadoc: ({ documentation }) => (documentation ? formatDocAsJavaDoc(documentation) : documentation),
+    entityApiDescription: ({ documentation }) => (documentation ? formatDocAsApiDescription(documentation) : documentation),
+  });
+
   if (isReservedTableName(entity.entityInstance, entity.prodDatabaseType ?? entity.databaseType) && entity.jhiPrefix) {
     entity.entityInstanceDbSafe = `${entity.jhiPrefix}${entity.entityClass}`;
   } else {
@@ -90,7 +96,7 @@ export function preparePostEntityServerDerivedProperties(entity) {
   entity.relationshipsContainOtherSideIgnore = entity.relationships.some(relationship => relationship.ignoreOtherSideProperty);
 
   entity.importApiModelProperty =
-    entity.relationships.some(relationship => relationship.javadoc) || entity.fields.some(field => field.javadoc);
+    entity.relationships.some(relationship => relationship.documentation) || entity.fields.some(field => field.documentation);
 
   entity.uniqueEnums = {};
 
diff --git a/generators/server/support/prepare-field.mjs b/generators/server/support/prepare-field.mjs
index d148c26b2201..2ddc4988da48 100644
--- a/generators/server/support/prepare-field.mjs
+++ b/generators/server/support/prepare-field.mjs
@@ -17,11 +17,12 @@
  * limitations under the License.
  */
 import assert from 'assert';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 
 import { databaseTypes, entityOptions, fieldTypes, reservedKeywords } from '../../../jdl/jhipster/index.mjs';
 import { getUXConstraintName } from './database.mjs';
 import { hibernateSnakeCase } from './string.mjs';
+import { formatDocAsApiDescription, formatDocAsJavaDoc } from './doc.mjs';
 
 const TYPE_BYTES = fieldTypes.RelationalOnlyDBTypes.BYTES;
 const TYPE_BYTE_BUFFER = fieldTypes.RelationalOnlyDBTypes.BYTE_BUFFER;
@@ -49,6 +50,11 @@ export default function prepareField(entityWithConfig, field, generator) {
     field.readonly = true;
   }
 
+  if (field.documentation) {
+    field.fieldJavadoc = formatDocAsJavaDoc(field.documentation, 4);
+    field.fieldApiDescription = formatDocAsApiDescription(field.documentation);
+  }
+
   if (field.id && entityWithConfig.primaryKey) {
     if (field.autoGenerate === undefined) {
       field.autoGenerate = !entityWithConfig.primaryKey.composite && [INTEGER, LONG, UUID].includes(field.fieldType);
diff --git a/generators/server/support/prepare-relationship.mts b/generators/server/support/prepare-relationship.mts
new file mode 100644
index 000000000000..e1255bb3ae32
--- /dev/null
+++ b/generators/server/support/prepare-relationship.mts
@@ -0,0 +1,8 @@
+import { formatDocAsApiDescription, formatDocAsJavaDoc } from './doc.mjs';
+
+export function prepareRelationship({ relationship }: { relationship: any; entity: any }) {
+  if (relationship.documentation) {
+    relationship.relationshipJavadoc = formatDocAsJavaDoc(relationship.documentation, 4);
+    relationship.relationshipApiDescription = formatDocAsApiDescription(relationship.documentation);
+  }
+}
diff --git a/generators/server/templates/README.md.jhi.spring-boot.ejs b/generators/server/templates/README.md.jhi.spring-boot.ejs
new file mode 100644
index 000000000000..ea76c171942c
--- /dev/null
+++ b/generators/server/templates/README.md.jhi.spring-boot.ejs
@@ -0,0 +1,404 @@
+<%#
+ Copyright 2013-2023 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+<%#
+ This is a fragment file, it will be merged into to root template if available.
+ EJS fragments will process % delimiter tags in template and & delimiter tags in the merge process.
+-%>
+<&_ if (fragment.introSection) { -&>
+  <%_ if (applicationTypeGateway || applicationTypeMicroservice) { _%>
+
+This is a "<%= applicationType %>" application intended to be part of a microservice architecture, please refer to the [Doing microservices with JHipster][] page of the documentation for more information.
+This application is configured for Service Discovery and Configuration with <% if (serviceDiscoveryEureka) { %>the JHipster-Registry<% } %><% if (serviceDiscoveryConsul) { %>Consul<% } %>. On launch, it will refuse to start if it is not able to connect to <% if (serviceDiscoveryEureka) { %>the JHipster-Registry at [http://localhost:8761](http://localhost:8761)<% } %><% if (serviceDiscoveryConsul) { %>Consul at [http://localhost:8500](http://localhost:8500)<% } %>.<% if (serviceDiscoveryEureka) { %> For more information, read our documentation on [Service Discovery and Configuration with the JHipster-Registry][].<% } %><% if (serviceDiscoveryConsul) { %> For more information, read our documentation on [Service Discovery and Configuration with Consul][].<% } %>
+  <%_ } _%>
+
+<&_ } -&>
+
+<&_ if (fragment.structureSection) { -&>
+Node is required for generation and recommended for development. `package.json` is always generated for a better development experience with prettier, commit hooks, scripts and so on.
+
+In the project root, JHipster generates configuration files for tools like git, prettier, eslint, husky, and others that are well known and you can find references in the web.
+
+  <%_ if (backendTypeJavaAny) { %>
+`/src/*` structure follows default <%= backendType %> structure.
+
+  <%_ } _%>
+- `.yo-rc.json` - Yeoman configuration file
+JHipster configuration is stored in this file at `generator-jhipster` key. You may find `generator-jhipster-*` for specific blueprints configuration.
+- `.yo-resolve` (optional) - Yeoman conflict resolver
+Allows to use a specific action when conflicts are found skipping prompts for files that matches a pattern. Each line should match `[pattern] [action]` with pattern been a [Minimatch](https://github.com/isaacs/minimatch#minimatch) pattern and action been one of skip (default if ommited) or force. Lines starting with `#` are considered comments and are ignored.
+- `.jhipster/*.json` - JHipster entity configuration files
+  <%_ if (!skipClient) { %>
+- `npmw` - wrapper to use locally installed npm.
+JHipster installs Node and npm locally using the build tool by default. This wrapper makes sure npm is installed locally and uses it avoiding some differences different versions can cause. By using `./npmw` instead of the traditional `npm` you can configure a Node-less environment to develop or test your application.
+  <%_ } _%>
+- `/src/main/docker` - Docker configurations for the application and services that the application depends on
+
+<&_ } -&>
+
+<&_ if (fragment.developmentSection) { -&>
+  <%_ if (skipClient) { _%>
+To start your application in the dev profile, run:
+
+```
+<% if (buildToolMaven) { %>./mvnw<% } %><% if (buildToolGradle) { %>./gradlew<% } %>
+```
+
+For further instructions on how to develop with JHipster, have a look at [Using JHipster in development][].
+
+  <%_ } _%>
+<%_ if (authenticationTypeOauth2) { -%>
+### OAuth 2.0 / OpenID Connect
+
+Congratulations! You've selected an excellent way to secure your JHipster application. If you're not sure what OAuth and OpenID Connect (OIDC) are, please see [What the Heck is OAuth?](https://developer.okta.com/blog/2017/06/21/what-the-heck-is-oauth)
+
+To log in to your app, you'll need to have [Keycloak](https://keycloak.org) up and running. The JHipster Team has created a Docker container for you that has the default users and roles. Start Keycloak using the following command.
+
+```
+docker compose -f src/main/docker/keycloak.yml up
+```
+
+The security settings in `src/main/resources/config/application.yml` are configured for this image.
+
+```yaml
+spring:
+  ...
+  security:
+    oauth2:
+      client:
+        provider:
+          oidc:
+            issuer-uri: http://localhost:9080/realms/jhipster
+        registration:
+          oidc:
+            client-id: web_app
+            client-secret: web_app
+            scope: openid,profile,email
+```
+
+Some of Keycloak configuration is now done in build time and the other part before running the app, here is the [list](https://www.keycloak.org/server/all-config) of all build and configuration options.
+
+Before moving to production, please make sure to follow this [guide](https://www.keycloak.org/server/configuration) for better security and performance.
+
+Also, you should never use `start-dev` nor `KC_DB=dev-file` in production.
+
+When using Kubernetes, importing should be done using init-containers (with a volume when using `db=dev-file`).
+
+### Okta
+
+If you'd like to use Okta instead of Keycloak, it's pretty quick using the [Okta CLI](https://cli.okta.com/). After you've installed it, run:
+
+```shell
+okta register
+```
+
+Then, in your JHipster app's directory, run `okta apps create` and select **JHipster**. This will set up an Okta app for you, create `ROLE_ADMIN` and `ROLE_USER` groups, create a `.okta.env` file with your Okta settings, and configure a `groups` claim in your ID token.
+
+Run `source .okta.env` and start your app with Maven or Gradle. You should be able to sign in with the credentials you registered with.
+
+If you're on Windows, you should install [WSL](https://docs.microsoft.com/en-us/windows/wsl/install-win10) so the `source` command will work.
+
+If you'd like to configure things manually through the Okta developer console, see the instructions below.
+
+First, you'll need to create a free developer account at <https://developer.okta.com/signup/>. After doing so, you'll get your own Okta domain, that has a name like `https://dev-123456.okta.com`.
+
+Modify `src/main/resources/config/application.yml` to use your Okta settings.
+
+```yaml
+spring:
+  ...
+  security:
+    oauth2:
+      client:
+        provider:
+          oidc:
+            issuer-uri: https://{yourOktaDomain}/oauth2/default
+        registration:
+          oidc:
+            client-id: {clientId}
+            client-secret: {clientSecret}
+security:
+```
+
+Create an OIDC App in Okta to get a `{clientId}` and `{clientSecret}`. To do this, log in to your Okta Developer account and navigate to **Applications** > **Add Application**. Click **Web** and click the **Next** button. Give the app a name you’ll remember, specify `http://localhost:8080` as a Base URI, and `http://localhost:8080/login/oauth2/code/oidc` as a Login Redirect URI. Click **Done**, then Edit and add `http://localhost:8080` as a Logout redirect URI. Copy and paste the client ID and secret into your `application.yml` file.
+
+Create a `ROLE_ADMIN` and `ROLE_USER` group and add users into them. Modify e2e tests to use this account when running integration tests. You'll need to change credentials in `<%= clientTestDir %>e2e/account/account.spec.ts` and `<%= clientTestDir %>e2e/admin/administration.spec.ts`.
+
+Navigate to **API** > **Authorization Servers**, click the **Authorization Servers** tab and edit the default one. Click the **Claims** tab and **Add Claim**. Name it "groups", and include it in the ID Token. Set the value type to "Groups" and set the filter to be a Regex of `.*`.
+
+After making these changes, you should be good to go! If you have any issues, please post them to [Stack Overflow](https://stackoverflow.com/questions/tagged/jhipster). Make sure to tag your question with "jhipster" and "okta".
+
+### Auth0
+
+If you'd like to use [Auth0](https://auth0.com/) instead of Keycloak, follow the configuration steps below:
+
+- Create a free developer account at <https://auth0.com/signup>. After successful sign-up, your account will be associated with a unique domain like `dev-xxx.us.auth0.com`
+- Create a new application of type `Regular Web Applications`. Switch to the `Settings` tab, and configure your application settings like:
+    - Allowed Callback URLs: `http://localhost:8080/login/oauth2/code/oidc`
+    - Allowed Logout URLs: `http://localhost:8080/`
+- Navigate to **User Management** > **Roles** and create new roles named `ROLE_ADMIN`, and `ROLE_USER`.
+- Navigate to **User Management** > **Users** and create a new user account. Click on the **Role** tab to assign roles to the newly created user account.
+- Navigate to **Auth Pipeline** > **Rules** and create a new Rule. Choose `Empty rule` template. Provide a meaningful name like `JHipster claims` and replace `Script` content with the following and Save.
+```javascript
+function (user, context, callback) {
+  user.preferred_username = user.email;
+  const roles = (context.authorization || {}).roles;
+
+  function prepareCustomClaimKey(claim) {
+    return `https://www.jhipster.tech/${claim}`;
+  }
+
+  const rolesClaim = prepareCustomClaimKey('roles');
+
+  if (context.idToken) {
+    context.idToken[rolesClaim] = roles;
+  }
+
+  if (context.accessToken) {
+    context.accessToken[rolesClaim] = roles;
+  }
+
+  callback(null, user, context);
+}
+```
+- In your `JHipster` application, modify `src/main/resources/config/application.yml` to use your Auth0 application settings:
+```yaml
+spring:
+  ...
+  security:
+    oauth2:
+      client:
+        provider:
+          oidc:
+            # make sure to include the ending slash!
+            issuer-uri: https://{your-auth0-domain}/
+        registration:
+          oidc:
+            client-id: {clientId}
+            client-secret: {clientSecret}
+            scope: openid,profile,email
+jhipster:
+  ...
+  security:
+    oauth2:
+      audience:
+        - https://{your-auth0-domain}/api/v2/
+```
+  <%_ if (cypressTests) { _%>
+
+Before running Cypress tests, specify Auth0 user credentials by overriding the `CYPRESS_E2E_USERNAME` and `CYPRESS_E2E_PASSWORD` environment variables.
+
+```
+export CYPRESS_E2E_USERNAME="<your-username>"
+export CYPRESS_E2E_PASSWORD="<your-password>"
+```
+
+See Cypress' documentation for setting OS [environment variables](https://docs.cypress.io/guides/guides/environment-variables#Setting) to learn more.
+
+**Auth0 requires a user to provide authorization consent on the first login.** Consent flow is currently not handled in the Cypress test suite. To mitigate the issue, you can use a user account that has already granted consent to authorize application access via interactive login.
+  <%_ } _%>
+<%_ } _%>
+
+<%_ if (enableSwaggerCodegen) { _%>
+### Doing API-First development using openapi-generator-cli
+
+[OpenAPI-Generator]() is configured for this application. You can generate API code from the `src/main/resources/swagger/api.yml` definition file by running:
+    <%_ if (buildToolMaven) { _%>
+```bash
+./mvnw generate-sources
+```
+    <%_ } _%>
+    <%_ if (buildToolGradle) { _%>
+```bash
+./gradlew openApiGenerate
+```
+    <%_ } _%>
+Then implements the generated delegate classes with `@Service` classes.
+
+To edit the `api.yml` definition file, you can use a tool such as [Swagger-Editor](). Start a local instance of the swagger-editor using docker by running: `docker compose -f src/main/docker/swagger-editor.yml up -d`. The editor will then be reachable at [http://localhost:7742](http://localhost:7742).
+
+Refer to [Doing API-First development][] for more details.
+<%_ } _%>
+
+<&_ } -&>
+
+<&_ if (fragment.testingSection) { -&>
+### Spring Boot tests
+
+To launch your application's tests, run:
+
+```
+<%_ if (buildToolMaven) { _%>
+./mvnw verify
+<%_ } else { _%>
+./gradlew test integrationTest jacocoTestReport
+<%_ } _%>
+```
+
+<&_ } -&>
+
+<&_ if (fragment.productionSection) { -&>
+### Packaging as jar
+
+To build the final jar and optimize the <%= baseName %> application for production, run:
+
+```
+<%_ if (buildToolMaven) { _%>
+./mvnw -Pprod clean verify
+<%_ } _%>
+<%_ if (buildToolGradle) { _%>
+./gradlew -Pprod clean bootJar
+<%_ } _%>
+```
+
+<%_ if (!skipClient) { _%>
+This will concatenate and minify the client CSS and JavaScript files. It will also modify `index.html` so it references these new files.
+<%_ } _%>
+To ensure everything worked, run:
+
+```
+<%_ if (buildToolMaven) { _%>
+java -jar target/*.jar
+<%_ } _%>
+<%_ if (buildToolGradle) { _%>
+java -jar build/libs/*.jar
+<%_ } _%>
+```
+
+<% if (!skipClient) { %>Then navigate to [http://localhost:<%= serverPort %>](http://localhost:<%= serverPort %>) in your browser.
+<% } %>
+Refer to [Using JHipster in production][] for more details.
+
+### Packaging as war
+
+To package your application as a war in order to deploy it to an application server, run:
+
+```
+<%_ if (buildToolMaven) { _%>
+./mvnw -Pprod,war clean verify
+<%_ } _%>
+<%_ if (buildToolGradle) { _%>
+./gradlew -Pprod -Pwar clean bootWar
+<%_ } _%>
+```
+
+### JHipster Control Center
+
+JHipster Control Center can help you manage and control your application(s). You can start a local control center server (accessible on http://localhost:7419) with:
+
+```
+docker compose -f src/main/docker/jhipster-control-center.yml up
+```
+
+<&_ } -&>
+
+<&_ if (fragment.othersSection) { -&>
+
+### Code quality using Sonar
+
+Sonar is used to analyse code quality. You can start a local Sonar server (accessible on http://localhost:9001) with:
+
+```
+docker compose -f src/main/docker/sonar.yml up -d
+```
+
+Note: we have turned off forced authentication redirect for UI in [src/main/docker/sonar.yml](src/main/docker/sonar.yml) for out of the box experience while trying out SonarQube, for real use cases turn it back on.
+
+You can run a Sonar analysis with using the [sonar-scanner](https://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner)<% if (buildTool) { %> or by using the <% if (buildTool === 'maven') { %>maven<% } %><% if (buildTool === 'gradle') { %>gradle<% } %> plugin<% } %>.
+
+Then, run a Sonar analysis:
+
+<%_ if (buildToolMaven) { _%>
+```
+./mvnw -Pprod clean verify sonar:sonar -Dsonar.login=admin -Dsonar.password=admin
+```
+
+If you need to re-run the Sonar phase, please be sure to specify at least the `initialize` phase since Sonar properties are loaded from the sonar-project.properties file.
+
+```
+./mvnw initialize sonar:sonar -Dsonar.login=admin -Dsonar.password=admin
+```
+<%_ } else if (buildToolGradle) { _%>
+```
+./gradlew -Pprod clean check jacocoTestReport sonarqube -Dsonar.login=admin -Dsonar.password=admin
+```
+<%_ } _%>
+
+Additionally, Instead of passing `sonar.password` and `sonar.login` as CLI arguments, these parameters can be configured from [sonar-project.properties](sonar-project.properties) as shown below:
+
+```
+sonar.login=admin
+sonar.password=admin
+```
+
+For more information, refer to the [Code quality page][].
+
+### Using Docker to simplify development (optional)
+
+You can use Docker to improve your JHipster development experience. A number of docker-compose configuration are available in the [src/main/docker](src/main/docker) folder to launch required third party services.
+
+<%_ if (!databaseTypeNo) { _%>
+For example, to start a <%= prodDatabaseType %> database in a docker container, run:
+
+```
+docker compose -f src/main/docker/<%= prodDatabaseType ?? databaseType %>.yml up -d
+```
+
+To stop it and remove the container, run:
+
+```
+docker compose -f src/main/docker/<%= prodDatabaseType ?? databaseType %>.yml down
+```
+<%_ } _%>
+
+You can also fully dockerize your application and all the services that it depends on.
+To achieve this, first build a docker image of your app by running:
+
+```
+npm run java:docker
+```
+
+Or build a arm64 docker image when using an arm64 processor os like MacOS with M1 processor family running:
+
+```
+npm run java:docker:arm64
+```
+
+Then run:
+
+```
+docker compose -f <%- dockerServicesDir %>app.yml up -d
+```
+
+When running Docker Desktop on MacOS Big Sur or later, consider enabling experimental `Use the new Virtualization framework` for better processing performance ([disk access performance is worse](https://github.com/docker/roadmap/issues/7)).
+
+For more information refer to [Using Docker and Docker-Compose][], this page also contains information on the docker-compose sub-generator (`jhipster docker-compose`), which is able to generate docker configurations for one or several JHipster applications.
+
+## Continuous Integration (optional)
+
+To configure CI for your project, run the ci-cd sub-generator (`jhipster ci-cd`), this will let you generate configuration files for a number of Continuous Integration systems. Consult the [Setting up Continuous Integration][] page for more information.
+
+<&_ } -&>
+
+<&_ if (fragment.referenceSection) { -&>
+  <%_ if (enableSwaggerCodegen) { _%>
+[OpenAPI-Generator]: https://openapi-generator.tech
+[Swagger-Editor]: https://editor.swagger.io
+[Doing API-First development]: <%= documentationArchiveUrl %>/doing-api-first-development/
+  <%_ } _%>
+<&_ } -&>
diff --git a/generators/server/templates/entity/partials/it_patch_update.partial.java.ejs b/generators/server/templates/_global_partials_entity_/it_patch_update.partial.java.ejs
similarity index 100%
rename from generators/server/templates/entity/partials/it_patch_update.partial.java.ejs
rename to generators/server/templates/_global_partials_entity_/it_patch_update.partial.java.ejs
diff --git a/generators/server/templates/entity/partials/save_template.ejs b/generators/server/templates/_global_partials_entity_/save_template.ejs
similarity index 100%
rename from generators/server/templates/entity/partials/save_template.ejs
rename to generators/server/templates/_global_partials_entity_/save_template.ejs
diff --git a/generators/server/templates/entity/partials/update_template.ejs b/generators/server/templates/_global_partials_entity_/update_template.ejs
similarity index 100%
rename from generators/server/templates/entity/partials/update_template.ejs
rename to generators/server/templates/_global_partials_entity_/update_template.ejs
diff --git a/generators/server/templates/gradle/profile_dev.gradle.ejs b/generators/server/templates/gradle/profile_dev.gradle.ejs
index c47dc42e583d..8d15349445c6 100644
--- a/generators/server/templates/gradle/profile_dev.gradle.ejs
+++ b/generators/server/templates/gradle/profile_dev.gradle.ejs
@@ -16,11 +16,11 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (devDatabaseType !== prodDatabaseType && (prodDatabaseTypeMariadb || prodDatabaseTypeMssql || prodDatabaseTypeMysql || prodDatabaseTypePostgres)) { _%>
+<%_ if (devDatabaseType !== prodDatabaseType && (prodDatabaseTypeMariadb || prodDatabaseTypeMssql || prodDatabaseTypeMysql || prodDatabaseTypePostgresql)) { _%>
 sourceSets {
     test {
         java {
-            exclude '<%= packageFolder %>/config/<% if (prodDatabaseTypeMariadb) { %>Mariadb<% } else if (prodDatabaseTypeMssql) { %>MsSql<% } else if (prodDatabaseTypeMysql) { %>Mysql<% } else if (prodDatabaseTypePostgres) { %>PostgreSql<% } %>TestContainer.java'
+            exclude '<%= packageFolder %>/config/<% if (prodDatabaseTypeMariadb) { %>Mariadb<% } else if (prodDatabaseTypeMssql) { %>MsSql<% } else if (prodDatabaseTypeMysql) { %>Mysql<% } else if (prodDatabaseTypePostgresql) { %>PostgreSql<% } %>TestContainer.java'
         }
     }
 }
@@ -82,7 +82,7 @@ dependencies {
   <%_ if (prodDatabaseTypeMariadb) { _%>
     testImplementation "org.testcontainers:mariadb"
   <%_ } _%>
-  <%_ if (prodDatabaseTypePostgres) { _%>
+  <%_ if (prodDatabaseTypePostgresql) { _%>
     testImplementation "org.testcontainers:postgresql"
   <%_ } _%>
   <%_ if (prodDatabaseTypeMssql) { _%>
diff --git a/generators/server/templates/gradle/profile_prod.gradle.ejs b/generators/server/templates/gradle/profile_prod.gradle.ejs
index 42357920fc39..02ba85ea4039 100644
--- a/generators/server/templates/gradle/profile_prod.gradle.ejs
+++ b/generators/server/templates/gradle/profile_prod.gradle.ejs
@@ -48,7 +48,7 @@ dependencies {
     implementation "com.mysql:mysql-connector-j"
     testImplementation "org.testcontainers:mysql"
   <%_ } _%>
-  <%_ if (prodDatabaseTypePostgres) { _%>
+  <%_ if (prodDatabaseTypePostgresql) { _%>
     <%_ if (reactive) { _%>
     implementation "org.postgresql:r2dbc-postgresql"
     <%_ } _%>
diff --git a/generators/server/templates/package.json.ejs b/generators/server/templates/package.json.ejs
index cd1e45d68fbb..4a3ef03e2eb7 100644
--- a/generators/server/templates/package.json.ejs
+++ b/generators/server/templates/package.json.ejs
@@ -25,17 +25,6 @@
   "cacheDirectories": [
     "node_modules"
   ],
-  "devDependencies": {
-<%_ if (!skipJhipsterDependencies) { _%>
-    "generator-jhipster": "<%= jhipsterVersion %>",
-  <%_ blueprints.forEach(blueprint => { _%>
-    "<%= blueprint.name %>": "<%= blueprint.version %>",
-  <%_ }); _%>
-<%_ } _%>
-    "prettier": "<%= nodeDependencies.prettier %>",
-    "prettier-plugin-java": "<%= nodeDependencies['prettier-plugin-java'] %>",
-    "prettier-plugin-packagejson": "<%= nodeDependencies['prettier-plugin-packagejson'] %>"
-  },
   "engines": {
     "node": ">=<%= nodeVersion %>"
   },
diff --git a/generators/server/templates/entity/reactive/partials/save_template.ejs b/generators/server/templates/reactive/_global_partials_entity_/save_template.ejs
similarity index 100%
rename from generators/server/templates/entity/reactive/partials/save_template.ejs
rename to generators/server/templates/reactive/_global_partials_entity_/save_template.ejs
diff --git a/generators/server/templates/entity/reactive/partials/update_template.ejs b/generators/server/templates/reactive/_global_partials_entity_/update_template.ejs
similarity index 100%
rename from generators/server/templates/entity/reactive/partials/update_template.ejs
rename to generators/server/templates/reactive/_global_partials_entity_/update_template.ejs
diff --git a/generators/server/templates/src/main/java/package/Application.java.ejs b/generators/server/templates/src/main/java/_package_/Application.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/Application.java.ejs
rename to generators/server/templates/src/main/java/_package_/Application.java.ejs
diff --git a/generators/server/templates/src/main/java/package/ApplicationWebXml.java.ejs b/generators/server/templates/src/main/java/_package_/ApplicationWebXml.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/ApplicationWebXml.java.ejs
rename to generators/server/templates/src/main/java/_package_/ApplicationWebXml.java.ejs
diff --git a/generators/server/templates/entity/src/main/java/package/common/delete_template.ejs b/generators/server/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/delete_template.ejs
similarity index 100%
rename from generators/server/templates/entity/src/main/java/package/common/delete_template.ejs
rename to generators/server/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/delete_template.ejs
diff --git a/generators/server/templates/entity/src/main/java/package/common/get_all_stream_template.ejs b/generators/server/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/get_all_stream_template.ejs
similarity index 100%
rename from generators/server/templates/entity/src/main/java/package/common/get_all_stream_template.ejs
rename to generators/server/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/get_all_stream_template.ejs
diff --git a/generators/server/templates/entity/src/main/java/package/common/get_all_template.ejs b/generators/server/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/get_all_template.ejs
similarity index 100%
rename from generators/server/templates/entity/src/main/java/package/common/get_all_template.ejs
rename to generators/server/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/get_all_template.ejs
diff --git a/generators/server/templates/entity/src/main/java/package/common/get_filtered_template.ejs b/generators/server/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/get_filtered_template.ejs
similarity index 100%
rename from generators/server/templates/entity/src/main/java/package/common/get_filtered_template.ejs
rename to generators/server/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/get_filtered_template.ejs
diff --git a/generators/server/templates/entity/src/main/java/package/common/get_template.ejs b/generators/server/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/get_template.ejs
similarity index 100%
rename from generators/server/templates/entity/src/main/java/package/common/get_template.ejs
rename to generators/server/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/get_template.ejs
diff --git a/generators/server/templates/entity/src/main/java/package/common/inject_template.ejs b/generators/server/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/inject_template.ejs
similarity index 100%
rename from generators/server/templates/entity/src/main/java/package/common/inject_template.ejs
rename to generators/server/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/inject_template.ejs
diff --git a/generators/server/templates/entity/src/main/java/package/common/patch_template.ejs b/generators/server/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/patch_template.ejs
similarity index 100%
rename from generators/server/templates/entity/src/main/java/package/common/patch_template.ejs
rename to generators/server/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/patch_template.ejs
diff --git a/generators/server/templates/entity/src/main/java/package/common/search_stream_template.ejs b/generators/server/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/search_stream_template.ejs
similarity index 100%
rename from generators/server/templates/entity/src/main/java/package/common/search_stream_template.ejs
rename to generators/server/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/search_stream_template.ejs
diff --git a/generators/server/templates/entity/src/main/java/package/common/search_template.ejs b/generators/server/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/search_template.ejs
similarity index 100%
rename from generators/server/templates/entity/src/main/java/package/common/search_template.ejs
rename to generators/server/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/search_template.ejs
diff --git a/generators/server/templates/entity/src/main/java/package/repository/_EntityClass_Repository.java.ejs b/generators/server/templates/src/main/java/_package_/_entityPackage_/repository/_entityClass_Repository.java.ejs
similarity index 100%
rename from generators/server/templates/entity/src/main/java/package/repository/_EntityClass_Repository.java.ejs
rename to generators/server/templates/src/main/java/_package_/_entityPackage_/repository/_entityClass_Repository.java.ejs
diff --git a/generators/server/templates/entity/src/main/java/package/repository/_EntityClass_Repository_reactive.java.ejs b/generators/server/templates/src/main/java/_package_/_entityPackage_/repository/_entityClass_Repository_reactive.java.ejs
similarity index 100%
rename from generators/server/templates/entity/src/main/java/package/repository/_EntityClass_Repository_reactive.java.ejs
rename to generators/server/templates/src/main/java/_package_/_entityPackage_/repository/_entityClass_Repository_reactive.java.ejs
diff --git a/generators/server/templates/entity/src/main/java/package/service/_EntityClass_QueryService.java.ejs b/generators/server/templates/src/main/java/_package_/_entityPackage_/service/_entityClass_QueryService.java.ejs
similarity index 97%
rename from generators/server/templates/entity/src/main/java/package/service/_EntityClass_QueryService.java.ejs
rename to generators/server/templates/src/main/java/_package_/_entityPackage_/service/_entityClass_QueryService.java.ejs
index 61b3e5864654..197521f1d516 100644
--- a/generators/server/templates/entity/src/main/java/package/service/_EntityClass_QueryService.java.ejs
+++ b/generators/server/templates/src/main/java/_package_/_entityPackage_/service/_entityClass_QueryService.java.ejs
@@ -69,7 +69,7 @@ import <%= entityAbsolutePackage %>.service.mapper.<%= entityClass %>Mapper;
 public class <%= serviceClassName %> extends QueryService<<%= persistClass %>> {
 
     private final Logger log = LoggerFactory.getLogger(<%= serviceClassName %>.class);
-<%- include('../common/inject_template', {viaService: false, constructorName: serviceClassName, queryService: false, isUsingMapsId: false, mapsIdAssoc: null, isController: false}); -%>
+<%- include('../_partials_entity_/inject_template', {viaService: false, constructorName: serviceClassName, queryService: false, isUsingMapsId: false, mapsIdAssoc: null, isController: false}); -%>
 
     /**
      * Return a {@link List} of {@link <%= instanceType %>} which matches the criteria from the database.
diff --git a/generators/server/templates/entity/src/main/java/package/service/_EntityClass_Service.java.ejs b/generators/server/templates/src/main/java/_package_/_entityPackage_/service/_entityClass_Service.java.ejs
similarity index 100%
rename from generators/server/templates/entity/src/main/java/package/service/_EntityClass_Service.java.ejs
rename to generators/server/templates/src/main/java/_package_/_entityPackage_/service/_entityClass_Service.java.ejs
diff --git a/generators/server/templates/entity/src/main/java/package/service/criteria/_EntityClass_Criteria.java.ejs b/generators/server/templates/src/main/java/_package_/_entityPackage_/service/criteria/_entityClass_Criteria.java.ejs
similarity index 100%
rename from generators/server/templates/entity/src/main/java/package/service/criteria/_EntityClass_Criteria.java.ejs
rename to generators/server/templates/src/main/java/_package_/_entityPackage_/service/criteria/_entityClass_Criteria.java.ejs
diff --git a/generators/server/templates/entity/src/main/java/package/service/dto/_DtoClass_.java.ejs b/generators/server/templates/src/main/java/_package_/_entityPackage_/service/dto/_dtoClass_.java.ejs
similarity index 93%
rename from generators/server/templates/entity/src/main/java/package/service/dto/_DtoClass_.java.ejs
rename to generators/server/templates/src/main/java/_package_/_entityPackage_/service/dto/_dtoClass_.java.ejs
index 5732a7e384a0..219b0a7e5e6a 100644
--- a/generators/server/templates/entity/src/main/java/package/service/dto/_DtoClass_.java.ejs
+++ b/generators/server/templates/src/main/java/_package_/_entityPackage_/service/dto/_dtoClass_.java.ejs
@@ -19,7 +19,7 @@
 package <%= entityAbsolutePackage %>.service.dto;
 
 import java.util.Objects;
-<%_ if (typeof javadoc !== 'undefined' || importApiModelProperty) { _%>
+<%_ if (entityApiDescription || importApiModelProperty) { _%>
 import io.swagger.v3.oas.annotations.media.Schema;
 <%_ } _%>
 <%_ if (anyFieldIsInstant) { _%>
@@ -65,8 +65,8 @@ import <%= `${otherEntity.entityAbsolutePackage}.service.dto.${otherEntity.dtoCl
 /**
  * A DTO for the {@link <%= entityAbsolutePackage %>.domain.<%= persistClass %>} entity.
  */
-<%_ if (typeof javadoc !== 'undefined') { _%>
-@Schema(description = "<%- this.formatAsApiDescription(javadoc) %>")
+<%_ if (entityApiDescription) { _%>
+@Schema(description = "<%- entityApiDescription %>")
 <%_ } _%>
 @SuppressWarnings("common-java:DuplicatedBlocks")
 public class <%= dtoClass %> implements Serializable {
@@ -74,17 +74,17 @@ public class <%= dtoClass %> implements Serializable {
 <%_ for (reference of dtoReferences) {
   if (typeof reference.doc !== 'undefined') {
 _%>
-<%- this.formatAsFieldJavadoc(reference.doc) %>
+<%- reference.propertyJavadoc %>
   <%_ }
   const field = reference.field;
   const required = field && field.fieldValidate && field.fieldValidationRequired;
   if (field) {
     if (field.fieldValidate ) { _%>
-    <%- include('../../common/field_validators', {field, reactive}); -%>
+    <%- include('/_global_partials_entity_/field_validators', {field, reactive}); -%>
     <%_ }
   } _%>
   <%_ if (reference.doc) { _%>
-    @Schema(description = "<%- this.formatAsApiDescription(reference.doc) %>"<% if (required) { %>, required = true<% } %>)
+    @Schema(description = "<%- reference.propertyApiDescription %>"<% if (required) { %>, required = true<% } %>)
   <%_ } _%>
   <%_ if (field && field.fieldTypeBytes && databaseTypeSql) { _%>
     @Lob
diff --git a/generators/server/templates/entity/src/main/java/package/service/impl/_EntityClass_ServiceImpl.java.ejs b/generators/server/templates/src/main/java/_package_/_entityPackage_/service/impl/_entityClass_ServiceImpl.java.ejs
similarity index 90%
rename from generators/server/templates/entity/src/main/java/package/service/impl/_EntityClass_ServiceImpl.java.ejs
rename to generators/server/templates/src/main/java/_package_/_entityPackage_/service/impl/_entityClass_ServiceImpl.java.ejs
index e0ad573cf71d..a2d8c653f6e7 100644
--- a/generators/server/templates/entity/src/main/java/package/service/impl/_EntityClass_ServiceImpl.java.ejs
+++ b/generators/server/templates/src/main/java/_package_/_entityPackage_/service/impl/_entityClass_ServiceImpl.java.ejs
@@ -96,7 +96,7 @@ import java.util.stream.StreamSupport;
 public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= entityClass %>Service<% } %> {
 
     private final Logger log = LoggerFactory.getLogger(<%= serviceClassName %>.class);
-<%- include('../../common/inject_template', {viaService: false, constructorName: serviceClassName, queryService: false, isUsingMapsId: isUsingMapsId, mapsIdAssoc: mapsIdAssoc, isController: false}); -%>
+<%- include('../../_partials_entity_/inject_template', {viaService: false, constructorName: serviceClassName, queryService: false, isUsingMapsId: isUsingMapsId, mapsIdAssoc: mapsIdAssoc, isController: false}); -%>
 
 <%_ if (!serviceImpl) { _%>
     /**
@@ -111,7 +111,7 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
 <%_ } _%>
     public <% if (reactive) { %>Mono<<% } %><%= instanceType %><% if (reactive) { %>><% } %> save(<%= instanceType %> <%= instanceName %>) {
         log.debug("Request to save <%= entityClass %> : {}", <%= instanceName %>);
-<%- include('/partials/save_template', {viaService: false, returnDirectly: true, isUsingMapsId: isUsingMapsId, mapsIdAssoc: mapsIdAssoc, isController: false, isPersisted: false}); -%>
+<%- include('/_global_partials_entity_/save_template', {viaService: false, returnDirectly: true, isUsingMapsId: isUsingMapsId, mapsIdAssoc: mapsIdAssoc, isController: false, isPersisted: false}); -%>
     }
 
 <%_ if (!serviceImpl) { _%>
@@ -127,7 +127,7 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
 <%_ } _%>
     public <% if (reactive) { %>Mono<<% } %><%= instanceType %><% if (reactive) { %>><% } %> update(<%= instanceType %> <%= instanceName %>) {
         log.debug("Request to update <%= entityClass %> : {}", <%= instanceName %>);
-<%- include('/partials/update_template', {updatableEntity, viaService: false, returnDirectly: true, isUsingMapsId: isUsingMapsId, mapsIdAssoc: mapsIdAssoc, isController: false, isPersisted: requiresPersistableImplementation}); -%>
+<%- include('/_global_partials_entity_/update_template', {updatableEntity, viaService: false, returnDirectly: true, isUsingMapsId: isUsingMapsId, mapsIdAssoc: mapsIdAssoc, isController: false, isPersisted: requiresPersistableImplementation}); -%>
     }
 
 <%_ if (!serviceImpl) { _%>
@@ -143,7 +143,7 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
 <%_ } _%>
     public <% if (reactive) { %>Mono<% } else { %>Optional<% } %><<%= instanceType %>> partialUpdate(<%= instanceType %> <%= instanceName %>) {
         log.debug("Request to partially update <%= entityClass %> : {}", <%= instanceName %>);
-<%- include('../../common/patch_template', {isService: true, viaService: false}); -%>
+<%- include('../../_partials_entity_/patch_template', {isService: true, viaService: false}); -%>
     }
 
 <%_ if (!serviceImpl) { _%>
@@ -225,7 +225,7 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
         return <%= entityInstance %>Repository.findAllWithEagerRelationships(pageable)<% if (!dtoMapstruct) { %>;<% } else { %>.map(<%= entityToDtoReference %>);<% } %>
     }
 <%_ } _%>
-<%- include('../../common/get_filtered_template'); -%>
+<%- include('../../_partials_entity_/get_filtered_template'); -%>
 <%_ if (reactive) { _%>
   <%_ if (!serviceImpl) { _%>
     /**
@@ -266,7 +266,7 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
     @Transactional(readOnly = true)
     <%_ } _%>
     public <%= optionalOrMono %><<%= instanceType %>> findOne(<%= primaryKey.type %> id) {
-        log.debug("Request to get <%= entityClass %> : {}", id);<%- include('../../common/get_template', {viaService: false, returnDirectly:true, implementsEagerLoadApis}); -%>
+        log.debug("Request to get <%= entityClass %> : {}", id);<%- include('../../_partials_entity_/get_template', {viaService: false, returnDirectly:true, implementsEagerLoadApis}); -%>
     }
 
 <%_ if (!serviceImpl) { _%>
@@ -284,7 +284,7 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
 <%_ } _%>
     public <%- reactive ? 'Mono<Void>' : 'void' %> delete(<%= primaryKey.type %> id) {
         log.debug("Request to delete <%= entityClass %> : {}", id);
-<%- include('../../common/delete_template', {viaService: false, fromResource: false}); -%>
+<%- include('../../_partials_entity_/delete_template', {viaService: false, fromResource: false}); -%>
     }
 <%_ if (searchEngineAny) { _%>
 
@@ -307,7 +307,7 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
   <%_ } _%>
     public <% if (!paginationNo) { %><%= pageOrFlux %><<%= instanceType %><% } else { %><%= listOrFlux %><<%= instanceType %><% } %>> search(String query<% if (!paginationNo) { %>, Pageable pageable<% } %>) {
   <%_ if (paginationNo) { _%>
-        log.debug("Request to search <%= entityClassPlural %> for query {}", query);<%- include('../../common/search_stream_template', {viaService: false, fromResource: false}); -%>
+        log.debug("Request to search <%= entityClassPlural %> for query {}", query);<%- include('../../_partials_entity_/search_stream_template', {viaService: false, fromResource: false}); -%>
   <%_ } else { _%>
         log.debug("Request to search for a page of <%= entityClassPlural %> for query {}", query);
         return <%= entityInstance %><% if (searchEngineElasticsearch) { %>Search<% } %>Repository.search(query, pageable)<%_ if (!dtoMapstruct) { _%>;<% } else { %>
diff --git a/generators/server/templates/entity/src/main/java/package/service/mapper/EntityMapper.java.ejs b/generators/server/templates/src/main/java/_package_/_entityPackage_/service/mapper/EntityMapper.java.ejs
similarity index 100%
rename from generators/server/templates/entity/src/main/java/package/service/mapper/EntityMapper.java.ejs
rename to generators/server/templates/src/main/java/_package_/_entityPackage_/service/mapper/EntityMapper.java.ejs
diff --git a/generators/server/templates/entity/src/main/java/package/service/mapper/_EntityClass_Mapper.java.ejs b/generators/server/templates/src/main/java/_package_/_entityPackage_/service/mapper/_entityClass_Mapper.java.ejs
similarity index 100%
rename from generators/server/templates/entity/src/main/java/package/service/mapper/_EntityClass_Mapper.java.ejs
rename to generators/server/templates/src/main/java/_package_/_entityPackage_/service/mapper/_entityClass_Mapper.java.ejs
diff --git a/generators/server/templates/entity/src/main/java/package/web/rest/_EntityClass_Resource.java.ejs b/generators/server/templates/src/main/java/_package_/_entityPackage_/web/rest/_entityClass_Resource.java.ejs
similarity index 94%
rename from generators/server/templates/entity/src/main/java/package/web/rest/_EntityClass_Resource.java.ejs
rename to generators/server/templates/src/main/java/_package_/_entityPackage_/web/rest/_entityClass_Resource.java.ejs
index 33c64aa72d58..7de1afca7ced 100644
--- a/generators/server/templates/entity/src/main/java/package/web/rest/_EntityClass_Resource.java.ejs
+++ b/generators/server/templates/src/main/java/_package_/_entityPackage_/web/rest/_entityClass_Resource.java.ejs
@@ -153,7 +153,7 @@ public class <%= entityClass %>Resource {
     const instanceName = restInstance;
     const mapper = entityInstance  + 'Mapper';
     const entityToDtoReference = mapper + '::' + 'toDto';
-    _%><%- include('../../common/inject_template', {readOnly: readOnly, viaService: viaService, constructorName: entityClass + 'Resource', queryService: jpaMetamodelFiltering, isUsingMapsId: isUsingMapsId, mapsIdAssoc: mapsIdAssoc, isController: true, reactive: reactive}); -%>
+    _%><%- include('../../_partials_entity_/inject_template', {readOnly: readOnly, viaService: viaService, constructorName: entityClass + 'Resource', queryService: jpaMetamodelFiltering, isUsingMapsId: isUsingMapsId, mapsIdAssoc: mapsIdAssoc, isController: true, reactive: reactive}); -%>
 <%_ if (!readOnly) { _%>
 
     /**
@@ -189,7 +189,7 @@ public class <%= entityClass %>Resource {
         <%= instanceName %>.set<%= field.fieldNameCapitalized %>(UUID.randomUUID());
     <%_ } _%>
   <%_ } _%>
-<%- include('/partials/save_template', {viaService: viaService, returnDirectly: false, isUsingMapsId: isUsingMapsId, mapsIdAssoc: mapsIdAssoc, isController: true}); -%>
+<%- include('/_global_partials_entity_/save_template', {viaService: viaService, returnDirectly: false, isUsingMapsId: isUsingMapsId, mapsIdAssoc: mapsIdAssoc, isController: true}); -%>
   <%_ if (reactive) { _%>
             .map(result -> {
                 try {
@@ -256,7 +256,7 @@ public class <%= entityClass %>Resource {
       <%_ } _%>
     <% } %>
   <%_ } _%>
-<%- include('/partials/update_template', {updatableEntity, viaService: viaService, returnDirectly: false, isUsingMapsId: false, mapsIdAssoc: mapsIdAssoc, isController: true, isPersisted: requiresPersistableImplementation}); -%>
+<%- include('/_global_partials_entity_/update_template', {updatableEntity, viaService: viaService, returnDirectly: false, isUsingMapsId: false, mapsIdAssoc: mapsIdAssoc, isController: true, isPersisted: requiresPersistableImplementation}); -%>
   <%_ if (reactive) { _%>
             .switchIfEmpty(Mono.error(new ResponseStatusException(HttpStatus.NOT_FOUND)))
             .map(result -> ResponseEntity.ok()
@@ -322,7 +322,7 @@ public class <%= entityClass %>Resource {
     <% } %>
   <%_ } _%>
 
-            <%- include('../../common/patch_template', {isService: false, viaService: viaService}); -%>
+            <%- include('../../_partials_entity_/patch_template', {isService: false, viaService: viaService}); -%>
   <%_ if (reactive) { _%>
             return result
                 .switchIfEmpty(Mono.error(new ResponseStatusException(HttpStatus.NOT_FOUND)))
@@ -367,7 +367,7 @@ public class <%= entityClass %>Resource {
 <%_ if (databaseTypeSql && isUsingMapsId && !viaService) { _%>
     @Transactional(readOnly = true)
 <%_ } _%>
-<%- include('../../common/get_all_template', {viaService}); -%>
+<%- include('../../_partials_entity_/get_all_template', {viaService}); -%>
 
 <%_ if (!jpaMetamodelFiltering && reactive && paginationNo) { _%>
     /**
@@ -399,7 +399,7 @@ public class <%= entityClass %>Resource {
     @Transactional(readOnly = true)
 <%_ } _%>
     public <% if (reactive) { %>Mono<<% } %>ResponseEntity<<%= instanceType %>><% if (reactive) { %>><% } %> get<%= entityClass %>(@PathVariable <%= primaryKey.type %> id) {
-        log.debug("REST request to get <%= entityClass %> : {}", id);<%- include('../../common/get_template', {viaService, returnDirectly:false, implementsEagerLoadApis}); -%>
+        log.debug("REST request to get <%= entityClass %> : {}", id);<%- include('../../_partials_entity_/get_template', {viaService, returnDirectly:false, implementsEagerLoadApis}); -%>
         return ResponseUtil.wrapOrNotFound(<%= instanceName %>);
     }
 <%_ if (!readOnly) { _%>
@@ -413,7 +413,7 @@ public class <%= entityClass %>Resource {
     @DeleteMapping("/<%= entityApiUrl %>/{id}")
     public <% if (reactive) { %>Mono<<% } %>ResponseEntity<Void><% if (reactive) { %>><% } %> delete<%= entityClass %>(@PathVariable <%= primaryKey.type %> id) {
         log.debug("REST request to delete <%= entityClass %> : {}", id);
-<%- include('../../common/delete_template', {viaService: viaService, fromResource: true}); -%>
+<%- include('../../_partials_entity_/delete_template', {viaService: viaService, fromResource: true}); -%>
   <%_ if (reactive) { _%>
     <%_ if (databaseTypeCouchbase) { _%>
             .then(Mono.just(ResponseEntity.noContent()
@@ -444,6 +444,6 @@ public class <%= entityClass %>Resource {
   <%_ } _%>
      * @return the result of the search.
      */
-    @GetMapping("/_search/<%= entityApiUrl %>")<%- include('../../common/search_template', {viaService}); -%>
+    @GetMapping("/_search/<%= entityApiUrl %>")<%- include('../../_partials_entity_/search_template', {viaService}); -%>
 <%_ } _%>
 }
diff --git a/generators/server/templates/src/main/java/package/aop/logging/LoggingAspect.java.ejs b/generators/server/templates/src/main/java/_package_/aop/logging/LoggingAspect.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/aop/logging/LoggingAspect.java.ejs
rename to generators/server/templates/src/main/java/_package_/aop/logging/LoggingAspect.java.ejs
diff --git a/generators/server/templates/src/main/java/package/client/AuthorizedFeignClient.java.ejs b/generators/server/templates/src/main/java/_package_/client/AuthorizedFeignClient.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/client/AuthorizedFeignClient.java.ejs
rename to generators/server/templates/src/main/java/_package_/client/AuthorizedFeignClient.java.ejs
diff --git a/generators/server/templates/src/main/java/package/client/OAuth2InterceptedFeignConfiguration.java.ejs b/generators/server/templates/src/main/java/_package_/client/OAuth2InterceptedFeignConfiguration.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/client/OAuth2InterceptedFeignConfiguration.java.ejs
rename to generators/server/templates/src/main/java/_package_/client/OAuth2InterceptedFeignConfiguration.java.ejs
diff --git a/generators/server/templates/src/main/java/package/client/TokenRelayRequestInterceptor.java.ejs b/generators/server/templates/src/main/java/_package_/client/TokenRelayRequestInterceptor.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/client/TokenRelayRequestInterceptor.java.ejs
rename to generators/server/templates/src/main/java/_package_/client/TokenRelayRequestInterceptor.java.ejs
diff --git a/generators/server/templates/src/main/java/package/client/UserFeignClientInterceptor_jwt.java.ejs b/generators/server/templates/src/main/java/_package_/client/UserFeignClientInterceptor_jwt.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/client/UserFeignClientInterceptor_jwt.java.ejs
rename to generators/server/templates/src/main/java/_package_/client/UserFeignClientInterceptor_jwt.java.ejs
diff --git a/generators/server/templates/src/main/java/package/config/ApplicationProperties.java.ejs b/generators/server/templates/src/main/java/_package_/config/ApplicationProperties.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/config/ApplicationProperties.java.ejs
rename to generators/server/templates/src/main/java/_package_/config/ApplicationProperties.java.ejs
diff --git a/generators/server/templates/src/main/java/package/config/AsyncConfiguration.java.ejs b/generators/server/templates/src/main/java/_package_/config/AsyncConfiguration.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/config/AsyncConfiguration.java.ejs
rename to generators/server/templates/src/main/java/_package_/config/AsyncConfiguration.java.ejs
diff --git a/generators/server/templates/src/main/java/package/config/CRLFLogConverter.java.ejs b/generators/server/templates/src/main/java/_package_/config/CRLFLogConverter.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/config/CRLFLogConverter.java.ejs
rename to generators/server/templates/src/main/java/_package_/config/CRLFLogConverter.java.ejs
diff --git a/generators/server/templates/src/main/java/package/config/Constants.java.ejs b/generators/server/templates/src/main/java/_package_/config/Constants.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/config/Constants.java.ejs
rename to generators/server/templates/src/main/java/_package_/config/Constants.java.ejs
diff --git a/generators/server/templates/src/main/java/package/config/DateTimeFormatConfiguration.java.ejs b/generators/server/templates/src/main/java/_package_/config/DateTimeFormatConfiguration.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/config/DateTimeFormatConfiguration.java.ejs
rename to generators/server/templates/src/main/java/_package_/config/DateTimeFormatConfiguration.java.ejs
diff --git a/generators/server/templates/src/main/java/package/config/EurekaWorkaroundConfiguration.java.ejs b/generators/server/templates/src/main/java/_package_/config/EurekaWorkaroundConfiguration.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/config/EurekaWorkaroundConfiguration.java.ejs
rename to generators/server/templates/src/main/java/_package_/config/EurekaWorkaroundConfiguration.java.ejs
diff --git a/generators/server/templates/src/main/java/package/config/FeignConfiguration.java.ejs b/generators/server/templates/src/main/java/_package_/config/FeignConfiguration.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/config/FeignConfiguration.java.ejs
rename to generators/server/templates/src/main/java/_package_/config/FeignConfiguration.java.ejs
diff --git a/generators/server/templates/src/main/java/package/config/JacksonConfiguration.java.ejs b/generators/server/templates/src/main/java/_package_/config/JacksonConfiguration.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/config/JacksonConfiguration.java.ejs
rename to generators/server/templates/src/main/java/_package_/config/JacksonConfiguration.java.ejs
diff --git a/generators/server/templates/src/main/java/package/config/LocaleConfiguration_imperative.java.ejs b/generators/server/templates/src/main/java/_package_/config/LocaleConfiguration_imperative.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/config/LocaleConfiguration_imperative.java.ejs
rename to generators/server/templates/src/main/java/_package_/config/LocaleConfiguration_imperative.java.ejs
diff --git a/generators/server/templates/src/main/java/package/config/LocaleConfiguration_reactive.java.ejs b/generators/server/templates/src/main/java/_package_/config/LocaleConfiguration_reactive.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/config/LocaleConfiguration_reactive.java.ejs
rename to generators/server/templates/src/main/java/_package_/config/LocaleConfiguration_reactive.java.ejs
diff --git a/generators/server/templates/src/main/java/package/config/LoggingAspectConfiguration.java.ejs b/generators/server/templates/src/main/java/_package_/config/LoggingAspectConfiguration.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/config/LoggingAspectConfiguration.java.ejs
rename to generators/server/templates/src/main/java/_package_/config/LoggingAspectConfiguration.java.ejs
diff --git a/generators/server/templates/src/main/java/package/config/LoggingConfiguration.java.ejs b/generators/server/templates/src/main/java/_package_/config/LoggingConfiguration.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/config/LoggingConfiguration.java.ejs
rename to generators/server/templates/src/main/java/_package_/config/LoggingConfiguration.java.ejs
diff --git a/generators/server/templates/src/main/java/package/config/OAuth2Configuration.java.ejs b/generators/server/templates/src/main/java/_package_/config/OAuth2Configuration.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/config/OAuth2Configuration.java.ejs
rename to generators/server/templates/src/main/java/_package_/config/OAuth2Configuration.java.ejs
diff --git a/generators/server/templates/src/main/java/package/config/OpenApiConfiguration.java.ejs b/generators/server/templates/src/main/java/_package_/config/OpenApiConfiguration.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/config/OpenApiConfiguration.java.ejs
rename to generators/server/templates/src/main/java/_package_/config/OpenApiConfiguration.java.ejs
diff --git a/generators/server/templates/src/main/java/package/config/ReactorConfiguration.java.ejs b/generators/server/templates/src/main/java/_package_/config/ReactorConfiguration.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/config/ReactorConfiguration.java.ejs
rename to generators/server/templates/src/main/java/_package_/config/ReactorConfiguration.java.ejs
diff --git a/generators/server/templates/src/main/java/package/config/SecurityConfiguration_imperative.java.ejs b/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs
similarity index 98%
rename from generators/server/templates/src/main/java/package/config/SecurityConfiguration_imperative.java.ejs
rename to generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs
index a24ccea5f49c..fcd422fd36b4 100644
--- a/generators/server/templates/src/main/java/package/config/SecurityConfiguration_imperative.java.ejs
+++ b/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs
@@ -182,7 +182,7 @@ public class SecurityConfiguration {
                 // prettier-ignore
                 authz
 <%_ if (!skipClient) { _%>
-                    .requestMatchers(mvc.pattern("/index.html"), mvc.pattern("/*.js"), mvc.pattern("/*.map"), mvc.pattern("/*.css")).permitAll()
+                    .requestMatchers(mvc.pattern("/index.html"), mvc.pattern("/*.js"), mvc.pattern("/*.txt"), mvc.pattern("/*.json"), mvc.pattern("/*.map"), mvc.pattern("/*.css")).permitAll()
                     .requestMatchers(mvc.pattern("/*.ico"), mvc.pattern("/*.png"), mvc.pattern("/*.svg"), mvc.pattern("/*.webapp")).permitAll()
   <%_ if (clientFrameworkVue) { _%>
                     .requestMatchers(mvc.pattern("/assets/**")).permitAll()
@@ -245,6 +245,7 @@ public class SecurityConfiguration {
             )
             .formLogin(formLogin ->
                 formLogin
+                    .loginPage("/")
                     .loginProcessingUrl("/api/authentication")
                     .successHandler((request, response, authentication) -> response.setStatus(HttpStatus.OK.value()))
                     .failureHandler((request, response, exception) -> response.setStatus(HttpStatus.UNAUTHORIZED.value()))
diff --git a/generators/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs b/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs
similarity index 99%
rename from generators/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs
rename to generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs
index d45bdcd1bc79..c06671fe3b41 100644
--- a/generators/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs
+++ b/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs
@@ -244,6 +244,7 @@ public class SecurityConfiguration {
 <%_ } _%>
 <%_ if (authenticationTypeSession) { _%>
             .formLogin(formLogin -> formLogin
+                .loginPage("/")
                 .requiresAuthenticationMatcher(pathMatchers(HttpMethod.POST, "/api/authentication"))
                 .authenticationEntryPoint(new HttpStatusServerEntryPoint(HttpStatus.OK))
                 .authenticationSuccessHandler(this::onAuthenticationSuccess)
@@ -284,6 +285,8 @@ public class SecurityConfiguration {
   <%_ if (microfrontend) { _%>
                     // microfrontend resources are loaded by webpack without authentication, they need to be public
                     .pathMatchers("/services/*/*.js").permitAll()
+                    .pathMatchers("/services/*/*.txt").permitAll()
+                    .pathMatchers("/services/*/*.json").permitAll()
                     .pathMatchers("/services/*/*.js.map").permitAll()
   <%_ } _%>
                     .pathMatchers("/services/*/management/health/readiness").permitAll()
diff --git a/generators/server/templates/src/main/java/package/config/SecurityInMemoryConfiguration.java.ejs b/generators/server/templates/src/main/java/_package_/config/SecurityInMemoryConfiguration.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/config/SecurityInMemoryConfiguration.java.ejs
rename to generators/server/templates/src/main/java/_package_/config/SecurityInMemoryConfiguration.java.ejs
diff --git a/generators/server/templates/src/main/java/package/config/SecurityJwtConfiguration.java.ejs b/generators/server/templates/src/main/java/_package_/config/SecurityJwtConfiguration.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/config/SecurityJwtConfiguration.java.ejs
rename to generators/server/templates/src/main/java/_package_/config/SecurityJwtConfiguration.java.ejs
diff --git a/generators/server/templates/src/main/java/package/config/StaticResourcesWebConfiguration.java.ejs b/generators/server/templates/src/main/java/_package_/config/StaticResourcesWebConfiguration.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/config/StaticResourcesWebConfiguration.java.ejs
rename to generators/server/templates/src/main/java/_package_/config/StaticResourcesWebConfiguration.java.ejs
diff --git a/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs b/generators/server/templates/src/main/java/_package_/config/WebConfigurer.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs
rename to generators/server/templates/src/main/java/_package_/config/WebConfigurer.java.ejs
diff --git a/generators/server/templates/src/main/java/package/domain/AbstractAuditingEntity.java.ejs b/generators/server/templates/src/main/java/_package_/domain/AbstractAuditingEntity.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/domain/AbstractAuditingEntity.java.ejs
rename to generators/server/templates/src/main/java/_package_/domain/AbstractAuditingEntity.java.ejs
diff --git a/generators/server/templates/src/main/java/package/domain/Authority.java.ejs b/generators/server/templates/src/main/java/_package_/domain/Authority.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/domain/Authority.java.ejs
rename to generators/server/templates/src/main/java/_package_/domain/Authority.java.ejs
diff --git a/generators/server/templates/src/main/java/package/domain/PersistentToken.java.ejs b/generators/server/templates/src/main/java/_package_/domain/PersistentToken.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/domain/PersistentToken.java.ejs
rename to generators/server/templates/src/main/java/_package_/domain/PersistentToken.java.ejs
diff --git a/generators/server/templates/src/main/java/package/domain/User.java.ejs b/generators/server/templates/src/main/java/_package_/domain/User.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/domain/User.java.ejs
rename to generators/server/templates/src/main/java/_package_/domain/User.java.ejs
diff --git a/generators/server/templates/src/main/java/package/management/SecurityMetersService.java.ejs b/generators/server/templates/src/main/java/_package_/management/SecurityMetersService.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/management/SecurityMetersService.java.ejs
rename to generators/server/templates/src/main/java/_package_/management/SecurityMetersService.java.ejs
diff --git a/generators/server/templates/src/main/java/package/repository/AuthorityRepository.java.ejs b/generators/server/templates/src/main/java/_package_/repository/AuthorityRepository.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/repository/AuthorityRepository.java.ejs
rename to generators/server/templates/src/main/java/_package_/repository/AuthorityRepository.java.ejs
diff --git a/generators/server/templates/src/main/java/package/repository/PersistentTokenRepository.java.ejs b/generators/server/templates/src/main/java/_package_/repository/PersistentTokenRepository.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/repository/PersistentTokenRepository.java.ejs
rename to generators/server/templates/src/main/java/_package_/repository/PersistentTokenRepository.java.ejs
diff --git a/generators/server/templates/src/main/java/package/repository/UserRepository.java.ejs b/generators/server/templates/src/main/java/_package_/repository/UserRepository.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/repository/UserRepository.java.ejs
rename to generators/server/templates/src/main/java/_package_/repository/UserRepository.java.ejs
diff --git a/generators/server/templates/src/main/java/package/security/AuthoritiesConstants.java.ejs b/generators/server/templates/src/main/java/_package_/security/AuthoritiesConstants.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/security/AuthoritiesConstants.java.ejs
rename to generators/server/templates/src/main/java/_package_/security/AuthoritiesConstants.java.ejs
diff --git a/generators/server/templates/src/main/java/package/security/DomainUserDetailsService.java.ejs b/generators/server/templates/src/main/java/_package_/security/DomainUserDetailsService.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/security/DomainUserDetailsService.java.ejs
rename to generators/server/templates/src/main/java/_package_/security/DomainUserDetailsService.java.ejs
diff --git a/generators/server/templates/src/main/java/package/security/PersistentTokenRememberMeServices.java.ejs b/generators/server/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/security/PersistentTokenRememberMeServices.java.ejs
rename to generators/server/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs
diff --git a/generators/server/templates/src/main/java/package/security/SecurityUtils.java.ejs b/generators/server/templates/src/main/java/_package_/security/SecurityUtils.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/security/SecurityUtils.java.ejs
rename to generators/server/templates/src/main/java/_package_/security/SecurityUtils.java.ejs
diff --git a/generators/server/templates/src/main/java/package/security/SpringSecurityAuditorAware.java.ejs b/generators/server/templates/src/main/java/_package_/security/SpringSecurityAuditorAware.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/security/SpringSecurityAuditorAware.java.ejs
rename to generators/server/templates/src/main/java/_package_/security/SpringSecurityAuditorAware.java.ejs
diff --git a/generators/server/templates/src/main/java/package/security/UserNotActivatedException.java.ejs b/generators/server/templates/src/main/java/_package_/security/UserNotActivatedException.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/security/UserNotActivatedException.java.ejs
rename to generators/server/templates/src/main/java/_package_/security/UserNotActivatedException.java.ejs
diff --git a/generators/server/templates/src/main/java/package/security/jwt/JWTRelayGatewayFilterFactory.java.ejs b/generators/server/templates/src/main/java/_package_/security/jwt/JWTRelayGatewayFilterFactory.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/security/jwt/JWTRelayGatewayFilterFactory.java.ejs
rename to generators/server/templates/src/main/java/_package_/security/jwt/JWTRelayGatewayFilterFactory.java.ejs
diff --git a/generators/server/templates/src/main/java/package/security/oauth2/AudienceValidator.java.ejs b/generators/server/templates/src/main/java/_package_/security/oauth2/AudienceValidator.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/security/oauth2/AudienceValidator.java.ejs
rename to generators/server/templates/src/main/java/_package_/security/oauth2/AudienceValidator.java.ejs
diff --git a/generators/server/templates/src/main/java/package/security/oauth2/AuthorizationHeaderUtil.java.ejs b/generators/server/templates/src/main/java/_package_/security/oauth2/AuthorizationHeaderUtil.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/security/oauth2/AuthorizationHeaderUtil.java.ejs
rename to generators/server/templates/src/main/java/_package_/security/oauth2/AuthorizationHeaderUtil.java.ejs
diff --git a/generators/server/templates/src/main/java/package/security/oauth2/CustomClaimConverter.java.ejs b/generators/server/templates/src/main/java/_package_/security/oauth2/CustomClaimConverter.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/security/oauth2/CustomClaimConverter.java.ejs
rename to generators/server/templates/src/main/java/_package_/security/oauth2/CustomClaimConverter.java.ejs
diff --git a/generators/server/templates/src/main/java/package/security/oauth2/JwtGrantedAuthorityConverter.java.ejs b/generators/server/templates/src/main/java/_package_/security/oauth2/JwtGrantedAuthorityConverter.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/security/oauth2/JwtGrantedAuthorityConverter.java.ejs
rename to generators/server/templates/src/main/java/_package_/security/oauth2/JwtGrantedAuthorityConverter.java.ejs
diff --git a/generators/server/templates/src/main/java/package/security/oauth2/OAuthIdpTokenResponseDTO.java.ejs b/generators/server/templates/src/main/java/_package_/security/oauth2/OAuthIdpTokenResponseDTO.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/security/oauth2/OAuthIdpTokenResponseDTO.java.ejs
rename to generators/server/templates/src/main/java/_package_/security/oauth2/OAuthIdpTokenResponseDTO.java.ejs
diff --git a/generators/server/templates/src/main/java/package/service/EmailAlreadyUsedException.java.ejs b/generators/server/templates/src/main/java/_package_/service/EmailAlreadyUsedException.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/service/EmailAlreadyUsedException.java.ejs
rename to generators/server/templates/src/main/java/_package_/service/EmailAlreadyUsedException.java.ejs
diff --git a/generators/server/templates/src/main/java/package/service/InvalidPasswordException.java.ejs b/generators/server/templates/src/main/java/_package_/service/InvalidPasswordException.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/service/InvalidPasswordException.java.ejs
rename to generators/server/templates/src/main/java/_package_/service/InvalidPasswordException.java.ejs
diff --git a/generators/server/templates/src/main/java/package/service/MailService.java.ejs b/generators/server/templates/src/main/java/_package_/service/MailService.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/service/MailService.java.ejs
rename to generators/server/templates/src/main/java/_package_/service/MailService.java.ejs
diff --git a/generators/server/templates/src/main/java/package/service/UserService.java.ejs b/generators/server/templates/src/main/java/_package_/service/UserService.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/service/UserService.java.ejs
rename to generators/server/templates/src/main/java/_package_/service/UserService.java.ejs
diff --git a/generators/server/templates/src/main/java/package/service/UsernameAlreadyUsedException.java.ejs b/generators/server/templates/src/main/java/_package_/service/UsernameAlreadyUsedException.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/service/UsernameAlreadyUsedException.java.ejs
rename to generators/server/templates/src/main/java/_package_/service/UsernameAlreadyUsedException.java.ejs
diff --git a/generators/server/templates/src/main/java/package/service/dto/AdminUserDTO.java.ejs b/generators/server/templates/src/main/java/_package_/service/dto/AdminUserDTO.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/service/dto/AdminUserDTO.java.ejs
rename to generators/server/templates/src/main/java/_package_/service/dto/AdminUserDTO.java.ejs
diff --git a/generators/server/templates/src/main/java/package/service/dto/PasswordChangeDTO.java.ejs b/generators/server/templates/src/main/java/_package_/service/dto/PasswordChangeDTO.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/service/dto/PasswordChangeDTO.java.ejs
rename to generators/server/templates/src/main/java/_package_/service/dto/PasswordChangeDTO.java.ejs
diff --git a/generators/server/templates/src/main/java/package/service/dto/UserDTO.java.ejs b/generators/server/templates/src/main/java/_package_/service/dto/UserDTO.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/service/dto/UserDTO.java.ejs
rename to generators/server/templates/src/main/java/_package_/service/dto/UserDTO.java.ejs
diff --git a/generators/server/templates/src/main/java/package/service/mapper/UserMapper.java.ejs b/generators/server/templates/src/main/java/_package_/service/mapper/UserMapper.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/service/mapper/UserMapper.java.ejs
rename to generators/server/templates/src/main/java/_package_/service/mapper/UserMapper.java.ejs
diff --git a/generators/server/templates/src/main/java/package/web/filter/ModifyServersOpenApiFilter.java.ejs b/generators/server/templates/src/main/java/_package_/web/filter/ModifyServersOpenApiFilter.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/web/filter/ModifyServersOpenApiFilter.java.ejs
rename to generators/server/templates/src/main/java/_package_/web/filter/ModifyServersOpenApiFilter.java.ejs
diff --git a/generators/server/templates/src/main/java/package/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs b/generators/server/templates/src/main/java/_package_/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs
rename to generators/server/templates/src/main/java/_package_/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs
diff --git a/generators/server/templates/src/main/java/package/web/filter/OAuth2RefreshTokensWebFilter.java.ejs b/generators/server/templates/src/main/java/_package_/web/filter/OAuth2RefreshTokensWebFilter.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/web/filter/OAuth2RefreshTokensWebFilter.java.ejs
rename to generators/server/templates/src/main/java/_package_/web/filter/OAuth2RefreshTokensWebFilter.java.ejs
diff --git a/generators/server/templates/src/main/java/package/web/filter/SpaWebFilter_imperative.java.ejs b/generators/server/templates/src/main/java/_package_/web/filter/SpaWebFilter_imperative.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/web/filter/SpaWebFilter_imperative.java.ejs
rename to generators/server/templates/src/main/java/_package_/web/filter/SpaWebFilter_imperative.java.ejs
diff --git a/generators/server/templates/src/main/java/package/web/filter/SpaWebFilter_reactive.java.ejs b/generators/server/templates/src/main/java/_package_/web/filter/SpaWebFilter_reactive.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/web/filter/SpaWebFilter_reactive.java.ejs
rename to generators/server/templates/src/main/java/_package_/web/filter/SpaWebFilter_reactive.java.ejs
diff --git a/generators/server/templates/src/main/java/package/web/rest/AccountResource.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/web/rest/AccountResource.java.ejs
rename to generators/server/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs
diff --git a/generators/server/templates/src/main/java/package/web/rest/AccountResource_oauth2.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/AccountResource_oauth2.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/web/rest/AccountResource_oauth2.java.ejs
rename to generators/server/templates/src/main/java/_package_/web/rest/AccountResource_oauth2.java.ejs
diff --git a/generators/server/templates/src/main/java/package/web/rest/AccountResource_skipUserManagement.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/AccountResource_skipUserManagement.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/web/rest/AccountResource_skipUserManagement.java.ejs
rename to generators/server/templates/src/main/java/_package_/web/rest/AccountResource_skipUserManagement.java.ejs
diff --git a/generators/server/templates/src/main/java/package/web/rest/AuthInfoResource.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/AuthInfoResource.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/web/rest/AuthInfoResource.java.ejs
rename to generators/server/templates/src/main/java/_package_/web/rest/AuthInfoResource.java.ejs
diff --git a/generators/server/templates/src/main/java/package/web/rest/AuthenticateController.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/web/rest/AuthenticateController.java.ejs
rename to generators/server/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs
diff --git a/generators/server/templates/src/main/java/package/web/rest/GatewayResource.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/GatewayResource.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/web/rest/GatewayResource.java.ejs
rename to generators/server/templates/src/main/java/_package_/web/rest/GatewayResource.java.ejs
diff --git a/generators/server/templates/src/main/java/package/web/rest/LogoutResource_imperative.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/LogoutResource_imperative.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/web/rest/LogoutResource_imperative.java.ejs
rename to generators/server/templates/src/main/java/_package_/web/rest/LogoutResource_imperative.java.ejs
diff --git a/generators/server/templates/src/main/java/package/web/rest/LogoutResource_reactive.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/LogoutResource_reactive.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/web/rest/LogoutResource_reactive.java.ejs
rename to generators/server/templates/src/main/java/_package_/web/rest/LogoutResource_reactive.java.ejs
diff --git a/generators/server/templates/src/main/java/package/web/rest/PublicUserResource.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/PublicUserResource.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/web/rest/PublicUserResource.java.ejs
rename to generators/server/templates/src/main/java/_package_/web/rest/PublicUserResource.java.ejs
diff --git a/generators/server/templates/src/main/java/package/web/rest/UserResource.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/UserResource.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/web/rest/UserResource.java.ejs
rename to generators/server/templates/src/main/java/_package_/web/rest/UserResource.java.ejs
diff --git a/generators/server/templates/src/main/java/package/web/rest/errors/BadRequestAlertException.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/errors/BadRequestAlertException.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/web/rest/errors/BadRequestAlertException.java.ejs
rename to generators/server/templates/src/main/java/_package_/web/rest/errors/BadRequestAlertException.java.ejs
diff --git a/generators/server/templates/src/main/java/package/web/rest/errors/EmailAlreadyUsedException.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/errors/EmailAlreadyUsedException.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/web/rest/errors/EmailAlreadyUsedException.java.ejs
rename to generators/server/templates/src/main/java/_package_/web/rest/errors/EmailAlreadyUsedException.java.ejs
diff --git a/generators/server/templates/src/main/java/package/web/rest/errors/ErrorConstants.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/errors/ErrorConstants.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/web/rest/errors/ErrorConstants.java.ejs
rename to generators/server/templates/src/main/java/_package_/web/rest/errors/ErrorConstants.java.ejs
diff --git a/generators/server/templates/src/main/java/package/web/rest/errors/ExceptionTranslator.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/errors/ExceptionTranslator.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/web/rest/errors/ExceptionTranslator.java.ejs
rename to generators/server/templates/src/main/java/_package_/web/rest/errors/ExceptionTranslator.java.ejs
diff --git a/generators/server/templates/src/main/java/package/web/rest/errors/FieldErrorVM.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/errors/FieldErrorVM.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/web/rest/errors/FieldErrorVM.java.ejs
rename to generators/server/templates/src/main/java/_package_/web/rest/errors/FieldErrorVM.java.ejs
diff --git a/generators/server/templates/src/main/java/package/web/rest/errors/InvalidPasswordException.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/errors/InvalidPasswordException.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/web/rest/errors/InvalidPasswordException.java.ejs
rename to generators/server/templates/src/main/java/_package_/web/rest/errors/InvalidPasswordException.java.ejs
diff --git a/generators/server/templates/src/main/java/package/web/rest/errors/LoginAlreadyUsedException.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/errors/LoginAlreadyUsedException.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/web/rest/errors/LoginAlreadyUsedException.java.ejs
rename to generators/server/templates/src/main/java/_package_/web/rest/errors/LoginAlreadyUsedException.java.ejs
diff --git a/generators/server/templates/src/main/java/package/web/rest/vm/KeyAndPasswordVM.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/vm/KeyAndPasswordVM.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/web/rest/vm/KeyAndPasswordVM.java.ejs
rename to generators/server/templates/src/main/java/_package_/web/rest/vm/KeyAndPasswordVM.java.ejs
diff --git a/generators/server/templates/src/main/java/package/web/rest/vm/LoginVM.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/vm/LoginVM.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/web/rest/vm/LoginVM.java.ejs
rename to generators/server/templates/src/main/java/_package_/web/rest/vm/LoginVM.java.ejs
diff --git a/generators/server/templates/src/main/java/package/web/rest/vm/ManagedUserVM.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/vm/ManagedUserVM.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/web/rest/vm/ManagedUserVM.java.ejs
rename to generators/server/templates/src/main/java/_package_/web/rest/vm/ManagedUserVM.java.ejs
diff --git a/generators/server/templates/src/main/java/package/web/rest/vm/RouteVM.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/vm/RouteVM.java.ejs
similarity index 100%
rename from generators/server/templates/src/main/java/package/web/rest/vm/RouteVM.java.ejs
rename to generators/server/templates/src/main/java/_package_/web/rest/vm/RouteVM.java.ejs
diff --git a/generators/server/templates/src/main/resources/logback-spring.xml.ejs b/generators/server/templates/src/main/resources/logback-spring.xml.ejs
index 34e313506bb8..de5472d30d41 100644
--- a/generators/server/templates/src/main/resources/logback-spring.xml.ejs
+++ b/generators/server/templates/src/main/resources/logback-spring.xml.ejs
@@ -124,7 +124,7 @@
 <%_ if (cacheProviderMemcached) { _%>
     <logger name="net.rubyeye.xmemcached" level="INFO"/>
 <%_ } _%>
-<%_ if (prodDatabaseTypePostgres) { _%>
+<%_ if (prodDatabaseTypePostgresql) { _%>
     <logger name="org.postgresql" level="WARN"/>
 <%_ } _%>
     <logger name="org.springframework" level="WARN"/>
diff --git a/generators/server/templates/src/test/java/package/IntegrationTest.java.ejs b/generators/server/templates/src/test/java/_package_/IntegrationTest.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/IntegrationTest.java.ejs
rename to generators/server/templates/src/test/java/_package_/IntegrationTest.java.ejs
diff --git a/generators/server/templates/src/test/java/package/TechnicalStructureTest.java.ejs b/generators/server/templates/src/test/java/_package_/TechnicalStructureTest.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/TechnicalStructureTest.java.ejs
rename to generators/server/templates/src/test/java/_package_/TechnicalStructureTest.java.ejs
diff --git a/generators/server/templates/entity/src/test/java/package/service/dto/_DtoClass_Test.java.ejs b/generators/server/templates/src/test/java/_package_/_entityPackage_/service/dto/_dtoClass_Test.java.ejs
similarity index 100%
rename from generators/server/templates/entity/src/test/java/package/service/dto/_DtoClass_Test.java.ejs
rename to generators/server/templates/src/test/java/_package_/_entityPackage_/service/dto/_dtoClass_Test.java.ejs
diff --git a/generators/server/templates/entity/src/test/java/package/service/mapper/_EntityClass_MapperTest.java.ejs b/generators/server/templates/src/test/java/_package_/_entityPackage_/service/mapper/_entityClass_MapperTest.java.ejs
similarity index 100%
rename from generators/server/templates/entity/src/test/java/package/service/mapper/_EntityClass_MapperTest.java.ejs
rename to generators/server/templates/src/test/java/_package_/_entityPackage_/service/mapper/_entityClass_MapperTest.java.ejs
diff --git a/generators/server/templates/entity/src/test/java/package/web/rest/_EntityClass_ResourceIT.java.ejs b/generators/server/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs
similarity index 99%
rename from generators/server/templates/entity/src/test/java/package/web/rest/_EntityClass_ResourceIT.java.ejs
rename to generators/server/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs
index 32f78badc518..3a0fef700030 100644
--- a/generators/server/templates/entity/src/test/java/package/web/rest/_EntityClass_ResourceIT.java.ejs
+++ b/generators/server/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs
@@ -1612,7 +1612,7 @@ _%>
         <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
   <%_ const fieldsToIncludeInPartialPatchTest = fieldsToTest.map(field => prepareFieldForPatchTest(field, () => faker.datatype.boolean())); _%>
-<%- include('/partials/it_patch_update.partial.java.ejs', {fields: fieldsToIncludeInPartialPatchTest, saveMethod, callBlock, callListBlock}); -%>
+<%- include('/_global_partials_entity_/it_patch_update.partial.java.ejs', {fields: fieldsToIncludeInPartialPatchTest, saveMethod, callBlock, callListBlock}); -%>
     }
 
     @Test<%= transactionalAnnotation %>
@@ -1626,7 +1626,7 @@ _%>
         <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
   <% const fieldsToIncludeInFullPatchTest = fieldsToTest.map(field => prepareFieldForPatchTest(field, () => true)); %>
-<%- include('/partials/it_patch_update.partial.java.ejs', {fields: fieldsToIncludeInFullPatchTest, saveMethod, callBlock, callListBlock}); -%>
+<%- include('/_global_partials_entity_/it_patch_update.partial.java.ejs', {fields: fieldsToIncludeInFullPatchTest, saveMethod, callBlock, callListBlock}); -%>
     }
 
     @Test<%= transactionalAnnotation %>
diff --git a/generators/server/templates/src/test/java/package/config/AsyncSyncConfiguration.java.ejs b/generators/server/templates/src/test/java/_package_/config/AsyncSyncConfiguration.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/config/AsyncSyncConfiguration.java.ejs
rename to generators/server/templates/src/test/java/_package_/config/AsyncSyncConfiguration.java.ejs
diff --git a/generators/server/templates/src/test/java/package/config/JHipsterBlockHoundIntegration.java.ejs b/generators/server/templates/src/test/java/_package_/config/JHipsterBlockHoundIntegration.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/config/JHipsterBlockHoundIntegration.java.ejs
rename to generators/server/templates/src/test/java/_package_/config/JHipsterBlockHoundIntegration.java.ejs
diff --git a/generators/server/templates/src/test/java/package/config/SpringBootTestClassOrderer.java.ejs b/generators/server/templates/src/test/java/_package_/config/SpringBootTestClassOrderer.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/config/SpringBootTestClassOrderer.java.ejs
rename to generators/server/templates/src/test/java/_package_/config/SpringBootTestClassOrderer.java.ejs
diff --git a/generators/server/templates/src/test/java/package/config/StaticResourcesWebConfigurerTest.java.ejs b/generators/server/templates/src/test/java/_package_/config/StaticResourcesWebConfigurerTest.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/config/StaticResourcesWebConfigurerTest.java.ejs
rename to generators/server/templates/src/test/java/_package_/config/StaticResourcesWebConfigurerTest.java.ejs
diff --git a/generators/server/templates/src/test/java/package/config/TestContainersSpringContextCustomizerFactory.java.ejs b/generators/server/templates/src/test/java/_package_/config/TestContainersSpringContextCustomizerFactory.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/config/TestContainersSpringContextCustomizerFactory.java.ejs
rename to generators/server/templates/src/test/java/_package_/config/TestContainersSpringContextCustomizerFactory.java.ejs
diff --git a/generators/server/templates/src/test/java/package/config/TestSecurityConfiguration.java.ejs b/generators/server/templates/src/test/java/_package_/config/TestSecurityConfiguration.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/config/TestSecurityConfiguration.java.ejs
rename to generators/server/templates/src/test/java/_package_/config/TestSecurityConfiguration.java.ejs
diff --git a/generators/server/templates/src/test/java/package/config/WebConfigurerTest.java.ejs b/generators/server/templates/src/test/java/_package_/config/WebConfigurerTest.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/config/WebConfigurerTest.java.ejs
rename to generators/server/templates/src/test/java/_package_/config/WebConfigurerTest.java.ejs
diff --git a/generators/server/templates/src/test/java/package/config/WebConfigurerTestController.java.ejs b/generators/server/templates/src/test/java/_package_/config/WebConfigurerTestController.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/config/WebConfigurerTestController.java.ejs
rename to generators/server/templates/src/test/java/_package_/config/WebConfigurerTestController.java.ejs
diff --git a/generators/server/templates/src/test/java/package/management/SecurityMetersServiceTests.java.ejs b/generators/server/templates/src/test/java/_package_/management/SecurityMetersServiceTests.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/management/SecurityMetersServiceTests.java.ejs
rename to generators/server/templates/src/test/java/_package_/management/SecurityMetersServiceTests.java.ejs
diff --git a/generators/server/templates/src/test/java/package/security/DomainUserDetailsServiceIT.java.ejs b/generators/server/templates/src/test/java/_package_/security/DomainUserDetailsServiceIT.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/security/DomainUserDetailsServiceIT.java.ejs
rename to generators/server/templates/src/test/java/_package_/security/DomainUserDetailsServiceIT.java.ejs
diff --git a/generators/server/templates/src/test/java/package/security/SecurityUtilsUnitTest_imperative.java.ejs b/generators/server/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/security/SecurityUtilsUnitTest_imperative.java.ejs
rename to generators/server/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs
diff --git a/generators/server/templates/src/test/java/package/security/SecurityUtilsUnitTest_reactive.java.ejs b/generators/server/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_reactive.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/security/SecurityUtilsUnitTest_reactive.java.ejs
rename to generators/server/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_reactive.java.ejs
diff --git a/generators/server/templates/src/test/java/package/security/jwt/AuthenticationIntegrationTest.java.ejs b/generators/server/templates/src/test/java/_package_/security/jwt/AuthenticationIntegrationTest.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/security/jwt/AuthenticationIntegrationTest.java.ejs
rename to generators/server/templates/src/test/java/_package_/security/jwt/AuthenticationIntegrationTest.java.ejs
diff --git a/generators/server/templates/src/test/java/package/security/jwt/JwtAuthenticationTestUtils.java.ejs b/generators/server/templates/src/test/java/_package_/security/jwt/JwtAuthenticationTestUtils.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/security/jwt/JwtAuthenticationTestUtils.java.ejs
rename to generators/server/templates/src/test/java/_package_/security/jwt/JwtAuthenticationTestUtils.java.ejs
diff --git a/generators/server/templates/src/test/java/package/security/jwt/TestAuthenticationResource.java.ejs b/generators/server/templates/src/test/java/_package_/security/jwt/TestAuthenticationResource.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/security/jwt/TestAuthenticationResource.java.ejs
rename to generators/server/templates/src/test/java/_package_/security/jwt/TestAuthenticationResource.java.ejs
diff --git a/generators/server/templates/src/test/java/package/security/jwt/TokenAuthenticationIT.java.ejs b/generators/server/templates/src/test/java/_package_/security/jwt/TokenAuthenticationIT.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/security/jwt/TokenAuthenticationIT.java.ejs
rename to generators/server/templates/src/test/java/_package_/security/jwt/TokenAuthenticationIT.java.ejs
diff --git a/generators/server/templates/src/test/java/package/security/jwt/TokenAuthenticationSecurityMetersIT.java.ejs b/generators/server/templates/src/test/java/_package_/security/jwt/TokenAuthenticationSecurityMetersIT.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/security/jwt/TokenAuthenticationSecurityMetersIT.java.ejs
rename to generators/server/templates/src/test/java/_package_/security/jwt/TokenAuthenticationSecurityMetersIT.java.ejs
diff --git a/generators/server/templates/src/test/java/package/security/oauth2/AudienceValidatorTest.java.ejs b/generators/server/templates/src/test/java/_package_/security/oauth2/AudienceValidatorTest.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/security/oauth2/AudienceValidatorTest.java.ejs
rename to generators/server/templates/src/test/java/_package_/security/oauth2/AudienceValidatorTest.java.ejs
diff --git a/generators/server/templates/src/test/java/package/security/oauth2/AuthorizationHeaderUtilTest.java.ejs b/generators/server/templates/src/test/java/_package_/security/oauth2/AuthorizationHeaderUtilTest.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/security/oauth2/AuthorizationHeaderUtilTest.java.ejs
rename to generators/server/templates/src/test/java/_package_/security/oauth2/AuthorizationHeaderUtilTest.java.ejs
diff --git a/generators/server/templates/src/test/java/package/security/oauth2/CustomClaimConverterIT.java.ejs b/generators/server/templates/src/test/java/_package_/security/oauth2/CustomClaimConverterIT.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/security/oauth2/CustomClaimConverterIT.java.ejs
rename to generators/server/templates/src/test/java/_package_/security/oauth2/CustomClaimConverterIT.java.ejs
diff --git a/generators/server/templates/src/test/java/package/service/MailServiceIT.java.ejs b/generators/server/templates/src/test/java/_package_/service/MailServiceIT.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/service/MailServiceIT.java.ejs
rename to generators/server/templates/src/test/java/_package_/service/MailServiceIT.java.ejs
diff --git a/generators/server/templates/src/test/java/package/service/UserServiceIT.java.ejs b/generators/server/templates/src/test/java/_package_/service/UserServiceIT.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/service/UserServiceIT.java.ejs
rename to generators/server/templates/src/test/java/_package_/service/UserServiceIT.java.ejs
diff --git a/generators/server/templates/src/test/java/package/service/mapper/UserMapperTest.java.ejs b/generators/server/templates/src/test/java/_package_/service/mapper/UserMapperTest.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/service/mapper/UserMapperTest.java.ejs
rename to generators/server/templates/src/test/java/_package_/service/mapper/UserMapperTest.java.ejs
diff --git a/generators/server/templates/src/test/java/package/test/util/OAuth2TestUtil.java.ejs b/generators/server/templates/src/test/java/_package_/test/util/OAuth2TestUtil.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/test/util/OAuth2TestUtil.java.ejs
rename to generators/server/templates/src/test/java/_package_/test/util/OAuth2TestUtil.java.ejs
diff --git a/generators/server/templates/src/test/java/package/web/filter/ModifyServersOpenApiFilterTest.java.ejs b/generators/server/templates/src/test/java/_package_/web/filter/ModifyServersOpenApiFilterTest.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/web/filter/ModifyServersOpenApiFilterTest.java.ejs
rename to generators/server/templates/src/test/java/_package_/web/filter/ModifyServersOpenApiFilterTest.java.ejs
diff --git a/generators/server/templates/src/test/java/package/web/filter/SpaWebFilterIT_imperative.java.ejs b/generators/server/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_imperative.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/web/filter/SpaWebFilterIT_imperative.java.ejs
rename to generators/server/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_imperative.java.ejs
diff --git a/generators/server/templates/src/test/java/package/web/filter/SpaWebFilterIT_reactive.java.ejs b/generators/server/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_reactive.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/web/filter/SpaWebFilterIT_reactive.java.ejs
rename to generators/server/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_reactive.java.ejs
diff --git a/generators/server/templates/src/test/java/package/web/filter/SpaWebFilterTestController_reactive.java.ejs b/generators/server/templates/src/test/java/_package_/web/filter/SpaWebFilterTestController_reactive.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/web/filter/SpaWebFilterTestController_reactive.java.ejs
rename to generators/server/templates/src/test/java/_package_/web/filter/SpaWebFilterTestController_reactive.java.ejs
diff --git a/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT.java.ejs b/generators/server/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/web/rest/AccountResourceIT.java.ejs
rename to generators/server/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs
diff --git a/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_oauth2.java.ejs b/generators/server/templates/src/test/java/_package_/web/rest/AccountResourceIT_oauth2.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_oauth2.java.ejs
rename to generators/server/templates/src/test/java/_package_/web/rest/AccountResourceIT_oauth2.java.ejs
diff --git a/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_skipUserManagement.java.ejs b/generators/server/templates/src/test/java/_package_/web/rest/AccountResourceIT_skipUserManagement.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_skipUserManagement.java.ejs
rename to generators/server/templates/src/test/java/_package_/web/rest/AccountResourceIT_skipUserManagement.java.ejs
diff --git a/generators/server/templates/src/test/java/package/web/rest/AuthenticateControllerIT.java.ejs b/generators/server/templates/src/test/java/_package_/web/rest/AuthenticateControllerIT.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/web/rest/AuthenticateControllerIT.java.ejs
rename to generators/server/templates/src/test/java/_package_/web/rest/AuthenticateControllerIT.java.ejs
diff --git a/generators/server/templates/src/test/java/package/web/rest/LogoutResourceIT.java.ejs b/generators/server/templates/src/test/java/_package_/web/rest/LogoutResourceIT.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/web/rest/LogoutResourceIT.java.ejs
rename to generators/server/templates/src/test/java/_package_/web/rest/LogoutResourceIT.java.ejs
diff --git a/generators/server/templates/src/test/java/package/web/rest/PublicUserResourceIT.java.ejs b/generators/server/templates/src/test/java/_package_/web/rest/PublicUserResourceIT.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/web/rest/PublicUserResourceIT.java.ejs
rename to generators/server/templates/src/test/java/_package_/web/rest/PublicUserResourceIT.java.ejs
diff --git a/generators/server/templates/src/test/java/package/web/rest/TestUtil.java.ejs b/generators/server/templates/src/test/java/_package_/web/rest/TestUtil.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/web/rest/TestUtil.java.ejs
rename to generators/server/templates/src/test/java/_package_/web/rest/TestUtil.java.ejs
diff --git a/generators/server/templates/src/test/java/package/web/rest/UserResourceIT.java.ejs b/generators/server/templates/src/test/java/_package_/web/rest/UserResourceIT.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/web/rest/UserResourceIT.java.ejs
rename to generators/server/templates/src/test/java/_package_/web/rest/UserResourceIT.java.ejs
diff --git a/generators/server/templates/src/test/java/package/web/rest/WithUnauthenticatedMockUser.java.ejs b/generators/server/templates/src/test/java/_package_/web/rest/WithUnauthenticatedMockUser.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/web/rest/WithUnauthenticatedMockUser.java.ejs
rename to generators/server/templates/src/test/java/_package_/web/rest/WithUnauthenticatedMockUser.java.ejs
diff --git a/generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorIT_imperative.java.ejs b/generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_imperative.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorIT_imperative.java.ejs
rename to generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_imperative.java.ejs
diff --git a/generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs b/generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs
rename to generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs
diff --git a/generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorTestController.java.ejs b/generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorTestController.java.ejs
similarity index 100%
rename from generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorTestController.java.ejs
rename to generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorTestController.java.ejs
diff --git a/generators/server/templates/src/test/resources/logback.xml.ejs b/generators/server/templates/src/test/resources/logback.xml.ejs
index fea94a5e9f8f..8c68cc31b2c2 100644
--- a/generators/server/templates/src/test/resources/logback.xml.ejs
+++ b/generators/server/templates/src/test/resources/logback.xml.ejs
@@ -100,7 +100,7 @@
 <%_ if (cacheProviderMemcached) { _%>
     <logger name="net.rubyeye.xmemcached" level="INFO"/>
 <%_ } _%>
-<%_ if (prodDatabaseTypePostgres) { _%>
+<%_ if (prodDatabaseTypePostgresql) { _%>
     <logger name="org.postgresql.jdbc" level="WARN"/>
 <%_ } _%>
     <logger name="org.springframework" level="WARN"/>
diff --git a/generators/server/types.d.mts b/generators/server/types.d.mts
index d9041bfb00b3..16faa496f5f3 100644
--- a/generators/server/types.d.mts
+++ b/generators/server/types.d.mts
@@ -66,14 +66,15 @@ type SearchEngine = {
   searchEngine: string;
 };
 
-type ApplicatonNature = (ImperativeApplication & CacheProviderApplication) | ReactiveApplication;
+type ApplicationNature = (ImperativeApplication & CacheProviderApplication) | ReactiveApplication;
 
 export type SpringBootApplication = JavaApplication &
-  ApplicatonNature &
+  ApplicationNature &
   BuildToolApplication &
   SearchEngine &
   DatabaseTypeApplication &
   MessageBrokerApplicationType & {
+    javaVersion: string;
     dockerContainers: Record<string, string>;
 
     enableSwaggerCodegen: boolean;
diff --git a/generators/spring-cache/files.mts b/generators/spring-cache/files.mts
index ffe4219024d0..55465be7600d 100644
--- a/generators/spring-cache/files.mts
+++ b/generators/spring-cache/files.mts
@@ -28,19 +28,19 @@ const files: WriteFileSection<Generator, any> = {
       templates: ['gradle/cache.gradle'],
     },
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['config/CacheConfiguration.java'],
     },
     {
       condition: data => data.cacheProviderInfinispan,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['config/CacheFactoryConfiguration.java'],
     },
     {
       condition: data => data.cacheProviderRedis,
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: [
         'config/EmbeddedRedis.java',
diff --git a/generators/spring-cache/generator.mts b/generators/spring-cache/generator.mts
index c5dff6cea0f0..bfe8a0b28790 100644
--- a/generators/spring-cache/generator.mts
+++ b/generators/spring-cache/generator.mts
@@ -25,10 +25,13 @@ import { getCacheProviderMavenDefinition } from './internal/dependencies.mjs';
 
 export default class SpringCacheGenerator extends BaseApplicationGenerator {
   async beforeQueue() {
-    await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
     if (!this.fromBlueprint) {
       await this.composeWithBlueprints(GENERATOR_SPRING_CACHE);
     }
+
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+    }
   }
 
   get preparing() {
diff --git a/generators/spring-cache/templates/src/main/java/package/config/CacheConfiguration.java.ejs b/generators/spring-cache/templates/src/main/java/_package_/config/CacheConfiguration.java.ejs
similarity index 100%
rename from generators/spring-cache/templates/src/main/java/package/config/CacheConfiguration.java.ejs
rename to generators/spring-cache/templates/src/main/java/_package_/config/CacheConfiguration.java.ejs
diff --git a/generators/spring-cache/templates/src/main/java/package/config/CacheFactoryConfiguration.java.ejs b/generators/spring-cache/templates/src/main/java/_package_/config/CacheFactoryConfiguration.java.ejs
similarity index 100%
rename from generators/spring-cache/templates/src/main/java/package/config/CacheFactoryConfiguration.java.ejs
rename to generators/spring-cache/templates/src/main/java/_package_/config/CacheFactoryConfiguration.java.ejs
diff --git a/generators/spring-cache/templates/src/test/java/package/config/EmbeddedRedis.java.ejs b/generators/spring-cache/templates/src/test/java/_package_/config/EmbeddedRedis.java.ejs
similarity index 100%
rename from generators/spring-cache/templates/src/test/java/package/config/EmbeddedRedis.java.ejs
rename to generators/spring-cache/templates/src/test/java/_package_/config/EmbeddedRedis.java.ejs
diff --git a/generators/spring-cache/templates/src/test/java/package/config/RedisTestContainer.java.ejs b/generators/spring-cache/templates/src/test/java/_package_/config/RedisTestContainer.java.ejs
similarity index 100%
rename from generators/spring-cache/templates/src/test/java/package/config/RedisTestContainer.java.ejs
rename to generators/spring-cache/templates/src/test/java/_package_/config/RedisTestContainer.java.ejs
diff --git a/generators/spring-cache/templates/src/test/java/package/config/RedisTestContainersSpringContextCustomizerFactory.java.ejs b/generators/spring-cache/templates/src/test/java/_package_/config/RedisTestContainersSpringContextCustomizerFactory.java.ejs
similarity index 100%
rename from generators/spring-cache/templates/src/test/java/package/config/RedisTestContainersSpringContextCustomizerFactory.java.ejs
rename to generators/spring-cache/templates/src/test/java/_package_/config/RedisTestContainersSpringContextCustomizerFactory.java.ejs
diff --git a/generators/spring-cloud-stream/cleanup.mts b/generators/spring-cloud-stream/cleanup.mts
index 6291d7cfb5b2..02e42410f60e 100644
--- a/generators/spring-cloud-stream/cleanup.mts
+++ b/generators/spring-cloud-stream/cleanup.mts
@@ -30,7 +30,7 @@ export default function cleanupKafkaFilesTask(this: KafkaGenerator, { applicatio
     this.removeFile(`${application.javaPackageSrcDir}config/KafkaSseConsumer.java`);
     this.removeFile(`${application.javaPackageSrcDir}config/KafkaSseProducer.java`);
 
-    // make sure those files are removed and reacreated
+    // make sure those files are removed and recreated
     this.removeFile(`${application.srcTestResources}META-INF/spring.factories`);
     this.removeFile(`${application.javaPackageTestDir}config/TestContainersSpringContextCustomizerFactory.java`);
   }
diff --git a/generators/spring-cloud-stream/files.mts b/generators/spring-cloud-stream/files.mts
index ca600537d80c..2d6d5cccf562 100644
--- a/generators/spring-cloud-stream/files.mts
+++ b/generators/spring-cloud-stream/files.mts
@@ -28,14 +28,14 @@ export const kafkaFiles: WriteFileSection<any, any> = {
       templates: ['gradle/kafka.gradle'],
     },
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: [data => `broker/KafkaConsumer_${data.imperativeOrReactive}.java`, 'broker/KafkaProducer.java'],
     },
   ],
   resources: [
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       to: moveToJavaPackageSrcDir,
       templates: [
         {
@@ -47,7 +47,7 @@ export const kafkaFiles: WriteFileSection<any, any> = {
   ],
   test: [
     {
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: [
         'config/KafkaTestContainer.java',
@@ -56,7 +56,7 @@ export const kafkaFiles: WriteFileSection<any, any> = {
       ],
     },
     {
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       to: moveToJavaPackageTestDir,
       templates: [
         {
@@ -77,7 +77,7 @@ export const pulsarFiles: WriteFileSection<any, any> = {
   ],
   test: [
     {
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: [
         'broker/PulsarIT.java',
diff --git a/generators/spring-cloud-stream/generator.mts b/generators/spring-cloud-stream/generator.mts
index dfc88fa4d21f..5d1db434385c 100644
--- a/generators/spring-cloud-stream/generator.mts
+++ b/generators/spring-cloud-stream/generator.mts
@@ -24,10 +24,13 @@ import writeFilesTask from './files.mjs';
 
 export default class KafkaGenerator extends BaseApplicationGenerator {
   async beforeQueue() {
-    await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_SERVER);
     if (!this.fromBlueprint) {
       await this.composeWithBlueprints(GENERATOR_SPRING_CLOUD_STREAM);
     }
+
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_SERVER);
+    }
   }
 
   get preparing() {
diff --git a/generators/spring-cloud-stream/templates/src/main/java/package/broker/KafkaConsumer_imperative.java.ejs b/generators/spring-cloud-stream/templates/src/main/java/_package_/broker/KafkaConsumer_imperative.java.ejs
similarity index 100%
rename from generators/spring-cloud-stream/templates/src/main/java/package/broker/KafkaConsumer_imperative.java.ejs
rename to generators/spring-cloud-stream/templates/src/main/java/_package_/broker/KafkaConsumer_imperative.java.ejs
diff --git a/generators/spring-cloud-stream/templates/src/main/java/package/broker/KafkaConsumer_reactive.java.ejs b/generators/spring-cloud-stream/templates/src/main/java/_package_/broker/KafkaConsumer_reactive.java.ejs
similarity index 100%
rename from generators/spring-cloud-stream/templates/src/main/java/package/broker/KafkaConsumer_reactive.java.ejs
rename to generators/spring-cloud-stream/templates/src/main/java/_package_/broker/KafkaConsumer_reactive.java.ejs
diff --git a/generators/spring-cloud-stream/templates/src/main/java/package/broker/KafkaProducer.java.ejs b/generators/spring-cloud-stream/templates/src/main/java/_package_/broker/KafkaProducer.java.ejs
similarity index 100%
rename from generators/spring-cloud-stream/templates/src/main/java/package/broker/KafkaProducer.java.ejs
rename to generators/spring-cloud-stream/templates/src/main/java/_package_/broker/KafkaProducer.java.ejs
diff --git a/generators/spring-cloud-stream/templates/src/main/java/package/web/rest/KafkaResource_imperative.java.ejs b/generators/spring-cloud-stream/templates/src/main/java/_package_/web/rest/KafkaResource_imperative.java.ejs
similarity index 100%
rename from generators/spring-cloud-stream/templates/src/main/java/package/web/rest/KafkaResource_imperative.java.ejs
rename to generators/spring-cloud-stream/templates/src/main/java/_package_/web/rest/KafkaResource_imperative.java.ejs
diff --git a/generators/spring-cloud-stream/templates/src/main/java/package/web/rest/KafkaResource_reactive.java.ejs b/generators/spring-cloud-stream/templates/src/main/java/_package_/web/rest/KafkaResource_reactive.java.ejs
similarity index 100%
rename from generators/spring-cloud-stream/templates/src/main/java/package/web/rest/KafkaResource_reactive.java.ejs
rename to generators/spring-cloud-stream/templates/src/main/java/_package_/web/rest/KafkaResource_reactive.java.ejs
diff --git a/generators/spring-cloud-stream/templates/src/test/java/package/broker/PulsarIT.java.ejs b/generators/spring-cloud-stream/templates/src/test/java/_package_/broker/PulsarIT.java.ejs
similarity index 100%
rename from generators/spring-cloud-stream/templates/src/test/java/package/broker/PulsarIT.java.ejs
rename to generators/spring-cloud-stream/templates/src/test/java/_package_/broker/PulsarIT.java.ejs
diff --git a/generators/spring-cloud-stream/templates/src/test/java/package/config/BrokerConfiguration.java.ejs b/generators/spring-cloud-stream/templates/src/test/java/_package_/config/BrokerConfiguration.java.ejs
similarity index 100%
rename from generators/spring-cloud-stream/templates/src/test/java/package/config/BrokerConfiguration.java.ejs
rename to generators/spring-cloud-stream/templates/src/test/java/_package_/config/BrokerConfiguration.java.ejs
diff --git a/generators/spring-cloud-stream/templates/src/test/java/package/config/EmbeddedKafka.java.ejs b/generators/spring-cloud-stream/templates/src/test/java/_package_/config/EmbeddedKafka.java.ejs
similarity index 100%
rename from generators/spring-cloud-stream/templates/src/test/java/package/config/EmbeddedKafka.java.ejs
rename to generators/spring-cloud-stream/templates/src/test/java/_package_/config/EmbeddedKafka.java.ejs
diff --git a/generators/spring-cloud-stream/templates/src/test/java/package/config/EmbeddedPulsar.java.ejs b/generators/spring-cloud-stream/templates/src/test/java/_package_/config/EmbeddedPulsar.java.ejs
similarity index 100%
rename from generators/spring-cloud-stream/templates/src/test/java/package/config/EmbeddedPulsar.java.ejs
rename to generators/spring-cloud-stream/templates/src/test/java/_package_/config/EmbeddedPulsar.java.ejs
diff --git a/generators/spring-cloud-stream/templates/src/test/java/package/config/KafkaTestContainer.java.ejs b/generators/spring-cloud-stream/templates/src/test/java/_package_/config/KafkaTestContainer.java.ejs
similarity index 100%
rename from generators/spring-cloud-stream/templates/src/test/java/package/config/KafkaTestContainer.java.ejs
rename to generators/spring-cloud-stream/templates/src/test/java/_package_/config/KafkaTestContainer.java.ejs
diff --git a/generators/spring-cloud-stream/templates/src/test/java/package/config/KafkaTestContainersSpringContextCustomizerFactory.java.ejs b/generators/spring-cloud-stream/templates/src/test/java/_package_/config/KafkaTestContainersSpringContextCustomizerFactory.java.ejs
similarity index 100%
rename from generators/spring-cloud-stream/templates/src/test/java/package/config/KafkaTestContainersSpringContextCustomizerFactory.java.ejs
rename to generators/spring-cloud-stream/templates/src/test/java/_package_/config/KafkaTestContainersSpringContextCustomizerFactory.java.ejs
diff --git a/generators/spring-cloud-stream/templates/src/test/java/package/config/PulsarTestContainer.java.ejs b/generators/spring-cloud-stream/templates/src/test/java/_package_/config/PulsarTestContainer.java.ejs
similarity index 100%
rename from generators/spring-cloud-stream/templates/src/test/java/package/config/PulsarTestContainer.java.ejs
rename to generators/spring-cloud-stream/templates/src/test/java/_package_/config/PulsarTestContainer.java.ejs
diff --git a/generators/spring-cloud-stream/templates/src/test/java/package/config/PulsarTestContainersSpringContextCustomizerFactory.java.ejs b/generators/spring-cloud-stream/templates/src/test/java/_package_/config/PulsarTestContainersSpringContextCustomizerFactory.java.ejs
similarity index 100%
rename from generators/spring-cloud-stream/templates/src/test/java/package/config/PulsarTestContainersSpringContextCustomizerFactory.java.ejs
rename to generators/spring-cloud-stream/templates/src/test/java/_package_/config/PulsarTestContainersSpringContextCustomizerFactory.java.ejs
diff --git a/generators/spring-cloud-stream/templates/src/test/java/package/web/rest/KafkaResourceIT_imperative.java.ejs b/generators/spring-cloud-stream/templates/src/test/java/_package_/web/rest/KafkaResourceIT_imperative.java.ejs
similarity index 100%
rename from generators/spring-cloud-stream/templates/src/test/java/package/web/rest/KafkaResourceIT_imperative.java.ejs
rename to generators/spring-cloud-stream/templates/src/test/java/_package_/web/rest/KafkaResourceIT_imperative.java.ejs
diff --git a/generators/spring-cloud-stream/templates/src/test/java/package/web/rest/KafkaResourceIT_reactive.java.ejs b/generators/spring-cloud-stream/templates/src/test/java/_package_/web/rest/KafkaResourceIT_reactive.java.ejs
similarity index 100%
rename from generators/spring-cloud-stream/templates/src/test/java/package/web/rest/KafkaResourceIT_reactive.java.ejs
rename to generators/spring-cloud-stream/templates/src/test/java/_package_/web/rest/KafkaResourceIT_reactive.java.ejs
diff --git a/generators/spring-data-cassandra/entity-files.mjs b/generators/spring-data-cassandra/entity-files.mjs
index 486057ed34f9..02a59756a0f1 100644
--- a/generators/spring-data-cassandra/entity-files.mjs
+++ b/generators/spring-data-cassandra/entity-files.mjs
@@ -16,8 +16,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { SERVER_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR } from '../generator-constants.mjs';
-import { moveToJavaEntityPackageSrcDir } from '../server/support/index.mjs';
+import { SERVER_MAIN_RES_DIR } from '../generator-constants.mjs';
+import { javaMainPackageTemplatesBlock } from '../server/support/index.mjs';
 
 export const entityFiles = {
   dbChangelog: [
@@ -34,9 +34,8 @@ export const entityFiles = {
   ],
   server: [
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
-      renameTo: moveToJavaEntityPackageSrcDir,
-      templates: ['domain/_PersistClass_.java.jhi.spring_data_cassandra'],
+      ...javaMainPackageTemplatesBlock('_entityPackage_'),
+      templates: ['domain/_persistClass_.java.jhi.spring_data_cassandra'],
     },
   ],
 };
diff --git a/generators/spring-data-cassandra/files.mjs b/generators/spring-data-cassandra/files.mjs
index c6e89cbb297e..b66921bbaa42 100644
--- a/generators/spring-data-cassandra/files.mjs
+++ b/generators/spring-data-cassandra/files.mjs
@@ -22,7 +22,7 @@ import { moveToJavaPackageSrcDir, moveToJavaPackageTestDir } from '../server/sup
 export const cassandraFiles = {
   serverFiles: [
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['config/DatabaseConfiguration.java'],
     },
@@ -51,7 +51,7 @@ export const cassandraFiles = {
   ],
   serverTestFw: [
     {
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: [
         'CassandraKeyspaceIT.java',
diff --git a/generators/spring-data-cassandra/generator.mjs b/generators/spring-data-cassandra/generator.mjs
index 2156d8bdf004..a92390d493d2 100644
--- a/generators/spring-data-cassandra/generator.mjs
+++ b/generators/spring-data-cassandra/generator.mjs
@@ -25,10 +25,13 @@ import writeCassandraEntityFilesTask, { cleanupCassandraEntityFilesTask } from '
 
 export default class CassandraGenerator extends BaseApplicationGenerator {
   async beforeQueue() {
-    await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
     if (!this.fromBlueprint) {
       await this.composeWithBlueprints(GENERATOR_SPRING_DATA_CASSANDRA);
     }
+
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+    }
   }
 
   get configuringEachEntity() {
diff --git a/generators/spring-data-cassandra/templates/src/main/java/package/domain/_PersistClass_.java.jhi.spring_data_cassandra.ejs b/generators/spring-data-cassandra/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.spring_data_cassandra.ejs
similarity index 100%
rename from generators/spring-data-cassandra/templates/src/main/java/package/domain/_PersistClass_.java.jhi.spring_data_cassandra.ejs
rename to generators/spring-data-cassandra/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.spring_data_cassandra.ejs
diff --git a/generators/spring-data-cassandra/templates/src/main/java/package/config/DatabaseConfiguration.java.ejs b/generators/spring-data-cassandra/templates/src/main/java/_package_/config/DatabaseConfiguration.java.ejs
similarity index 100%
rename from generators/spring-data-cassandra/templates/src/main/java/package/config/DatabaseConfiguration.java.ejs
rename to generators/spring-data-cassandra/templates/src/main/java/_package_/config/DatabaseConfiguration.java.ejs
diff --git a/generators/spring-data-cassandra/templates/src/test/java/package/CassandraKeyspaceIT.java.ejs b/generators/spring-data-cassandra/templates/src/test/java/_package_/CassandraKeyspaceIT.java.ejs
similarity index 100%
rename from generators/spring-data-cassandra/templates/src/test/java/package/CassandraKeyspaceIT.java.ejs
rename to generators/spring-data-cassandra/templates/src/test/java/_package_/CassandraKeyspaceIT.java.ejs
diff --git a/generators/spring-data-cassandra/templates/src/test/java/package/config/CassandraTestContainer.java.ejs b/generators/spring-data-cassandra/templates/src/test/java/_package_/config/CassandraTestContainer.java.ejs
similarity index 100%
rename from generators/spring-data-cassandra/templates/src/test/java/package/config/CassandraTestContainer.java.ejs
rename to generators/spring-data-cassandra/templates/src/test/java/_package_/config/CassandraTestContainer.java.ejs
diff --git a/generators/spring-data-cassandra/templates/src/test/java/package/config/CassandraTestContainersSpringContextCustomizerFactory.java.ejs b/generators/spring-data-cassandra/templates/src/test/java/_package_/config/CassandraTestContainersSpringContextCustomizerFactory.java.ejs
similarity index 100%
rename from generators/spring-data-cassandra/templates/src/test/java/package/config/CassandraTestContainersSpringContextCustomizerFactory.java.ejs
rename to generators/spring-data-cassandra/templates/src/test/java/_package_/config/CassandraTestContainersSpringContextCustomizerFactory.java.ejs
diff --git a/generators/spring-data-cassandra/templates/src/test/java/package/config/EmbeddedCassandra.java.ejs b/generators/spring-data-cassandra/templates/src/test/java/_package_/config/EmbeddedCassandra.java.ejs
similarity index 100%
rename from generators/spring-data-cassandra/templates/src/test/java/package/config/EmbeddedCassandra.java.ejs
rename to generators/spring-data-cassandra/templates/src/test/java/_package_/config/EmbeddedCassandra.java.ejs
diff --git a/generators/spring-data-couchbase/entity-files.mjs b/generators/spring-data-couchbase/entity-files.mjs
index 86a4c4fe70fd..27d3b154fa45 100644
--- a/generators/spring-data-couchbase/entity-files.mjs
+++ b/generators/spring-data-couchbase/entity-files.mjs
@@ -16,8 +16,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { SERVER_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR } from '../generator-constants.mjs';
-import { moveToJavaEntityPackageSrcDir } from '../server/support/index.mjs';
+import { SERVER_MAIN_RES_DIR } from '../generator-constants.mjs';
+import { javaMainPackageTemplatesBlock } from '../server/support/index.mjs';
 
 export const entityFiles = {
   dbChangelog: [
@@ -45,15 +45,13 @@ export const entityFiles = {
   ],
   server: [
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
-      renameTo: moveToJavaEntityPackageSrcDir,
-      templates: ['domain/_PersistClass_.java.jhi.spring_data_couchbase'],
+      ...javaMainPackageTemplatesBlock('_entityPackage_'),
+      templates: ['domain/_persistClass_.java.jhi.spring_data_couchbase'],
     },
     {
       condition: generator => !generator.embedded,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
-      renameTo: moveToJavaEntityPackageSrcDir,
-      templates: ['repository/_EntityClass_Repository.java'],
+      ...javaMainPackageTemplatesBlock('_entityPackage_'),
+      templates: ['repository/_entityClass_Repository.java'],
     },
   ],
 };
diff --git a/generators/spring-data-couchbase/files.mjs b/generators/spring-data-couchbase/files.mjs
index ce48b87fed89..b5764604dc9e 100644
--- a/generators/spring-data-couchbase/files.mjs
+++ b/generators/spring-data-couchbase/files.mjs
@@ -22,25 +22,25 @@ import { moveToJavaPackageSrcDir, moveToJavaPackageTestDir } from '../server/sup
 export const couchbaseFiles = {
   serverJavaConfig: [
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['repository/JHipsterCouchbaseRepository.java', 'config/DatabaseConfiguration.java'],
     },
     {
       condition: data => data.authenticationTypeSession && !data.reactive && data.generateUserManagement,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['repository/PersistentTokenRepository_couchbase.java'],
     },
     {
       condition: data => data.searchEngineCouchbase,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['repository/CouchbaseSearchRepository.java'],
     },
     {
       condition: data => data.searchEngineCouchbase,
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: ['repository/CouchbaseSearchRepositoryTest.java'],
     },
@@ -64,7 +64,7 @@ export const couchbaseFiles = {
   ],
   serverTestFw: [
     {
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: ['config/CouchbaseTestContainer.java', 'config/EmbeddedCouchbase.java'],
     },
diff --git a/generators/spring-data-couchbase/generator.mjs b/generators/spring-data-couchbase/generator.mjs
index d5bacfe651b7..9c033ac20974 100644
--- a/generators/spring-data-couchbase/generator.mjs
+++ b/generators/spring-data-couchbase/generator.mjs
@@ -24,10 +24,13 @@ import writeCouchbaseEntityFilesTask, { cleanupCouchbaseEntityFilesTask } from '
 
 export default class CouchbaseGenerator extends BaseApplicationGenerator {
   async beforeQueue() {
-    await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
     if (!this.fromBlueprint) {
       await this.composeWithBlueprints(GENERATOR_SPRING_DATA_COUCHBASE);
     }
+
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+    }
   }
 
   get writing() {
diff --git a/generators/spring-data-couchbase/templates/src/main/java/package/domain/_PersistClass_.java.jhi.spring_data_couchbase.ejs b/generators/spring-data-couchbase/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.spring_data_couchbase.ejs
similarity index 100%
rename from generators/spring-data-couchbase/templates/src/main/java/package/domain/_PersistClass_.java.jhi.spring_data_couchbase.ejs
rename to generators/spring-data-couchbase/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.spring_data_couchbase.ejs
diff --git a/generators/spring-data-couchbase/templates/src/main/java/package/repository/_EntityClass_Repository.java.ejs b/generators/spring-data-couchbase/templates/src/main/java/_package_/_entityPackage_/repository/_entityClass_Repository.java.ejs
similarity index 100%
rename from generators/spring-data-couchbase/templates/src/main/java/package/repository/_EntityClass_Repository.java.ejs
rename to generators/spring-data-couchbase/templates/src/main/java/_package_/_entityPackage_/repository/_entityClass_Repository.java.ejs
diff --git a/generators/spring-data-couchbase/templates/src/main/java/package/config/DatabaseConfiguration.java.ejs b/generators/spring-data-couchbase/templates/src/main/java/_package_/config/DatabaseConfiguration.java.ejs
similarity index 100%
rename from generators/spring-data-couchbase/templates/src/main/java/package/config/DatabaseConfiguration.java.ejs
rename to generators/spring-data-couchbase/templates/src/main/java/_package_/config/DatabaseConfiguration.java.ejs
diff --git a/generators/spring-data-couchbase/templates/src/main/java/package/repository/CouchbaseSearchRepository.java.ejs b/generators/spring-data-couchbase/templates/src/main/java/_package_/repository/CouchbaseSearchRepository.java.ejs
similarity index 100%
rename from generators/spring-data-couchbase/templates/src/main/java/package/repository/CouchbaseSearchRepository.java.ejs
rename to generators/spring-data-couchbase/templates/src/main/java/_package_/repository/CouchbaseSearchRepository.java.ejs
diff --git a/generators/spring-data-couchbase/templates/src/main/java/package/repository/JHipsterCouchbaseRepository.java.ejs b/generators/spring-data-couchbase/templates/src/main/java/_package_/repository/JHipsterCouchbaseRepository.java.ejs
similarity index 100%
rename from generators/spring-data-couchbase/templates/src/main/java/package/repository/JHipsterCouchbaseRepository.java.ejs
rename to generators/spring-data-couchbase/templates/src/main/java/_package_/repository/JHipsterCouchbaseRepository.java.ejs
diff --git a/generators/spring-data-couchbase/templates/src/main/java/package/repository/PersistentTokenRepository_couchbase.java.ejs b/generators/spring-data-couchbase/templates/src/main/java/_package_/repository/PersistentTokenRepository_couchbase.java.ejs
similarity index 100%
rename from generators/spring-data-couchbase/templates/src/main/java/package/repository/PersistentTokenRepository_couchbase.java.ejs
rename to generators/spring-data-couchbase/templates/src/main/java/_package_/repository/PersistentTokenRepository_couchbase.java.ejs
diff --git a/generators/spring-data-couchbase/templates/src/test/java/package/config/CouchbaseTestContainer.java.ejs b/generators/spring-data-couchbase/templates/src/test/java/_package_/config/CouchbaseTestContainer.java.ejs
similarity index 100%
rename from generators/spring-data-couchbase/templates/src/test/java/package/config/CouchbaseTestContainer.java.ejs
rename to generators/spring-data-couchbase/templates/src/test/java/_package_/config/CouchbaseTestContainer.java.ejs
diff --git a/generators/spring-data-couchbase/templates/src/test/java/package/config/EmbeddedCouchbase.java.ejs b/generators/spring-data-couchbase/templates/src/test/java/_package_/config/EmbeddedCouchbase.java.ejs
similarity index 100%
rename from generators/spring-data-couchbase/templates/src/test/java/package/config/EmbeddedCouchbase.java.ejs
rename to generators/spring-data-couchbase/templates/src/test/java/_package_/config/EmbeddedCouchbase.java.ejs
diff --git a/generators/spring-data-couchbase/templates/src/test/java/package/repository/CouchbaseSearchRepositoryTest.java.ejs b/generators/spring-data-couchbase/templates/src/test/java/_package_/repository/CouchbaseSearchRepositoryTest.java.ejs
similarity index 100%
rename from generators/spring-data-couchbase/templates/src/test/java/package/repository/CouchbaseSearchRepositoryTest.java.ejs
rename to generators/spring-data-couchbase/templates/src/test/java/_package_/repository/CouchbaseSearchRepositoryTest.java.ejs
diff --git a/generators/spring-data-elasticsearch/__test-support/elastic-search-matcher.mts b/generators/spring-data-elasticsearch/__test-support/elastic-search-matcher.mts
index 8b6f3e9b877a..6ba212aaccc8 100644
--- a/generators/spring-data-elasticsearch/__test-support/elastic-search-matcher.mts
+++ b/generators/spring-data-elasticsearch/__test-support/elastic-search-matcher.mts
@@ -2,11 +2,11 @@ import type { RunResult } from 'yeoman-test';
 import type BaseApplicationGenerator from '../../base-application/index.mjs';
 import type { SpringBootApplication } from '../../server/types.mjs';
 
-import { SERVER_MAIN_SRC_DIR, DOCKER_DIR } from '../../generator-constants.mjs';
+import { SERVER_MAIN_SRC_DIR, JAVA_DOCKER_DIR } from '../../generator-constants.mjs';
 import { matchWrittenConfig, matchWrittenFiles } from '../../../test/support/matcher.mjs';
 
 const expectedElasticsearchFiles = () => {
-  return [`${DOCKER_DIR}elasticsearch.yml`];
+  return [`${JAVA_DOCKER_DIR}elasticsearch.yml`];
 };
 
 const expectedElasticsearchUserFiles = (resultGetter: () => RunResult) => {
diff --git a/generators/spring-data-elasticsearch/entity-files.mjs b/generators/spring-data-elasticsearch/entity-files.mjs
index 49e11bc97593..2bf7e9556ed2 100644
--- a/generators/spring-data-elasticsearch/entity-files.mjs
+++ b/generators/spring-data-elasticsearch/entity-files.mjs
@@ -16,21 +16,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { SERVER_MAIN_SRC_DIR } from '../generator-constants.mjs';
-import { moveToJavaEntityPackageSrcDir } from '../server/support/index.mjs';
+import { javaMainPackageTemplatesBlock } from '../server/support/index.mjs';
 
 export const entityFiles = {
   elasticSearchFiles: [
     {
       condition: generator => !generator.embedded,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
-      renameTo: moveToJavaEntityPackageSrcDir,
-      templates: ['repository/search/_EntityClass_SearchRepository.java'],
+      ...javaMainPackageTemplatesBlock('_entityPackage_'),
+      templates: ['repository/search/_entityClass_SearchRepository.java'],
     },
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
-      renameTo: moveToJavaEntityPackageSrcDir,
-      templates: ['domain/_PersistClass_.java.jhi.elastic_search'],
+      ...javaMainPackageTemplatesBlock('_entityPackage_'),
+      templates: ['domain/_persistClass_.java.jhi.elastic_search'],
     },
   ],
 };
diff --git a/generators/spring-data-elasticsearch/files.mjs b/generators/spring-data-elasticsearch/files.mjs
index cfa2edf8b1db..72e72902afea 100644
--- a/generators/spring-data-elasticsearch/files.mjs
+++ b/generators/spring-data-elasticsearch/files.mjs
@@ -22,7 +22,7 @@ import { moveToJavaPackageSrcDir, moveToJavaPackageTestDir } from '../server/sup
 export const files = {
   serverResource: [
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: [
         'config/ElasticsearchConfiguration.java',
@@ -32,12 +32,12 @@ export const files = {
     },
     {
       condition: generator => generator.generateBuiltInUserEntity || generator.authenticationTypeOauth2,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['repository/search/UserSearchRepository.java'],
     },
     {
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: [
         'config/ElasticsearchTestConfiguration.java',
diff --git a/generators/spring-data-elasticsearch/generator.mjs b/generators/spring-data-elasticsearch/generator.mjs
index 910de7fa69cc..5eec7004a8df 100644
--- a/generators/spring-data-elasticsearch/generator.mjs
+++ b/generators/spring-data-elasticsearch/generator.mjs
@@ -25,10 +25,13 @@ import writeElasticsearchEntityFilesTask, { cleanupElasticsearchEntityFilesTask
 
 export default class ElasticsearchGenerator extends BaseApplicationGenerator {
   async beforeQueue() {
-    await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
     if (!this.fromBlueprint) {
       await this.composeWithBlueprints(GENERATOR_SPRING_DATA_ELASTICSEARCH);
     }
+
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+    }
   }
 
   get writing() {
diff --git a/generators/spring-data-elasticsearch/templates/src/main/java/package/domain/_PersistClass_.java.jhi.elastic_search.ejs b/generators/spring-data-elasticsearch/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.elastic_search.ejs
similarity index 100%
rename from generators/spring-data-elasticsearch/templates/src/main/java/package/domain/_PersistClass_.java.jhi.elastic_search.ejs
rename to generators/spring-data-elasticsearch/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.elastic_search.ejs
diff --git a/generators/spring-data-elasticsearch/templates/src/main/java/package/repository/search/_EntityClass_SearchRepository.java.ejs b/generators/spring-data-elasticsearch/templates/src/main/java/_package_/_entityPackage_/repository/search/_entityClass_SearchRepository.java.ejs
similarity index 100%
rename from generators/spring-data-elasticsearch/templates/src/main/java/package/repository/search/_EntityClass_SearchRepository.java.ejs
rename to generators/spring-data-elasticsearch/templates/src/main/java/_package_/_entityPackage_/repository/search/_entityClass_SearchRepository.java.ejs
diff --git a/generators/spring-data-elasticsearch/templates/src/main/java/package/config/ElasticsearchConfiguration.java.ejs b/generators/spring-data-elasticsearch/templates/src/main/java/_package_/config/ElasticsearchConfiguration.java.ejs
similarity index 100%
rename from generators/spring-data-elasticsearch/templates/src/main/java/package/config/ElasticsearchConfiguration.java.ejs
rename to generators/spring-data-elasticsearch/templates/src/main/java/_package_/config/ElasticsearchConfiguration.java.ejs
diff --git a/generators/spring-data-elasticsearch/templates/src/main/java/package/repository/search/UserSearchRepository.java.ejs b/generators/spring-data-elasticsearch/templates/src/main/java/_package_/repository/search/UserSearchRepository.java.ejs
similarity index 100%
rename from generators/spring-data-elasticsearch/templates/src/main/java/package/repository/search/UserSearchRepository.java.ejs
rename to generators/spring-data-elasticsearch/templates/src/main/java/_package_/repository/search/UserSearchRepository.java.ejs
diff --git a/generators/spring-data-elasticsearch/templates/src/main/java/package/web/rest/errors/ElasticsearchExceptionMapper.java.ejs b/generators/spring-data-elasticsearch/templates/src/main/java/_package_/web/rest/errors/ElasticsearchExceptionMapper.java.ejs
similarity index 100%
rename from generators/spring-data-elasticsearch/templates/src/main/java/package/web/rest/errors/ElasticsearchExceptionMapper.java.ejs
rename to generators/spring-data-elasticsearch/templates/src/main/java/_package_/web/rest/errors/ElasticsearchExceptionMapper.java.ejs
diff --git a/generators/spring-data-elasticsearch/templates/src/main/java/package/web/rest/errors/QuerySyntaxException.java.ejs b/generators/spring-data-elasticsearch/templates/src/main/java/_package_/web/rest/errors/QuerySyntaxException.java.ejs
similarity index 100%
rename from generators/spring-data-elasticsearch/templates/src/main/java/package/web/rest/errors/QuerySyntaxException.java.ejs
rename to generators/spring-data-elasticsearch/templates/src/main/java/_package_/web/rest/errors/QuerySyntaxException.java.ejs
diff --git a/generators/spring-data-elasticsearch/templates/src/main/java/package/web/web/rest/errors/ElasticsearchExceptionMapper.java.ejs b/generators/spring-data-elasticsearch/templates/src/main/java/_package_/web/web/rest/errors/ElasticsearchExceptionMapper.java.ejs
similarity index 100%
rename from generators/spring-data-elasticsearch/templates/src/main/java/package/web/web/rest/errors/ElasticsearchExceptionMapper.java.ejs
rename to generators/spring-data-elasticsearch/templates/src/main/java/_package_/web/web/rest/errors/ElasticsearchExceptionMapper.java.ejs
diff --git a/generators/spring-data-elasticsearch/templates/src/main/java/package/web/web/rest/errors/QuerySyntaxException.java.ejs b/generators/spring-data-elasticsearch/templates/src/main/java/_package_/web/web/rest/errors/QuerySyntaxException.java.ejs
similarity index 100%
rename from generators/spring-data-elasticsearch/templates/src/main/java/package/web/web/rest/errors/QuerySyntaxException.java.ejs
rename to generators/spring-data-elasticsearch/templates/src/main/java/_package_/web/web/rest/errors/QuerySyntaxException.java.ejs
diff --git a/generators/spring-data-elasticsearch/templates/src/test/java/package/config/ElasticsearchTestConfiguration.java.ejs b/generators/spring-data-elasticsearch/templates/src/test/java/_package_/config/ElasticsearchTestConfiguration.java.ejs
similarity index 100%
rename from generators/spring-data-elasticsearch/templates/src/test/java/package/config/ElasticsearchTestConfiguration.java.ejs
rename to generators/spring-data-elasticsearch/templates/src/test/java/_package_/config/ElasticsearchTestConfiguration.java.ejs
diff --git a/generators/spring-data-elasticsearch/templates/src/test/java/package/config/ElasticsearchTestContainer.java.ejs b/generators/spring-data-elasticsearch/templates/src/test/java/_package_/config/ElasticsearchTestContainer.java.ejs
similarity index 100%
rename from generators/spring-data-elasticsearch/templates/src/test/java/package/config/ElasticsearchTestContainer.java.ejs
rename to generators/spring-data-elasticsearch/templates/src/test/java/_package_/config/ElasticsearchTestContainer.java.ejs
diff --git a/generators/spring-data-elasticsearch/templates/src/test/java/package/config/EmbeddedElasticsearch.java.ejs b/generators/spring-data-elasticsearch/templates/src/test/java/_package_/config/EmbeddedElasticsearch.java.ejs
similarity index 100%
rename from generators/spring-data-elasticsearch/templates/src/test/java/package/config/EmbeddedElasticsearch.java.ejs
rename to generators/spring-data-elasticsearch/templates/src/test/java/_package_/config/EmbeddedElasticsearch.java.ejs
diff --git a/generators/spring-data-elasticsearch/templates/src/test/java/package/web/rest/errors/ElasticsearchExceptionMapperTest.java.ejs b/generators/spring-data-elasticsearch/templates/src/test/java/_package_/web/rest/errors/ElasticsearchExceptionMapperTest.java.ejs
similarity index 100%
rename from generators/spring-data-elasticsearch/templates/src/test/java/package/web/rest/errors/ElasticsearchExceptionMapperTest.java.ejs
rename to generators/spring-data-elasticsearch/templates/src/test/java/_package_/web/rest/errors/ElasticsearchExceptionMapperTest.java.ejs
diff --git a/generators/spring-data-mongodb/entity-files.mjs b/generators/spring-data-mongodb/entity-files.mjs
index 9470c4745ad6..83cd5cfde50a 100644
--- a/generators/spring-data-mongodb/entity-files.mjs
+++ b/generators/spring-data-mongodb/entity-files.mjs
@@ -16,15 +16,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { SERVER_MAIN_SRC_DIR } from '../generator-constants.mjs';
-import { moveToJavaEntityPackageSrcDir } from '../server/support/index.mjs';
+import { javaMainPackageTemplatesBlock } from '../server/support/index.mjs';
 
 export const entityFiles = {
   server: [
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
-      renameTo: moveToJavaEntityPackageSrcDir,
-      templates: ['domain/_PersistClass_.java.jhi.spring_data_mongodb'],
+      ...javaMainPackageTemplatesBlock('_entityPackage_'),
+      templates: ['domain/_persistClass_.java.jhi.spring_data_mongodb'],
     },
   ],
 };
diff --git a/generators/spring-data-mongodb/files.mjs b/generators/spring-data-mongodb/files.mjs
index d010fcde79c1..5705f16d5825 100644
--- a/generators/spring-data-mongodb/files.mjs
+++ b/generators/spring-data-mongodb/files.mjs
@@ -22,18 +22,18 @@ import { moveToJavaPackageSrcDir, moveToJavaPackageTestDir } from '../server/sup
 export const mongoDbFiles = {
   serverResource: [
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['config/DatabaseConfiguration.java'],
     },
     {
       condition: generator => generator.generateBuiltInUserEntity,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['config/dbmigrations/InitialSetupMigration.java'],
     },
     {
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: ['config/MongoDbTestContainer.java', 'config/EmbeddedMongo.java'],
     },
diff --git a/generators/spring-data-mongodb/generator.mjs b/generators/spring-data-mongodb/generator.mjs
index 717b5f107a2f..990e2acf013a 100644
--- a/generators/spring-data-mongodb/generator.mjs
+++ b/generators/spring-data-mongodb/generator.mjs
@@ -25,10 +25,13 @@ import writeMongodbEntityFilesTask, { cleanupMongodbEntityFilesTask } from './en
 
 export default class MongoDBGenerator extends BaseApplicationGenerator {
   async beforeQueue() {
-    await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
     if (!this.fromBlueprint) {
       await this.composeWithBlueprints(GENERATOR_SPRING_DATA_MONGODB);
     }
+
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+    }
   }
 
   get writing() {
diff --git a/generators/spring-data-mongodb/templates/src/main/java/package/domain/_PersistClass_.java.jhi.spring_data_mongodb.ejs b/generators/spring-data-mongodb/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.spring_data_mongodb.ejs
similarity index 100%
rename from generators/spring-data-mongodb/templates/src/main/java/package/domain/_PersistClass_.java.jhi.spring_data_mongodb.ejs
rename to generators/spring-data-mongodb/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.spring_data_mongodb.ejs
diff --git a/generators/spring-data-mongodb/templates/src/main/java/package/config/DatabaseConfiguration.java.ejs b/generators/spring-data-mongodb/templates/src/main/java/_package_/config/DatabaseConfiguration.java.ejs
similarity index 100%
rename from generators/spring-data-mongodb/templates/src/main/java/package/config/DatabaseConfiguration.java.ejs
rename to generators/spring-data-mongodb/templates/src/main/java/_package_/config/DatabaseConfiguration.java.ejs
diff --git a/generators/spring-data-mongodb/templates/src/main/java/package/config/dbmigrations/InitialSetupMigration.java.ejs b/generators/spring-data-mongodb/templates/src/main/java/_package_/config/dbmigrations/InitialSetupMigration.java.ejs
similarity index 100%
rename from generators/spring-data-mongodb/templates/src/main/java/package/config/dbmigrations/InitialSetupMigration.java.ejs
rename to generators/spring-data-mongodb/templates/src/main/java/_package_/config/dbmigrations/InitialSetupMigration.java.ejs
diff --git a/generators/spring-data-mongodb/templates/src/test/java/package/config/EmbeddedMongo.java.ejs b/generators/spring-data-mongodb/templates/src/test/java/_package_/config/EmbeddedMongo.java.ejs
similarity index 100%
rename from generators/spring-data-mongodb/templates/src/test/java/package/config/EmbeddedMongo.java.ejs
rename to generators/spring-data-mongodb/templates/src/test/java/_package_/config/EmbeddedMongo.java.ejs
diff --git a/generators/spring-data-mongodb/templates/src/test/java/package/config/MongoDbTestContainer.java.ejs b/generators/spring-data-mongodb/templates/src/test/java/_package_/config/MongoDbTestContainer.java.ejs
similarity index 100%
rename from generators/spring-data-mongodb/templates/src/test/java/package/config/MongoDbTestContainer.java.ejs
rename to generators/spring-data-mongodb/templates/src/test/java/_package_/config/MongoDbTestContainer.java.ejs
diff --git a/generators/spring-data-neo4j/entity-files.mts b/generators/spring-data-neo4j/entity-files.mts
index 56c92defb275..9a09a6e90951 100644
--- a/generators/spring-data-neo4j/entity-files.mts
+++ b/generators/spring-data-neo4j/entity-files.mts
@@ -17,16 +17,14 @@
  * limitations under the License.
  */
 import Generator from './generator.mjs';
-import { SERVER_MAIN_SRC_DIR } from '../generator-constants.mjs';
-import { moveToJavaEntityPackageSrcDir } from '../server/support/index.mjs';
+import { javaMainPackageTemplatesBlock } from '../server/support/index.mjs';
 
 export const entityFiles = {
   server: [
     {
       condition: generator => generator.databaseTypeNeo4j,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
-      renameTo: moveToJavaEntityPackageSrcDir,
-      templates: ['domain/_PersistClass_.java.jhi.spring_data_neo4j'],
+      ...javaMainPackageTemplatesBlock('_entityPackage_'),
+      templates: ['domain/_persistClass_.java.jhi.spring_data_neo4j'],
     },
   ],
 };
diff --git a/generators/spring-data-neo4j/files.mts b/generators/spring-data-neo4j/files.mts
index b320bff9e8f5..20b2f6f1f579 100644
--- a/generators/spring-data-neo4j/files.mts
+++ b/generators/spring-data-neo4j/files.mts
@@ -23,13 +23,13 @@ import Generator from './generator.mjs';
 export const neo4jFiles = {
   serverResource: [
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['config/DatabaseConfiguration.java_neo4j'],
     },
     {
       condition: generator => generator.generateBuiltInUserEntity && !generator.databaseMigrationLiquibase,
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: ['config/neo4j/Neo4jMigrations.java'],
     },
@@ -41,7 +41,7 @@ export const neo4jFiles = {
   ],
   serverTestFw: [
     {
-      path: `${SERVER_TEST_SRC_DIR}package/`,
+      path: `${SERVER_TEST_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageTestDir,
       templates: [
         'config/Neo4jTestContainer.java',
diff --git a/generators/spring-data-neo4j/generator.mts b/generators/spring-data-neo4j/generator.mts
index e02f33f39b49..ff338f4d1b56 100644
--- a/generators/spring-data-neo4j/generator.mts
+++ b/generators/spring-data-neo4j/generator.mts
@@ -25,10 +25,13 @@ import writeEntitiesTask, { cleanupEntitiesTask } from './entity-files.mjs';
 
 export default class Neo4jGenerator extends BaseApplicationGenerator {
   async beforeQueue() {
-    await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
     if (!this.fromBlueprint) {
       await this.composeWithBlueprints(GENERATOR_SPRING_DATA_NEO4J);
     }
+
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+    }
   }
 
   get composing() {
diff --git a/generators/spring-data-neo4j/templates/src/main/java/package/domain/_PersistClass_.java.jhi.spring_data_neo4j.ejs b/generators/spring-data-neo4j/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.spring_data_neo4j.ejs
similarity index 100%
rename from generators/spring-data-neo4j/templates/src/main/java/package/domain/_PersistClass_.java.jhi.spring_data_neo4j.ejs
rename to generators/spring-data-neo4j/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.spring_data_neo4j.ejs
diff --git a/generators/spring-data-neo4j/templates/src/main/java/package/config/DatabaseConfiguration.java_neo4j.ejs b/generators/spring-data-neo4j/templates/src/main/java/_package_/config/DatabaseConfiguration.java_neo4j.ejs
similarity index 100%
rename from generators/spring-data-neo4j/templates/src/main/java/package/config/DatabaseConfiguration.java_neo4j.ejs
rename to generators/spring-data-neo4j/templates/src/main/java/_package_/config/DatabaseConfiguration.java_neo4j.ejs
diff --git a/generators/spring-data-neo4j/templates/src/main/java/package/config/neo4j/Neo4jMigrations.java.ejs b/generators/spring-data-neo4j/templates/src/main/java/_package_/config/neo4j/Neo4jMigrations.java.ejs
similarity index 100%
rename from generators/spring-data-neo4j/templates/src/main/java/package/config/neo4j/Neo4jMigrations.java.ejs
rename to generators/spring-data-neo4j/templates/src/main/java/_package_/config/neo4j/Neo4jMigrations.java.ejs
diff --git a/generators/spring-data-neo4j/templates/src/test/java/package/config/EmbeddedNeo4j.java.ejs b/generators/spring-data-neo4j/templates/src/test/java/_package_/config/EmbeddedNeo4j.java.ejs
similarity index 100%
rename from generators/spring-data-neo4j/templates/src/test/java/package/config/EmbeddedNeo4j.java.ejs
rename to generators/spring-data-neo4j/templates/src/test/java/_package_/config/EmbeddedNeo4j.java.ejs
diff --git a/generators/spring-data-neo4j/templates/src/test/java/package/config/Neo4jTestContainer.java.ejs b/generators/spring-data-neo4j/templates/src/test/java/_package_/config/Neo4jTestContainer.java.ejs
similarity index 100%
rename from generators/spring-data-neo4j/templates/src/test/java/package/config/Neo4jTestContainer.java.ejs
rename to generators/spring-data-neo4j/templates/src/test/java/_package_/config/Neo4jTestContainer.java.ejs
diff --git a/generators/spring-data-neo4j/templates/src/test/java/package/config/Neo4jTestContainersSpringContextCustomizerFactory.java.ejs b/generators/spring-data-neo4j/templates/src/test/java/_package_/config/Neo4jTestContainersSpringContextCustomizerFactory.java.ejs
similarity index 100%
rename from generators/spring-data-neo4j/templates/src/test/java/package/config/Neo4jTestContainersSpringContextCustomizerFactory.java.ejs
rename to generators/spring-data-neo4j/templates/src/test/java/_package_/config/Neo4jTestContainersSpringContextCustomizerFactory.java.ejs
diff --git a/generators/spring-data-relational/cleanup.mts b/generators/spring-data-relational/cleanup.mts
index 31e2cbc0fde9..22caf0696ed0 100644
--- a/generators/spring-data-relational/cleanup.mts
+++ b/generators/spring-data-relational/cleanup.mts
@@ -27,7 +27,7 @@ export default function cleanupOldServerFilesTask(this: Generator, { application
     if (application.devDatabaseTypeH2Any) {
       this.removeFile(`${application.javaPackageSrcDir}domain/util/FixedH2Dialect.java`);
     }
-    if (application.prodDatabaseTypePostgres) {
+    if (application.prodDatabaseTypePostgresql) {
       this.removeFile(`${application.javaPackageSrcDir}domain/util/FixedPostgreSQL82Dialect`);
     }
   }
diff --git a/generators/spring-data-relational/entity-files.mjs b/generators/spring-data-relational/entity-files.mjs
index 3c4384479629..02fda1929b44 100644
--- a/generators/spring-data-relational/entity-files.mjs
+++ b/generators/spring-data-relational/entity-files.mjs
@@ -22,49 +22,49 @@ const sqlFiles = {
   sqlFiles: [
     {
       condition: generator => !generator.reactive,
-      ...javaMainPackageTemplatesBlock(),
-      templates: ['domain/_PersistClass_.java.jhi.jakarta_persistence'],
+      ...javaMainPackageTemplatesBlock('_entityPackage_'),
+      templates: ['domain/_persistClass_.java.jhi.jakarta_persistence'],
     },
     {
       condition: generator => !generator.reactive && generator.requiresPersistableImplementation,
-      ...javaMainPackageTemplatesBlock(),
-      templates: ['domain/_PersistClass_.java.jhi.jakarta_lifecycle_events'],
+      ...javaMainPackageTemplatesBlock('_entityPackage_'),
+      templates: ['domain/_persistClass_.java.jhi.jakarta_lifecycle_events'],
     },
     {
       condition: generator => !generator.reactive && generator.enableHibernateCache,
-      ...javaMainPackageTemplatesBlock(),
-      templates: ['domain/_PersistClass_.java.jhi.hibernate_cache'],
+      ...javaMainPackageTemplatesBlock('_entityPackage_'),
+      templates: ['domain/_persistClass_.java.jhi.hibernate_cache'],
     },
     {
       condition: generator => !generator.reactive && !generator.embedded && generator.containsBagRelationships,
-      ...javaMainPackageTemplatesBlock(),
+      ...javaMainPackageTemplatesBlock('_entityPackage_'),
       templates: [
-        'repository/_EntityClass_RepositoryWithBagRelationships.java',
-        'repository/_EntityClass_RepositoryWithBagRelationshipsImpl.java',
+        'repository/_entityClass_RepositoryWithBagRelationships.java',
+        'repository/_entityClass_RepositoryWithBagRelationshipsImpl.java',
       ],
     },
     {
       condition: generator => generator.reactive,
-      ...javaMainPackageTemplatesBlock(),
-      templates: ['domain/_PersistClass_.java.jhi.spring_data_reactive'],
+      ...javaMainPackageTemplatesBlock('_entityPackage_'),
+      templates: ['domain/_persistClass_.java.jhi.spring_data_reactive'],
     },
     {
       condition: generator => generator.requiresPersistableImplementation,
-      ...javaMainPackageTemplatesBlock(),
-      templates: ['domain/_PersistClass_.java.jhi.spring_data_persistable'],
+      ...javaMainPackageTemplatesBlock('_entityPackage_'),
+      templates: ['domain/_persistClass_.java.jhi.spring_data_persistable'],
     },
     {
       condition: generator => generator.reactive && generator.requiresPersistableImplementation,
-      ...javaMainPackageTemplatesBlock(),
-      templates: ['domain/_PersistClass_Callback.java'],
+      ...javaMainPackageTemplatesBlock('_entityPackage_'),
+      templates: ['domain/_persistClass_Callback.java'],
     },
     {
       condition: generator => generator.reactive && !generator.embedded,
-      ...javaMainPackageTemplatesBlock(),
+      ...javaMainPackageTemplatesBlock('_entityPackage_'),
       templates: [
-        'repository/_EntityClass_RepositoryInternalImpl_reactive.java',
-        'repository/_EntityClass_SqlHelper_reactive.java',
-        'repository/rowmapper/_EntityClass_RowMapper_reactive.java',
+        'repository/_entityClass_RepositoryInternalImpl_reactive.java',
+        'repository/_entityClass_SqlHelper_reactive.java',
+        'repository/rowmapper/_entityClass_RowMapper_reactive.java',
       ],
     },
   ],
@@ -79,8 +79,8 @@ export default async function writeEntitiesTask({ application, entities }) {
         blocks: [
           {
             condition: generator => generator.reactive && generator.requiresPersistableImplementation,
-            ...javaMainPackageTemplatesBlock(),
-            templates: ['domain/_PersistClass_Callback.java'],
+            ...javaMainPackageTemplatesBlock('_entityPackage_'),
+            templates: ['domain/_persistClass_Callback.java'],
           },
         ],
         context: { ...application, ...entity },
diff --git a/generators/spring-data-relational/files.mjs b/generators/spring-data-relational/files.mjs
index f39c52b9ff5c..278402872c25 100644
--- a/generators/spring-data-relational/files.mjs
+++ b/generators/spring-data-relational/files.mjs
@@ -124,7 +124,7 @@ export const serverFiles = mergeSections(
   addSectionsCondition(mysqlFiles, context => context.prodDatabaseTypeMysql),
   addSectionsCondition(mariadbFiles, context => context.prodDatabaseTypeMariadb),
   addSectionsCondition(mssqlFiles, context => context.prodDatabaseTypeMssql),
-  addSectionsCondition(postgresFiles, context => context.prodDatabaseTypePostgres),
+  addSectionsCondition(postgresFiles, context => context.prodDatabaseTypePostgresql),
 );
 
 export default async function writeSqlFiles({ application }) {
diff --git a/generators/spring-data-relational/generator.mts b/generators/spring-data-relational/generator.mts
index 536a5b1e8bef..5210de3ac28a 100644
--- a/generators/spring-data-relational/generator.mts
+++ b/generators/spring-data-relational/generator.mts
@@ -25,7 +25,7 @@ import writeEntitiesTask, { cleanupEntitiesTask } from './entity-files.mjs';
 import { isReservedTableName } from '../../jdl/jhipster/reserved-keywords.js';
 import { databaseTypes } from '../../jdl/jhipster/index.mjs';
 import { GeneratorDefinition as SpringBootGeneratorDefinition } from '../server/index.mjs';
-import { getDBCExtraOption } from './support/database-data.mjs';
+import { getDBCExtraOption, getJdbcUrl, getR2dbcUrl } from './support/index.mjs';
 import {
   getCommonMavenDefinition,
   getDatabaseTypeMavenDefinition,
@@ -33,18 +33,19 @@ import {
   getImperativeMavenDefinition,
   getReactiveMavenDefinition,
 } from './internal/dependencies.mjs';
-import { hibernateSnakeCase } from '../server/support/string.mjs';
-import { getJdbcUrl, getR2dbcUrl } from './support/index.mjs';
 import command from './command.mjs';
 
 const { SQL } = databaseTypes;
 
 export default class SqlGenerator extends BaseApplicationGenerator<SpringBootGeneratorDefinition> {
   async beforeQueue() {
-    await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
     if (!this.fromBlueprint) {
       await this.composeWithBlueprints(GENERATOR_SPRING_DATA_RELATIONAL);
     }
+
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+    }
   }
 
   get initializing() {
@@ -166,16 +167,6 @@ export default class SqlGenerator extends BaseApplicationGenerator<SpringBootGen
     return this.asPostWritingTaskGroup(this.delegateTasksToBlueprint(() => this.postWriting));
   }
 
-  /**
-   * @private
-   * get a table column name in JHipster preferred style.
-   *
-   * @param {string} value - table column name string
-   */
-  getColumnName(value) {
-    return hibernateSnakeCase(value);
-  }
-
   /**
    * @private
    * Returns the JDBC URL for a databaseType
diff --git a/generators/spring-data-relational/support/application-properties.mts b/generators/spring-data-relational/support/application-properties.mts
index 1223ca7085b9..ee9252104b71 100644
--- a/generators/spring-data-relational/support/application-properties.mts
+++ b/generators/spring-data-relational/support/application-properties.mts
@@ -28,7 +28,7 @@ export default function prepareSqlApplicationProperties({ application }: { appli
   application.prodDatabaseTypeMssql = application.prodDatabaseType === MSSQL;
   application.prodDatabaseTypeMysql = application.prodDatabaseType === MYSQL;
   application.prodDatabaseTypeOracle = application.prodDatabaseType === ORACLE;
-  application.prodDatabaseTypePostgres = application.prodDatabaseType === POSTGRESQL;
+  application.prodDatabaseTypePostgresql = application.prodDatabaseType === POSTGRESQL;
 
   application.devDatabaseTypeH2Disk = application.devDatabaseType === H2_DISK;
   application.devDatabaseTypeH2Memory = application.devDatabaseType === H2_MEMORY;
@@ -38,28 +38,22 @@ export default function prepareSqlApplicationProperties({ application }: { appli
   application.devDatabaseTypeMssql = application.prodDatabaseTypeMssql && !application.devDatabaseTypeH2Any;
   application.devDatabaseTypeMysql = application.prodDatabaseTypeMysql && !application.devDatabaseTypeH2Any;
   application.devDatabaseTypeOracle = application.prodDatabaseTypeOracle && !application.devDatabaseTypeH2Any;
-  application.devDatabaseTypePostgres = application.prodDatabaseTypePostgres && !application.devDatabaseTypeH2Any;
+  application.devDatabaseTypePostgresql = application.prodDatabaseTypePostgresql && !application.devDatabaseTypeH2Any;
+  application.devDatabaseTypePostgres = application.devDatabaseTypePostgresql; // Deprecated
 
   if (!application.databaseTypeSql) {
     return;
   }
 
-  const devDatabaseData = getDatabaseData(application.devDatabaseType);
   const prodDatabaseData = getDatabaseData(application.prodDatabaseType);
-
-  application.devHibernateDialect = devDatabaseData.hibernateDialect;
   application.prodHibernateDialect = prodDatabaseData.hibernateDialect;
-
-  application.devJdbcDriver = devDatabaseData.jdbcDriver;
   application.prodJdbcDriver = prodDatabaseData.jdbcDriver;
-
-  application.devDatabaseUsername = devDatabaseData.defaultUsername ?? application.baseName;
-  application.devDatabasePassword = devDatabaseData.defaultPassword ?? '';
   application.prodDatabaseUsername = prodDatabaseData.defaultUsername ?? application.baseName;
   application.prodDatabasePassword = prodDatabaseData.defaultPassword ?? '';
+  application.prodDatabaseName = prodDatabaseData.defaultDatabaseName ?? application.baseName;
 
   const prodDatabaseOptions = {
-    databaseName: prodDatabaseData.defaultDatabaseName ?? application.baseName,
+    databaseName: application.prodDatabaseName,
     hostname: 'localhost',
   };
 
@@ -73,44 +67,67 @@ export default function prepareSqlApplicationProperties({ application }: { appli
   }
 
   if (application.devDatabaseTypeH2Any) {
-    const devDatabaseOptions = {
-      databaseName: devDatabaseData.defaultDatabaseName ?? application.lowercaseBaseName,
-    };
-    application.devJdbcUrl = getJdbcUrl(application.devDatabaseType, {
-      ...devDatabaseOptions,
-      buildDirectory: `./${application.temporaryDir}`,
-      prodDatabaseType: application.prodDatabaseType,
-    });
-
-    let devLiquibaseOptions;
-    if (application.devDatabaseTypeH2Memory) {
-      devLiquibaseOptions = {
-        protocolSuffix: 'h2:tcp://',
-        localDirectory: 'localhost:18080/mem:',
-      };
-    } else {
-      devLiquibaseOptions = {
-        // eslint-disable-next-line no-template-curly-in-string
-        buildDirectory: application.buildToolGradle ? `./${application.temporaryDir}` : '${project.build.directory}/',
+    try {
+      const devDatabaseData = getDatabaseData(application.devDatabaseType);
+      application.devHibernateDialect = devDatabaseData.hibernateDialect;
+      application.devJdbcDriver = devDatabaseData.jdbcDriver;
+      application.devDatabaseUsername = devDatabaseData.defaultUsername ?? application.baseName;
+      application.devDatabasePassword = devDatabaseData.defaultPassword ?? '';
+      application.devDatabaseName = devDatabaseData.defaultDatabaseName ?? application.baseName;
+
+      const devDatabaseOptions = {
+        databaseName: application.devDatabaseName,
       };
-    }
-
-    application.devLiquibaseUrl = getJdbcUrl(application.devDatabaseType, {
-      ...devDatabaseOptions,
-      skipExtraOptions: true,
-      ...devLiquibaseOptions,
-    });
-
-    if (application.reactive) {
-      application.devR2dbcUrl = getR2dbcUrl(application.devDatabaseType, {
+      application.devJdbcUrl = getJdbcUrl(application.devDatabaseType, {
         ...devDatabaseOptions,
         buildDirectory: `./${application.temporaryDir}`,
         prodDatabaseType: application.prodDatabaseType,
       });
+
+      let devLiquibaseOptions;
+      if (application.devDatabaseTypeH2Memory) {
+        devLiquibaseOptions = {
+          protocolSuffix: 'h2:tcp://',
+          localDirectory: 'localhost:18080/mem:',
+        };
+      } else {
+        devLiquibaseOptions = {
+          // eslint-disable-next-line no-template-curly-in-string
+          buildDirectory: application.buildToolGradle ? `./${application.temporaryDir}` : '${project.build.directory}/',
+        };
+      }
+
+      application.devLiquibaseUrl = getJdbcUrl(application.devDatabaseType, {
+        ...devDatabaseOptions,
+        skipExtraOptions: true,
+        ...devLiquibaseOptions,
+      });
+
+      if (application.reactive) {
+        application.devR2dbcUrl = getR2dbcUrl(application.devDatabaseType, {
+          ...devDatabaseOptions,
+          buildDirectory: `./${application.temporaryDir}`,
+          prodDatabaseType: application.prodDatabaseType,
+        });
+      }
+    } catch (error) {
+      if (application.backendTypeSpringBoot) {
+        throw error;
+      }
     }
   } else {
     application.devJdbcUrl = application.prodJdbcUrl;
     application.devLiquibaseUrl = application.prodLiquibaseUrl;
     application.devR2dbcUrl = application.prodR2dbcUrl;
+    application.devHibernateDialect = application.prodHibernateDialect;
+    application.devJdbcDriver = application.prodJdbcDriver;
+    application.devDatabaseUsername = application.prodDatabaseUsername;
+    application.devDatabasePassword = application.prodDatabasePassword;
+    application.devDatabaseName = application.prodDatabaseName;
+    application.devJdbcUrl = application.prodJdbcUrl;
+    application.devLiquibaseUrl = application.prodLiquibaseUrl;
+    if (application.reactive) {
+      application.devR2dbcUrl = application.prodR2dbcUrl;
+    }
   }
 }
diff --git a/generators/spring-data-relational/templates/src/main/java/_package_/domain/_PersistClass_.java.jhi.hibernate_cache.ejs b/generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.hibernate_cache.ejs
similarity index 100%
rename from generators/spring-data-relational/templates/src/main/java/_package_/domain/_PersistClass_.java.jhi.hibernate_cache.ejs
rename to generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.hibernate_cache.ejs
diff --git a/generators/spring-data-relational/templates/src/main/java/_package_/domain/_PersistClass_.java.jhi.jakarta_lifecycle_events.ejs b/generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.jakarta_lifecycle_events.ejs
similarity index 100%
rename from generators/spring-data-relational/templates/src/main/java/_package_/domain/_PersistClass_.java.jhi.jakarta_lifecycle_events.ejs
rename to generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.jakarta_lifecycle_events.ejs
diff --git a/generators/spring-data-relational/templates/src/main/java/_package_/domain/_PersistClass_.java.jhi.jakarta_persistence.ejs b/generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.jakarta_persistence.ejs
similarity index 97%
rename from generators/spring-data-relational/templates/src/main/java/_package_/domain/_PersistClass_.java.jhi.jakarta_persistence.ejs
rename to generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.jakarta_persistence.ejs
index 50cd77c3cabf..b1a7d4a6eef5 100644
--- a/generators/spring-data-relational/templates/src/main/java/_package_/domain/_PersistClass_.java.jhi.jakarta_persistence.ejs
+++ b/generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.jakarta_persistence.ejs
@@ -22,7 +22,7 @@
 -%>
 <&_ if (fragment.importSection) { -&>
 import jakarta.persistence.*;
-<%_ if ((prodDatabaseTypePostgres && anyFieldHasTextContentType) || (anyFieldIsUUID && (prodDatabaseTypeMysql || prodDatabaseTypeMariadb))) { _%>
+<%_ if ((prodDatabaseTypePostgresql && anyFieldHasTextContentType) || (anyFieldIsUUID && (prodDatabaseTypeMysql || prodDatabaseTypeMariadb))) { _%>
 import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.type.SqlTypes;
 <%_ } _%>
diff --git a/generators/spring-data-relational/templates/src/main/java/_package_/domain/_PersistClass_.java.jhi.spring_data_persistable.ejs b/generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.spring_data_persistable.ejs
similarity index 100%
rename from generators/spring-data-relational/templates/src/main/java/_package_/domain/_PersistClass_.java.jhi.spring_data_persistable.ejs
rename to generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.spring_data_persistable.ejs
diff --git a/generators/spring-data-relational/templates/src/main/java/_package_/domain/_PersistClass_.java.jhi.spring_data_reactive.ejs b/generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.spring_data_reactive.ejs
similarity index 100%
rename from generators/spring-data-relational/templates/src/main/java/_package_/domain/_PersistClass_.java.jhi.spring_data_reactive.ejs
rename to generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.spring_data_reactive.ejs
diff --git a/generators/spring-data-relational/templates/src/main/java/_package_/domain/_PersistClass_Callback.java.ejs b/generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_Callback.java.ejs
similarity index 100%
rename from generators/spring-data-relational/templates/src/main/java/_package_/domain/_PersistClass_Callback.java.ejs
rename to generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_Callback.java.ejs
diff --git a/generators/spring-data-relational/templates/src/main/java/_package_/repository/_EntityClass_RepositoryInternalImpl_reactive.java.ejs b/generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/repository/_entityClass_RepositoryInternalImpl_reactive.java.ejs
similarity index 99%
rename from generators/spring-data-relational/templates/src/main/java/_package_/repository/_EntityClass_RepositoryInternalImpl_reactive.java.ejs
rename to generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/repository/_entityClass_RepositoryInternalImpl_reactive.java.ejs
index 670f8518b621..9e1390b730e8 100644
--- a/generators/spring-data-relational/templates/src/main/java/_package_/repository/_EntityClass_RepositoryInternalImpl_reactive.java.ejs
+++ b/generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/repository/_entityClass_RepositoryInternalImpl_reactive.java.ejs
@@ -115,7 +115,7 @@ class <%= entityClass %>RepositoryInternalImpl extends SimpleR2dbcRepository<<%=
 <%_ relationships.forEach(rel => {
   if (rel.shouldWriteJoinTable) {
 _%>
-    private final static EntityManager.LinkTable <%= rel.relationshipName %>Link = new EntityManager.LinkTable("<%= rel.joinTable.name %>", "<%= entityTableName %>_<%= this.getColumnName(primaryKey.name) %>", "<%= rel.joinColumnNames[0] %>");
+    private final static EntityManager.LinkTable <%= rel.relationshipName %>Link = new EntityManager.LinkTable("<%= rel.joinTable.name %>", "<%= entityTableName %>_<%= primaryKey.hibernateSnakeCaseName %>", "<%= rel.joinColumnNames[0] %>");
 <%_ }
 }); _%>
 
diff --git a/generators/spring-data-relational/templates/src/main/java/_package_/repository/_EntityClass_RepositoryWithBagRelationships.java.ejs b/generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/repository/_entityClass_RepositoryWithBagRelationships.java.ejs
similarity index 100%
rename from generators/spring-data-relational/templates/src/main/java/_package_/repository/_EntityClass_RepositoryWithBagRelationships.java.ejs
rename to generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/repository/_entityClass_RepositoryWithBagRelationships.java.ejs
diff --git a/generators/spring-data-relational/templates/src/main/java/_package_/repository/_EntityClass_RepositoryWithBagRelationshipsImpl.java.ejs b/generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/repository/_entityClass_RepositoryWithBagRelationshipsImpl.java.ejs
similarity index 100%
rename from generators/spring-data-relational/templates/src/main/java/_package_/repository/_EntityClass_RepositoryWithBagRelationshipsImpl.java.ejs
rename to generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/repository/_entityClass_RepositoryWithBagRelationshipsImpl.java.ejs
diff --git a/generators/spring-data-relational/templates/src/main/java/_package_/repository/_EntityClass_SqlHelper_reactive.java.ejs b/generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/repository/_entityClass_SqlHelper_reactive.java.ejs
similarity index 100%
rename from generators/spring-data-relational/templates/src/main/java/_package_/repository/_EntityClass_SqlHelper_reactive.java.ejs
rename to generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/repository/_entityClass_SqlHelper_reactive.java.ejs
diff --git a/generators/spring-data-relational/templates/src/main/java/_package_/repository/rowmapper/_EntityClass_RowMapper_reactive.java.ejs b/generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/repository/rowmapper/_entityClass_RowMapper_reactive.java.ejs
similarity index 100%
rename from generators/spring-data-relational/templates/src/main/java/_package_/repository/rowmapper/_EntityClass_RowMapper_reactive.java.ejs
rename to generators/spring-data-relational/templates/src/main/java/_package_/_entityPackage_/repository/rowmapper/_entityClass_RowMapper_reactive.java.ejs
diff --git a/generators/spring-data-relational/templates/src/main/java/_package_/config/DatabaseConfiguration.java.ejs b/generators/spring-data-relational/templates/src/main/java/_package_/config/DatabaseConfiguration.java.ejs
index f4e88d7386a3..1d4aa1941da8 100644
--- a/generators/spring-data-relational/templates/src/main/java/_package_/config/DatabaseConfiguration.java.ejs
+++ b/generators/spring-data-relational/templates/src/main/java/_package_/config/DatabaseConfiguration.java.ejs
@@ -18,7 +18,7 @@
 -%>
 
 <%_
-    let uuidConversionNeeded = (reactive && !prodDatabaseTypePostgres);
+    let uuidConversionNeeded = (reactive && !prodDatabaseTypePostgresql);
 _%>
 package <%= packageName %>.config;
 
diff --git a/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainersSpringContextCustomizerFactory.java.ejs b/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainersSpringContextCustomizerFactory.java.ejs
index 12c779f986f1..b4369e379689 100644
--- a/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainersSpringContextCustomizerFactory.java.ejs
+++ b/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainersSpringContextCustomizerFactory.java.ejs
@@ -60,7 +60,7 @@ public class SqlTestContainersSpringContextCustomizerFactory implements ContextC
                 log.info("Warming up the sql database");
                 if (null == prodTestContainer) {
                     try {
-                        Class<? extends SqlTestContainer> containerClass = (Class<? extends SqlTestContainer>) Class.forName(this.getClass().getPackageName() + ".<% if (prodDatabaseTypeMysql) { %>Mysql<% } else if (prodDatabaseTypeMariadb) { %>Mariadb<% } else if (prodDatabaseTypeMssql) { %>MsSql<% } else if (prodDatabaseTypePostgres) { %>PostgreSql<% } %>TestContainer");
+                        Class<? extends SqlTestContainer> containerClass = (Class<? extends SqlTestContainer>) Class.forName(this.getClass().getPackageName() + ".<% if (prodDatabaseTypeMysql) { %>Mysql<% } else if (prodDatabaseTypeMariadb) { %>Mariadb<% } else if (prodDatabaseTypeMssql) { %>MsSql<% } else if (prodDatabaseTypePostgresql) { %>PostgreSql<% } %>TestContainer");
                         prodTestContainer = beanFactory.createBean(containerClass);
                         beanFactory.registerSingleton(containerClass.getName(), prodTestContainer);
                         // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(containerClass.getName(), prodTestContainer);
diff --git a/generators/spring-websocket/files.mts b/generators/spring-websocket/files.mts
index 3605cdfc86de..79049c652280 100644
--- a/generators/spring-websocket/files.mts
+++ b/generators/spring-websocket/files.mts
@@ -25,7 +25,7 @@ import { SpringBootApplication } from '../server/types.mjs';
 const files: WriteFileSection<Generator, SpringBootApplication> = {
   websocketFiles: [
     {
-      path: `${SERVER_MAIN_SRC_DIR}package/`,
+      path: `${SERVER_MAIN_SRC_DIR}_package_/`,
       renameTo: moveToJavaPackageSrcDir,
       templates: [
         'config/WebsocketConfiguration.java',
diff --git a/generators/spring-websocket/generator.mts b/generators/spring-websocket/generator.mts
index 8b09c725c530..81e47a5d9cc8 100644
--- a/generators/spring-websocket/generator.mts
+++ b/generators/spring-websocket/generator.mts
@@ -23,10 +23,13 @@ import cleanupTask from './cleanup.mjs';
 
 export default class SpringWebsocketGenerator extends BaseApplicationGenerator {
   async beforeQueue() {
-    await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
     if (!this.fromBlueprint) {
       await this.composeWithBlueprints(GENERATOR_SPRING_WEBSOCKET);
     }
+
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+    }
   }
 
   get writing() {
diff --git a/generators/spring-websocket/templates/src/main/java/package/config/WebsocketConfiguration.java.ejs b/generators/spring-websocket/templates/src/main/java/_package_/config/WebsocketConfiguration.java.ejs
similarity index 100%
rename from generators/spring-websocket/templates/src/main/java/package/config/WebsocketConfiguration.java.ejs
rename to generators/spring-websocket/templates/src/main/java/_package_/config/WebsocketConfiguration.java.ejs
diff --git a/generators/spring-websocket/templates/src/main/java/package/config/WebsocketSecurityConfiguration.java.ejs b/generators/spring-websocket/templates/src/main/java/_package_/config/WebsocketSecurityConfiguration.java.ejs
similarity index 100%
rename from generators/spring-websocket/templates/src/main/java/package/config/WebsocketSecurityConfiguration.java.ejs
rename to generators/spring-websocket/templates/src/main/java/_package_/config/WebsocketSecurityConfiguration.java.ejs
diff --git a/generators/spring-websocket/templates/src/main/java/package/web/websocket/ActivityService.java.ejs b/generators/spring-websocket/templates/src/main/java/_package_/web/websocket/ActivityService.java.ejs
similarity index 100%
rename from generators/spring-websocket/templates/src/main/java/package/web/websocket/ActivityService.java.ejs
rename to generators/spring-websocket/templates/src/main/java/_package_/web/websocket/ActivityService.java.ejs
diff --git a/generators/spring-websocket/templates/src/main/java/package/web/websocket/dto/ActivityDTO.java.ejs b/generators/spring-websocket/templates/src/main/java/_package_/web/websocket/dto/ActivityDTO.java.ejs
similarity index 100%
rename from generators/spring-websocket/templates/src/main/java/package/web/websocket/dto/ActivityDTO.java.ejs
rename to generators/spring-websocket/templates/src/main/java/_package_/web/websocket/dto/ActivityDTO.java.ejs
diff --git a/generators/upgrade/generator.mjs b/generators/upgrade/generator.mjs
index 9b2a0687adfb..f766cd7af0eb 100644
--- a/generators/upgrade/generator.mjs
+++ b/generators/upgrade/generator.mjs
@@ -17,16 +17,14 @@
  * limitations under the License.
  */
 import process from 'node:process';
-import fs from 'fs';
-import path from 'path';
+import fs, { rmSync, readdirSync } from 'node:fs';
+import path from 'node:path';
 import chalk from 'chalk';
-import shelljs from 'shelljs';
 import semver from 'semver';
 import gitignore from 'parse-gitignore';
 import latestVersion from 'latest-version';
 
 import BaseGenerator from '../base/index.mjs';
-import { upgradeFilesTask as upgradeLanguagesFilesTask } from '../languages/index.mjs';
 import { SERVER_MAIN_RES_DIR } from '../generator-constants.mjs';
 import statistics from '../statistics.mjs';
 import { parseBluePrints } from '../base/internal/index.mjs';
@@ -40,37 +38,6 @@ const GLOBAL_VERSION = 'global';
 const GIT_VERSION_NOT_ALLOW_MERGE_UNRELATED_HISTORIES = '2.9.0';
 const FIRST_CLI_SUPPORTED_VERSION = '4.5.1'; // The first version in which CLI support was added
 
-/**
- * Executes a Git command using shellJS
- * gitExec(args [, options, callback])
- *
- * @param {string|array} args - can be an array of arguments or a string command
- * @param {object} options[optional] - takes any of child process options
- * @param {function} callback[optional] - a callback function to be called once process complete, The call back will receive code, stdout and stderr
- * @return {object} when in synchronous mode, this returns a ShellString. Otherwise, this returns the child process object.
- */
-function gitExec(logger, args, options = {}, callback) {
-  if (typeof options === 'function') {
-    callback = options;
-    options = {};
-  }
-
-  if (options.async === undefined) options.async = callback !== undefined;
-  if (options.silent === undefined) options.silent = true;
-  if (options.trace === undefined) options.trace = true;
-
-  if (!Array.isArray(args)) {
-    args = [args];
-  }
-  const command = `git ${args.join(' ')}`;
-
-  logger.debug(command);
-  if (callback) {
-    return shelljs.exec(command, options, callback);
-  }
-  return shelljs.exec(command, options);
-}
-
 export default class UpgradeGenerator extends BaseGenerator {
   fromV7;
   fromV7_9_3App;
@@ -122,7 +89,7 @@ export default class UpgradeGenerator extends BaseGenerator {
   _rmRf(file) {
     const absolutePath = path.resolve(file);
     this.log.verboseInfo(`Removing ${absolutePath}`);
-    shelljs.rm('-rf', absolutePath);
+    rmSync(absolutePath, { recursive: true, force: true });
   }
 
   _gitCheckout(branch, options = {}) {
@@ -130,23 +97,16 @@ export default class UpgradeGenerator extends BaseGenerator {
     if (options.force) {
       args.push('-f');
     }
-    const gitCheckout = this.gitExec(args, { silent: this.silent });
-    if (gitCheckout.code !== 0) throw new Error(`Unable to checkout branch ${branch}:\n${gitCheckout.stderr}`);
+    const gitCheckout = this.spawnSync('git', args, { stdio: 'pipe', reject: false });
+    if (gitCheckout.exitCode !== 0) throw new Error(`Unable to checkout branch ${branch}:\n${gitCheckout.stderr}`);
     this.log.ok(`Checked out branch "${branch}"`);
   }
 
-  _upgradeFiles() {
-    if (upgradeLanguagesFilesTask.call(this)) {
-      const gitCommit = this.gitExec(['commit', '-q', '-m', '"Upgrade preparation."', '--no-verify'], { silent: this.silent });
-      if (gitCommit.code !== 0) throw new Error(`Unable to prepare upgrade:\n${gitCommit.stderr}`);
-      this.log.ok('Upgrade preparation');
-    }
-  }
-
   _cleanUp() {
     const ignoredFiles = gitignore(fs.readFileSync('.gitignore')).patterns || [];
     const filesToKeep = ['.yo-rc.json', '.jhipster', 'node_modules', '.git', '.idea', '.mvn', ...ignoredFiles];
-    shelljs.ls('-A').forEach(file => {
+    const files = readdirSync(this.destinationPath());
+    files.forEach(file => {
       if (!filesToKeep.includes(file)) {
         this._rmRf(file);
       }
@@ -163,8 +123,8 @@ export default class UpgradeGenerator extends BaseGenerator {
       this._rmRf('node_modules');
       generatorCommand = 'jhipster';
     } else if (semver.gte(jhipsterVersion, FIRST_CLI_SUPPORTED_VERSION)) {
-      const result = shelljs.exec('npm bin', { silent: this.silent });
-      if (result.code === 0) {
+      const result = this.spawnCommandSync('npm bin', { stdio: 'pipe', reject: false });
+      if (result.exitCode === 0) {
         generatorCommand = `"${result.stdout.replace('\n', '')}/jhipster"`;
       } else {
         generatorCommand = 'npm exec --no jhipster --';
@@ -184,13 +144,13 @@ export default class UpgradeGenerator extends BaseGenerator {
   }
 
   _gitCommitAll(commitMsg) {
-    const gitAdd = this.gitExec(['add', '-A'], { maxBuffer: 1024 * 10000, silent: this.silent });
-    if (gitAdd.code !== 0) throw new Error(`Unable to add resources in git:\n${gitAdd.stderr}`);
+    const gitAdd = this.spawnSync('git', ['add', '-A'], { stdio: 'pipe', reject: false });
+    if (gitAdd.exitCode !== 0) throw new Error(`Unable to add resources in git:\n${gitAdd.stderr}`);
 
-    const gitCommit = this.gitExec(['commit', '-q', '-m', `"${commitMsg}"`, '-a', '--allow-empty', '--no-verify'], {
-      silent: this.silent,
+    const gitCommit = this.spawnSync('git', ['commit', '-q', '-m', commitMsg, '-a', '--allow-empty', '--no-verify'], {
+      stdio: 'pipe',
     });
-    if (gitCommit.code !== 0) throw new Error(`Unable to commit in git:\n${gitCommit.stderr}`);
+    if (gitCommit.exitCode !== 0) throw new Error(`Unable to commit in git:\n${gitCommit.stderr}`);
     this.log.ok(`Committed with message "${commitMsg}"`);
   }
 
@@ -210,8 +170,8 @@ export default class UpgradeGenerator extends BaseGenerator {
     const generatorCommand = `${commandPrefix} ${npmPackage}@${version} ${devDependencyParam} ${noPackageLockParam} --ignore-scripts --force`;
     this.log.verboseInfo(generatorCommand);
 
-    const npmIntall = shelljs.exec(generatorCommand, { silent: this.silent });
-    if (npmIntall.code === 0) this.log.ok(`Installed ${npmPackage}@${version}`);
+    const npmIntall = this.spawnCommandSync(generatorCommand, { stdio: 'pipe', reject: false });
+    if (npmIntall.exitCode === 0) this.log.ok(`Installed ${npmPackage}@${version}`);
     else throw new Error(`Something went wrong while installing ${npmPackage}! ${npmIntall.stdout} ${npmIntall.stderr}`);
   }
 
@@ -299,19 +259,19 @@ export default class UpgradeGenerator extends BaseGenerator {
 
       assertGitRepository() {
         const gitInit = () => {
-          const gitInit = this.gitExec('init', { silent: this.silent });
-          if (gitInit.code !== 0) throw new Error(`Unable to initialize a new Git repository:\n${gitInit.stdout} ${gitInit.stderr}`);
+          const gitInit = this.spawnSync('git', ['init'], { stdio: 'pipe', reject: false });
+          if (gitInit.exitCode !== 0) throw new Error(`Unable to initialize a new Git repository:\n${gitInit.stdout} ${gitInit.stderr}`);
           this.log.ok('Initialized a new Git repository');
           this._gitCommitAll('Initial');
         };
-        const gitRevParse = this.gitExec(['rev-parse', '-q', '--is-inside-work-tree'], { silent: this.silent });
-        if (gitRevParse.code !== 0) gitInit();
+        const gitRevParse = this.spawnSync('git', ['rev-parse', '-q', '--is-inside-work-tree'], { stdio: 'pipe', reject: false });
+        if (gitRevParse.exitCode !== 0) gitInit();
         else this.log.ok('Git repository detected');
       },
 
       assertNoLocalChanges() {
-        const gitStatus = this.gitExec(['status', '--porcelain'], { silent: this.silent });
-        if (gitStatus.code !== 0) throw new Error(`Unable to check for local changes:\n${gitStatus.stdout} ${gitStatus.stderr}`);
+        const gitStatus = this.spawnSync('git', ['status', '--porcelain'], { stdio: 'pipe', reject: false });
+        if (gitStatus.exitCode !== 0) throw new Error(`Unable to check for local changes:\n${gitStatus.stdout} ${gitStatus.stderr}`);
         if (gitStatus.stdout) {
           this.log.warn(gitStatus.stdout);
           throw new Error(' local changes found.\n\tPlease commit/stash them before upgrading');
@@ -319,14 +279,15 @@ export default class UpgradeGenerator extends BaseGenerator {
       },
 
       detectCurrentBranch() {
-        const gitRevParse = this.gitExec(['rev-parse', '-q', '--abbrev-ref', 'HEAD'], { silent: this.silent });
-        if (gitRevParse.code !== 0) throw new Error(`Unable to detect current Git branch:\n${gitRevParse.stdout} ${gitRevParse.stderr}`);
+        const gitRevParse = this.spawnSync('git', ['rev-parse', '-q', '--abbrev-ref', 'HEAD'], { stdio: 'pipe', reject: false });
+        if (gitRevParse.exitCode !== 0)
+          throw new Error(`Unable to detect current Git branch:\n${gitRevParse.stdout} ${gitRevParse.stderr}`);
         this.sourceBranch = gitRevParse.stdout.replace('\n', '');
       },
 
       async prepareUpgradeBranch() {
         const getGitVersion = () => {
-          const gitVersion = this.gitExec(['--version'], { silent: this.silent });
+          const gitVersion = this.spawnSync('git', ['--version'], { stdio: 'pipe', reject: false });
           return String(gitVersion.stdout.match(/([0-9]+\.[0-9]+\.[0-9]+)/g));
         };
 
@@ -338,8 +299,8 @@ export default class UpgradeGenerator extends BaseGenerator {
           } else {
             args = ['merge', '--strategy=ours', '-q', '--no-edit', '--allow-unrelated-histories', UPGRADE_BRANCH];
           }
-          const gitMerge = this.gitExec(args, { silent: this.silent });
-          if (gitMerge.code !== 0) {
+          const gitMerge = this.spawnSync('git', args, { stdio: 'pipe', reject: false });
+          if (gitMerge.exitCode !== 0) {
             throw new Error(
               `Unable to record current code has been generated with version ${this.currentJhipsterVersion}:\n${gitMerge.stdout} ${gitMerge.stderr}`,
             );
@@ -373,14 +334,14 @@ export default class UpgradeGenerator extends BaseGenerator {
         };
 
         const createUpgradeBranch = () => {
-          const gitCheckout = this.gitExec(['checkout', '--orphan', UPGRADE_BRANCH], { silent: this.silent });
-          if (gitCheckout.code !== 0)
+          const gitCheckout = this.spawnSync('git', ['checkout', '--orphan', UPGRADE_BRANCH], { stdio: 'pipe', reject: false });
+          if (gitCheckout.exitCode !== 0)
             throw new Error(`Unable to create ${UPGRADE_BRANCH} branch:\n${gitCheckout.stdout} ${gitCheckout.stderr}`);
           this.log.ok(`Created branch ${UPGRADE_BRANCH}`);
         };
 
-        const gitRevParse = this.gitExec(['rev-parse', '-q', '--verify', UPGRADE_BRANCH], { silent: this.silent });
-        if (gitRevParse.code !== 0) {
+        const gitRevParse = this.spawnSync('git', ['rev-parse', '-q', '--verify', UPGRADE_BRANCH], { stdio: 'pipe', reject: false });
+        if (gitRevParse.exitCode !== 0) {
           // Create and checkout upgrade branch
           createUpgradeBranch();
           // Remove/rename old files
@@ -441,10 +402,6 @@ export default class UpgradeGenerator extends BaseGenerator {
         });
       },
 
-      upgradeFiles() {
-        this._upgradeFiles();
-      },
-
       generateWithTargetVersion() {
         this._cleanUp();
 
@@ -464,13 +421,13 @@ export default class UpgradeGenerator extends BaseGenerator {
 
       mergeChangesBack() {
         this.log.verboseInfo(`Merging changes back to ${this.sourceBranch}...`);
-        this.gitExec(['merge', '-q', UPGRADE_BRANCH], { silent: this.silent });
+        this.spawnSync('git', ['merge', '-q', UPGRADE_BRANCH], { stdio: 'pipe', reject: false });
         this.log.ok('Merge done!');
       },
 
       checkConflictsInPackageJson() {
-        const gitDiff = this.gitExec(['diff', '--name-only', '--diff-filter=U', 'package.json'], { silent: this.silent });
-        if (gitDiff.code !== 0) throw new Error(`Unable to check for conflicts in package.json:\n${gitDiff.stdout} ${gitDiff.stderr}`);
+        const gitDiff = this.spawnSync('git', ['diff', '--name-only', '--diff-filter=U', 'package.json'], { stdio: 'pipe', reject: false });
+        if (gitDiff.exitCode !== 0) throw new Error(`Unable to check for conflicts in package.json:\n${gitDiff.stdout} ${gitDiff.stderr}`);
         if (gitDiff.stdout) {
           const installCommand = 'npm install';
           this.log.warn(`There are conflicts in package.json, please fix them and then run ${installCommand}`);
@@ -481,7 +438,7 @@ export default class UpgradeGenerator extends BaseGenerator {
   }
 
   get [BaseGenerator.INSTALL]() {
-    return {
+    return this.asInstallTaskGroup({
       install() {
         if (!this.skipInstall) {
           this.log.verboseInfo('Installing dependencies, please wait...');
@@ -490,8 +447,8 @@ export default class UpgradeGenerator extends BaseGenerator {
           const installCommand = 'npm install';
           this.log.verboseInfo(installCommand);
 
-          const pkgInstall = shelljs.exec(installCommand, { silent: this.silent });
-          if (pkgInstall.code !== 0) {
+          const pkgInstall = this.spawnSync(installCommand, { stdio: 'pipe', reject: false });
+          if (pkgInstall.exitCode !== 0) {
             throw new Error(`${installCommand} failed.`);
           }
         } else {
@@ -499,14 +456,14 @@ export default class UpgradeGenerator extends BaseGenerator {
           this.log.ok(logMsg);
         }
       },
-    };
+    });
   }
 
   get [BaseGenerator.END]() {
     return {
       end() {
-        const gitDiff = this.gitExec(['diff', '--name-only', '--diff-filter=U'], { silent: this.silent });
-        if (gitDiff.code !== 0) throw new Error(`Unable to check for conflicts:\n${gitDiff.stdout} ${gitDiff.stderr}`);
+        const gitDiff = this.spawnSync('git', ['diff', '--name-only', '--diff-filter=U'], { stdio: 'pipe', reject: false });
+        if (gitDiff.exitCode !== 0) throw new Error(`Unable to check for conflicts:\n${gitDiff.stdout} ${gitDiff.stderr}`);
         this.log.ok(chalk.bold('Upgraded successfully.'));
         if (gitDiff.stdout) {
           this.log.warn(`Please fix conflicts listed below and commit!\n${gitDiff.stdout}`);
@@ -514,18 +471,4 @@ export default class UpgradeGenerator extends BaseGenerator {
       },
     };
   }
-
-  /**
-   * @deprecated
-   * executes a Git command using shellJS
-   * gitExec(args [, options] [, callback])
-   *
-   * @param {string|array} args - can be an array of arguments or a string command
-   * @param {object} options[optional] - takes any of child process options
-   * @param {function} callback[optional] - a callback function to be called once process complete, The call back will receive code, stdout and stderr
-   * @return {object} when in synchronous mode, this returns a ShellString. Otherwise, this returns the child process object.
-   */
-  gitExec(args, options, callback) {
-    return gitExec(this.logger, args, options, callback);
-  }
 }
diff --git a/generators/upgrade/upgrade.spec.mts b/generators/upgrade/upgrade.spec.mts
index 1cc6c04f320b..1498ba75f5a4 100644
--- a/generators/upgrade/upgrade.spec.mts
+++ b/generators/upgrade/upgrade.spec.mts
@@ -1,10 +1,10 @@
 import path, { dirname, resolve } from 'path';
 import { fileURLToPath } from 'url';
-import shelljs from 'shelljs';
 import fse from 'fs-extra';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { expect } from 'esmocha';
 
+import { execaCommandSync } from 'execa';
 import { packageJson } from '../../lib/index.mjs';
 import { GENERATOR_APP, GENERATOR_UPGRADE } from '../generator-list.mjs';
 import { basicHelpers as helpers, getGenerator, result as runResult } from '../../test/support/index.mjs';
@@ -39,7 +39,7 @@ describe('generator - upgrade', function () {
     });
 
     it('generated git commits to match snapshot', () => {
-      const commits = shelljs.exec('git log --pretty=format:%s', { silent: false }).stdout;
+      const commits = execaCommandSync('git log --pretty=format:%s', { stdio: 'pipe', reject: false }).stdout;
       expect(commits.replace(new RegExp(escapeRegExp(packageJson.version), 'g'), 'VERSION')).toMatchInlineSnapshot(`
 "Merge branch 'jhipster_upgrade'
 Generated with JHipster VERSION
@@ -50,7 +50,7 @@ Initial version of upgradeTest generated by generator-jhipster@undefined"
     });
 
     it('generates expected number of commits', () => {
-      const commitsCount = shelljs.exec('git rev-list --count HEAD', { silent: false }).stdout.replace('\n', '');
+      const commitsCount = execaCommandSync('git rev-list --count HEAD', { stdio: 'pipe', reject: false }).stdout.replace('\n', '');
       // Expecting 5 commits in history (because we used `force` option):
       //   - master: initial commit
       //   - jhipster_upgrade; initial generation
@@ -102,13 +102,13 @@ Initial version of upgradeTest generated by generator-jhipster@undefined"
     });
 
     it('generated git commits to match snapshot', () => {
-      const commits = shelljs.exec('git log --pretty=format:%s', { silent: false }).stdout;
+      const commits = execaCommandSync('git log --pretty=format:%s', { stdio: 'pipe', reject: false }).stdout;
       expect(commits.replace(new RegExp(escapeRegExp(packageJson.version), 'g'), 'VERSION')).toMatchInlineSnapshot(`
 `);
     });
 
     it('generates expected number of commits', () => {
-      const commitsCount = shelljs.exec('git rev-list --count HEAD', { silent: false }).stdout.replace('\n', '');
+      const commitsCount = execaCommandSync('git rev-list --count HEAD', { stdio: 'pipe', reject: false }).stdout.replace('\n', '');
       // Expecting 5 commits in history (because we used `force` option):
       //   - master: initial commit
       //   - jhipster_upgrade; initial generation
diff --git a/generators/vue/__snapshots__/generator.spec.mts.snap b/generators/vue/__snapshots__/generator.spec.mts.snap
index 37bc0ef92061..11f795841704 100644
--- a/generators/vue/__snapshots__/generator.spec.mts.snap
+++ b/generators/vue/__snapshots__/generator.spec.mts.snap
@@ -1,13 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`generator - vue gateway-jwt-skipUserManagement(true)-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-src/-websocket(true) should match generated files snapshot 1`] = `
+exports[`generator - vue gateway-jwt-skipUserManagement(true)-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-clientRoot/-websocket(true) should match generated files snapshot 1`] = `
 {
-  ".eslintignore": {
-    "stateCleared": "modified",
-  },
-  ".eslintrc.cjs": {
-    "stateCleared": "modified",
-  },
   ".jhipster/EntityWithCustomId.json": {
     "stateCleared": "modified",
   },
@@ -20,449 +14,449 @@ exports[`generator - vue gateway-jwt-skipUserManagement(true)-withAdminUi(false)
   ".jhipster/SkipClient.json": {
     "stateCleared": "modified",
   },
-  ".postcssrc.js": {
+  ".yo-rc.json": {
     "stateCleared": "modified",
   },
-  ".yo-rc.json": {
+  "clientRoot/.eslintignore": {
     "stateCleared": "modified",
   },
-  "package.json": {
+  "clientRoot/.eslintrc.cjs": {
     "stateCleared": "modified",
   },
-  "src/404.html": {
+  "clientRoot/.postcssrc.js": {
     "stateCleared": "modified",
   },
-  "src/WEB-INF/web.xml": {
+  "clientRoot/package.json": {
     "stateCleared": "modified",
   },
-  "src/app/account/account.service.spec.ts": {
+  "clientRoot/src/main/webapp/404.html": {
     "stateCleared": "modified",
   },
-  "src/app/account/account.service.ts": {
+  "clientRoot/src/main/webapp/WEB-INF/web.xml": {
     "stateCleared": "modified",
   },
-  "src/app/account/login-form/login-form.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/account/account.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/account/login-form/login-form.component.ts": {
+  "clientRoot/src/main/webapp/app/account/account.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/account/login-form/login-form.vue": {
+  "clientRoot/src/main/webapp/app/account/login-form/login-form.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/account/login.service.ts": {
+  "clientRoot/src/main/webapp/app/account/login-form/login-form.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/docs/docs.component.ts": {
+  "clientRoot/src/main/webapp/app/account/login-form/login-form.vue": {
     "stateCleared": "modified",
   },
-  "src/app/admin/docs/docs.vue": {
+  "clientRoot/src/main/webapp/app/account/login.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/gateway/gateway.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/admin/docs/docs.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/gateway/gateway.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/docs/docs.vue": {
     "stateCleared": "modified",
   },
-  "src/app/admin/gateway/gateway.service.ts": {
+  "clientRoot/src/main/webapp/app/admin/gateway/gateway.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/gateway/gateway.vue": {
+  "clientRoot/src/main/webapp/app/admin/gateway/gateway.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/app.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/gateway/gateway.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/app.vue": {
+  "clientRoot/src/main/webapp/app/admin/gateway/gateway.vue": {
     "stateCleared": "modified",
   },
-  "src/app/constants.ts": {
+  "clientRoot/src/main/webapp/app/app.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/error/error.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/app.vue": {
     "stateCleared": "modified",
   },
-  "src/app/core/error/error.component.ts": {
+  "clientRoot/src/main/webapp/app/constants.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/error/error.vue": {
+  "clientRoot/src/main/webapp/app/core/error/error.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/home/home.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/error/error.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/home/home.component.ts": {
+  "clientRoot/src/main/webapp/app/core/error/error.vue": {
     "stateCleared": "modified",
   },
-  "src/app/core/home/home.vue": {
+  "clientRoot/src/main/webapp/app/core/home/home.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/jhi-footer/jhi-footer.component.ts": {
+  "clientRoot/src/main/webapp/app/core/home/home.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/jhi-footer/jhi-footer.vue": {
+  "clientRoot/src/main/webapp/app/core/home/home.vue": {
     "stateCleared": "modified",
   },
-  "src/app/core/jhi-navbar/jhi-navbar.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/jhi-footer/jhi-footer.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/jhi-navbar/jhi-navbar.component.ts": {
+  "clientRoot/src/main/webapp/app/core/jhi-footer/jhi-footer.vue": {
     "stateCleared": "modified",
   },
-  "src/app/core/jhi-navbar/jhi-navbar.vue": {
+  "clientRoot/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/ribbon/ribbon.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/ribbon/ribbon.component.ts": {
+  "clientRoot/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue": {
     "stateCleared": "modified",
   },
-  "src/app/core/ribbon/ribbon.vue": {
+  "clientRoot/src/main/webapp/app/core/ribbon/ribbon.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/declarations.d.ts": {
+  "clientRoot/src/main/webapp/app/core/ribbon/ribbon.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entities-menu.component.ts": {
+  "clientRoot/src/main/webapp/app/core/ribbon/ribbon.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entities-menu.vue": {
+  "clientRoot/src/main/webapp/app/declarations.d.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entities.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entities-menu.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entities.vue": {
+  "clientRoot/src/main/webapp/app/entities/entities-menu.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-details.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entities.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-details.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entities.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-details.vue": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-details.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-update.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-details.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-update.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-details.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-update.vue": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-update.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.vue": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-details.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-details.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-details.vue": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-details.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-update.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-details.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-update.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-details.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-update.vue": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-update.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.vue": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-details.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-details.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-details.vue": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-details.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-update.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-details.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-update.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-details.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-update.vue": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-update.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.vue": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/main.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/router/account.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.vue": {
     "stateCleared": "modified",
   },
-  "src/app/router/admin.ts": {
+  "clientRoot/src/main/webapp/app/main.ts": {
     "stateCleared": "modified",
   },
-  "src/app/router/entities.ts": {
+  "clientRoot/src/main/webapp/app/router/account.ts": {
     "stateCleared": "modified",
   },
-  "src/app/router/index.ts": {
+  "clientRoot/src/main/webapp/app/router/admin.ts": {
     "stateCleared": "modified",
   },
-  "src/app/router/pages.ts": {
+  "clientRoot/src/main/webapp/app/router/entities.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/router/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert.service.ts": {
+  "clientRoot/src/main/webapp/app/router/pages.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/composables/date-format.ts": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/composables/index.ts": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/composables/validation.ts": {
+  "clientRoot/src/main/webapp/app/shared/composables/date-format.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/computables/arrays.ts": {
+  "clientRoot/src/main/webapp/app/shared/composables/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/computables/index.ts": {
+  "clientRoot/src/main/webapp/app/shared/composables/validation.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/config/axios-interceptor.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/computables/arrays.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/config/axios-interceptor.ts": {
+  "clientRoot/src/main/webapp/app/shared/computables/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/config/config-bootstrap-vue.ts": {
+  "clientRoot/src/main/webapp/app/shared/config/axios-interceptor.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/config/config.ts": {
+  "clientRoot/src/main/webapp/app/shared/config/axios-interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/config/dayjs.ts": {
+  "clientRoot/src/main/webapp/app/shared/config/config-bootstrap-vue.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/config/store/account-store.ts": {
+  "clientRoot/src/main/webapp/app/shared/config/config.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/data/data-utils.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/config/dayjs.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/data/data-utils.service.ts": {
+  "clientRoot/src/main/webapp/app/shared/config/store/account-store.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/jhi-item-count.component.ts": {
+  "clientRoot/src/main/webapp/app/shared/data/data-utils.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/jhi-item-count.vue": {
+  "clientRoot/src/main/webapp/app/shared/data/data-utils.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/model/entity-with-custom-id.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/jhi-item-count.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/model/microservice.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/jhi-item-count.vue": {
     "stateCleared": "modified",
   },
-  "src/app/shared/model/simple.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/model/entity-with-custom-id.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/model/user.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/model/microservice.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/security/authority.ts": {
+  "clientRoot/src/main/webapp/app/shared/model/simple.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/jhi-sort-indicator.component.ts": {
+  "clientRoot/src/main/webapp/app/shared/model/user.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/jhi-sort-indicator.vue": {
+  "clientRoot/src/main/webapp/app/shared/security/authority.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/sorts.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/sort/jhi-sort-indicator.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/sorts.ts": {
+  "clientRoot/src/main/webapp/app/shared/sort/jhi-sort-indicator.vue": {
     "stateCleared": "modified",
   },
-  "src/app/shims-vue.d.ts": {
+  "clientRoot/src/main/webapp/app/shared/sort/sorts.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/store.ts": {
+  "clientRoot/src/main/webapp/app/shared/sort/sorts.ts": {
     "stateCleared": "modified",
   },
-  "src/app/test-setup.ts": {
+  "clientRoot/src/main/webapp/app/shims-vue.d.ts": {
     "stateCleared": "modified",
   },
-  "src/content/css/loading.css": {
+  "clientRoot/src/main/webapp/app/store.ts": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0.svg": {
+  "clientRoot/src/main/webapp/app/test-setup.ts": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-192.png": {
+  "clientRoot/src/main/webapp/content/css/loading.css": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/logo-jhipster.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/scss/_bootstrap-variables.scss": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/scss/global.scss": {
+  "clientRoot/src/main/webapp/content/images/logo-jhipster.png": {
     "stateCleared": "modified",
   },
-  "src/content/scss/vendor.scss": {
+  "clientRoot/src/main/webapp/content/scss/_bootstrap-variables.scss": {
     "stateCleared": "modified",
   },
-  "src/favicon.ico": {
+  "clientRoot/src/main/webapp/content/scss/global.scss": {
     "stateCleared": "modified",
   },
-  "src/index.html": {
+  "clientRoot/src/main/webapp/content/scss/vendor.scss": {
     "stateCleared": "modified",
   },
-  "src/manifest.webapp": {
+  "clientRoot/src/main/webapp/favicon.ico": {
     "stateCleared": "modified",
   },
-  "src/robots.txt": {
+  "clientRoot/src/main/webapp/index.html": {
     "stateCleared": "modified",
   },
-  "src/swagger-ui/dist/images/throbber.gif": {
+  "clientRoot/src/main/webapp/manifest.webapp": {
     "stateCleared": "modified",
   },
-  "src/swagger-ui/index.html": {
+  "clientRoot/src/main/webapp/robots.txt": {
     "stateCleared": "modified",
   },
-  "tsconfig.app.json": {
+  "clientRoot/src/main/webapp/swagger-ui/dist/images/throbber.gif": {
     "stateCleared": "modified",
   },
-  "tsconfig.json": {
+  "clientRoot/src/main/webapp/swagger-ui/index.html": {
     "stateCleared": "modified",
   },
-  "tsconfig.node.json": {
+  "clientRoot/tsconfig.app.json": {
     "stateCleared": "modified",
   },
-  "tsconfig.vitest.json": {
+  "clientRoot/tsconfig.json": {
     "stateCleared": "modified",
   },
-  "vite.config.ts": {
+  "clientRoot/tsconfig.node.json": {
     "stateCleared": "modified",
   },
-  "vitest.config.ts": {
+  "clientRoot/tsconfig.vitest.json": {
     "stateCleared": "modified",
   },
-}
-`;
-
-exports[`generator - vue gateway-oauth2-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)-src/-websocket(true) should match generated files snapshot 1`] = `
-{
-  ".eslintignore": {
+  "clientRoot/vite.config.ts": {
     "stateCleared": "modified",
   },
-  ".eslintrc.cjs": {
+  "clientRoot/vitest.config.ts": {
     "stateCleared": "modified",
   },
+}
+`;
+
+exports[`generator - vue gateway-oauth2-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)-clientRoot/-websocket(true) should match generated files snapshot 1`] = `
+{
   ".jhipster/EntityWithCustomId.json": {
     "stateCleared": "modified",
   },
@@ -475,521 +469,521 @@ exports[`generator - vue gateway-oauth2-withAdminUi(true)-skipJhipsterDependenci
   ".jhipster/SkipClient.json": {
     "stateCleared": "modified",
   },
-  ".postcssrc.js": {
+  ".yo-rc.json": {
     "stateCleared": "modified",
   },
-  ".yo-rc.json": {
+  "clientRoot/.eslintignore": {
     "stateCleared": "modified",
   },
-  "package.json": {
+  "clientRoot/.eslintrc.cjs": {
     "stateCleared": "modified",
   },
-  "src/404.html": {
+  "clientRoot/.postcssrc.js": {
     "stateCleared": "modified",
   },
-  "src/WEB-INF/web.xml": {
+  "clientRoot/package.json": {
     "stateCleared": "modified",
   },
-  "src/app/account/account.service.spec.ts": {
+  "clientRoot/src/main/webapp/404.html": {
     "stateCleared": "modified",
   },
-  "src/app/account/account.service.ts": {
+  "clientRoot/src/main/webapp/WEB-INF/web.xml": {
     "stateCleared": "modified",
   },
-  "src/app/account/login.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/account/account.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/account/login.service.ts": {
+  "clientRoot/src/main/webapp/app/account/account.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/configuration/configuration.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/account/login.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/configuration/configuration.component.ts": {
+  "clientRoot/src/main/webapp/app/account/login.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/configuration/configuration.service.ts": {
+  "clientRoot/src/main/webapp/app/admin/configuration/configuration.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/configuration/configuration.vue": {
+  "clientRoot/src/main/webapp/app/admin/configuration/configuration.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/docs/docs.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/configuration/configuration.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/docs/docs.vue": {
+  "clientRoot/src/main/webapp/app/admin/configuration/configuration.vue": {
     "stateCleared": "modified",
   },
-  "src/app/admin/gateway/gateway.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/admin/docs/docs.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/gateway/gateway.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/docs/docs.vue": {
     "stateCleared": "modified",
   },
-  "src/app/admin/gateway/gateway.service.ts": {
+  "clientRoot/src/main/webapp/app/admin/gateway/gateway.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/gateway/gateway.vue": {
+  "clientRoot/src/main/webapp/app/admin/gateway/gateway.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/health/health-modal.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/admin/gateway/gateway.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/health/health-modal.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/gateway/gateway.vue": {
     "stateCleared": "modified",
   },
-  "src/app/admin/health/health-modal.vue": {
+  "clientRoot/src/main/webapp/app/admin/health/health-modal.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/health/health.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/admin/health/health-modal.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/health/health.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/health/health-modal.vue": {
     "stateCleared": "modified",
   },
-  "src/app/admin/health/health.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/admin/health/health.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/health/health.service.ts": {
+  "clientRoot/src/main/webapp/app/admin/health/health.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/health/health.vue": {
+  "clientRoot/src/main/webapp/app/admin/health/health.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/logs/logs.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/admin/health/health.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/logs/logs.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/health/health.vue": {
     "stateCleared": "modified",
   },
-  "src/app/admin/logs/logs.service.ts": {
+  "clientRoot/src/main/webapp/app/admin/logs/logs.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/logs/logs.vue": {
+  "clientRoot/src/main/webapp/app/admin/logs/logs.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/metrics-modal.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/admin/logs/logs.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/metrics-modal.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/logs/logs.vue": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/metrics-modal.vue": {
+  "clientRoot/src/main/webapp/app/admin/metrics/metrics-modal.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/metrics.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/admin/metrics/metrics-modal.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/metrics.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/metrics/metrics-modal.vue": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/metrics.service.ts": {
+  "clientRoot/src/main/webapp/app/admin/metrics/metrics.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/metrics/metrics.vue": {
+  "clientRoot/src/main/webapp/app/admin/metrics/metrics.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/app.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/metrics/metrics.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/app.vue": {
+  "clientRoot/src/main/webapp/app/admin/metrics/metrics.vue": {
     "stateCleared": "modified",
   },
-  "src/app/constants.ts": {
+  "clientRoot/src/main/webapp/app/app.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/error/error.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/app.vue": {
     "stateCleared": "modified",
   },
-  "src/app/core/error/error.component.ts": {
+  "clientRoot/src/main/webapp/app/constants.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/error/error.vue": {
+  "clientRoot/src/main/webapp/app/core/error/error.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/home/home.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/error/error.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/home/home.component.ts": {
+  "clientRoot/src/main/webapp/app/core/error/error.vue": {
     "stateCleared": "modified",
   },
-  "src/app/core/home/home.vue": {
+  "clientRoot/src/main/webapp/app/core/home/home.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/jhi-footer/jhi-footer.component.ts": {
+  "clientRoot/src/main/webapp/app/core/home/home.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/jhi-footer/jhi-footer.vue": {
+  "clientRoot/src/main/webapp/app/core/home/home.vue": {
     "stateCleared": "modified",
   },
-  "src/app/core/jhi-navbar/jhi-navbar.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/jhi-footer/jhi-footer.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/jhi-navbar/jhi-navbar.component.ts": {
+  "clientRoot/src/main/webapp/app/core/jhi-footer/jhi-footer.vue": {
     "stateCleared": "modified",
   },
-  "src/app/core/jhi-navbar/jhi-navbar.vue": {
+  "clientRoot/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/ribbon/ribbon.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/ribbon/ribbon.component.ts": {
+  "clientRoot/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue": {
     "stateCleared": "modified",
   },
-  "src/app/core/ribbon/ribbon.vue": {
+  "clientRoot/src/main/webapp/app/core/ribbon/ribbon.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/declarations.d.ts": {
+  "clientRoot/src/main/webapp/app/core/ribbon/ribbon.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entities-menu.component.ts": {
+  "clientRoot/src/main/webapp/app/core/ribbon/ribbon.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entities-menu.vue": {
+  "clientRoot/src/main/webapp/app/declarations.d.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entities.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entities-menu.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entities.vue": {
+  "clientRoot/src/main/webapp/app/entities/entities-menu.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-details.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entities.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-details.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entities.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-details.vue": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-details.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-update.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-details.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-update.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-details.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-update.vue": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-update.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.vue": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-details.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-details.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-details.vue": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-details.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-update.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-details.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-update.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-details.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-update.vue": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-update.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.vue": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-details.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-details.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-details.vue": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-details.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-update.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-details.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-update.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-details.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-update.vue": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-update.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.vue": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/user/user.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/locale/translation.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.vue": {
     "stateCleared": "modified",
   },
-  "src/app/main.ts": {
+  "clientRoot/src/main/webapp/app/entities/user/user.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/router/admin.ts": {
+  "clientRoot/src/main/webapp/app/locale/translation.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/router/entities.ts": {
+  "clientRoot/src/main/webapp/app/main.ts": {
     "stateCleared": "modified",
   },
-  "src/app/router/index.ts": {
+  "clientRoot/src/main/webapp/app/router/admin.ts": {
     "stateCleared": "modified",
   },
-  "src/app/router/pages.ts": {
+  "clientRoot/src/main/webapp/app/router/entities.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/router/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert.service.ts": {
+  "clientRoot/src/main/webapp/app/router/pages.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/composables/date-format.ts": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/composables/index.ts": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/composables/validation.ts": {
+  "clientRoot/src/main/webapp/app/shared/composables/date-format.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/computables/arrays.ts": {
+  "clientRoot/src/main/webapp/app/shared/composables/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/computables/index.ts": {
+  "clientRoot/src/main/webapp/app/shared/composables/validation.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/config/axios-interceptor.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/computables/arrays.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/config/axios-interceptor.ts": {
+  "clientRoot/src/main/webapp/app/shared/computables/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/config/config-bootstrap-vue.ts": {
+  "clientRoot/src/main/webapp/app/shared/config/axios-interceptor.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/config/config.ts": {
+  "clientRoot/src/main/webapp/app/shared/config/axios-interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/config/dayjs.ts": {
+  "clientRoot/src/main/webapp/app/shared/config/config-bootstrap-vue.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/config/languages.ts": {
+  "clientRoot/src/main/webapp/app/shared/config/config.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/config/store/account-store.ts": {
+  "clientRoot/src/main/webapp/app/shared/config/dayjs.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/config/store/translation-store.ts": {
+  "clientRoot/src/main/webapp/app/shared/config/languages.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/data/data-utils.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/config/store/account-store.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/data/data-utils.service.ts": {
+  "clientRoot/src/main/webapp/app/shared/config/store/translation-store.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/jhi-item-count.component.ts": {
+  "clientRoot/src/main/webapp/app/shared/data/data-utils.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/jhi-item-count.vue": {
+  "clientRoot/src/main/webapp/app/shared/data/data-utils.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/model/entity-with-custom-id.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/jhi-item-count.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/model/microservice.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/jhi-item-count.vue": {
     "stateCleared": "modified",
   },
-  "src/app/shared/model/simple.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/model/entity-with-custom-id.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/model/user.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/model/microservice.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/security/authority.ts": {
+  "clientRoot/src/main/webapp/app/shared/model/simple.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/jhi-sort-indicator.component.ts": {
+  "clientRoot/src/main/webapp/app/shared/model/user.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/jhi-sort-indicator.vue": {
+  "clientRoot/src/main/webapp/app/shared/security/authority.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/sorts.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/sort/jhi-sort-indicator.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/sorts.ts": {
+  "clientRoot/src/main/webapp/app/shared/sort/jhi-sort-indicator.vue": {
     "stateCleared": "modified",
   },
-  "src/app/shims-vue.d.ts": {
+  "clientRoot/src/main/webapp/app/shared/sort/sorts.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/store.ts": {
+  "clientRoot/src/main/webapp/app/shared/sort/sorts.ts": {
     "stateCleared": "modified",
   },
-  "src/app/test-setup.ts": {
+  "clientRoot/src/main/webapp/app/shims-vue.d.ts": {
     "stateCleared": "modified",
   },
-  "src/content/css/loading.css": {
+  "clientRoot/src/main/webapp/app/store.ts": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0.svg": {
+  "clientRoot/src/main/webapp/app/test-setup.ts": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-192.png": {
+  "clientRoot/src/main/webapp/content/css/loading.css": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/logo-jhipster.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/scss/_bootstrap-variables.scss": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/scss/global.scss": {
+  "clientRoot/src/main/webapp/content/images/logo-jhipster.png": {
     "stateCleared": "modified",
   },
-  "src/content/scss/vendor.scss": {
+  "clientRoot/src/main/webapp/content/scss/_bootstrap-variables.scss": {
     "stateCleared": "modified",
   },
-  "src/favicon.ico": {
+  "clientRoot/src/main/webapp/content/scss/global.scss": {
     "stateCleared": "modified",
   },
-  "src/index.html": {
+  "clientRoot/src/main/webapp/content/scss/vendor.scss": {
     "stateCleared": "modified",
   },
-  "src/manifest.webapp": {
+  "clientRoot/src/main/webapp/favicon.ico": {
     "stateCleared": "modified",
   },
-  "src/robots.txt": {
+  "clientRoot/src/main/webapp/index.html": {
     "stateCleared": "modified",
   },
-  "src/swagger-ui/dist/images/throbber.gif": {
+  "clientRoot/src/main/webapp/manifest.webapp": {
     "stateCleared": "modified",
   },
-  "src/swagger-ui/index.html": {
+  "clientRoot/src/main/webapp/robots.txt": {
     "stateCleared": "modified",
   },
-  "tsconfig.app.json": {
+  "clientRoot/src/main/webapp/swagger-ui/dist/images/throbber.gif": {
     "stateCleared": "modified",
   },
-  "tsconfig.json": {
+  "clientRoot/src/main/webapp/swagger-ui/index.html": {
     "stateCleared": "modified",
   },
-  "tsconfig.node.json": {
+  "clientRoot/tsconfig.app.json": {
     "stateCleared": "modified",
   },
-  "tsconfig.vitest.json": {
+  "clientRoot/tsconfig.json": {
     "stateCleared": "modified",
   },
-  "vite.config.ts": {
+  "clientRoot/tsconfig.node.json": {
     "stateCleared": "modified",
   },
-  "vitest.config.ts": {
+  "clientRoot/tsconfig.vitest.json": {
     "stateCleared": "modified",
   },
-}
-`;
-
-exports[`generator - vue microservice-jwt-skipUserManagement(false)-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-src/-websocket(false) should match generated files snapshot 1`] = `
-{
-  ".eslintignore": {
+  "clientRoot/vite.config.ts": {
     "stateCleared": "modified",
   },
-  ".eslintrc.cjs": {
+  "clientRoot/vitest.config.ts": {
     "stateCleared": "modified",
   },
+}
+`;
+
+exports[`generator - vue microservice-jwt-skipUserManagement(false)-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-clientRoot/-websocket(false) should match generated files snapshot 1`] = `
+{
   ".jhipster/EntityWithCustomId.json": {
     "stateCleared": "modified",
   },
@@ -1002,466 +996,472 @@ exports[`generator - vue microservice-jwt-skipUserManagement(false)-withAdminUi(
   ".jhipster/SkipClient.json": {
     "stateCleared": "modified",
   },
-  ".postcssrc.js": {
+  ".yo-rc.json": {
     "stateCleared": "modified",
   },
-  ".yo-rc.json": {
+  "clientRoot/.eslintignore": {
     "stateCleared": "modified",
   },
-  "package.json": {
+  "clientRoot/.eslintrc.cjs": {
     "stateCleared": "modified",
   },
-  "src/404.html": {
+  "clientRoot/.postcssrc.js": {
     "stateCleared": "modified",
   },
-  "src/WEB-INF/web.xml": {
+  "clientRoot/package.json": {
     "stateCleared": "modified",
   },
-  "src/app/account/account.service.spec.ts": {
+  "clientRoot/src/main/webapp/404.html": {
     "stateCleared": "modified",
   },
-  "src/app/account/account.service.ts": {
+  "clientRoot/src/main/webapp/WEB-INF/web.xml": {
     "stateCleared": "modified",
   },
-  "src/app/account/login-form/login-form.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/account/account.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/account/login-form/login-form.component.ts": {
+  "clientRoot/src/main/webapp/app/account/account.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/account/login-form/login-form.vue": {
+  "clientRoot/src/main/webapp/app/account/login-form/login-form.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/account/login.service.ts": {
+  "clientRoot/src/main/webapp/app/account/login-form/login-form.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/admin/docs/docs.component.ts": {
+  "clientRoot/src/main/webapp/app/account/login-form/login-form.vue": {
     "stateCleared": "modified",
   },
-  "src/app/admin/docs/docs.vue": {
+  "clientRoot/src/main/webapp/app/account/login.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/app.component.ts": {
+  "clientRoot/src/main/webapp/app/admin/docs/docs.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/app.vue": {
+  "clientRoot/src/main/webapp/app/admin/docs/docs.vue": {
     "stateCleared": "modified",
   },
-  "src/app/constants.ts": {
+  "clientRoot/src/main/webapp/app/app.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/error/error-loading.vue": {
+  "clientRoot/src/main/webapp/app/app.vue": {
     "stateCleared": "modified",
   },
-  "src/app/core/error/error.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/constants.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/error/error.component.ts": {
+  "clientRoot/src/main/webapp/app/core/error/error-loading.vue": {
     "stateCleared": "modified",
   },
-  "src/app/core/error/error.vue": {
+  "clientRoot/src/main/webapp/app/core/error/error.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/home/home.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/error/error.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/home/home.component.ts": {
+  "clientRoot/src/main/webapp/app/core/error/error.vue": {
     "stateCleared": "modified",
   },
-  "src/app/core/home/home.vue": {
+  "clientRoot/src/main/webapp/app/core/home/home.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/jhi-footer/jhi-footer.component.ts": {
+  "clientRoot/src/main/webapp/app/core/home/home.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/jhi-footer/jhi-footer.vue": {
+  "clientRoot/src/main/webapp/app/core/home/home.vue": {
     "stateCleared": "modified",
   },
-  "src/app/core/jhi-navbar/jhi-navbar.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/jhi-footer/jhi-footer.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/jhi-navbar/jhi-navbar.component.ts": {
+  "clientRoot/src/main/webapp/app/core/jhi-footer/jhi-footer.vue": {
     "stateCleared": "modified",
   },
-  "src/app/core/jhi-navbar/jhi-navbar.vue": {
+  "clientRoot/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/ribbon/ribbon.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/core/ribbon/ribbon.component.ts": {
+  "clientRoot/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue": {
     "stateCleared": "modified",
   },
-  "src/app/core/ribbon/ribbon.vue": {
+  "clientRoot/src/main/webapp/app/core/ribbon/ribbon.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/declarations.d.ts": {
+  "clientRoot/src/main/webapp/app/core/ribbon/ribbon.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entities-menu.component.ts": {
+  "clientRoot/src/main/webapp/app/core/ribbon/ribbon.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entities-menu.spec.ts": {
+  "clientRoot/src/main/webapp/app/declarations.d.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entities-menu.vue": {
+  "clientRoot/src/main/webapp/app/entities/entities-menu.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entities.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entities-menu.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entities.vue": {
+  "clientRoot/src/main/webapp/app/entities/entities-menu.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-details.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entities.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-details.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entities.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-details.vue": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-details.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-update.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-details.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-update.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-details.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id-update.vue": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-update.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/entity-with-custom-id/entity-with-custom-id.vue": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-details.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-details.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-details.vue": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-details.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-update.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-details.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-update.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-details.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice-update.vue": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice-update.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/microservice/microservice.vue": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-details.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-details.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/microservice/microservice.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-details.vue": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-details.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-update.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-details.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-update.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-details.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple-update.vue": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.component.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.component.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple-update.vue": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.service.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/entities/simple/simple.vue": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/index.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/main.ts": {
+  "clientRoot/src/main/webapp/app/entities/simple/simple.vue": {
     "stateCleared": "modified",
   },
-  "src/app/router/account.ts": {
+  "clientRoot/src/main/webapp/app/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/router/admin.ts": {
+  "clientRoot/src/main/webapp/app/main.ts": {
     "stateCleared": "modified",
   },
-  "src/app/router/entities.ts": {
+  "clientRoot/src/main/webapp/app/router/account.ts": {
     "stateCleared": "modified",
   },
-  "src/app/router/index.ts": {
+  "clientRoot/src/main/webapp/app/router/admin.ts": {
     "stateCleared": "modified",
   },
-  "src/app/router/pages.ts": {
+  "clientRoot/src/main/webapp/app/router/entities.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/router/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/alert/alert.service.ts": {
+  "clientRoot/src/main/webapp/app/router/pages.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/composables/date-format.ts": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/composables/index.ts": {
+  "clientRoot/src/main/webapp/app/shared/alert/alert.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/composables/validation.ts": {
+  "clientRoot/src/main/webapp/app/shared/composables/date-format.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/computables/arrays.ts": {
+  "clientRoot/src/main/webapp/app/shared/composables/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/computables/index.ts": {
+  "clientRoot/src/main/webapp/app/shared/composables/validation.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/config/axios-interceptor.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/computables/arrays.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/config/axios-interceptor.ts": {
+  "clientRoot/src/main/webapp/app/shared/computables/index.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/config/config-bootstrap-vue.ts": {
+  "clientRoot/src/main/webapp/app/shared/config/axios-interceptor.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/config/config.ts": {
+  "clientRoot/src/main/webapp/app/shared/config/axios-interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/config/dayjs.ts": {
+  "clientRoot/src/main/webapp/app/shared/config/config-bootstrap-vue.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/config/store/account-store.ts": {
+  "clientRoot/src/main/webapp/app/shared/config/config.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/data/data-utils.service.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/config/dayjs.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/data/data-utils.service.ts": {
+  "clientRoot/src/main/webapp/app/shared/config/store/account-store.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/jhi-item-count.component.ts": {
+  "clientRoot/src/main/webapp/app/shared/data/data-utils.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/jhi-item-count.vue": {
+  "clientRoot/src/main/webapp/app/shared/data/data-utils.service.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/model/entity-with-custom-id.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/jhi-item-count.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/model/microservice.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/jhi-item-count.vue": {
     "stateCleared": "modified",
   },
-  "src/app/shared/model/simple.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/model/entity-with-custom-id.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/model/user.model.ts": {
+  "clientRoot/src/main/webapp/app/shared/model/microservice.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/security/authority.ts": {
+  "clientRoot/src/main/webapp/app/shared/model/simple.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/jhi-sort-indicator.component.ts": {
+  "clientRoot/src/main/webapp/app/shared/model/user.model.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/jhi-sort-indicator.vue": {
+  "clientRoot/src/main/webapp/app/shared/security/authority.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/sorts.spec.ts": {
+  "clientRoot/src/main/webapp/app/shared/sort/jhi-sort-indicator.component.ts": {
     "stateCleared": "modified",
   },
-  "src/app/shared/sort/sorts.ts": {
+  "clientRoot/src/main/webapp/app/shared/sort/jhi-sort-indicator.vue": {
     "stateCleared": "modified",
   },
-  "src/app/shims-vue.d.ts": {
+  "clientRoot/src/main/webapp/app/shared/sort/sorts.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/app/store.ts": {
+  "clientRoot/src/main/webapp/app/shared/sort/sorts.ts": {
     "stateCleared": "modified",
   },
-  "src/app/test-setup.ts": {
+  "clientRoot/src/main/webapp/app/shims-vue.d.ts": {
     "stateCleared": "modified",
   },
-  "src/content/css/loading.css": {
+  "clientRoot/src/main/webapp/app/store.ts": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0.svg": {
+  "clientRoot/src/main/webapp/app/test-setup.ts": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-192.png": {
+  "clientRoot/src/main/webapp/content/css/loading.css": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_0_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_0_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_1_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_1_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_2_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3.svg": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-192.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_2_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-256.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3.svg": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-384.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/jhipster_family_member_3_head-512.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/content/images/logo-jhipster.png": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/content/scss/_bootstrap-variables.scss": {
+  "clientRoot/src/main/webapp/content/images/jhipster_family_member_3_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/content/scss/global.scss": {
+  "clientRoot/src/main/webapp/content/images/logo-jhipster.png": {
     "stateCleared": "modified",
   },
-  "src/content/scss/vendor.scss": {
+  "clientRoot/src/main/webapp/content/scss/_bootstrap-variables.scss": {
     "stateCleared": "modified",
   },
-  "src/favicon.ico": {
+  "clientRoot/src/main/webapp/content/scss/global.scss": {
     "stateCleared": "modified",
   },
-  "src/index.html": {
+  "clientRoot/src/main/webapp/content/scss/vendor.scss": {
     "stateCleared": "modified",
   },
-  "src/manifest.webapp": {
+  "clientRoot/src/main/webapp/favicon.ico": {
     "stateCleared": "modified",
   },
-  "src/microfrontends/entities-menu-test.vue": {
+  "clientRoot/src/main/webapp/index.html": {
     "stateCleared": "modified",
   },
-  "src/microfrontends/entities-menu.component-test.ts": {
+  "clientRoot/src/main/webapp/manifest.webapp": {
     "stateCleared": "modified",
   },
-  "src/microfrontends/entities-router-test.ts": {
+  "clientRoot/src/main/webapp/microfrontends/entities-menu-test.vue": {
     "stateCleared": "modified",
   },
-  "src/robots.txt": {
+  "clientRoot/src/main/webapp/microfrontends/entities-menu.component-test.ts": {
     "stateCleared": "modified",
   },
-  "src/swagger-ui/dist/images/throbber.gif": {
+  "clientRoot/src/main/webapp/microfrontends/entities-router-test.ts": {
     "stateCleared": "modified",
   },
-  "src/swagger-ui/index.html": {
+  "clientRoot/src/main/webapp/robots.txt": {
     "stateCleared": "modified",
   },
-  "tsconfig.app.json": {
+  "clientRoot/src/main/webapp/swagger-ui/dist/images/throbber.gif": {
     "stateCleared": "modified",
   },
-  "tsconfig.json": {
+  "clientRoot/src/main/webapp/swagger-ui/index.html": {
     "stateCleared": "modified",
   },
-  "tsconfig.node.json": {
+  "clientRoot/tsconfig.app.json": {
     "stateCleared": "modified",
   },
-  "tsconfig.vitest.json": {
+  "clientRoot/tsconfig.json": {
     "stateCleared": "modified",
   },
-  "vite.config.ts": {
+  "clientRoot/tsconfig.node.json": {
     "stateCleared": "modified",
   },
-  "vitest.config.ts": {
+  "clientRoot/tsconfig.vitest.json": {
     "stateCleared": "modified",
   },
-  "webpack/config.js": {
+  "clientRoot/vite.config.ts": {
     "stateCleared": "modified",
   },
-  "webpack/vue.utils.js": {
+  "clientRoot/vitest.config.ts": {
     "stateCleared": "modified",
   },
-  "webpack/webpack.common.js": {
+  "clientRoot/webpack/config.js": {
     "stateCleared": "modified",
   },
-  "webpack/webpack.dev.js": {
+  "clientRoot/webpack/vue.utils.js": {
     "stateCleared": "modified",
   },
-  "webpack/webpack.microfrontend.js": {
+  "clientRoot/webpack/webpack.common.js": {
     "stateCleared": "modified",
   },
-  "webpack/webpack.prod.js": {
+  "clientRoot/webpack/webpack.dev.js": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/webpack/webpack.microfrontend.js": {
+    "stateCleared": "modified",
+  },
+  "clientRoot/webpack/webpack.prod.js": {
     "stateCleared": "modified",
   },
 }
 `;
 
-exports[`generator - vue microservice-oauth2-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)-src/main/webapp2/-websocket(false) should match generated files snapshot 1`] = `
+exports[`generator - vue microservice-oauth2-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)--websocket(false) should match generated files snapshot 1`] = `
 {
   ".eslintignore": {
     "stateCleared": "modified",
@@ -1490,418 +1490,418 @@ exports[`generator - vue microservice-oauth2-withAdminUi(true)-skipJhipsterDepen
   "package.json": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/404.html": {
+  "src/main/webapp/404.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/WEB-INF/web.xml": {
+  "src/main/webapp/WEB-INF/web.xml": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/account.service.spec.ts": {
+  "src/main/webapp/app/account/account.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/account.service.ts": {
+  "src/main/webapp/app/account/account.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/login.service.spec.ts": {
+  "src/main/webapp/app/account/login.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/login.service.ts": {
+  "src/main/webapp/app/account/login.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/docs/docs.component.ts": {
+  "src/main/webapp/app/admin/docs/docs.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/docs/docs.vue": {
+  "src/main/webapp/app/admin/docs/docs.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/app.component.ts": {
+  "src/main/webapp/app/app.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/app.vue": {
+  "src/main/webapp/app/app.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/constants.ts": {
+  "src/main/webapp/app/constants.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/error/error-loading.vue": {
+  "src/main/webapp/app/core/error/error-loading.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/error/error.component.spec.ts": {
+  "src/main/webapp/app/core/error/error.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/error/error.component.ts": {
+  "src/main/webapp/app/core/error/error.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/error/error.vue": {
+  "src/main/webapp/app/core/error/error.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/home/home.component.spec.ts": {
+  "src/main/webapp/app/core/home/home.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/home/home.component.ts": {
+  "src/main/webapp/app/core/home/home.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/home/home.vue": {
+  "src/main/webapp/app/core/home/home.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/jhi-footer/jhi-footer.component.ts": {
+  "src/main/webapp/app/core/jhi-footer/jhi-footer.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/jhi-footer/jhi-footer.vue": {
+  "src/main/webapp/app/core/jhi-footer/jhi-footer.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/jhi-navbar/jhi-navbar.component.spec.ts": {
+  "src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/jhi-navbar/jhi-navbar.component.ts": {
+  "src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/jhi-navbar/jhi-navbar.vue": {
+  "src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/ribbon/ribbon.component.spec.ts": {
+  "src/main/webapp/app/core/ribbon/ribbon.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/ribbon/ribbon.component.ts": {
+  "src/main/webapp/app/core/ribbon/ribbon.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/ribbon/ribbon.vue": {
+  "src/main/webapp/app/core/ribbon/ribbon.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/declarations.d.ts": {
+  "src/main/webapp/app/declarations.d.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entities-menu.component.ts": {
+  "src/main/webapp/app/entities/entities-menu.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entities-menu.spec.ts": {
+  "src/main/webapp/app/entities/entities-menu.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entities-menu.vue": {
+  "src/main/webapp/app/entities/entities-menu.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entities.component.ts": {
+  "src/main/webapp/app/entities/entities.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entities.vue": {
+  "src/main/webapp/app/entities/entities.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id-details.component.spec.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-details.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id-details.component.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-details.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id-details.vue": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-details.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id-update.component.spec.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id-update.component.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id-update.vue": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-update.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id.component.spec.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id.component.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id.service.spec.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id.service.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id.vue": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice-details.component.spec.ts": {
+  "src/main/webapp/app/entities/microservice/microservice-details.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice-details.component.ts": {
+  "src/main/webapp/app/entities/microservice/microservice-details.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice-details.vue": {
+  "src/main/webapp/app/entities/microservice/microservice-details.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice-update.component.spec.ts": {
+  "src/main/webapp/app/entities/microservice/microservice-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice-update.component.ts": {
+  "src/main/webapp/app/entities/microservice/microservice-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice-update.vue": {
+  "src/main/webapp/app/entities/microservice/microservice-update.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice.component.spec.ts": {
+  "src/main/webapp/app/entities/microservice/microservice.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice.component.ts": {
+  "src/main/webapp/app/entities/microservice/microservice.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice.service.spec.ts": {
+  "src/main/webapp/app/entities/microservice/microservice.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice.service.ts": {
+  "src/main/webapp/app/entities/microservice/microservice.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice.vue": {
+  "src/main/webapp/app/entities/microservice/microservice.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple-details.component.spec.ts": {
+  "src/main/webapp/app/entities/simple/simple-details.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple-details.component.ts": {
+  "src/main/webapp/app/entities/simple/simple-details.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple-details.vue": {
+  "src/main/webapp/app/entities/simple/simple-details.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple-update.component.spec.ts": {
+  "src/main/webapp/app/entities/simple/simple-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple-update.component.ts": {
+  "src/main/webapp/app/entities/simple/simple-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple-update.vue": {
+  "src/main/webapp/app/entities/simple/simple-update.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple.component.spec.ts": {
+  "src/main/webapp/app/entities/simple/simple.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple.component.ts": {
+  "src/main/webapp/app/entities/simple/simple.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple.service.spec.ts": {
+  "src/main/webapp/app/entities/simple/simple.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple.service.ts": {
+  "src/main/webapp/app/entities/simple/simple.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple.vue": {
+  "src/main/webapp/app/entities/simple/simple.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/user/user.service.ts": {
+  "src/main/webapp/app/entities/user/user.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/index.ts": {
+  "src/main/webapp/app/index.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/locale/translation.service.ts": {
+  "src/main/webapp/app/locale/translation.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/main.ts": {
+  "src/main/webapp/app/main.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/router/admin.ts": {
+  "src/main/webapp/app/router/admin.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/router/entities.ts": {
+  "src/main/webapp/app/router/entities.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/router/index.ts": {
+  "src/main/webapp/app/router/index.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/router/pages.ts": {
+  "src/main/webapp/app/router/pages.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/alert/alert.service.spec.ts": {
+  "src/main/webapp/app/shared/alert/alert.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/alert/alert.service.ts": {
+  "src/main/webapp/app/shared/alert/alert.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/composables/date-format.ts": {
+  "src/main/webapp/app/shared/composables/date-format.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/composables/index.ts": {
+  "src/main/webapp/app/shared/composables/index.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/composables/validation.ts": {
+  "src/main/webapp/app/shared/composables/validation.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/computables/arrays.ts": {
+  "src/main/webapp/app/shared/computables/arrays.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/computables/index.ts": {
+  "src/main/webapp/app/shared/computables/index.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/config/axios-interceptor.spec.ts": {
+  "src/main/webapp/app/shared/config/axios-interceptor.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/config/axios-interceptor.ts": {
+  "src/main/webapp/app/shared/config/axios-interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/config/config-bootstrap-vue.ts": {
+  "src/main/webapp/app/shared/config/config-bootstrap-vue.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/config/config.ts": {
+  "src/main/webapp/app/shared/config/config.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/config/dayjs.ts": {
+  "src/main/webapp/app/shared/config/dayjs.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/config/languages.ts": {
+  "src/main/webapp/app/shared/config/languages.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/config/store/account-store.ts": {
+  "src/main/webapp/app/shared/config/store/account-store.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/config/store/translation-store.ts": {
+  "src/main/webapp/app/shared/config/store/translation-store.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/data/data-utils.service.spec.ts": {
+  "src/main/webapp/app/shared/data/data-utils.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/data/data-utils.service.ts": {
+  "src/main/webapp/app/shared/data/data-utils.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/jhi-item-count.component.ts": {
+  "src/main/webapp/app/shared/jhi-item-count.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/jhi-item-count.vue": {
+  "src/main/webapp/app/shared/jhi-item-count.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/model/entity-with-custom-id.model.ts": {
+  "src/main/webapp/app/shared/model/entity-with-custom-id.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/model/microservice.model.ts": {
+  "src/main/webapp/app/shared/model/microservice.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/model/simple.model.ts": {
+  "src/main/webapp/app/shared/model/simple.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/model/user.model.ts": {
+  "src/main/webapp/app/shared/model/user.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/security/authority.ts": {
+  "src/main/webapp/app/shared/security/authority.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/sort/jhi-sort-indicator.component.ts": {
+  "src/main/webapp/app/shared/sort/jhi-sort-indicator.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/sort/jhi-sort-indicator.vue": {
+  "src/main/webapp/app/shared/sort/jhi-sort-indicator.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/sort/sorts.spec.ts": {
+  "src/main/webapp/app/shared/sort/sorts.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/sort/sorts.ts": {
+  "src/main/webapp/app/shared/sort/sorts.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shims-vue.d.ts": {
+  "src/main/webapp/app/shims-vue.d.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/store.ts": {
+  "src/main/webapp/app/store.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/test-setup.ts": {
+  "src/main/webapp/app/test-setup.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/css/loading.css": {
+  "src/main/webapp/content/css/loading.css": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0.svg": {
+  "src/main/webapp/content/images/jhipster_family_member_0.svg": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0_head-192.png": {
+  "src/main/webapp/content/images/jhipster_family_member_0_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0_head-256.png": {
+  "src/main/webapp/content/images/jhipster_family_member_0_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0_head-384.png": {
+  "src/main/webapp/content/images/jhipster_family_member_0_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0_head-512.png": {
+  "src/main/webapp/content/images/jhipster_family_member_0_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1.svg": {
+  "src/main/webapp/content/images/jhipster_family_member_1.svg": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1_head-192.png": {
+  "src/main/webapp/content/images/jhipster_family_member_1_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1_head-256.png": {
+  "src/main/webapp/content/images/jhipster_family_member_1_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1_head-384.png": {
+  "src/main/webapp/content/images/jhipster_family_member_1_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1_head-512.png": {
+  "src/main/webapp/content/images/jhipster_family_member_1_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2.svg": {
+  "src/main/webapp/content/images/jhipster_family_member_2.svg": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2_head-192.png": {
+  "src/main/webapp/content/images/jhipster_family_member_2_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2_head-256.png": {
+  "src/main/webapp/content/images/jhipster_family_member_2_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2_head-384.png": {
+  "src/main/webapp/content/images/jhipster_family_member_2_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2_head-512.png": {
+  "src/main/webapp/content/images/jhipster_family_member_2_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3.svg": {
+  "src/main/webapp/content/images/jhipster_family_member_3.svg": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3_head-192.png": {
+  "src/main/webapp/content/images/jhipster_family_member_3_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3_head-256.png": {
+  "src/main/webapp/content/images/jhipster_family_member_3_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3_head-384.png": {
+  "src/main/webapp/content/images/jhipster_family_member_3_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3_head-512.png": {
+  "src/main/webapp/content/images/jhipster_family_member_3_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/logo-jhipster.png": {
+  "src/main/webapp/content/images/logo-jhipster.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/scss/_bootstrap-variables.scss": {
+  "src/main/webapp/content/scss/_bootstrap-variables.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/scss/global.scss": {
+  "src/main/webapp/content/scss/global.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/scss/vendor.scss": {
+  "src/main/webapp/content/scss/vendor.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/favicon.ico": {
+  "src/main/webapp/favicon.ico": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/index.html": {
+  "src/main/webapp/index.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/manifest.webapp": {
+  "src/main/webapp/manifest.webapp": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/microfrontends/entities-menu-test.vue": {
+  "src/main/webapp/microfrontends/entities-menu-test.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/microfrontends/entities-menu.component-test.ts": {
+  "src/main/webapp/microfrontends/entities-menu.component-test.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/microfrontends/entities-router-test.ts": {
+  "src/main/webapp/microfrontends/entities-router-test.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/robots.txt": {
+  "src/main/webapp/robots.txt": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/swagger-ui/dist/images/throbber.gif": {
+  "src/main/webapp/swagger-ui/dist/images/throbber.gif": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/swagger-ui/index.html": {
+  "src/main/webapp/swagger-ui/index.html": {
     "stateCleared": "modified",
   },
   "tsconfig.app.json": {
@@ -1943,7 +1943,7 @@ exports[`generator - vue microservice-oauth2-withAdminUi(true)-skipJhipsterDepen
 }
 `;
 
-exports[`generator - vue monolith-jwt-skipUserManagement(false)-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)-src/main/webapp2/-websocket(true) should match generated files snapshot 1`] = `
+exports[`generator - vue monolith-jwt-skipUserManagement(false)-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)--websocket(true) should match generated files snapshot 1`] = `
 {
   ".eslintignore": {
     "stateCleared": "modified",
@@ -1972,568 +1972,568 @@ exports[`generator - vue monolith-jwt-skipUserManagement(false)-withAdminUi(true
   "package.json": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/404.html": {
+  "src/main/webapp/404.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/WEB-INF/web.xml": {
+  "src/main/webapp/WEB-INF/web.xml": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/account.service.spec.ts": {
+  "src/main/webapp/app/account/account.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/account.service.ts": {
+  "src/main/webapp/app/account/account.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/activate/activate.component.spec.ts": {
+  "src/main/webapp/app/account/activate/activate.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/activate/activate.component.ts": {
+  "src/main/webapp/app/account/activate/activate.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/activate/activate.service.ts": {
+  "src/main/webapp/app/account/activate/activate.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/activate/activate.vue": {
+  "src/main/webapp/app/account/activate/activate.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/change-password/change-password.component.spec.ts": {
+  "src/main/webapp/app/account/change-password/change-password.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/change-password/change-password.component.ts": {
+  "src/main/webapp/app/account/change-password/change-password.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/change-password/change-password.vue": {
+  "src/main/webapp/app/account/change-password/change-password.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/login-form/login-form.component.spec.ts": {
+  "src/main/webapp/app/account/login-form/login-form.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/login-form/login-form.component.ts": {
+  "src/main/webapp/app/account/login-form/login-form.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/login-form/login-form.vue": {
+  "src/main/webapp/app/account/login-form/login-form.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/login.service.ts": {
+  "src/main/webapp/app/account/login.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/register/register.component.spec.ts": {
+  "src/main/webapp/app/account/register/register.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/register/register.component.ts": {
+  "src/main/webapp/app/account/register/register.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/register/register.service.ts": {
+  "src/main/webapp/app/account/register/register.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/register/register.vue": {
+  "src/main/webapp/app/account/register/register.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/reset-password/finish/reset-password-finish.component.spec.ts": {
+  "src/main/webapp/app/account/reset-password/finish/reset-password-finish.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/reset-password/finish/reset-password-finish.component.ts": {
+  "src/main/webapp/app/account/reset-password/finish/reset-password-finish.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/reset-password/finish/reset-password-finish.vue": {
+  "src/main/webapp/app/account/reset-password/finish/reset-password-finish.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/reset-password/init/reset-password-init.component.spec.ts": {
+  "src/main/webapp/app/account/reset-password/init/reset-password-init.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/reset-password/init/reset-password-init.component.ts": {
+  "src/main/webapp/app/account/reset-password/init/reset-password-init.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/reset-password/init/reset-password-init.vue": {
+  "src/main/webapp/app/account/reset-password/init/reset-password-init.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/settings/settings.component.spec.ts": {
+  "src/main/webapp/app/account/settings/settings.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/settings/settings.component.ts": {
+  "src/main/webapp/app/account/settings/settings.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/account/settings/settings.vue": {
+  "src/main/webapp/app/account/settings/settings.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/configuration/configuration.component.spec.ts": {
+  "src/main/webapp/app/admin/configuration/configuration.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/configuration/configuration.component.ts": {
+  "src/main/webapp/app/admin/configuration/configuration.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/configuration/configuration.service.ts": {
+  "src/main/webapp/app/admin/configuration/configuration.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/configuration/configuration.vue": {
+  "src/main/webapp/app/admin/configuration/configuration.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/docs/docs.component.ts": {
+  "src/main/webapp/app/admin/docs/docs.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/docs/docs.vue": {
+  "src/main/webapp/app/admin/docs/docs.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/health/health-modal.component.spec.ts": {
+  "src/main/webapp/app/admin/health/health-modal.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/health/health-modal.component.ts": {
+  "src/main/webapp/app/admin/health/health-modal.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/health/health-modal.vue": {
+  "src/main/webapp/app/admin/health/health-modal.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/health/health.component.spec.ts": {
+  "src/main/webapp/app/admin/health/health.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/health/health.component.ts": {
+  "src/main/webapp/app/admin/health/health.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/health/health.service.spec.ts": {
+  "src/main/webapp/app/admin/health/health.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/health/health.service.ts": {
+  "src/main/webapp/app/admin/health/health.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/health/health.vue": {
+  "src/main/webapp/app/admin/health/health.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/logs/logs.component.spec.ts": {
+  "src/main/webapp/app/admin/logs/logs.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/logs/logs.component.ts": {
+  "src/main/webapp/app/admin/logs/logs.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/logs/logs.service.ts": {
+  "src/main/webapp/app/admin/logs/logs.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/logs/logs.vue": {
+  "src/main/webapp/app/admin/logs/logs.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/metrics-modal.component.spec.ts": {
+  "src/main/webapp/app/admin/metrics/metrics-modal.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/metrics-modal.component.ts": {
+  "src/main/webapp/app/admin/metrics/metrics-modal.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/metrics-modal.vue": {
+  "src/main/webapp/app/admin/metrics/metrics-modal.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/metrics.component.spec.ts": {
+  "src/main/webapp/app/admin/metrics/metrics.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/metrics.component.ts": {
+  "src/main/webapp/app/admin/metrics/metrics.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/metrics.service.ts": {
+  "src/main/webapp/app/admin/metrics/metrics.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/metrics/metrics.vue": {
+  "src/main/webapp/app/admin/metrics/metrics.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/user-management/user-management-edit.component.spec.ts": {
+  "src/main/webapp/app/admin/user-management/user-management-edit.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/user-management/user-management-edit.component.ts": {
+  "src/main/webapp/app/admin/user-management/user-management-edit.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/user-management/user-management-edit.vue": {
+  "src/main/webapp/app/admin/user-management/user-management-edit.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/user-management/user-management-view.component.spec.ts": {
+  "src/main/webapp/app/admin/user-management/user-management-view.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/user-management/user-management-view.component.ts": {
+  "src/main/webapp/app/admin/user-management/user-management-view.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/user-management/user-management-view.vue": {
+  "src/main/webapp/app/admin/user-management/user-management-view.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/user-management/user-management.component.spec.ts": {
+  "src/main/webapp/app/admin/user-management/user-management.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/user-management/user-management.component.ts": {
+  "src/main/webapp/app/admin/user-management/user-management.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/user-management/user-management.service.ts": {
+  "src/main/webapp/app/admin/user-management/user-management.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/admin/user-management/user-management.vue": {
+  "src/main/webapp/app/admin/user-management/user-management.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/app.component.ts": {
+  "src/main/webapp/app/app.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/app.vue": {
+  "src/main/webapp/app/app.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/constants.ts": {
+  "src/main/webapp/app/constants.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/error/error.component.spec.ts": {
+  "src/main/webapp/app/core/error/error.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/error/error.component.ts": {
+  "src/main/webapp/app/core/error/error.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/error/error.vue": {
+  "src/main/webapp/app/core/error/error.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/home/home.component.spec.ts": {
+  "src/main/webapp/app/core/home/home.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/home/home.component.ts": {
+  "src/main/webapp/app/core/home/home.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/home/home.vue": {
+  "src/main/webapp/app/core/home/home.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/jhi-footer/jhi-footer.component.ts": {
+  "src/main/webapp/app/core/jhi-footer/jhi-footer.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/jhi-footer/jhi-footer.vue": {
+  "src/main/webapp/app/core/jhi-footer/jhi-footer.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/jhi-navbar/jhi-navbar.component.spec.ts": {
+  "src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/jhi-navbar/jhi-navbar.component.ts": {
+  "src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/jhi-navbar/jhi-navbar.vue": {
+  "src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/ribbon/ribbon.component.spec.ts": {
+  "src/main/webapp/app/core/ribbon/ribbon.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/ribbon/ribbon.component.ts": {
+  "src/main/webapp/app/core/ribbon/ribbon.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/core/ribbon/ribbon.vue": {
+  "src/main/webapp/app/core/ribbon/ribbon.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/declarations.d.ts": {
+  "src/main/webapp/app/declarations.d.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entities-menu.component.ts": {
+  "src/main/webapp/app/entities/entities-menu.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entities-menu.vue": {
+  "src/main/webapp/app/entities/entities-menu.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entities.component.ts": {
+  "src/main/webapp/app/entities/entities.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entities.vue": {
+  "src/main/webapp/app/entities/entities.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id-details.component.spec.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-details.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id-details.component.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-details.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id-details.vue": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-details.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id-update.component.spec.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id-update.component.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id-update.vue": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id-update.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id.component.spec.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id.component.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id.service.spec.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id.service.ts": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/entity-with-custom-id/entity-with-custom-id.vue": {
+  "src/main/webapp/app/entities/entity-with-custom-id/entity-with-custom-id.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice-details.component.spec.ts": {
+  "src/main/webapp/app/entities/microservice/microservice-details.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice-details.component.ts": {
+  "src/main/webapp/app/entities/microservice/microservice-details.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice-details.vue": {
+  "src/main/webapp/app/entities/microservice/microservice-details.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice-update.component.spec.ts": {
+  "src/main/webapp/app/entities/microservice/microservice-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice-update.component.ts": {
+  "src/main/webapp/app/entities/microservice/microservice-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice-update.vue": {
+  "src/main/webapp/app/entities/microservice/microservice-update.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice.component.spec.ts": {
+  "src/main/webapp/app/entities/microservice/microservice.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice.component.ts": {
+  "src/main/webapp/app/entities/microservice/microservice.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice.service.spec.ts": {
+  "src/main/webapp/app/entities/microservice/microservice.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice.service.ts": {
+  "src/main/webapp/app/entities/microservice/microservice.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/microservice/microservice.vue": {
+  "src/main/webapp/app/entities/microservice/microservice.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple-details.component.spec.ts": {
+  "src/main/webapp/app/entities/simple/simple-details.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple-details.component.ts": {
+  "src/main/webapp/app/entities/simple/simple-details.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple-details.vue": {
+  "src/main/webapp/app/entities/simple/simple-details.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple-update.component.spec.ts": {
+  "src/main/webapp/app/entities/simple/simple-update.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple-update.component.ts": {
+  "src/main/webapp/app/entities/simple/simple-update.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple-update.vue": {
+  "src/main/webapp/app/entities/simple/simple-update.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple.component.spec.ts": {
+  "src/main/webapp/app/entities/simple/simple.component.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple.component.ts": {
+  "src/main/webapp/app/entities/simple/simple.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple.service.spec.ts": {
+  "src/main/webapp/app/entities/simple/simple.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple.service.ts": {
+  "src/main/webapp/app/entities/simple/simple.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/simple/simple.vue": {
+  "src/main/webapp/app/entities/simple/simple.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/entities/user/user.service.ts": {
+  "src/main/webapp/app/entities/user/user.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/locale/translation.service.ts": {
+  "src/main/webapp/app/locale/translation.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/main.ts": {
+  "src/main/webapp/app/main.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/router/account.ts": {
+  "src/main/webapp/app/router/account.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/router/admin.ts": {
+  "src/main/webapp/app/router/admin.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/router/entities.ts": {
+  "src/main/webapp/app/router/entities.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/router/index.ts": {
+  "src/main/webapp/app/router/index.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/router/pages.ts": {
+  "src/main/webapp/app/router/pages.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/alert/alert.service.spec.ts": {
+  "src/main/webapp/app/shared/alert/alert.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/alert/alert.service.ts": {
+  "src/main/webapp/app/shared/alert/alert.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/composables/date-format.ts": {
+  "src/main/webapp/app/shared/composables/date-format.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/composables/index.ts": {
+  "src/main/webapp/app/shared/composables/index.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/composables/validation.ts": {
+  "src/main/webapp/app/shared/composables/validation.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/computables/arrays.ts": {
+  "src/main/webapp/app/shared/computables/arrays.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/computables/index.ts": {
+  "src/main/webapp/app/shared/computables/index.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/config/axios-interceptor.spec.ts": {
+  "src/main/webapp/app/shared/config/axios-interceptor.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/config/axios-interceptor.ts": {
+  "src/main/webapp/app/shared/config/axios-interceptor.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/config/config-bootstrap-vue.ts": {
+  "src/main/webapp/app/shared/config/config-bootstrap-vue.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/config/config.ts": {
+  "src/main/webapp/app/shared/config/config.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/config/dayjs.ts": {
+  "src/main/webapp/app/shared/config/dayjs.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/config/languages.ts": {
+  "src/main/webapp/app/shared/config/languages.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/config/store/account-store.ts": {
+  "src/main/webapp/app/shared/config/store/account-store.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/config/store/translation-store.ts": {
+  "src/main/webapp/app/shared/config/store/translation-store.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/data/data-utils.service.spec.ts": {
+  "src/main/webapp/app/shared/data/data-utils.service.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/data/data-utils.service.ts": {
+  "src/main/webapp/app/shared/data/data-utils.service.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/jhi-item-count.component.ts": {
+  "src/main/webapp/app/shared/jhi-item-count.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/jhi-item-count.vue": {
+  "src/main/webapp/app/shared/jhi-item-count.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/model/entity-with-custom-id.model.ts": {
+  "src/main/webapp/app/shared/model/entity-with-custom-id.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/model/microservice.model.ts": {
+  "src/main/webapp/app/shared/model/microservice.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/model/simple.model.ts": {
+  "src/main/webapp/app/shared/model/simple.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/model/user.model.ts": {
+  "src/main/webapp/app/shared/model/user.model.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/security/authority.ts": {
+  "src/main/webapp/app/shared/security/authority.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/sort/jhi-sort-indicator.component.ts": {
+  "src/main/webapp/app/shared/sort/jhi-sort-indicator.component.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/sort/jhi-sort-indicator.vue": {
+  "src/main/webapp/app/shared/sort/jhi-sort-indicator.vue": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/sort/sorts.spec.ts": {
+  "src/main/webapp/app/shared/sort/sorts.spec.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shared/sort/sorts.ts": {
+  "src/main/webapp/app/shared/sort/sorts.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/shims-vue.d.ts": {
+  "src/main/webapp/app/shims-vue.d.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/store.ts": {
+  "src/main/webapp/app/store.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/app/test-setup.ts": {
+  "src/main/webapp/app/test-setup.ts": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/css/loading.css": {
+  "src/main/webapp/content/css/loading.css": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0.svg": {
+  "src/main/webapp/content/images/jhipster_family_member_0.svg": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0_head-192.png": {
+  "src/main/webapp/content/images/jhipster_family_member_0_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0_head-256.png": {
+  "src/main/webapp/content/images/jhipster_family_member_0_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0_head-384.png": {
+  "src/main/webapp/content/images/jhipster_family_member_0_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_0_head-512.png": {
+  "src/main/webapp/content/images/jhipster_family_member_0_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1.svg": {
+  "src/main/webapp/content/images/jhipster_family_member_1.svg": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1_head-192.png": {
+  "src/main/webapp/content/images/jhipster_family_member_1_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1_head-256.png": {
+  "src/main/webapp/content/images/jhipster_family_member_1_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1_head-384.png": {
+  "src/main/webapp/content/images/jhipster_family_member_1_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_1_head-512.png": {
+  "src/main/webapp/content/images/jhipster_family_member_1_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2.svg": {
+  "src/main/webapp/content/images/jhipster_family_member_2.svg": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2_head-192.png": {
+  "src/main/webapp/content/images/jhipster_family_member_2_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2_head-256.png": {
+  "src/main/webapp/content/images/jhipster_family_member_2_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2_head-384.png": {
+  "src/main/webapp/content/images/jhipster_family_member_2_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_2_head-512.png": {
+  "src/main/webapp/content/images/jhipster_family_member_2_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3.svg": {
+  "src/main/webapp/content/images/jhipster_family_member_3.svg": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3_head-192.png": {
+  "src/main/webapp/content/images/jhipster_family_member_3_head-192.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3_head-256.png": {
+  "src/main/webapp/content/images/jhipster_family_member_3_head-256.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3_head-384.png": {
+  "src/main/webapp/content/images/jhipster_family_member_3_head-384.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/jhipster_family_member_3_head-512.png": {
+  "src/main/webapp/content/images/jhipster_family_member_3_head-512.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/images/logo-jhipster.png": {
+  "src/main/webapp/content/images/logo-jhipster.png": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/scss/_bootstrap-variables.scss": {
+  "src/main/webapp/content/scss/_bootstrap-variables.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/scss/global.scss": {
+  "src/main/webapp/content/scss/global.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/content/scss/vendor.scss": {
+  "src/main/webapp/content/scss/vendor.scss": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/favicon.ico": {
+  "src/main/webapp/favicon.ico": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/index.html": {
+  "src/main/webapp/index.html": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/manifest.webapp": {
+  "src/main/webapp/manifest.webapp": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/robots.txt": {
+  "src/main/webapp/robots.txt": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/swagger-ui/dist/images/throbber.gif": {
+  "src/main/webapp/swagger-ui/dist/images/throbber.gif": {
     "stateCleared": "modified",
   },
-  "src/main/webapp2/swagger-ui/index.html": {
+  "src/main/webapp/swagger-ui/index.html": {
     "stateCleared": "modified",
   },
   "tsconfig.app.json": {
@@ -3439,12 +3439,11 @@ exports[`generator - vue monolith-session-skipUserManagement(true)-withAdminUi(f
 
 exports[`generator - vue samples matrix should match snapshot 1`] = `
 {
-  "gateway-jwt-skipUserManagement(true)-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-src/-websocket(true)": {
+  "gateway-jwt-skipUserManagement(true)-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-clientRoot/-websocket(true)": {
     "applicationType": "gateway",
     "authenticationType": "jwt",
     "clientFramework": "vue",
-    "clientSrcDir": "src/",
-    "clientTestDir": "test/",
+    "clientRootDir": "clientRoot/",
     "enableTranslation": false,
     "languages": [
       "fr",
@@ -3456,12 +3455,11 @@ exports[`generator - vue samples matrix should match snapshot 1`] = `
     "websocket": true,
     "withAdminUi": false,
   },
-  "gateway-oauth2-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)-src/-websocket(true)": {
+  "gateway-oauth2-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)-clientRoot/-websocket(true)": {
     "applicationType": "gateway",
     "authenticationType": "oauth2",
     "clientFramework": "vue",
-    "clientSrcDir": "src/",
-    "clientTestDir": "test/",
+    "clientRootDir": "clientRoot/",
     "enableTranslation": true,
     "languages": [
       "fr",
@@ -3472,12 +3470,11 @@ exports[`generator - vue samples matrix should match snapshot 1`] = `
     "websocket": true,
     "withAdminUi": true,
   },
-  "microservice-jwt-skipUserManagement(false)-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-src/-websocket(false)": {
+  "microservice-jwt-skipUserManagement(false)-withAdminUi(false)-skipJhipsterDependencies(false)-enableTranslation(false)-clientRoot/-websocket(false)": {
     "applicationType": "microservice",
     "authenticationType": "jwt",
     "clientFramework": "vue",
-    "clientSrcDir": "src/",
-    "clientTestDir": "test/",
+    "clientRootDir": "clientRoot/",
     "enableTranslation": false,
     "languages": [
       "fr",
@@ -3489,12 +3486,11 @@ exports[`generator - vue samples matrix should match snapshot 1`] = `
     "websocket": false,
     "withAdminUi": false,
   },
-  "microservice-oauth2-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)-src/main/webapp2/-websocket(false)": {
+  "microservice-oauth2-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)--websocket(false)": {
     "applicationType": "microservice",
     "authenticationType": "oauth2",
     "clientFramework": "vue",
-    "clientSrcDir": "src/main/webapp2/",
-    "clientTestDir": "src/test/javascript2/",
+    "clientRootDir": "",
     "enableTranslation": true,
     "languages": [
       "fr",
@@ -3505,12 +3501,11 @@ exports[`generator - vue samples matrix should match snapshot 1`] = `
     "websocket": false,
     "withAdminUi": true,
   },
-  "monolith-jwt-skipUserManagement(false)-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)-src/main/webapp2/-websocket(true)": {
+  "monolith-jwt-skipUserManagement(false)-withAdminUi(true)-skipJhipsterDependencies(true)-enableTranslation(true)--websocket(true)": {
     "applicationType": "monolith",
     "authenticationType": "jwt",
     "clientFramework": "vue",
-    "clientSrcDir": "src/main/webapp2/",
-    "clientTestDir": "src/test/javascript2/",
+    "clientRootDir": "",
     "enableTranslation": true,
     "languages": [
       "fr",
@@ -3526,7 +3521,7 @@ exports[`generator - vue samples matrix should match snapshot 1`] = `
     "applicationType": "monolith",
     "authenticationType": "oauth2",
     "clientFramework": "vue",
-    "clientSrcDir": undefined,
+    "clientRootDir": undefined,
     "enableTranslation": false,
     "languages": [
       "fr",
@@ -3541,7 +3536,7 @@ exports[`generator - vue samples matrix should match snapshot 1`] = `
     "applicationType": "monolith",
     "authenticationType": "session",
     "clientFramework": "vue",
-    "clientSrcDir": undefined,
+    "clientRootDir": undefined,
     "enableTranslation": false,
     "languages": [
       "fr",
diff --git a/generators/vue/entity-files-vue.mjs b/generators/vue/entity-files-vue.mjs
index 442f2dbf4a1d..67a6fd3942d0 100644
--- a/generators/vue/entity-files-vue.mjs
+++ b/generators/vue/entity-files-vue.mjs
@@ -17,36 +17,34 @@
  * limitations under the License.
  */
 import { clientApplicationTemplatesBlock } from '../client/support/files.mjs';
-import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.mjs';
 
 export const entityFiles = {
   client: [
-    {
-      ...clientApplicationTemplatesBlock('shared/model/'),
-      path: `${CLIENT_MAIN_SRC_DIR}app/entities/_entityFolder/`,
-      templates: ['_entityModel.model.ts'],
-    },
+    clientApplicationTemplatesBlock({
+      relativePath: 'shared/model/',
+      templates: ['_entityModel_.model.ts'],
+    }),
     {
       condition: generator => !generator.embedded,
       ...clientApplicationTemplatesBlock(),
       templates: [
-        'entities/_entityFolder/_entityFile-details.vue',
-        'entities/_entityFolder/_entityFile-details.component.ts',
-        'entities/_entityFolder/_entityFile-details.component.spec.ts',
-        'entities/_entityFolder/_entityFile.vue',
-        'entities/_entityFolder/_entityFile.component.ts',
-        'entities/_entityFolder/_entityFile.component.spec.ts',
-        'entities/_entityFolder/_entityFile.service.ts',
-        'entities/_entityFolder/_entityFile.service.spec.ts',
+        'entities/_entityFolder_/_entityFile_-details.vue',
+        'entities/_entityFolder_/_entityFile_-details.component.ts',
+        'entities/_entityFolder_/_entityFile_-details.component.spec.ts',
+        'entities/_entityFolder_/_entityFile_.vue',
+        'entities/_entityFolder_/_entityFile_.component.ts',
+        'entities/_entityFolder_/_entityFile_.component.spec.ts',
+        'entities/_entityFolder_/_entityFile_.service.ts',
+        'entities/_entityFolder_/_entityFile_.service.spec.ts',
       ],
     },
     {
       condition: generator => !generator.readOnly && !generator.embedded,
       ...clientApplicationTemplatesBlock(),
       templates: [
-        'entities/_entityFolder/_entityFile-update.vue',
-        'entities/_entityFolder/_entityFile-update.component.ts',
-        'entities/_entityFolder/_entityFile-update.component.spec.ts',
+        'entities/_entityFolder_/_entityFile_-update.vue',
+        'entities/_entityFolder_/_entityFile_-update.component.ts',
+        'entities/_entityFolder_/_entityFile_-update.component.spec.ts',
       ],
     },
   ],
diff --git a/generators/vue/files-vue.mjs b/generators/vue/files-vue.mjs
index b24bdbbd502c..1c21084e80d8 100644
--- a/generators/vue/files-vue.mjs
+++ b/generators/vue/files-vue.mjs
@@ -17,11 +17,11 @@
  * limitations under the License.
  */
 
-import { clientApplicationTemplatesBlock, clientSrcTemplatesBlock } from '../client/support/files.mjs';
+import { clientApplicationTemplatesBlock, clientRootTemplatesBlock, clientSrcTemplatesBlock } from '../client/support/files.mjs';
 
 export const vueFiles = {
   common: [
-    {
+    clientRootTemplatesBlock({
       templates: [
         'package.json',
         'tsconfig.json',
@@ -33,10 +33,10 @@ export const vueFiles = {
         'vite.config.ts',
         'vitest.config.ts',
       ],
-    },
+    }),
   ],
   microfrontend: [
-    {
+    clientRootTemplatesBlock({
       condition: generator => generator.microfrontend,
       templates: [
         'webpack/config.js',
@@ -46,7 +46,7 @@ export const vueFiles = {
         'webpack/vue.utils.js',
         'webpack/webpack.microfrontend.js.jhi.vue',
       ],
-    },
+    }),
     {
       condition: generator => generator.microfrontend,
       ...clientApplicationTemplatesBlock(),
diff --git a/generators/vue/generator.mjs b/generators/vue/generator.mjs
index 49f8654dc4cb..87dd4a3f4bc1 100644
--- a/generators/vue/generator.mjs
+++ b/generators/vue/generator.mjs
@@ -18,7 +18,7 @@
  */
 import { relative } from 'path';
 import chalk from 'chalk';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { isFilePending } from 'mem-fs-editor/state';
 
 import BaseApplicationGenerator from '../base-application/index.mjs';
@@ -43,22 +43,14 @@ const TYPE_BOOLEAN = CommonDBTypes.BOOLEAN;
 
 export default class VueGenerator extends BaseApplicationGenerator {
   async beforeQueue() {
-    await this.dependsOnJHipster(GENERATOR_CLIENT);
     if (!this.fromBlueprint) {
       await this.composeWithBlueprints(GENERATOR_VUE);
     }
-  }
-
-  get composing() {
-    return this.asComposingTaskGroup({
-      async composing() {
-        await this.composeWithJHipster(GENERATOR_LANGUAGES);
-      },
-    });
-  }
 
-  get [BaseApplicationGenerator.COMPOSING]() {
-    return this.delegateTasksToBlueprint(() => this.composing);
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_CLIENT);
+      await this.dependsOnJHipster(GENERATOR_LANGUAGES);
+    }
   }
 
   get loading() {
@@ -88,7 +80,7 @@ export default class VueGenerator extends BaseApplicationGenerator {
         application.clientSrcDirRelativeToClientTestDir = `${relative(application.clientSpecDir, application.clientWebappDir)}/`;
 
         source.addWebpackConfig = args => {
-          const webpackPath = 'webpack/webpack.common.js';
+          const webpackPath = `${application.clientRootDir}webpack/webpack.common.js`;
           const ignoreNonExisting = this.sharedData.getControl().ignoreNeedlesError && 'Webpack configuration file not found';
           this.editFile(
             webpackPath,
diff --git a/generators/vue/generator.spec.mts b/generators/vue/generator.spec.mts
index fffc497eed63..a17467679576 100644
--- a/generators/vue/generator.spec.mts
+++ b/generators/vue/generator.spec.mts
@@ -13,7 +13,7 @@ import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/
 import Generator from './index.mjs';
 
 import { clientFrameworkTypes } from '../../jdl/jhipster/index.mjs';
-import { CLIENT_MAIN_SRC_DIR, CLIENT_TEST_SRC_DIR } from '../generator-constants.mjs';
+import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.mjs';
 import { GENERATOR_VUE } from '../generator-list.mjs';
 
 const { snakeCase } = lodash;
@@ -70,6 +70,8 @@ describe(`generator - ${clientFramework}`, () => {
   });
 
   Object.entries(testSamples).forEach(([name, sampleConfig]) => {
+    const { clientRootDir = '' } = sampleConfig;
+
     describe(name, () => {
       let runResult;
 
@@ -90,32 +92,21 @@ describe(`generator - ${clientFramework}`, () => {
         runResult.assertFileContent('.yo-rc.json', new RegExp(`"clientFramework": "${clientFramework}"`));
       });
       it('should not contain version placeholders at package.json', () => {
-        runResult.assertNoFileContent('package.json', /VERSION_MANAGED_BY_CLIENT_COMMON/);
-        runResult.assertNoFileContent('package.json', /VERSION_MANAGED_BY_CLIENT_ANGULAR/);
-        runResult.assertNoFileContent('package.json', /VERSION_MANAGED_BY_CLIENT_REACT/);
-        runResult.assertNoFileContent('package.json', /VERSION_MANAGED_BY_CLIENT_VUE/);
-      });
-
-      describe('skipJhipsterDependencies', () => {
-        const { skipJhipsterDependencies } = sampleConfig;
-        const skipJhipsterDependenciesTitle = skipJhipsterDependencies
-          ? 'should not add generator-jhipster to package.json'
-          : 'should add generator-jhipster to package.json';
-        it(skipJhipsterDependenciesTitle, () => {
-          const assertion = (...args) =>
-            skipJhipsterDependencies ? runResult.assertNoFileContent(...args) : runResult.assertFileContent(...args);
-          assertion('package.json', 'generator-jhipster');
-        });
+        runResult.assertNoFileContent(`${clientRootDir}package.json`, /VERSION_MANAGED_BY_CLIENT_COMMON/);
+        runResult.assertNoFileContent(`${clientRootDir}package.json`, /VERSION_MANAGED_BY_CLIENT_ANGULAR/);
+        runResult.assertNoFileContent(`${clientRootDir}package.json`, /VERSION_MANAGED_BY_CLIENT_REACT/);
+        runResult.assertNoFileContent(`${clientRootDir}package.json`, /VERSION_MANAGED_BY_CLIENT_VUE/);
       });
 
       describe('withAdminUi', () => {
-        const { applicationType, withAdminUi, clientSrcDir = CLIENT_MAIN_SRC_DIR, clientTestDir = CLIENT_TEST_SRC_DIR } = sampleConfig;
+        const { applicationType, withAdminUi } = sampleConfig;
+        const clientSrcDir = `${clientRootDir}${CLIENT_MAIN_SRC_DIR}`;
         const generateAdminUi = applicationType !== 'microservice' && withAdminUi;
         const adminUiComponents = generateAdminUi ? 'should generate admin ui components' : 'should not generate admin ui components';
 
         it(adminUiComponents, () => {
           const assertion = (...args) => (generateAdminUi ? runResult.assertFile(...args) : runResult.assertNoFile(...args));
-          assertion(clientAdminFiles(clientSrcDir, clientTestDir));
+          assertion(clientAdminFiles(clientSrcDir));
         });
 
         if (applicationType !== 'microservice') {
diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json
index a0829e873440..e194353e6ba6 100644
--- a/generators/vue/resources/package.json
+++ b/generators/vue/resources/package.json
@@ -5,41 +5,41 @@
     "@fortawesome/vue-fontawesome": "3.0.3",
     "@vuelidate/core": "2.0.3",
     "@vuelidate/validators": "2.0.4",
-    "@vueuse/core": "10.4.1",
-    "axios": "1.5.0",
+    "@vueuse/core": "10.5.0",
+    "axios": "1.5.1",
     "bootstrap": "4.6.2",
     "bootstrap-vue": "2.23.1",
-    "bootswatch": "5.3.1",
+    "bootswatch": "5.3.2",
     "deepmerge": "4.3.1",
     "js-cookie": "3.0.5",
-    "pinia": "2.1.6",
+    "pinia": "2.1.7",
     "vue": "3.3.4",
-    "vue-i18n": "9.4.1",
-    "vue-router": "4.2.4"
+    "vue-i18n": "9.5.0",
+    "vue-router": "4.2.5"
   },
   "devDependencies": {
     "@pinia/testing": "0.1.3",
-    "@rushstack/eslint-patch": "1.4.0",
+    "@rushstack/eslint-patch": "1.5.1",
     "@tsconfig/node18": "18.2.2",
-    "@types/node": "18.17.17",
-    "@types/sinon": "10.0.16",
-    "@vitejs/plugin-vue": "4.3.4",
+    "@types/node": "18.18.6",
+    "@types/sinon": "10.0.20",
+    "@vitejs/plugin-vue": "4.4.0",
     "@vue/eslint-config-prettier": "8.0.0",
     "@vue/eslint-config-typescript": "10.0.0",
     "@vue/test-utils": "2.4.1",
     "@vue/tsconfig": "0.4.0",
-    "autoprefixer": "10.4.15",
+    "autoprefixer": "10.4.16",
     "axios-mock-adapter": "1.22.0",
     "browser-sync-webpack-plugin": "2.3.0",
     "copy-webpack-plugin": "11.0.0",
     "css-loader": "6.8.1",
     "css-minimizer-webpack-plugin": "5.0.1",
-    "eslint": "8.49.0",
-    "eslint-plugin-prettier": "5.0.0",
+    "eslint": "8.51.0",
+    "eslint-plugin-prettier": "5.0.1",
     "eslint-plugin-vue": "8.7.1",
     "flush-promises": "1.0.2",
     "folder-hash": "4.0.4",
-    "happy-dom": "12.0.1",
+    "happy-dom": "12.9.1",
     "html-webpack-plugin": "5.5.3",
     "merge-jsons-webpack-plugin": "2.0.1",
     "mini-css-extract-plugin": "2.7.6",
@@ -47,25 +47,25 @@
     "postcss-import": "15.1.0",
     "postcss-loader": "7.3.3",
     "postcss-url": "10.1.3",
-    "rimraf": "5.0.1",
+    "rimraf": "5.0.5",
     "rollup-plugin-copy": "3.5.0",
-    "sass": "1.67.0",
+    "sass": "1.69.4",
     "sass-loader": "13.3.2",
-    "sinon": "16.0.0",
+    "sinon": "16.1.3",
     "terser-webpack-plugin": "5.3.9",
-    "ts-loader": "9.4.4",
+    "ts-loader": "9.5.0",
     "typescript": "5.2.2",
-    "vite": "4.4.9",
-    "vitest": "0.34.4",
+    "vite": "4.5.0",
+    "vitest": "0.34.6",
     "vitest-sonar-reporter": "0.4.1",
-    "vue-loader": "17.2.2",
+    "vue-loader": "17.3.0",
     "vue-style-loader": "4.1.3",
-    "vue-tsc": "1.8.11",
-    "webpack": "5.88.2",
+    "vue-tsc": "1.8.19",
+    "webpack": "5.89.0",
     "webpack-bundle-analyzer": "4.9.1",
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "4.15.1",
-    "webpack-merge": "5.9.0",
+    "webpack-merge": "5.10.0",
     "workbox-webpack-plugin": "7.0.0"
   }
 }
diff --git a/generators/vue/templates/.eslintrc.cjs.ejs b/generators/vue/templates/.eslintrc.cjs.ejs
index aeb58f1a151d..f58e812f1dec 100644
--- a/generators/vue/templates/.eslintrc.cjs.ejs
+++ b/generators/vue/templates/.eslintrc.cjs.ejs
@@ -54,5 +54,5 @@ module.exports = {
     '@typescript-eslint/no-var-requires': 'off',
     '@typescript-eslint/consistent-type-imports': 'error',
   },
-  ignorePatterns: ['<%= temporaryDir %>'],
+  ignorePatterns: ['<%= this.relativeDir(clientRootDir, temporaryDir) %>'],
 };
diff --git a/generators/vue/templates/package.json.ejs b/generators/vue/templates/package.json.ejs
index 0b9e3e4f0f88..05046e4a70de 100644
--- a/generators/vue/templates/package.json.ejs
+++ b/generators/vue/templates/package.json.ejs
@@ -94,22 +94,11 @@
     "@vue/tsconfig": null,
     "axios-mock-adapter": "<%= nodeDependencies['axios-mock-adapter'] %>",
     "autoprefixer": "<%= nodeDependencies['autoprefixer'] %>",
-<%_ if (!skipJhipsterDependencies) { _%>
-    "generator-jhipster": "<%= jhipsterVersion %>",
-  <%_ blueprints.forEach(blueprint => { _%>
-    "<%= blueprint.name %>": "<%= blueprint.version %>",
-  <%_ }); _%>
-<%_ } _%>
     "flush-promises": null,
     "happy-dom": "<%= nodeDependencies['happy-dom'] %>",
     "numeral": "<%= nodeDependencies['numeral'] %>",
     "postcss-import": "<%= nodeDependencies['postcss-import'] %>",
     "postcss-url": "<%= nodeDependencies['postcss-url'] %>",
-    "prettier": "<%= nodeDependencies['prettier'] %>",
-<%_ if (!skipServer) { _%>
-    "prettier-plugin-java": "<%= nodeDependencies['prettier-plugin-java'] %>",
-<%_ } _%>
-    "prettier-plugin-packagejson": "<%= nodeDependencies['prettier-plugin-packagejson'] %>",
 <%_ if (cypressTests) { _%>
     "cypress": "<%= nodeDependencies['cypress'] %>",
 <%_ } _%>
@@ -143,8 +132,8 @@
 <%_ } %>
     "lint": "eslint . --ext .ts,.vue ",
     "lint:fix": "eslint . --ext .ts,.vue --fix",
-    "cleanup": "rimraf <%= clientDistDir %>",
-    "clean-www": "rimraf <%= clientDistDir %>app/{src,<%= temporaryDir %>}",
+    "cleanup": "rimraf <%= this.relativeDir(clientRootDir, temporaryDir) %>",
+    "clean-www": "rimraf <%= this.relativeDir(clientRootDir, clientDistDir) %>",
     "start": "<%= clientPackageManager %> run webapp:dev --",
     "start-tls": "<%= clientPackageManager %> run webapp:dev -- --env.tls",
     "serve": "<%= clientPackageManager %> run start --",
diff --git a/generators/vue/templates/src/main/webapp/app/entities/_entityFolder/_entityFile-details.component.spec.ts.ejs b/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-details.component.spec.ts.ejs
similarity index 100%
rename from generators/vue/templates/src/main/webapp/app/entities/_entityFolder/_entityFile-details.component.spec.ts.ejs
rename to generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-details.component.spec.ts.ejs
diff --git a/generators/vue/templates/src/main/webapp/app/entities/_entityFolder/_entityFile-details.component.ts.ejs b/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-details.component.ts.ejs
similarity index 100%
rename from generators/vue/templates/src/main/webapp/app/entities/_entityFolder/_entityFile-details.component.ts.ejs
rename to generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-details.component.ts.ejs
diff --git a/generators/vue/templates/src/main/webapp/app/entities/_entityFolder/_entityFile-details.vue.ejs b/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-details.vue.ejs
similarity index 100%
rename from generators/vue/templates/src/main/webapp/app/entities/_entityFolder/_entityFile-details.vue.ejs
rename to generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-details.vue.ejs
diff --git a/generators/vue/templates/src/main/webapp/app/entities/_entityFolder/_entityFile-update.component.spec.ts.ejs b/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.component.spec.ts.ejs
similarity index 95%
rename from generators/vue/templates/src/main/webapp/app/entities/_entityFolder/_entityFile-update.component.spec.ts.ejs
rename to generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.component.spec.ts.ejs
index 3c0d3ab13600..2b882c101bea 100644
--- a/generators/vue/templates/src/main/webapp/app/entities/_entityFolder/_entityFile-update.component.spec.ts.ejs
+++ b/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.component.spec.ts.ejs
@@ -38,9 +38,9 @@ import AlertService from '@/shared/alert/alert.service';
     .filter(relationships => relationships.length > 0);
 _%>
 <%_ for (const [relationship] of Object.values(allRelationshipsThatNeedSelectOptions)) { _%>
-  <% if (relationship.otherEntityUser && (generateBuiltInUserEntity)) { %>
+  <% if (relationship.otherEntityUser && generateBuiltInUserEntity) { %>
 import UserService from '@/entities/user/user.service';
-  <%_ } else { _%>
+  <%_ } else if (relationship.otherEntity.entityAngularName !== entityAngularName) { _%>
 import <%= relationship.otherEntity.entityAngularName %>Service from '@/entities/<%= relationship.otherEntity.entityClientRootFolder %><%= relationship.otherEntity.entityFolderName %>/<%= relationship.otherEntity.entityFileName %>.service';
   <%_ } _%>
 <%_ } _%>
@@ -68,6 +68,7 @@ describe('Component Tests', () => {
     beforeEach(() => {
       route = {};
       <%= entityInstance %>ServiceStub = sinon.createStubInstance<<%= entityAngularName %>Service>(<%= entityAngularName %>Service);
+      <%= entityInstance %>ServiceStub.retrieve.onFirstCall().resolves(Promise.resolve([]));
 
       alertService = new AlertService({
 <%_ if (enableTranslation) { _%>
@@ -95,7 +96,7 @@ describe('Component Tests', () => {
               sinon.createStubInstance<UserService>(UserService, {
                 retrieve: sinon.stub().resolves({}),
               } as any),
-  <%_ } else { _%>
+  <%_ } else if (relationship.otherEntity.entityAngularName !== entityAngularName) { _%>
             <%= relationship.otherEntity.entityInstance %>Service: () =>
               sinon.createStubInstance<<%= relationship.otherEntity.entityAngularName %>Service>(<%= relationship.otherEntity.entityAngularName %>Service, {
                 retrieve: sinon.stub().resolves({}),
diff --git a/generators/vue/templates/src/main/webapp/app/entities/_entityFolder/_entityFile-update.component.ts.ejs b/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.component.ts.ejs
similarity index 98%
rename from generators/vue/templates/src/main/webapp/app/entities/_entityFolder/_entityFile-update.component.ts.ejs
rename to generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.component.ts.ejs
index 699cda70a6a8..5e1406bc30d1 100644
--- a/generators/vue/templates/src/main/webapp/app/entities/_entityFolder/_entityFile-update.component.ts.ejs
+++ b/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.component.ts.ejs
@@ -22,7 +22,7 @@ _%>
 <%_ for (const [relationship] of Object.values(allRelationshipsThatNeedSelectOptions)) { _%>
   <%_ if (relationship.otherEntity.builtInUser) { _%>
 import UserService from '@/entities/user/user.service';
-  <%_ } else { _%>
+  <%_ } else if (relationship.otherEntity.entityAngularName !== entityAngularName) { _%>
 import <%= relationship.otherEntity.entityAngularName %>Service from '@/entities/<%= relationship.otherEntity.entityClientRootFolder %><%= relationship.otherEntity.entityFolderName %>/<%= relationship.otherEntity.entityFileName %>.service';
 import { type I<%= relationship.otherEntity.entityAngularName %> } from '@/shared/model/<%= relationship.otherEntityModelName %>.model';
   <%_ } _%>
@@ -47,7 +47,9 @@ export default defineComponent({
     const userService = inject('userService', () => new UserService());
     const <%= relationship.otherEntity.entityInstancePlural %>: Ref<Array<any>> = ref([]);
   <%_ } else { _%>
+    <%_ if (relationship.otherEntity.entityAngularName !== entityAngularName) { %>
     const <%= relationship.otherEntity.entityInstance %>Service = inject('<%= relationship.otherEntity.entityInstance %>Service', () => new <%= relationship.otherEntity.entityAngularName %>Service());
+    <%_ } %>
     const <%= relationship.otherEntity.entityInstancePlural %>: Ref<I<%= relationship.otherEntity.entityAngularName %>[]> = ref([]);
   <%_ } _%>
 <%_ } _%>
diff --git a/generators/vue/templates/src/main/webapp/app/entities/_entityFolder/_entityFile-update.vue.ejs b/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.vue.ejs
similarity index 100%
rename from generators/vue/templates/src/main/webapp/app/entities/_entityFolder/_entityFile-update.vue.ejs
rename to generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.vue.ejs
diff --git a/generators/vue/templates/src/main/webapp/app/entities/_entityFolder/_entityFile.component.spec.ts.ejs b/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.component.spec.ts.ejs
similarity index 100%
rename from generators/vue/templates/src/main/webapp/app/entities/_entityFolder/_entityFile.component.spec.ts.ejs
rename to generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.component.spec.ts.ejs
diff --git a/generators/vue/templates/src/main/webapp/app/entities/_entityFolder/_entityFile.component.ts.ejs b/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.component.ts.ejs
similarity index 100%
rename from generators/vue/templates/src/main/webapp/app/entities/_entityFolder/_entityFile.component.ts.ejs
rename to generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.component.ts.ejs
diff --git a/generators/vue/templates/src/main/webapp/app/entities/_entityFolder/_entityFile.service.spec.ts.ejs b/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.service.spec.ts.ejs
similarity index 100%
rename from generators/vue/templates/src/main/webapp/app/entities/_entityFolder/_entityFile.service.spec.ts.ejs
rename to generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.service.spec.ts.ejs
diff --git a/generators/vue/templates/src/main/webapp/app/entities/_entityFolder/_entityFile.service.ts.ejs b/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.service.ts.ejs
similarity index 100%
rename from generators/vue/templates/src/main/webapp/app/entities/_entityFolder/_entityFile.service.ts.ejs
rename to generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.service.ts.ejs
diff --git a/generators/vue/templates/src/main/webapp/app/entities/_entityFolder/_entityFile.vue.ejs b/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.vue.ejs
similarity index 100%
rename from generators/vue/templates/src/main/webapp/app/entities/_entityFolder/_entityFile.vue.ejs
rename to generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.vue.ejs
diff --git a/generators/vue/templates/src/main/webapp/app/shared/config/axios-interceptor.spec.ts.ejs b/generators/vue/templates/src/main/webapp/app/shared/config/axios-interceptor.spec.ts.ejs
index 0fbf52ed982d..b1e284a57d99 100644
--- a/generators/vue/templates/src/main/webapp/app/shared/config/axios-interceptor.spec.ts.ejs
+++ b/generators/vue/templates/src/main/webapp/app/shared/config/axios-interceptor.spec.ts.ejs
@@ -15,7 +15,7 @@ describe('Axios interceptor', () => {
 <%_ if (authenticationTypeJwt) { _%>
     localStorage.setItem('<%=jhiPrefixDashed %>-authenticationToken', 'auth');
 <%_ } _%>
-    const result = setupAxiosConfig.onRequestSuccess(() => console.log('A problem occured'));
+    const result = setupAxiosConfig.onRequestSuccess(() => console.log('A problem occurred'));
 
 <%_ if (authenticationTypeJwt) { _%>
     expect(result.headers.Authorization).toBe('Bearer auth');
diff --git a/generators/vue/templates/src/main/webapp/app/entities/_entityFolder/_entityModel.model.ts.ejs b/generators/vue/templates/src/main/webapp/app/shared/model/_entityModel_.model.ts.ejs
similarity index 100%
rename from generators/vue/templates/src/main/webapp/app/entities/_entityFolder/_entityModel.model.ts.ejs
rename to generators/vue/templates/src/main/webapp/app/shared/model/_entityModel_.model.ts.ejs
diff --git a/generators/vue/templates/src/main/webapp/content/scss/vendor.scss.ejs b/generators/vue/templates/src/main/webapp/content/scss/vendor.scss.ejs
index c96f71c65d56..79c9bd371958 100644
--- a/generators/vue/templates/src/main/webapp/content/scss/vendor.scss.ejs
+++ b/generators/vue/templates/src/main/webapp/content/scss/vendor.scss.ejs
@@ -40,7 +40,7 @@ nav li.router-link-active .navbar-dropdown-menu {
 }
 <%_ } _%>
 <%_ if (enableI18nRTL) { _%>
-@import '<%= clientSrcDir %>content/scss/rtl.scss';
+@import '<%= this.relativeDir(clientRootDir, clientSrcDir) %>content/scss/rtl.scss';
 <%_ } _%>
 
 
diff --git a/generators/vue/templates/tsconfig.app.json.ejs b/generators/vue/templates/tsconfig.app.json.ejs
index e02eadfa0faf..49c744545969 100644
--- a/generators/vue/templates/tsconfig.app.json.ejs
+++ b/generators/vue/templates/tsconfig.app.json.ejs
@@ -1,13 +1,13 @@
 {
   "extends": "@vue/tsconfig/tsconfig.dom.json",
-  "include": ["<%= clientSrcDir %>/**/*", "<%= clientSrcDir %>app/**/*.vue"],
-  "exclude": ["<%= clientSrcDir %>app/**/*.spec.ts"],
+  "include": ["<%= this.relativeDir(clientRootDir, clientSrcDir) %>/**/*", "<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/**/*.vue"],
+  "exclude": ["<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/**/*.spec.ts"],
   "compilerOptions": {
     "composite": true,
-    "baseUrl": "<%= clientSrcDir %>app",
-    "outDir": "<%= temporaryDir %>out-tsc/dist",
+    "baseUrl": "<%= this.relativeDir(clientRootDir, clientSrcDir) %>app",
+    "outDir": "<%= this.relativeDir(clientRootDir, temporaryDir) %>out-tsc/dist",
     "paths": {
-      "@/*": ["./<%= clientSrcDir %>app/*"]
+      "@/*": ["./<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/*"]
     }
   }
 }
diff --git a/generators/vue/templates/vite.config.ts.ejs b/generators/vue/templates/vite.config.ts.ejs
index c4f4e1b9b7af..49afeb5a4c8c 100644
--- a/generators/vue/templates/vite.config.ts.ejs
+++ b/generators/vue/templates/vite.config.ts.ejs
@@ -53,30 +53,30 @@ let config = defineConfig({
             `${require('swagger-ui-dist').getAbsoluteFSPath()}/*.{js,css,html,png}`,
             `!${require('swagger-ui-dist').getAbsoluteFSPath()}/**/index.html`,
             getFileFromRepo('axios/dist/axios.min.js'),
-            fileURLToPath(new URL('./<%- clientSrcDir %>swagger-ui/index.html', import.meta.url)),
+            fileURLToPath(new URL('./<%- this.relativeDir(clientRootDir, clientSrcDir) %>swagger-ui/index.html', import.meta.url)),
           ],
-          dest: '<%= clientDistDir %>swagger-ui',
+          dest: '<%= this.relativeDir(clientRootDir, clientDistDir) %>swagger-ui',
         },
       ],
       hook: 'writeBundle',
     }),
   ],
-  root: fileURLToPath(new URL('./<%- clientSrcDir %>', import.meta.url)),
-  publicDir: fileURLToPath(new URL('./<%- clientDistDir %>public', import.meta.url)),
-  cacheDir: fileURLToPath(new URL('./<%- temporaryDir %>.vite-cache', import.meta.url)),
+  root: fileURLToPath(new URL('./<%- this.relativeDir(clientRootDir, clientSrcDir) %>', import.meta.url)),
+  publicDir: fileURLToPath(new URL('./<%- this.relativeDir(clientRootDir, clientDistDir) %>public', import.meta.url)),
+  cacheDir: fileURLToPath(new URL('./<%- this.relativeDir(clientRootDir, temporaryDir) %>.vite-cache', import.meta.url)),
   build: {
     emptyOutDir: true,
-    outDir: fileURLToPath(new URL('./<%- clientDistDir %>', import.meta.url)),
+    outDir: fileURLToPath(new URL('./<%- this.relativeDir(clientRootDir, clientDistDir) %>', import.meta.url)),
     rollupOptions: {
       input: {
-        app: fileURLToPath(new URL('./<%- clientSrcDir %>index.html', import.meta.url)),
+        app: fileURLToPath(new URL('./<%- this.relativeDir(clientRootDir, clientSrcDir) %>index.html', import.meta.url)),
       },
     },
   },
   resolve: {
     alias: {
       vue: '@vue/compat/dist/vue.esm-bundler.js',
-      '@': fileURLToPath(new URL('./<%- clientSrcDir %>app/', import.meta.url)),
+      '@': fileURLToPath(new URL('./<%- this.relativeDir(clientRootDir, clientSrcDir) %>app/', import.meta.url)),
     },
   },
   define: {
@@ -132,8 +132,8 @@ config = mergeConfig(config, {
 <%_ } _%>
 <%_ if (applicationTypeMicroservice) { _%>
       exposes: {
-        './entities-router': './<%= clientSrcDir %>app/router/entities',
-        './entities-menu': './<%= clientSrcDir %>app/entities/entities-menu.vue',
+        './entities-router': './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/router/entities',
+        './entities-menu': './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/entities/entities-menu.vue',
       },
 <%_ } _%>
       shared: {
@@ -148,19 +148,19 @@ config = mergeConfig(config, {
         'vue-router': {},
         pinia: {},
         '@/shared/security/authority': {
-          packagePath: './<%= clientSrcDir %>app/shared/security/authority',
+          packagePath: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/shared/security/authority',
 <%_ if (applicationTypeGateway) { _%>
           version: sharedAppVersion,
 <%_ } _%>
         },
         '@/shared/alert/alert.service': {
-          packagePath: './<%= clientSrcDir %>app/shared/alert/alert.service',
+          packagePath: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/shared/alert/alert.service',
 <%_ if (applicationTypeGateway) { _%>
           version: sharedAppVersion,
 <%_ } _%>
         },
         '@/locale/translation.service': {
-          packagePath: './<%= clientSrcDir %>app/locale/translation.service',
+          packagePath: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/locale/translation.service',
 <%_ if (applicationTypeGateway) { _%>
           version: sharedAppVersion,
 <%_ } _%>
diff --git a/generators/vue/templates/vitest.config.ts.ejs b/generators/vue/templates/vitest.config.ts.ejs
index 9ef59e234e18..e23386cf93be 100644
--- a/generators/vue/templates/vitest.config.ts.ejs
+++ b/generators/vue/templates/vitest.config.ts.ejs
@@ -31,7 +31,7 @@ export default mergeConfig(
     test: {
       globals: true,
       environment: 'happy-dom', // happy-dom provides a better performance but doesn't have a default url.
-      setupFiles: [fileURLToPath(new URL('./<%= clientSrcDir %>app/test-setup.ts', import.meta.url))],
+      setupFiles: [fileURLToPath(new URL('./<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/test-setup.ts', import.meta.url))],
 <%_ if (applicationTypeGateway && microfrontend) { _%>
       alias: {
   <%_ for (const remote of microfrontends) { _%>
@@ -41,7 +41,7 @@ export default mergeConfig(
 <%_ } _%>
       reporters: ['default', 'vitest-sonar-reporter'],
       outputFile: {
-        'vitest-sonar-reporter': fileURLToPath(new URL('./<%= temporaryDir %>test-results/TESTS-results-vitest.xml', import.meta.url)),
+        'vitest-sonar-reporter': fileURLToPath(new URL('./<%= this.relativeDir(clientRootDir, temporaryDir) %>test-results/TESTS-results-vitest.xml', import.meta.url)),
       },
       coverage: {
         provider: 'v8',
diff --git a/generators/vue/templates/webpack/webpack.common.js.ejs b/generators/vue/templates/webpack/webpack.common.js.ejs
index 21ef131c8238..900f51427a8e 100644
--- a/generators/vue/templates/webpack/webpack.common.js.ejs
+++ b/generators/vue/templates/webpack/webpack.common.js.ejs
@@ -20,7 +20,7 @@ function resolve(dir = '') {
 module.exports = async (env, options) => {
   const development = options.mode === 'development';
 <%_ if (enableTranslation) { _%>
-  const languagesHash = await hashElement(resolve('<%= clientSrcDir %>i18n'), {
+  const languagesHash = await hashElement(resolve('<%= this.relativeDir(clientRootDir, clientSrcDir) %>i18n'), {
     algo: 'md5',
     encoding: 'hex',
     files: { include: ['*.json'] },
@@ -37,16 +37,16 @@ module.exports = async (env, options) => {
       },
 <%_ } _%>
       entry: {
-        app: './<%= clientSrcDir %>app/<%= microfrontend ? 'index' : 'main' %>.ts',
+        app: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/<%= microfrontend ? 'index' : 'main' %>.ts',
       },
       output: {
-        path: resolve('<%= clientDistDir %>'),
+        path: resolve('<%= this.relativeDir(clientRootDir, clientDistDir) %>'),
       },
       resolve: {
         extensions: ['.ts', '.js', '.vue', '.json'],
         alias: {
           vue$: '@vue/compat/dist/vue.esm-bundler.js',
-          '@': resolve('<%= clientSrcDir %>app'),
+          '@': resolve('<%= this.relativeDir(clientRootDir, clientSrcDir) %>app'),
         },
       },
       devServer: {
@@ -54,7 +54,7 @@ module.exports = async (env, options) => {
         hot: config.dev.hotReload,
 <%_ } _%>
         static: {
-          directory: './<%= clientDistDir %>',
+          directory: './<%= this.relativeDir(clientRootDir, clientDistDir) %>',
         },
         port: <%= devServerPort %>,
         proxy: [
@@ -89,7 +89,7 @@ module.exports = async (env, options) => {
       cache: {
         // 1. Set cache type to filesystem
         type: 'filesystem',
-        cacheDirectory: resolve('<%= temporaryDir %>webpack'),
+        cacheDirectory: resolve('<%= this.relativeDir(clientRootDir, temporaryDir) %>webpack'),
         buildDependencies: {
           // 2. Add your config as buildDependency to get cache invalidation on config change
           config: [
@@ -147,7 +147,7 @@ module.exports = async (env, options) => {
         }),
         new HtmlWebpackPlugin({
           base: '/',
-          template: './<%= clientSrcDir %>index.html',
+          template: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>index.html',
         }),
         new VueLoaderPlugin(),
         new CopyWebpackPlugin({
@@ -163,15 +163,15 @@ module.exports = async (env, options) => {
               from: path.join(path.dirname(require.resolve('axios/package.json')), 'dist/axios.min.js'),
               to: 'swagger-ui/',
             },
-            { from: './<%= clientSrcDir %>swagger-ui/', to: 'swagger-ui/' },
-            { from: './<%= clientSrcDir %>content/', to: 'content/' },
-            { from: './<%= clientSrcDir %>favicon.ico', to: 'favicon.ico' },
+            { from: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>swagger-ui/', to: 'swagger-ui/' },
+            { from: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>content/', to: 'content/' },
+            { from: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>favicon.ico', to: 'favicon.ico' },
             {
-              from: './<%= clientSrcDir %>manifest.webapp',
+              from: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>manifest.webapp',
               to: 'manifest.webapp',
             },
             // jhipster-needle-add-assets-to-webpack - JHipster will add/remove third-party resources in this array
-            { from: './<%= clientSrcDir %>robots.txt', to: 'robots.txt' },
+            { from: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>robots.txt', to: 'robots.txt' },
           ],
         })<% if (enableTranslation) { %>,
         new MergeJsonWebpackPlugin({
diff --git a/generators/vue/templates/webpack/webpack.microfrontend.js.jhi.vue.ejs b/generators/vue/templates/webpack/webpack.microfrontend.js.jhi.vue.ejs
index 6d82f45d856f..4755cd38122a 100644
--- a/generators/vue/templates/webpack/webpack.microfrontend.js.jhi.vue.ejs
+++ b/generators/vue/templates/webpack/webpack.microfrontend.js.jhi.vue.ejs
@@ -31,8 +31,8 @@ const { DefinePlugin } = require('webpack');
 <%_ } _%>
 <%_ if (applicationTypeMicroservice) { _%>
         exposes: {
-          './entities-router': './<%= clientSrcDir %>app/router/entities',
-          './entities-menu': './<%= clientSrcDir %>app/entities/entities-menu',
+          './entities-router': './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/router/entities',
+          './entities-menu': './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/entities/entities-menu',
         },
 <%_ } _%>
         shared: {
diff --git a/generators/workspaces/generator.mjs b/generators/workspaces/generator.mjs
index 0f45aade4cb2..109d6a2ed7be 100644
--- a/generators/workspaces/generator.mjs
+++ b/generators/workspaces/generator.mjs
@@ -38,11 +38,13 @@ export default class WorkspacesGenerator extends BaseWorkspacesGenerator {
   generateWorkspaces;
 
   async beforeQueue() {
-    await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_WORKSPACES, { generatorOptions: { customWorkspacesConfig: true } });
-
     if (!this.fromBlueprint) {
       await this.composeWithBlueprints(GENERATOR_WORKSPACES);
     }
+
+    if (!this.delegateToBlueprint) {
+      await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_WORKSPACES, { generatorOptions: { customWorkspacesConfig: true } });
+    }
   }
 
   get initializing() {
diff --git a/jdl/__snapshots__/jdl-importer.spec.ts.snap b/jdl/__snapshots__/jdl-importer.spec.ts.snap
index 790f359805cf..3939b6e59b2c 100644
--- a/jdl/__snapshots__/jdl-importer.spec.ts.snap
+++ b/jdl/__snapshots__/jdl-importer.spec.ts.snap
@@ -27,6 +27,7 @@ exports[`jdl - JDLImporter import when not parsing applications should return th
   "exportedEntities": [
     JSONEntity {
       "applications": "*",
+      "documentation": "",
       "dto": undefined,
       "embedded": undefined,
       "entityTableName": "country",
@@ -37,7 +38,6 @@ exports[`jdl - JDLImporter import when not parsing applications should return th
         },
       ],
       "fluentMethods": undefined,
-      "javadoc": "",
       "jpaMetamodelFiltering": undefined,
       "microserviceName": "mymicroservice",
       "name": "Country",
@@ -57,6 +57,7 @@ exports[`jdl - JDLImporter import when not parsing applications should return th
     },
     JSONEntity {
       "applications": "*",
+      "documentation": "",
       "dto": undefined,
       "embedded": true,
       "entityTableName": "department",
@@ -85,7 +86,6 @@ exports[`jdl - JDLImporter import when not parsing applications should return th
         },
       ],
       "fluentMethods": undefined,
-      "javadoc": "",
       "jpaMetamodelFiltering": undefined,
       "microserviceName": "mymicroservice",
       "name": "Department",
@@ -102,7 +102,7 @@ exports[`jdl - JDLImporter import when not parsing applications should return th
           "relationshipType": "one-to-one",
         },
         {
-          "javadoc": "A relationship",
+          "documentation": "A relationship",
           "otherEntityName": "employee",
           "otherEntityRelationshipName": "department",
           "relationshipName": "employee",
@@ -121,14 +121,15 @@ exports[`jdl - JDLImporter import when not parsing applications should return th
     },
     JSONEntity {
       "applications": "*",
+      "documentation": "The Employee entity.\\nSecond line in documentation.",
       "dto": "mapstruct",
       "embedded": undefined,
       "entityTableName": "employee",
       "fields": [
         {
+          "documentation": "The firstname attribute.",
           "fieldName": "firstName",
           "fieldType": "String",
-          "javadoc": "The firstname attribute.",
         },
         {
           "fieldName": "lastName",
@@ -156,7 +157,6 @@ exports[`jdl - JDLImporter import when not parsing applications should return th
         },
       ],
       "fluentMethods": undefined,
-      "javadoc": "The Employee entity.\\nSecond line in javadoc.",
       "jpaMetamodelFiltering": undefined,
       "microserviceName": "mymicroservice",
       "name": "Employee",
@@ -186,7 +186,7 @@ exports[`jdl - JDLImporter import when not parsing applications should return th
           "relationshipType": "many-to-one",
         },
         {
-          "javadoc": "Another side of the same relationship,",
+          "documentation": "Another side of the same relationship,",
           "otherEntityName": "department",
           "otherEntityRelationshipName": "employee",
           "relationshipName": "department",
@@ -206,6 +206,7 @@ exports[`jdl - JDLImporter import when not parsing applications should return th
     },
     JSONEntity {
       "applications": "*",
+      "documentation": "",
       "dto": undefined,
       "embedded": undefined,
       "entityTableName": "job",
@@ -235,7 +236,6 @@ exports[`jdl - JDLImporter import when not parsing applications should return th
         },
       ],
       "fluentMethods": undefined,
-      "javadoc": "",
       "jpaMetamodelFiltering": undefined,
       "microserviceName": "mymicroservice",
       "name": "Job",
@@ -270,6 +270,7 @@ exports[`jdl - JDLImporter import when not parsing applications should return th
     },
     JSONEntity {
       "applications": "*",
+      "documentation": "JobHistory comment.",
       "dto": undefined,
       "embedded": undefined,
       "entityTableName": "job_history",
@@ -293,7 +294,6 @@ exports[`jdl - JDLImporter import when not parsing applications should return th
         },
       ],
       "fluentMethods": undefined,
-      "javadoc": "JobHistory comment.",
       "jpaMetamodelFiltering": undefined,
       "microserviceName": "mymicroservice",
       "name": "JobHistory",
@@ -327,6 +327,7 @@ exports[`jdl - JDLImporter import when not parsing applications should return th
     },
     JSONEntity {
       "applications": "*",
+      "documentation": "",
       "dto": undefined,
       "embedded": undefined,
       "entityTableName": "location",
@@ -349,7 +350,6 @@ exports[`jdl - JDLImporter import when not parsing applications should return th
         },
       ],
       "fluentMethods": undefined,
-      "javadoc": "",
       "jpaMetamodelFiltering": undefined,
       "microserviceName": "mymicroservice",
       "name": "Location",
@@ -377,6 +377,7 @@ exports[`jdl - JDLImporter import when not parsing applications should return th
     },
     JSONEntity {
       "applications": "*",
+      "documentation": "",
       "dto": undefined,
       "embedded": undefined,
       "entityTableName": "region",
@@ -387,7 +388,6 @@ exports[`jdl - JDLImporter import when not parsing applications should return th
         },
       ],
       "fluentMethods": undefined,
-      "javadoc": "",
       "jpaMetamodelFiltering": undefined,
       "microserviceName": "mymicroservice",
       "name": "Region",
@@ -398,6 +398,7 @@ exports[`jdl - JDLImporter import when not parsing applications should return th
     },
     JSONEntity {
       "applications": "*",
+      "documentation": "",
       "dto": undefined,
       "embedded": undefined,
       "entityTableName": "task",
@@ -412,7 +413,6 @@ exports[`jdl - JDLImporter import when not parsing applications should return th
         },
       ],
       "fluentMethods": undefined,
-      "javadoc": "",
       "jpaMetamodelFiltering": undefined,
       "microserviceName": "mymicroservice",
       "name": "Task",
@@ -681,12 +681,12 @@ exports[`jdl - JDLImporter import when passing the unidirectionalRelationships o
     "applications": [
       "jhipster",
     ],
+    "documentation": undefined,
     "dto": undefined,
     "embedded": undefined,
     "entityTableName": "a",
     "fields": [],
     "fluentMethods": undefined,
-    "javadoc": undefined,
     "jpaMetamodelFiltering": undefined,
     "name": "A",
     "pagination": undefined,
@@ -751,12 +751,12 @@ exports[`jdl - JDLImporter import when passing the unidirectionalRelationships o
     "applications": [
       "jhipster",
     ],
+    "documentation": undefined,
     "dto": undefined,
     "embedded": undefined,
     "entityTableName": "b",
     "fields": [],
     "fluentMethods": undefined,
-    "javadoc": undefined,
     "jpaMetamodelFiltering": undefined,
     "name": "B",
     "pagination": undefined,
diff --git a/jdl/__test-files__/big_sample.jdl b/jdl/__test-files__/big_sample.jdl
index a09736c52bb9..e90701586a33 100644
--- a/jdl/__test-files__/big_sample.jdl
+++ b/jdl/__test-files__/big_sample.jdl
@@ -32,7 +32,7 @@ entity Job {
 
 /**
  * The Employee entity.
- * Second line in javadoc.
+ * Second line in documentation.
  */
 entity Employee {
   /**
diff --git a/jdl/__test-files__/complex_jdl.jdl b/jdl/__test-files__/complex_jdl.jdl
index 4f9c88428c78..00bce3d5ac2d 100644
--- a/jdl/__test-files__/complex_jdl.jdl
+++ b/jdl/__test-files__/complex_jdl.jdl
@@ -32,7 +32,7 @@ entity Job {
 
 /**
  * The Employee entity.
- * Second line in javadoc.
+ * Second line in documentation.
  */
 entity Employee {
   /**
diff --git a/jdl/__test-files__/jhipster_app/.jhipster/Country.json b/jdl/__test-files__/jhipster_app/.jhipster/Country.json
index f024a2237b37..96ad46968dbc 100644
--- a/jdl/__test-files__/jhipster_app/.jhipster/Country.json
+++ b/jdl/__test-files__/jhipster_app/.jhipster/Country.json
@@ -22,7 +22,7 @@
     {
       "fieldName": "countryId",
       "fieldType": "Long",
-      "javadoc": "The country Id"
+      "documentation": "The country Id"
     },
     {
       "fieldName": "countryName",
diff --git a/jdl/__test-files__/jhipster_app/.jhipster/Department.json b/jdl/__test-files__/jhipster_app/.jhipster/Department.json
index 43f77b894ed0..90a6bae253fe 100644
--- a/jdl/__test-files__/jhipster_app/.jhipster/Department.json
+++ b/jdl/__test-files__/jhipster_app/.jhipster/Department.json
@@ -13,7 +13,7 @@
       "relationshipValidateRules": "required",
       "relationshipName": "employee",
       "otherEntityName": "employee",
-      "javadoc": "A relationship",
+      "documentation": "A relationship",
       "otherEntityRelationshipName": "department"
     },
     {
diff --git a/jdl/__test-files__/jhipster_app/.jhipster/Employee.json b/jdl/__test-files__/jhipster_app/.jhipster/Employee.json
index e2bcbc29b51c..24ff82e6220e 100644
--- a/jdl/__test-files__/jhipster_app/.jhipster/Employee.json
+++ b/jdl/__test-files__/jhipster_app/.jhipster/Employee.json
@@ -3,7 +3,7 @@
     {
       "relationshipName": "department",
       "otherEntityName": "department",
-      "javadoc": "Another side of the same relationship",
+      "documentation": "Another side of the same relationship",
       "relationshipType": "many-to-one",
       "otherEntityField": "foo"
     },
@@ -27,7 +27,7 @@
     },
     {
       "fieldName": "firstName",
-      "javadoc": "The firstname attribute.",
+      "documentation": "The firstname attribute.",
       "fieldType": "String"
     },
     {
@@ -59,7 +59,7 @@
     }
   ],
   "changelogDate": "20160926083805",
-  "javadoc": "The Employee entity.",
+  "documentation": "The Employee entity.",
   "jpaMetamodelFiltering": true,
   "entityTableName": "emp",
   "dto": "mapstruct",
diff --git a/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Country.json b/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Country.json
index 259779727bbc..2dd5d2a9d615 100644
--- a/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Country.json
+++ b/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Country.json
@@ -21,6 +21,6 @@
   "dto": "no",
   "pagination": "pager",
   "service": "no",
-  "javadoc": "",
+  "documentation": "",
   "entityTableName": "country"
 }
diff --git a/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Department.json b/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Department.json
index 31bb901bed2c..3c2ca1b54300 100644
--- a/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Department.json
+++ b/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Department.json
@@ -27,6 +27,6 @@
   "dto": "no",
   "pagination": "no",
   "service": "no",
-  "javadoc": "",
+  "documentation": "",
   "entityTableName": "department"
 }
diff --git a/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Employee.json b/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Employee.json
index 3e0cc087cb38..d1568653c2da 100644
--- a/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Employee.json
+++ b/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Employee.json
@@ -53,6 +53,6 @@
   "dto": "no",
   "pagination": "no",
   "service": "no",
-  "javadoc": "",
+  "documentation": "",
   "entityTableName": "employee"
 }
diff --git a/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Job.json b/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Job.json
index 39b1294746de..8a0aa0b15400 100644
--- a/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Job.json
+++ b/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Job.json
@@ -33,6 +33,6 @@
   "dto": "no",
   "pagination": "no",
   "service": "no",
-  "javadoc": "",
+  "documentation": "",
   "entityTableName": "job"
 }
diff --git a/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/JobHistory.json b/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/JobHistory.json
index c32dc4bd9e04..a8ef2465f7c0 100644
--- a/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/JobHistory.json
+++ b/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/JobHistory.json
@@ -41,6 +41,6 @@
   "dto": "no",
   "pagination": "no",
   "service": "no",
-  "javadoc": "",
+  "documentation": "",
   "entityTableName": "job_history"
 }
diff --git a/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Location.json b/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Location.json
index fc7d7e73c8a7..dcc7e8224814 100644
--- a/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Location.json
+++ b/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Location.json
@@ -33,6 +33,6 @@
   "dto": "no",
   "pagination": "no",
   "service": "no",
-  "javadoc": "",
+  "documentation": "",
   "entityTableName": "location"
 }
diff --git a/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Region.json b/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Region.json
index db1f356bbda3..4c5f99468cde 100644
--- a/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Region.json
+++ b/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Region.json
@@ -12,6 +12,6 @@
   "dto": "no",
   "pagination": "no",
   "service": "no",
-  "javadoc": "",
+  "documentation": "",
   "entityTableName": "region"
 }
diff --git a/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Task.json b/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Task.json
index 7f4f04831e1e..a520b439bd44 100644
--- a/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Task.json
+++ b/jdl/__test-files__/json_to_jdl_converter/app_with_entities/.jhipster/Task.json
@@ -24,6 +24,6 @@
   "dto": "no",
   "pagination": "no",
   "service": "no",
-  "javadoc": "",
+  "documentation": "",
   "entityTableName": "task"
 }
diff --git a/jdl/__test-files__/json_to_jdl_converter/multi_apps/app1/.jhipster/Region.json b/jdl/__test-files__/json_to_jdl_converter/multi_apps/app1/.jhipster/Region.json
index db1f356bbda3..4c5f99468cde 100644
--- a/jdl/__test-files__/json_to_jdl_converter/multi_apps/app1/.jhipster/Region.json
+++ b/jdl/__test-files__/json_to_jdl_converter/multi_apps/app1/.jhipster/Region.json
@@ -12,6 +12,6 @@
   "dto": "no",
   "pagination": "no",
   "service": "no",
-  "javadoc": "",
+  "documentation": "",
   "entityTableName": "region"
 }
diff --git a/jdl/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Country.json b/jdl/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Country.json
index eaa145a51187..309686cfd7c3 100644
--- a/jdl/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Country.json
+++ b/jdl/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Country.json
@@ -12,6 +12,6 @@
   "dto": "no",
   "pagination": "no",
   "service": "no",
-  "javadoc": "",
+  "documentation": "",
   "entityTableName": "country"
 }
diff --git a/jdl/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Location.json b/jdl/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Location.json
index fc7d7e73c8a7..dcc7e8224814 100644
--- a/jdl/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Location.json
+++ b/jdl/__test-files__/json_to_jdl_converter/multi_apps/app2/.jhipster/Location.json
@@ -33,6 +33,6 @@
   "dto": "no",
   "pagination": "no",
   "service": "no",
-  "javadoc": "",
+  "documentation": "",
   "entityTableName": "location"
 }
diff --git a/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.ts b/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.ts
index d7c215238a59..d2c74fb7ed88 100644
--- a/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.ts
+++ b/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.ts
@@ -48,7 +48,7 @@ function createJSONEntities(jdlEntities: JDLEntity[]): Map<string, JSONEntity> {
       new JSONEntity({
         entityName,
         entityTableName: getTableNameFromEntityName(jdlEntity.tableName),
-        javadoc: formatComment(jdlEntity.comment),
+        documentation: formatComment(jdlEntity.comment),
       }),
     );
   });
diff --git a/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts b/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts
index ea9a1879ce25..3435b8bef61a 100644
--- a/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts
+++ b/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-information-converter.spec.ts
@@ -88,12 +88,12 @@ describe('jdl - JDLToJSONBasicEntityConverter', () => {
           jestExpect(convertedEntity).toMatchInlineSnapshot(`
 JSONEntity {
   "applications": [],
+  "documentation": "The best entity",
   "dto": undefined,
   "embedded": undefined,
   "entityTableName": "entity_a",
   "fields": [],
   "fluentMethods": undefined,
-  "javadoc": "The best entity",
   "jpaMetamodelFiltering": undefined,
   "name": "A",
   "pagination": undefined,
diff --git a/jdl/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts b/jdl/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts
index fae98b76d60b..f39b7e53c2a7 100644
--- a/jdl/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts
+++ b/jdl/converters/jdl-to-json/jdl-to-json-field-converter.spec.ts
@@ -197,7 +197,7 @@ describe('jdl - JDLToJSONFieldConverter', () => {
 {
   "fieldName": "enumField",
   "fieldType": "CustomEnum",
-  "fieldTypeJavadoc": "enum comment",
+  "fieldTypeDocumentation": "enum comment",
   "fieldValues": "AA,AB",
   "fieldValuesJavadocs": {
     "AA": "some comment",
@@ -231,9 +231,9 @@ describe('jdl - JDLToJSONFieldConverter', () => {
         it('should convert them', () => {
           jestExpect(convertedField).toMatchInlineSnapshot(`
 {
+  "documentation": "The best field",
   "fieldName": "firstField",
   "fieldType": "String",
-  "javadoc": "The best field",
 }
 `);
         });
@@ -383,9 +383,9 @@ describe('jdl - JDLToJSONFieldConverter', () => {
         it('should convert them', () => {
           jestExpect(convertedField).toMatchInlineSnapshot(`
 {
+  "documentation": "The best field",
   "fieldName": "firstField",
   "fieldType": "String",
-  "javadoc": "The best field",
   "options": {
     "id": 42,
   },
diff --git a/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts b/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts
index 852847487b67..6715f68d7f4b 100644
--- a/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts
+++ b/jdl/converters/jdl-to-json/jdl-to-json-field-converter.ts
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { validations } from '../../jhipster/index.mjs';
 import formatComment from '../../utils/format-utils.js';
 import { camelCase } from '../../utils/string-utils.js';
@@ -62,13 +62,13 @@ function getConvertedFieldsForEntity(jdlEntity: JDLEntity, jdlObject: JDLObject)
     };
     const comment = formatComment(jdlField.comment);
     if (comment) {
-      fieldData.javadoc = comment;
+      fieldData.documentation = comment;
     }
     if (jdlObject.hasEnum(jdlField.type)) {
       fieldData.fieldValues = jdlObject.getEnum(fieldData.fieldType).getValuesAsString();
       const fieldTypeComment = jdlObject.getEnum(fieldData.fieldType).comment;
       if (fieldTypeComment) {
-        fieldData.fieldTypeJavadoc = fieldTypeComment;
+        fieldData.fieldTypeDocumentation = fieldTypeComment;
       }
       const fieldValuesJavadocs = jdlObject.getEnum(fieldData.fieldType).getValueJavadocs();
       if (fieldValuesJavadocs && Object.keys(fieldValuesJavadocs).length > 0) {
diff --git a/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts b/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts
index 5f55083750aa..79074201e5aa 100644
--- a/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts
+++ b/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.spec.ts
@@ -293,7 +293,7 @@ describe('jdl - JDLToJSONRelationshipConverter', () => {
           jestExpect(relationshipsForA).toMatchInlineSnapshot(`
             [
               {
-                "javadoc": "A to B",
+                "documentation": "A to B",
                 "otherEntityName": "b",
                 "otherEntityRelationshipName": "a",
                 "relationshipName": "b",
@@ -305,7 +305,7 @@ describe('jdl - JDLToJSONRelationshipConverter', () => {
           jestExpect(relationshipsForB).toMatchInlineSnapshot(`
             [
               {
-                "javadoc": "A to B but in the destination",
+                "documentation": "A to B but in the destination",
                 "otherEntityName": "a",
                 "otherEntityRelationshipName": "b",
                 "relationshipName": "a",
diff --git a/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.ts b/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.ts
index ba6ae98b609f..c500c16afc61 100644
--- a/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.ts
+++ b/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.ts
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { relationshipOptions, validations } from '../../jhipster/index.mjs';
 import { camelCase, lowerFirst } from '../../utils/string-utils.js';
 import JDLRelationship from '../../models/jdl-relationship.js';
@@ -91,7 +91,7 @@ function setRelationshipsFromEntity(relatedRelationships, entityName) {
       convertedRelationship.relationshipValidateRules = REQUIRED;
     }
     if (relationshipToConvert.commentInFrom) {
-      convertedRelationship.javadoc = relationshipToConvert.commentInFrom;
+      convertedRelationship.documentation = relationshipToConvert.commentInFrom;
     }
     const splitField: any = extractField(relationshipToConvert.injectedFieldInFrom);
     convertedRelationship.relationshipName = camelCase(splitField.relationshipName || relationshipToConvert.to);
@@ -122,7 +122,7 @@ function setRelationshipsToEntity(relatedRelationships, entityName) {
       convertedRelationship.relationshipValidateRules = REQUIRED;
     }
     if (relationshipToConvert.commentInTo) {
-      convertedRelationship.javadoc = relationshipToConvert.commentInTo;
+      convertedRelationship.documentation = relationshipToConvert.commentInTo;
     }
     const splitField: any = extractField(relationshipToConvert.injectedFieldInTo);
     convertedRelationship.relationshipName = camelCase(splitField.relationshipName || relationshipToConvert.from);
diff --git a/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts b/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts
index e394bf504617..58f866051aeb 100644
--- a/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts
+++ b/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.spec.ts
@@ -174,24 +174,24 @@ describe('jdl - JDLWithApplicationsToJSONConverter', () => {
 
         it('should convert the entity', () => {
           jestExpect(convertedEntity).toMatchInlineSnapshot(`
-            JSONEntity {
-              "applications": [
-                "toto",
-              ],
-              "dto": undefined,
-              "embedded": undefined,
-              "entityTableName": "entity_a",
-              "fields": [],
-              "fluentMethods": undefined,
-              "javadoc": "The best entity",
-              "jpaMetamodelFiltering": undefined,
-              "name": "A",
-              "pagination": undefined,
-              "readOnly": undefined,
-              "relationships": [],
-              "service": undefined,
-            }
-          `);
+JSONEntity {
+  "applications": [
+    "toto",
+  ],
+  "documentation": "The best entity",
+  "dto": undefined,
+  "embedded": undefined,
+  "entityTableName": "entity_a",
+  "fields": [],
+  "fluentMethods": undefined,
+  "jpaMetamodelFiltering": undefined,
+  "name": "A",
+  "pagination": undefined,
+  "readOnly": undefined,
+  "relationships": [],
+  "service": undefined,
+}
+`);
         });
       });
       context('with options', () => {
@@ -281,30 +281,30 @@ describe('jdl - JDLWithApplicationsToJSONConverter', () => {
 
         it('should convert the entity', () => {
           jestExpect(convertedEntity).toMatchInlineSnapshot(`
-            JSONEntity {
-              "angularJSSuffix": "suffix",
-              "applications": [
-                "toto",
-              ],
-              "clientRootFolder": "../client_root_folder",
-              "dto": "mapstruct",
-              "embedded": true,
-              "entityTableName": "entity_a",
-              "fields": [],
-              "fluentMethods": false,
-              "javadoc": "The best entity",
-              "jpaMetamodelFiltering": true,
-              "microserviceName": "myMs",
-              "name": "A",
-              "pagination": "pagination",
-              "readOnly": true,
-              "relationships": [],
-              "searchEngine": "couchbase",
-              "service": "serviceImpl",
-              "skipClient": true,
-              "skipServer": true,
-            }
-          `);
+JSONEntity {
+  "angularJSSuffix": "suffix",
+  "applications": [
+    "toto",
+  ],
+  "clientRootFolder": "../client_root_folder",
+  "documentation": "The best entity",
+  "dto": "mapstruct",
+  "embedded": true,
+  "entityTableName": "entity_a",
+  "fields": [],
+  "fluentMethods": false,
+  "jpaMetamodelFiltering": true,
+  "microserviceName": "myMs",
+  "name": "A",
+  "pagination": "pagination",
+  "readOnly": true,
+  "relationships": [],
+  "searchEngine": "couchbase",
+  "service": "serviceImpl",
+  "skipClient": true,
+  "skipServer": true,
+}
+`);
         });
       });
       context('when setting the DTO option without the service option', () => {
@@ -348,24 +348,24 @@ describe('jdl - JDLWithApplicationsToJSONConverter', () => {
         });
         it('should set the service option to serviceClass', () => {
           jestExpect(convertedEntity).toMatchInlineSnapshot(`
-            JSONEntity {
-              "applications": [
-                "toto",
-              ],
-              "dto": "mapstruct",
-              "embedded": undefined,
-              "entityTableName": "entity_a",
-              "fields": [],
-              "fluentMethods": undefined,
-              "javadoc": "The best entity",
-              "jpaMetamodelFiltering": undefined,
-              "name": "A",
-              "pagination": undefined,
-              "readOnly": undefined,
-              "relationships": [],
-              "service": "serviceClass",
-            }
-          `);
+JSONEntity {
+  "applications": [
+    "toto",
+  ],
+  "documentation": "The best entity",
+  "dto": "mapstruct",
+  "embedded": undefined,
+  "entityTableName": "entity_a",
+  "fields": [],
+  "fluentMethods": undefined,
+  "jpaMetamodelFiltering": undefined,
+  "name": "A",
+  "pagination": undefined,
+  "readOnly": undefined,
+  "relationships": [],
+  "service": "serviceClass",
+}
+`);
         });
       });
       context('when setting the filtering option without the service option', () => {
@@ -411,24 +411,24 @@ describe('jdl - JDLWithApplicationsToJSONConverter', () => {
         });
         it('should set the service option to serviceClass', () => {
           jestExpect(convertedEntity).toMatchInlineSnapshot(`
-            JSONEntity {
-              "applications": [
-                "toto",
-              ],
-              "dto": undefined,
-              "embedded": undefined,
-              "entityTableName": "entity_a",
-              "fields": [],
-              "fluentMethods": undefined,
-              "javadoc": "The best entity",
-              "jpaMetamodelFiltering": true,
-              "name": "A",
-              "pagination": undefined,
-              "readOnly": undefined,
-              "relationships": [],
-              "service": "serviceClass",
-            }
-          `);
+JSONEntity {
+  "applications": [
+    "toto",
+  ],
+  "documentation": "The best entity",
+  "dto": undefined,
+  "embedded": undefined,
+  "entityTableName": "entity_a",
+  "fields": [],
+  "fluentMethods": undefined,
+  "jpaMetamodelFiltering": true,
+  "name": "A",
+  "pagination": undefined,
+  "readOnly": undefined,
+  "relationships": [],
+  "service": "serviceClass",
+}
+`);
         });
       });
       context('when the searching option is set with exclusions', () => {
@@ -464,25 +464,25 @@ describe('jdl - JDLWithApplicationsToJSONConverter', () => {
 
         it('should prevent the entities from being searched', () => {
           jestExpect(convertedEntity).toMatchInlineSnapshot(`
-            JSONEntity {
-              "applications": [
-                "toto",
-              ],
-              "dto": undefined,
-              "embedded": undefined,
-              "entityTableName": "entity_a",
-              "fields": [],
-              "fluentMethods": undefined,
-              "javadoc": "The best entity",
-              "jpaMetamodelFiltering": undefined,
-              "name": "A",
-              "pagination": undefined,
-              "readOnly": undefined,
-              "relationships": [],
-              "searchEngine": "no",
-              "service": undefined,
-            }
-          `);
+JSONEntity {
+  "applications": [
+    "toto",
+  ],
+  "documentation": "The best entity",
+  "dto": undefined,
+  "embedded": undefined,
+  "entityTableName": "entity_a",
+  "fields": [],
+  "fluentMethods": undefined,
+  "jpaMetamodelFiltering": undefined,
+  "name": "A",
+  "pagination": undefined,
+  "readOnly": undefined,
+  "relationships": [],
+  "searchEngine": "no",
+  "service": undefined,
+}
+`);
         });
       });
       context('with fields', () => {
@@ -521,33 +521,33 @@ describe('jdl - JDLWithApplicationsToJSONConverter', () => {
 
           it('should convert them', () => {
             jestExpect(convertedEntity).toMatchInlineSnapshot(`
-              JSONEntity {
-                "applications": [
-                  "toto",
-                ],
-                "dto": undefined,
-                "embedded": undefined,
-                "entityTableName": "entity_a",
-                "fields": [
-                  {
-                    "fieldName": "firstField",
-                    "fieldType": "String",
-                  },
-                  {
-                    "fieldName": "secondField",
-                    "fieldType": "Integer",
-                  },
-                ],
-                "fluentMethods": undefined,
-                "javadoc": "The best entity",
-                "jpaMetamodelFiltering": undefined,
-                "name": "A",
-                "pagination": undefined,
-                "readOnly": undefined,
-                "relationships": [],
-                "service": undefined,
-              }
-            `);
+JSONEntity {
+  "applications": [
+    "toto",
+  ],
+  "documentation": "The best entity",
+  "dto": undefined,
+  "embedded": undefined,
+  "entityTableName": "entity_a",
+  "fields": [
+    {
+      "fieldName": "firstField",
+      "fieldType": "String",
+    },
+    {
+      "fieldName": "secondField",
+      "fieldType": "Integer",
+    },
+  ],
+  "fluentMethods": undefined,
+  "jpaMetamodelFiltering": undefined,
+  "name": "A",
+  "pagination": undefined,
+  "readOnly": undefined,
+  "relationships": [],
+  "service": undefined,
+}
+`);
           });
         });
         context('when having blobs', () => {
@@ -595,45 +595,45 @@ describe('jdl - JDLWithApplicationsToJSONConverter', () => {
 
           it('should convert them', () => {
             jestExpect(convertedEntity).toMatchInlineSnapshot(`
-              JSONEntity {
-                "applications": [
-                  "toto",
-                ],
-                "dto": undefined,
-                "embedded": undefined,
-                "entityTableName": "entity_a",
-                "fields": [
-                  {
-                    "fieldName": "anyBlobField",
-                    "fieldType": "byte[]",
-                    "fieldTypeBlobContent": "any",
-                  },
-                  {
-                    "fieldName": "textBlobField",
-                    "fieldType": "byte[]",
-                    "fieldTypeBlobContent": "text",
-                  },
-                  {
-                    "fieldName": "blobField",
-                    "fieldType": "byte[]",
-                    "fieldTypeBlobContent": "any",
-                  },
-                  {
-                    "fieldName": "imageBlobField",
-                    "fieldType": "byte[]",
-                    "fieldTypeBlobContent": "image",
-                  },
-                ],
-                "fluentMethods": undefined,
-                "javadoc": "The best entity",
-                "jpaMetamodelFiltering": undefined,
-                "name": "A",
-                "pagination": undefined,
-                "readOnly": undefined,
-                "relationships": [],
-                "service": undefined,
-              }
-            `);
+JSONEntity {
+  "applications": [
+    "toto",
+  ],
+  "documentation": "The best entity",
+  "dto": undefined,
+  "embedded": undefined,
+  "entityTableName": "entity_a",
+  "fields": [
+    {
+      "fieldName": "anyBlobField",
+      "fieldType": "byte[]",
+      "fieldTypeBlobContent": "any",
+    },
+    {
+      "fieldName": "textBlobField",
+      "fieldType": "byte[]",
+      "fieldTypeBlobContent": "text",
+    },
+    {
+      "fieldName": "blobField",
+      "fieldType": "byte[]",
+      "fieldTypeBlobContent": "any",
+    },
+    {
+      "fieldName": "imageBlobField",
+      "fieldType": "byte[]",
+      "fieldTypeBlobContent": "image",
+    },
+  ],
+  "fluentMethods": undefined,
+  "jpaMetamodelFiltering": undefined,
+  "name": "A",
+  "pagination": undefined,
+  "readOnly": undefined,
+  "relationships": [],
+  "service": undefined,
+}
+`);
           });
         });
         context('with field types being enums', () => {
@@ -667,30 +667,30 @@ describe('jdl - JDLWithApplicationsToJSONConverter', () => {
 
           it('should convert them', () => {
             jestExpect(convertedEntity).toMatchInlineSnapshot(`
-              JSONEntity {
-                "applications": [
-                  "toto",
-                ],
-                "dto": undefined,
-                "embedded": undefined,
-                "entityTableName": "a",
-                "fields": [
-                  {
-                    "fieldName": "enumField",
-                    "fieldType": "CustomEnum",
-                    "fieldValues": "AA,AB",
-                  },
-                ],
-                "fluentMethods": undefined,
-                "javadoc": "The best entity",
-                "jpaMetamodelFiltering": undefined,
-                "name": "A",
-                "pagination": undefined,
-                "readOnly": undefined,
-                "relationships": [],
-                "service": undefined,
-              }
-            `);
+JSONEntity {
+  "applications": [
+    "toto",
+  ],
+  "documentation": "The best entity",
+  "dto": undefined,
+  "embedded": undefined,
+  "entityTableName": "a",
+  "fields": [
+    {
+      "fieldName": "enumField",
+      "fieldType": "CustomEnum",
+      "fieldValues": "AA,AB",
+    },
+  ],
+  "fluentMethods": undefined,
+  "jpaMetamodelFiltering": undefined,
+  "name": "A",
+  "pagination": undefined,
+  "readOnly": undefined,
+  "relationships": [],
+  "service": undefined,
+}
+`);
           });
         });
         context('with comments', () => {
@@ -724,30 +724,30 @@ describe('jdl - JDLWithApplicationsToJSONConverter', () => {
 
           it('should convert them', () => {
             jestExpect(convertedEntity).toMatchInlineSnapshot(`
-              JSONEntity {
-                "applications": [
-                  "toto",
-                ],
-                "dto": undefined,
-                "embedded": undefined,
-                "entityTableName": "entity_a",
-                "fields": [
-                  {
-                    "fieldName": "firstField",
-                    "fieldType": "String",
-                    "javadoc": "The best field",
-                  },
-                ],
-                "fluentMethods": undefined,
-                "javadoc": "The best entity",
-                "jpaMetamodelFiltering": undefined,
-                "name": "A",
-                "pagination": undefined,
-                "readOnly": undefined,
-                "relationships": [],
-                "service": undefined,
-              }
-            `);
+JSONEntity {
+  "applications": [
+    "toto",
+  ],
+  "documentation": "The best entity",
+  "dto": undefined,
+  "embedded": undefined,
+  "entityTableName": "entity_a",
+  "fields": [
+    {
+      "documentation": "The best field",
+      "fieldName": "firstField",
+      "fieldType": "String",
+    },
+  ],
+  "fluentMethods": undefined,
+  "jpaMetamodelFiltering": undefined,
+  "name": "A",
+  "pagination": undefined,
+  "readOnly": undefined,
+  "relationships": [],
+  "service": undefined,
+}
+`);
           });
         });
         context('with validations', () => {
@@ -836,60 +836,60 @@ describe('jdl - JDLWithApplicationsToJSONConverter', () => {
 
           it('should convert them', () => {
             jestExpect(convertedEntity).toMatchInlineSnapshot(`
-              JSONEntity {
-                "applications": [
-                  "toto",
-                ],
-                "dto": undefined,
-                "embedded": undefined,
-                "entityTableName": "entity_a",
-                "fields": [
-                  {
-                    "fieldName": "stringField",
-                    "fieldType": "String",
-                    "fieldValidateRules": [
-                      "required",
-                      "unique",
-                      "minlength",
-                      "maxlength",
-                      "pattern",
-                    ],
-                    "fieldValidateRulesMaxlength": 10,
-                    "fieldValidateRulesMinlength": 0,
-                    "fieldValidateRulesPattern": "^d$",
-                  },
-                  {
-                    "fieldName": "integerField",
-                    "fieldType": "Integer",
-                    "fieldValidateRules": [
-                      "min",
-                      "max",
-                    ],
-                    "fieldValidateRulesMax": 10,
-                    "fieldValidateRulesMin": 0,
-                  },
-                  {
-                    "fieldName": "blobField",
-                    "fieldType": "byte[]",
-                    "fieldTypeBlobContent": "any",
-                    "fieldValidateRules": [
-                      "minbytes",
-                      "maxbytes",
-                    ],
-                    "fieldValidateRulesMaxbytes": 10,
-                    "fieldValidateRulesMinbytes": 0,
-                  },
-                ],
-                "fluentMethods": undefined,
-                "javadoc": "The best entity",
-                "jpaMetamodelFiltering": undefined,
-                "name": "A",
-                "pagination": undefined,
-                "readOnly": undefined,
-                "relationships": [],
-                "service": undefined,
-              }
-            `);
+JSONEntity {
+  "applications": [
+    "toto",
+  ],
+  "documentation": "The best entity",
+  "dto": undefined,
+  "embedded": undefined,
+  "entityTableName": "entity_a",
+  "fields": [
+    {
+      "fieldName": "stringField",
+      "fieldType": "String",
+      "fieldValidateRules": [
+        "required",
+        "unique",
+        "minlength",
+        "maxlength",
+        "pattern",
+      ],
+      "fieldValidateRulesMaxlength": 10,
+      "fieldValidateRulesMinlength": 0,
+      "fieldValidateRulesPattern": "^d$",
+    },
+    {
+      "fieldName": "integerField",
+      "fieldType": "Integer",
+      "fieldValidateRules": [
+        "min",
+        "max",
+      ],
+      "fieldValidateRulesMax": 10,
+      "fieldValidateRulesMin": 0,
+    },
+    {
+      "fieldName": "blobField",
+      "fieldType": "byte[]",
+      "fieldTypeBlobContent": "any",
+      "fieldValidateRules": [
+        "minbytes",
+        "maxbytes",
+      ],
+      "fieldValidateRulesMaxbytes": 10,
+      "fieldValidateRulesMinbytes": 0,
+    },
+  ],
+  "fluentMethods": undefined,
+  "jpaMetamodelFiltering": undefined,
+  "name": "A",
+  "pagination": undefined,
+  "readOnly": undefined,
+  "relationships": [],
+  "service": undefined,
+}
+`);
           });
         });
         context('with options', () => {
@@ -926,33 +926,33 @@ describe('jdl - JDLWithApplicationsToJSONConverter', () => {
 
           it('should convert them', () => {
             jestExpect(convertedEntity).toMatchInlineSnapshot(`
-              JSONEntity {
-                "applications": [
-                  "toto",
-                ],
-                "dto": undefined,
-                "embedded": undefined,
-                "entityTableName": "entity_a",
-                "fields": [
-                  {
-                    "fieldName": "firstField",
-                    "fieldType": "String",
-                    "javadoc": "The best field",
-                    "options": {
-                      "id": 42,
-                    },
-                  },
-                ],
-                "fluentMethods": undefined,
-                "javadoc": "The best entity",
-                "jpaMetamodelFiltering": undefined,
-                "name": "A",
-                "pagination": undefined,
-                "readOnly": undefined,
-                "relationships": [],
-                "service": undefined,
-              }
-            `);
+JSONEntity {
+  "applications": [
+    "toto",
+  ],
+  "documentation": "The best entity",
+  "dto": undefined,
+  "embedded": undefined,
+  "entityTableName": "entity_a",
+  "fields": [
+    {
+      "documentation": "The best field",
+      "fieldName": "firstField",
+      "fieldType": "String",
+      "options": {
+        "id": 42,
+      },
+    },
+  ],
+  "fluentMethods": undefined,
+  "jpaMetamodelFiltering": undefined,
+  "name": "A",
+  "pagination": undefined,
+  "readOnly": undefined,
+  "relationships": [],
+  "service": undefined,
+}
+`);
           });
         });
       });
@@ -1279,7 +1279,7 @@ describe('jdl - JDLWithApplicationsToJSONConverter', () => {
             jestExpect(relationshipsForA).toMatchInlineSnapshot(`
               [
                 {
-                  "javadoc": "A to B",
+                  "documentation": "A to B",
                   "otherEntityName": "b",
                   "otherEntityRelationshipName": "a",
                   "relationshipName": "b",
@@ -1291,7 +1291,7 @@ describe('jdl - JDLWithApplicationsToJSONConverter', () => {
             jestExpect(relationshipsForB).toMatchInlineSnapshot(`
               [
                 {
-                  "javadoc": "A to B but in the destination",
+                  "documentation": "A to B but in the destination",
                   "otherEntityName": "a",
                   "otherEntityRelationshipName": "b",
                   "relationshipName": "a",
@@ -1794,117 +1794,117 @@ describe('jdl - JDLWithApplicationsToJSONConverter', () => {
 
         it('should set them', () => {
           jestExpect(convertedEntitiesForTataApplication).toMatchInlineSnapshot(`
-            [
-              JSONEntity {
-                "applications": [
-                  "tata",
-                ],
-                "dto": undefined,
-                "embedded": undefined,
-                "entityTableName": "entity_a",
-                "fields": [],
-                "fluentMethods": undefined,
-                "javadoc": "The best entity",
-                "jpaMetamodelFiltering": undefined,
-                "name": "A",
-                "pagination": "pagination",
-                "readOnly": undefined,
-                "relationships": [],
-                "service": undefined,
-              },
-              JSONEntity {
-                "applications": [
-                  "tata",
-                ],
-                "dto": undefined,
-                "embedded": undefined,
-                "entityTableName": "entity_b",
-                "fields": [],
-                "fluentMethods": undefined,
-                "javadoc": "The best entity",
-                "jpaMetamodelFiltering": undefined,
-                "name": "B",
-                "pagination": "infinite-scroll",
-                "readOnly": undefined,
-                "relationships": [],
-                "service": undefined,
-              },
-              JSONEntity {
-                "applications": [
-                  "tata",
-                  "tutu",
-                ],
-                "dto": undefined,
-                "embedded": undefined,
-                "entityTableName": "entity_c",
-                "fields": [],
-                "fluentMethods": undefined,
-                "javadoc": "The best entity",
-                "jpaMetamodelFiltering": undefined,
-                "name": "C",
-                "pagination": "pagination",
-                "readOnly": undefined,
-                "relationships": [],
-                "service": undefined,
-              },
-            ]
-          `);
+[
+  JSONEntity {
+    "applications": [
+      "tata",
+    ],
+    "documentation": "The best entity",
+    "dto": undefined,
+    "embedded": undefined,
+    "entityTableName": "entity_a",
+    "fields": [],
+    "fluentMethods": undefined,
+    "jpaMetamodelFiltering": undefined,
+    "name": "A",
+    "pagination": "pagination",
+    "readOnly": undefined,
+    "relationships": [],
+    "service": undefined,
+  },
+  JSONEntity {
+    "applications": [
+      "tata",
+    ],
+    "documentation": "The best entity",
+    "dto": undefined,
+    "embedded": undefined,
+    "entityTableName": "entity_b",
+    "fields": [],
+    "fluentMethods": undefined,
+    "jpaMetamodelFiltering": undefined,
+    "name": "B",
+    "pagination": "infinite-scroll",
+    "readOnly": undefined,
+    "relationships": [],
+    "service": undefined,
+  },
+  JSONEntity {
+    "applications": [
+      "tata",
+      "tutu",
+    ],
+    "documentation": "The best entity",
+    "dto": undefined,
+    "embedded": undefined,
+    "entityTableName": "entity_c",
+    "fields": [],
+    "fluentMethods": undefined,
+    "jpaMetamodelFiltering": undefined,
+    "name": "C",
+    "pagination": "pagination",
+    "readOnly": undefined,
+    "relationships": [],
+    "service": undefined,
+  },
+]
+`);
           jestExpect(convertedEntitiesForTutuApplication).toMatchInlineSnapshot(`
-            [
-              JSONEntity {
-                "applications": [
-                  "tata",
-                  "tutu",
-                ],
-                "dto": undefined,
-                "embedded": undefined,
-                "entityTableName": "entity_c",
-                "fields": [],
-                "fluentMethods": undefined,
-                "javadoc": "The best entity",
-                "jpaMetamodelFiltering": undefined,
-                "name": "C",
-                "pagination": "pagination",
-                "readOnly": undefined,
-                "relationships": [],
-                "service": undefined,
-              },
-              JSONEntity {
-                "applications": [
-                  "tutu",
-                ],
-                "dto": "mapstruct",
-                "embedded": undefined,
-                "entityTableName": "entity_d",
-                "fields": [],
-                "fluentMethods": undefined,
-                "javadoc": "The best entity",
-                "jpaMetamodelFiltering": undefined,
-                "name": "D",
-                "pagination": "infinite-scroll",
-                "readOnly": undefined,
-                "relationships": [],
-                "service": "serviceClass",
-              },
-              JSONEntity {
-                "applications": [
-                  "tutu",
-                ],
-                "dto": undefined,
-                "embedded": undefined,
-                "entityTableName": "entity_e",
-                "fields": [],
-                "fluentMethods": undefined,
-                "javadoc": "The best entity",
-                "jpaMetamodelFiltering": undefined,
-                "name": "E",
-                "pagination": "infinite-scroll",
-                "readOnly": undefined,
-                "relationships": [],
-                "service": undefined,
-              },
-            ]
-          `);
+[
+  JSONEntity {
+    "applications": [
+      "tata",
+      "tutu",
+    ],
+    "documentation": "The best entity",
+    "dto": undefined,
+    "embedded": undefined,
+    "entityTableName": "entity_c",
+    "fields": [],
+    "fluentMethods": undefined,
+    "jpaMetamodelFiltering": undefined,
+    "name": "C",
+    "pagination": "pagination",
+    "readOnly": undefined,
+    "relationships": [],
+    "service": undefined,
+  },
+  JSONEntity {
+    "applications": [
+      "tutu",
+    ],
+    "documentation": "The best entity",
+    "dto": "mapstruct",
+    "embedded": undefined,
+    "entityTableName": "entity_d",
+    "fields": [],
+    "fluentMethods": undefined,
+    "jpaMetamodelFiltering": undefined,
+    "name": "D",
+    "pagination": "infinite-scroll",
+    "readOnly": undefined,
+    "relationships": [],
+    "service": "serviceClass",
+  },
+  JSONEntity {
+    "applications": [
+      "tutu",
+    ],
+    "documentation": "The best entity",
+    "dto": undefined,
+    "embedded": undefined,
+    "entityTableName": "entity_e",
+    "fields": [],
+    "fluentMethods": undefined,
+    "jpaMetamodelFiltering": undefined,
+    "name": "E",
+    "pagination": "infinite-scroll",
+    "readOnly": undefined,
+    "relationships": [],
+    "service": undefined,
+  },
+]
+`);
         });
       });
     });
diff --git a/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts b/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts
index eec73f2bb568..2ddcc454002c 100644
--- a/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts
+++ b/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.spec.ts
@@ -159,22 +159,22 @@ describe('jdl - JDLWithoutApplicationToJSONConverter', () => {
 
         it('should convert the entity', () => {
           jestExpect(convertedEntity).toMatchInlineSnapshot(`
-            JSONEntity {
-              "applications": "*",
-              "dto": undefined,
-              "embedded": undefined,
-              "entityTableName": "entity_a",
-              "fields": [],
-              "fluentMethods": undefined,
-              "javadoc": "The best entity",
-              "jpaMetamodelFiltering": undefined,
-              "name": "A",
-              "pagination": undefined,
-              "readOnly": undefined,
-              "relationships": [],
-              "service": undefined,
-            }
-          `);
+JSONEntity {
+  "applications": "*",
+  "documentation": "The best entity",
+  "dto": undefined,
+  "embedded": undefined,
+  "entityTableName": "entity_a",
+  "fields": [],
+  "fluentMethods": undefined,
+  "jpaMetamodelFiltering": undefined,
+  "name": "A",
+  "pagination": undefined,
+  "readOnly": undefined,
+  "relationships": [],
+  "service": undefined,
+}
+`);
         });
       });
       context('with options', () => {
@@ -261,28 +261,28 @@ describe('jdl - JDLWithoutApplicationToJSONConverter', () => {
 
         it('should convert the entity', () => {
           jestExpect(convertedEntity).toMatchInlineSnapshot(`
-            JSONEntity {
-              "angularJSSuffix": "suffix",
-              "applications": "*",
-              "clientRootFolder": "../client_root_folder",
-              "dto": "mapstruct",
-              "embedded": true,
-              "entityTableName": "entity_a",
-              "fields": [],
-              "fluentMethods": false,
-              "javadoc": "The best entity",
-              "jpaMetamodelFiltering": true,
-              "microserviceName": "myMs",
-              "name": "A",
-              "pagination": "pagination",
-              "readOnly": true,
-              "relationships": [],
-              "searchEngine": "couchbase",
-              "service": "serviceImpl",
-              "skipClient": true,
-              "skipServer": true,
-            }
-          `);
+JSONEntity {
+  "angularJSSuffix": "suffix",
+  "applications": "*",
+  "clientRootFolder": "../client_root_folder",
+  "documentation": "The best entity",
+  "dto": "mapstruct",
+  "embedded": true,
+  "entityTableName": "entity_a",
+  "fields": [],
+  "fluentMethods": false,
+  "jpaMetamodelFiltering": true,
+  "microserviceName": "myMs",
+  "name": "A",
+  "pagination": "pagination",
+  "readOnly": true,
+  "relationships": [],
+  "searchEngine": "couchbase",
+  "service": "serviceImpl",
+  "skipClient": true,
+  "skipServer": true,
+}
+`);
         });
       });
       context('when setting the DTO option without the service option', () => {
@@ -326,22 +326,22 @@ describe('jdl - JDLWithoutApplicationToJSONConverter', () => {
         });
         it('should set the service option to serviceClass', () => {
           jestExpect(convertedEntity).toMatchInlineSnapshot(`
-            JSONEntity {
-              "applications": "*",
-              "dto": "mapstruct",
-              "embedded": undefined,
-              "entityTableName": "entity_a",
-              "fields": [],
-              "fluentMethods": undefined,
-              "javadoc": "The best entity",
-              "jpaMetamodelFiltering": undefined,
-              "name": "A",
-              "pagination": undefined,
-              "readOnly": undefined,
-              "relationships": [],
-              "service": "serviceClass",
-            }
-          `);
+JSONEntity {
+  "applications": "*",
+  "documentation": "The best entity",
+  "dto": "mapstruct",
+  "embedded": undefined,
+  "entityTableName": "entity_a",
+  "fields": [],
+  "fluentMethods": undefined,
+  "jpaMetamodelFiltering": undefined,
+  "name": "A",
+  "pagination": undefined,
+  "readOnly": undefined,
+  "relationships": [],
+  "service": "serviceClass",
+}
+`);
         });
       });
       context('when setting the filtering option without the service option', () => {
@@ -384,22 +384,22 @@ describe('jdl - JDLWithoutApplicationToJSONConverter', () => {
         });
         it('should set the service option to serviceClass', () => {
           jestExpect(convertedEntity).toMatchInlineSnapshot(`
-            JSONEntity {
-              "applications": "*",
-              "dto": undefined,
-              "embedded": undefined,
-              "entityTableName": "entity_a",
-              "fields": [],
-              "fluentMethods": undefined,
-              "javadoc": "The best entity",
-              "jpaMetamodelFiltering": true,
-              "name": "A",
-              "pagination": undefined,
-              "readOnly": undefined,
-              "relationships": [],
-              "service": "serviceClass",
-            }
-          `);
+JSONEntity {
+  "applications": "*",
+  "documentation": "The best entity",
+  "dto": undefined,
+  "embedded": undefined,
+  "entityTableName": "entity_a",
+  "fields": [],
+  "fluentMethods": undefined,
+  "jpaMetamodelFiltering": true,
+  "name": "A",
+  "pagination": undefined,
+  "readOnly": undefined,
+  "relationships": [],
+  "service": "serviceClass",
+}
+`);
         });
       });
       context('when the searching option is set with exclusions', () => {
@@ -432,23 +432,23 @@ describe('jdl - JDLWithoutApplicationToJSONConverter', () => {
 
         it('should prevent the entities from being searched', () => {
           jestExpect(convertedEntity).toMatchInlineSnapshot(`
-            JSONEntity {
-              "applications": "*",
-              "dto": undefined,
-              "embedded": undefined,
-              "entityTableName": "entity_a",
-              "fields": [],
-              "fluentMethods": undefined,
-              "javadoc": "The best entity",
-              "jpaMetamodelFiltering": undefined,
-              "name": "A",
-              "pagination": undefined,
-              "readOnly": undefined,
-              "relationships": [],
-              "searchEngine": "no",
-              "service": undefined,
-            }
-          `);
+JSONEntity {
+  "applications": "*",
+  "documentation": "The best entity",
+  "dto": undefined,
+  "embedded": undefined,
+  "entityTableName": "entity_a",
+  "fields": [],
+  "fluentMethods": undefined,
+  "jpaMetamodelFiltering": undefined,
+  "name": "A",
+  "pagination": undefined,
+  "readOnly": undefined,
+  "relationships": [],
+  "searchEngine": "no",
+  "service": undefined,
+}
+`);
         });
       });
       context('with fields', () => {
@@ -484,31 +484,31 @@ describe('jdl - JDLWithoutApplicationToJSONConverter', () => {
 
           it('should convert them', () => {
             jestExpect(convertedEntity).toMatchInlineSnapshot(`
-              JSONEntity {
-                "applications": "*",
-                "dto": undefined,
-                "embedded": undefined,
-                "entityTableName": "entity_a",
-                "fields": [
-                  {
-                    "fieldName": "firstField",
-                    "fieldType": "String",
-                  },
-                  {
-                    "fieldName": "secondField",
-                    "fieldType": "Integer",
-                  },
-                ],
-                "fluentMethods": undefined,
-                "javadoc": "The best entity",
-                "jpaMetamodelFiltering": undefined,
-                "name": "A",
-                "pagination": undefined,
-                "readOnly": undefined,
-                "relationships": [],
-                "service": undefined,
-              }
-            `);
+JSONEntity {
+  "applications": "*",
+  "documentation": "The best entity",
+  "dto": undefined,
+  "embedded": undefined,
+  "entityTableName": "entity_a",
+  "fields": [
+    {
+      "fieldName": "firstField",
+      "fieldType": "String",
+    },
+    {
+      "fieldName": "secondField",
+      "fieldType": "Integer",
+    },
+  ],
+  "fluentMethods": undefined,
+  "jpaMetamodelFiltering": undefined,
+  "name": "A",
+  "pagination": undefined,
+  "readOnly": undefined,
+  "relationships": [],
+  "service": undefined,
+}
+`);
           });
         });
         context('when having blobs', () => {
@@ -553,43 +553,43 @@ describe('jdl - JDLWithoutApplicationToJSONConverter', () => {
 
           it('should convert them', () => {
             jestExpect(convertedEntity).toMatchInlineSnapshot(`
-              JSONEntity {
-                "applications": "*",
-                "dto": undefined,
-                "embedded": undefined,
-                "entityTableName": "entity_a",
-                "fields": [
-                  {
-                    "fieldName": "anyBlobField",
-                    "fieldType": "byte[]",
-                    "fieldTypeBlobContent": "any",
-                  },
-                  {
-                    "fieldName": "textBlobField",
-                    "fieldType": "byte[]",
-                    "fieldTypeBlobContent": "text",
-                  },
-                  {
-                    "fieldName": "blobField",
-                    "fieldType": "byte[]",
-                    "fieldTypeBlobContent": "any",
-                  },
-                  {
-                    "fieldName": "imageBlobField",
-                    "fieldType": "byte[]",
-                    "fieldTypeBlobContent": "image",
-                  },
-                ],
-                "fluentMethods": undefined,
-                "javadoc": "The best entity",
-                "jpaMetamodelFiltering": undefined,
-                "name": "A",
-                "pagination": undefined,
-                "readOnly": undefined,
-                "relationships": [],
-                "service": undefined,
-              }
-            `);
+JSONEntity {
+  "applications": "*",
+  "documentation": "The best entity",
+  "dto": undefined,
+  "embedded": undefined,
+  "entityTableName": "entity_a",
+  "fields": [
+    {
+      "fieldName": "anyBlobField",
+      "fieldType": "byte[]",
+      "fieldTypeBlobContent": "any",
+    },
+    {
+      "fieldName": "textBlobField",
+      "fieldType": "byte[]",
+      "fieldTypeBlobContent": "text",
+    },
+    {
+      "fieldName": "blobField",
+      "fieldType": "byte[]",
+      "fieldTypeBlobContent": "any",
+    },
+    {
+      "fieldName": "imageBlobField",
+      "fieldType": "byte[]",
+      "fieldTypeBlobContent": "image",
+    },
+  ],
+  "fluentMethods": undefined,
+  "jpaMetamodelFiltering": undefined,
+  "name": "A",
+  "pagination": undefined,
+  "readOnly": undefined,
+  "relationships": [],
+  "service": undefined,
+}
+`);
           });
         });
         context('with field types being enums', () => {
@@ -620,28 +620,28 @@ describe('jdl - JDLWithoutApplicationToJSONConverter', () => {
 
           it('should convert them', () => {
             jestExpect(convertedEntity).toMatchInlineSnapshot(`
-              JSONEntity {
-                "applications": "*",
-                "dto": undefined,
-                "embedded": undefined,
-                "entityTableName": "a",
-                "fields": [
-                  {
-                    "fieldName": "enumField",
-                    "fieldType": "CustomEnum",
-                    "fieldValues": "AA,AB",
-                  },
-                ],
-                "fluentMethods": undefined,
-                "javadoc": "The best entity",
-                "jpaMetamodelFiltering": undefined,
-                "name": "A",
-                "pagination": undefined,
-                "readOnly": undefined,
-                "relationships": [],
-                "service": undefined,
-              }
-            `);
+JSONEntity {
+  "applications": "*",
+  "documentation": "The best entity",
+  "dto": undefined,
+  "embedded": undefined,
+  "entityTableName": "a",
+  "fields": [
+    {
+      "fieldName": "enumField",
+      "fieldType": "CustomEnum",
+      "fieldValues": "AA,AB",
+    },
+  ],
+  "fluentMethods": undefined,
+  "jpaMetamodelFiltering": undefined,
+  "name": "A",
+  "pagination": undefined,
+  "readOnly": undefined,
+  "relationships": [],
+  "service": undefined,
+}
+`);
           });
         });
         context('with comments', () => {
@@ -672,28 +672,28 @@ describe('jdl - JDLWithoutApplicationToJSONConverter', () => {
 
           it('should convert them', () => {
             jestExpect(convertedEntity).toMatchInlineSnapshot(`
-              JSONEntity {
-                "applications": "*",
-                "dto": undefined,
-                "embedded": undefined,
-                "entityTableName": "entity_a",
-                "fields": [
-                  {
-                    "fieldName": "firstField",
-                    "fieldType": "String",
-                    "javadoc": "The best field",
-                  },
-                ],
-                "fluentMethods": undefined,
-                "javadoc": "The best entity",
-                "jpaMetamodelFiltering": undefined,
-                "name": "A",
-                "pagination": undefined,
-                "readOnly": undefined,
-                "relationships": [],
-                "service": undefined,
-              }
-            `);
+JSONEntity {
+  "applications": "*",
+  "documentation": "The best entity",
+  "dto": undefined,
+  "embedded": undefined,
+  "entityTableName": "entity_a",
+  "fields": [
+    {
+      "documentation": "The best field",
+      "fieldName": "firstField",
+      "fieldType": "String",
+    },
+  ],
+  "fluentMethods": undefined,
+  "jpaMetamodelFiltering": undefined,
+  "name": "A",
+  "pagination": undefined,
+  "readOnly": undefined,
+  "relationships": [],
+  "service": undefined,
+}
+`);
           });
         });
         context('with validations', () => {
@@ -779,58 +779,58 @@ describe('jdl - JDLWithoutApplicationToJSONConverter', () => {
 
           it('should convert them', () => {
             jestExpect(convertedEntity).toMatchInlineSnapshot(`
-              JSONEntity {
-                "applications": "*",
-                "dto": undefined,
-                "embedded": undefined,
-                "entityTableName": "entity_a",
-                "fields": [
-                  {
-                    "fieldName": "stringField",
-                    "fieldType": "String",
-                    "fieldValidateRules": [
-                      "required",
-                      "unique",
-                      "minlength",
-                      "maxlength",
-                      "pattern",
-                    ],
-                    "fieldValidateRulesMaxlength": 10,
-                    "fieldValidateRulesMinlength": 0,
-                    "fieldValidateRulesPattern": "^d$",
-                  },
-                  {
-                    "fieldName": "integerField",
-                    "fieldType": "Integer",
-                    "fieldValidateRules": [
-                      "min",
-                      "max",
-                    ],
-                    "fieldValidateRulesMax": 10,
-                    "fieldValidateRulesMin": 0,
-                  },
-                  {
-                    "fieldName": "blobField",
-                    "fieldType": "byte[]",
-                    "fieldTypeBlobContent": "any",
-                    "fieldValidateRules": [
-                      "minbytes",
-                      "maxbytes",
-                    ],
-                    "fieldValidateRulesMaxbytes": 10,
-                    "fieldValidateRulesMinbytes": 0,
-                  },
-                ],
-                "fluentMethods": undefined,
-                "javadoc": "The best entity",
-                "jpaMetamodelFiltering": undefined,
-                "name": "A",
-                "pagination": undefined,
-                "readOnly": undefined,
-                "relationships": [],
-                "service": undefined,
-              }
-            `);
+JSONEntity {
+  "applications": "*",
+  "documentation": "The best entity",
+  "dto": undefined,
+  "embedded": undefined,
+  "entityTableName": "entity_a",
+  "fields": [
+    {
+      "fieldName": "stringField",
+      "fieldType": "String",
+      "fieldValidateRules": [
+        "required",
+        "unique",
+        "minlength",
+        "maxlength",
+        "pattern",
+      ],
+      "fieldValidateRulesMaxlength": 10,
+      "fieldValidateRulesMinlength": 0,
+      "fieldValidateRulesPattern": "^d$",
+    },
+    {
+      "fieldName": "integerField",
+      "fieldType": "Integer",
+      "fieldValidateRules": [
+        "min",
+        "max",
+      ],
+      "fieldValidateRulesMax": 10,
+      "fieldValidateRulesMin": 0,
+    },
+    {
+      "fieldName": "blobField",
+      "fieldType": "byte[]",
+      "fieldTypeBlobContent": "any",
+      "fieldValidateRules": [
+        "minbytes",
+        "maxbytes",
+      ],
+      "fieldValidateRulesMaxbytes": 10,
+      "fieldValidateRulesMinbytes": 0,
+    },
+  ],
+  "fluentMethods": undefined,
+  "jpaMetamodelFiltering": undefined,
+  "name": "A",
+  "pagination": undefined,
+  "readOnly": undefined,
+  "relationships": [],
+  "service": undefined,
+}
+`);
           });
         });
         context('with options', () => {
@@ -864,31 +864,31 @@ describe('jdl - JDLWithoutApplicationToJSONConverter', () => {
 
           it('should convert them', () => {
             jestExpect(convertedEntity).toMatchInlineSnapshot(`
-              JSONEntity {
-                "applications": "*",
-                "dto": undefined,
-                "embedded": undefined,
-                "entityTableName": "entity_a",
-                "fields": [
-                  {
-                    "fieldName": "firstField",
-                    "fieldType": "String",
-                    "javadoc": "The best field",
-                    "options": {
-                      "id": 42,
-                    },
-                  },
-                ],
-                "fluentMethods": undefined,
-                "javadoc": "The best entity",
-                "jpaMetamodelFiltering": undefined,
-                "name": "A",
-                "pagination": undefined,
-                "readOnly": undefined,
-                "relationships": [],
-                "service": undefined,
-              }
-            `);
+JSONEntity {
+  "applications": "*",
+  "documentation": "The best entity",
+  "dto": undefined,
+  "embedded": undefined,
+  "entityTableName": "entity_a",
+  "fields": [
+    {
+      "documentation": "The best field",
+      "fieldName": "firstField",
+      "fieldType": "String",
+      "options": {
+        "id": 42,
+      },
+    },
+  ],
+  "fluentMethods": undefined,
+  "jpaMetamodelFiltering": undefined,
+  "name": "A",
+  "pagination": undefined,
+  "readOnly": undefined,
+  "relationships": [],
+  "service": undefined,
+}
+`);
           });
         });
       });
@@ -1195,7 +1195,7 @@ describe('jdl - JDLWithoutApplicationToJSONConverter', () => {
             jestExpect(relationshipsForA).toMatchInlineSnapshot(`
               [
                 {
-                  "javadoc": "A to B",
+                  "documentation": "A to B",
                   "otherEntityName": "b",
                   "otherEntityRelationshipName": "a",
                   "relationshipName": "b",
@@ -1207,7 +1207,7 @@ describe('jdl - JDLWithoutApplicationToJSONConverter', () => {
             jestExpect(relationshipsForB).toMatchInlineSnapshot(`
               [
                 {
-                  "javadoc": "A to B but in the destination",
+                  "documentation": "A to B but in the destination",
                   "otherEntityName": "a",
                   "otherEntityRelationshipName": "b",
                   "relationshipName": "a",
diff --git a/jdl/converters/json-to-jdl-entity-converter.spec.ts b/jdl/converters/json-to-jdl-entity-converter.spec.ts
index 1012ed8949f2..6c95f68c8efa 100644
--- a/jdl/converters/json-to-jdl-entity-converter.spec.ts
+++ b/jdl/converters/json-to-jdl-entity-converter.spec.ts
@@ -66,7 +66,7 @@ describe('jdl - JSONToJDLEntityConverter', () => {
       });
 
       context('when parsing a JSON entity to JDL', () => {
-        it('should parse entity javadoc', () => {
+        it('should parse entity documentation', () => {
           expect(jdlObject.entities.Employee.comment).eq('The Employee entity.');
         });
         it('should parse tableName', () => {
@@ -76,7 +76,7 @@ describe('jdl - JSONToJDLEntityConverter', () => {
           expect(jdlObject.entities.Country.fields.countryId.type).eq('Long');
           expect(jdlObject.entities.Country.fields.countryName.type).eq('String');
         });
-        it('should parse field javadoc', () => {
+        it('should parse field documentation', () => {
           expect(jdlObject.entities.Country.fields.countryId.comment).eq('The country Id');
           expect(jdlObject.entities.Country.fields.countryName.comment).to.be.undefined;
         });
diff --git a/jdl/converters/json-to-jdl-entity-converter.ts b/jdl/converters/json-to-jdl-entity-converter.ts
index eb80a156f573..780d0e23cd06 100644
--- a/jdl/converters/json-to-jdl-entity-converter.ts
+++ b/jdl/converters/json-to-jdl-entity-converter.ts
@@ -83,7 +83,7 @@ function convertJSONToJDLEntity(entity: Entity, entityName: string): JDLEntity {
   const jdlEntity = new JDLEntity({
     name: entityName,
     tableName: entity.entityTableName,
-    comment: entity.javadoc,
+    comment: entity.documentation,
   });
   addFields(jdlEntity, entity);
   return jdlEntity;
@@ -99,7 +99,7 @@ function convertJSONToJDLField(field: Field) {
   const jdlField = new JDLField({
     name: lowerFirst(field.fieldName),
     type: field.fieldType,
-    comment: field.javadoc,
+    comment: field.documentation,
   });
   if (jdlField.type === BYTES) {
     jdlField.type = getTypeForBlob(field.fieldTypeBlobContent);
@@ -137,7 +137,7 @@ function addEnumsToJDL(entity: Entity) {
         new JDLEnum({
           name: field.fieldType,
           values: getEnumValuesFromString(field.fieldValues),
-          comment: field.fieldTypeJavadoc,
+          comment: field.fieldTypeDocumentation,
         }),
       );
     }
@@ -237,7 +237,7 @@ function getSourceEntitySideAttributes(entityName: string, relationship: Relatio
     sourceEntity: entityName,
     injectedFieldInSourceEntity: getInjectedFieldInSourceEntity(relationship),
     injectedFieldInSourceIsRequired: relationship.relationshipValidateRules,
-    commentForSourceEntity: relationship.javadoc,
+    commentForSourceEntity: relationship.documentation,
   };
 }
 
@@ -257,7 +257,7 @@ function getDestinationEntitySideAttributes(isEntityTheDestinationSideEntity, de
     injectedFieldInDestinationEntity += `(${foundDestinationSideEntity.otherEntityField})`;
   }
   const injectedFieldInDestinationIsRequired = !!foundDestinationSideEntity.relationshipValidateRules;
-  const commentForDestinationEntity = foundDestinationSideEntity.javadoc;
+  const commentForDestinationEntity = foundDestinationSideEntity.documentation;
   return {
     injectedFieldInDestinationEntity,
     injectedFieldInDestinationIsRequired,
diff --git a/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.spec.ts b/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.spec.ts
index c515cef57cb4..e8d706e41a0f 100644
--- a/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.spec.ts
+++ b/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.spec.ts
@@ -36,7 +36,7 @@ describe('jdl - EntityConverter', () => {
           [
             {
               name: 'A',
-              javadoc: '/** No comment */',
+              documentation: '/** No comment */',
             },
             {
               name: 'B',
diff --git a/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.ts b/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.ts
index e9cd7730c1c5..5502cb3df79e 100644
--- a/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.ts
+++ b/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.ts
@@ -36,7 +36,7 @@ export function convertEntities(parsedEntities, jdlFieldGetterFunction): JDLEnti
     const jdlEntity = new JDLEntity({
       name: parsedEntity.name,
       tableName: parsedEntity.tableName || parsedEntity.name,
-      comment: formatComment(parsedEntity.javadoc),
+      comment: formatComment(parsedEntity.documentation),
     });
     const jdlFields = jdlFieldGetterFunction.call(undefined, parsedEntity);
     jdlEntity.addFields(jdlFields);
diff --git a/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.spec.ts b/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.spec.ts
index 8cd7e7a430d1..53e1e2bd9c37 100644
--- a/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.spec.ts
+++ b/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.spec.ts
@@ -39,7 +39,7 @@ describe('jdl - EnumConverter', () => {
               { key: 'FRANCE', value: 'FRANCE' },
               { key: 'ITALY', value: 'ITALY' },
             ],
-            javadoc: 'A comment',
+            documentation: 'A comment',
           },
         ]);
       });
diff --git a/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.ts b/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.ts
index 0de14655e876..c9900b87f12d 100644
--- a/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.ts
+++ b/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.ts
@@ -43,6 +43,6 @@ function convertEnum(enumeration): JDLEnum {
   return new JDLEnum({
     name: enumeration.name,
     values: enumeration.values,
-    comment: formatComment(enumeration.javadoc),
+    comment: formatComment(enumeration.documentation),
   });
 }
diff --git a/jdl/converters/parsed-jdl-to-jdl-object/field-converter.spec.ts b/jdl/converters/parsed-jdl-to-jdl-object/field-converter.spec.ts
index 73a6a2a5d24b..68a91323c9f1 100644
--- a/jdl/converters/parsed-jdl-to-jdl-object/field-converter.spec.ts
+++ b/jdl/converters/parsed-jdl-to-jdl-object/field-converter.spec.ts
@@ -74,7 +74,7 @@ JDLField {
           const convertedField = convertField({
             name: 'AnAwesomeField',
             type: 'String',
-            javadoc: 'An awesome comment!',
+            documentation: 'An awesome comment!',
           });
           commentFromConvertedField = convertedField.comment;
         });
diff --git a/jdl/converters/parsed-jdl-to-jdl-object/field-converter.ts b/jdl/converters/parsed-jdl-to-jdl-object/field-converter.ts
index d846229fdd71..1a3e33fec615 100644
--- a/jdl/converters/parsed-jdl-to-jdl-object/field-converter.ts
+++ b/jdl/converters/parsed-jdl-to-jdl-object/field-converter.ts
@@ -37,8 +37,8 @@ export function convertField(field): JDLField {
     name,
     type: field.type,
   });
-  if (field.javadoc) {
-    jdlField.comment = formatComment(field.javadoc);
+  if (field.documentation) {
+    jdlField.comment = formatComment(field.documentation);
   }
   return jdlField;
 }
diff --git a/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts b/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts
index c4e647d8ed4e..0fdb3bb43abd 100644
--- a/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts
+++ b/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.ts
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import JDLObject from '../../models/jdl-object.js';
 import JDLUnaryOption from '../../models/jdl-unary-option.js';
 import JDLBinaryOption from '../../models/jdl-binary-option.js';
diff --git a/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.spec.ts b/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.spec.ts
index 546ad51d6a75..2484aaf500df 100644
--- a/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.spec.ts
+++ b/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.spec.ts
@@ -40,13 +40,13 @@ describe('jdl - RelationshipConverter', () => {
                   name: 'Source',
                   injectedField: 'destination',
                   required: true,
-                  javadoc: '/**\n * Required\n */',
+                  documentation: '/**\n * Required\n */',
                 },
                 to: {
                   name: 'Destination',
                   injectedField: 'source',
                   required: false,
-                  javadoc: '/**\n * Not required\n */',
+                  documentation: '/**\n * Not required\n */',
                 },
                 cardinality: 'one-to-many',
                 options: {
@@ -101,12 +101,12 @@ describe('jdl - RelationshipConverter', () => {
                 from: {
                   name: 'Source',
                   required: true,
-                  javadoc: '/**\n * Required\n */',
+                  documentation: '/**\n * Required\n */',
                 },
                 to: {
                   name: 'Destination',
                   required: false,
-                  javadoc: '/**\n * Not required\n */',
+                  documentation: '/**\n * Not required\n */',
                 },
                 cardinality: 'one-to-many',
                 options: {
diff --git a/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.ts b/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.ts
index 34bac5f50310..e78e3c89a716 100644
--- a/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.ts
+++ b/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.ts
@@ -43,8 +43,8 @@ export function convertRelationships(parsedRelationships, annotationToOptionConv
       injectedFieldInTo: parsedRelationship.to.injectedField,
       isInjectedFieldInFromRequired: parsedRelationship.from.required,
       isInjectedFieldInToRequired: parsedRelationship.to.required,
-      commentInFrom: formatComment(parsedRelationship.from.javadoc),
-      commentInTo: formatComment(parsedRelationship.to.javadoc),
+      commentInFrom: formatComment(parsedRelationship.from.documentation),
+      commentInTo: formatComment(parsedRelationship.to.documentation),
       options: {
         global: annotationToOptionConverter.call(undefined, parsedRelationship.options.global),
         source: annotationToOptionConverter.call(undefined, parsedRelationship.options.source),
diff --git a/jdl/converters/types.ts b/jdl/converters/types.ts
index f9627ebf63db..4c6634cd95eb 100644
--- a/jdl/converters/types.ts
+++ b/jdl/converters/types.ts
@@ -15,7 +15,7 @@ export type Relationship = {
 } & Record<string, any>;
 
 export type Entity = {
-  javadoc?: string;
+  documentation?: string;
   fields?: Field[];
   relationships?: Relationship[];
 } & Record<string, any>;
diff --git a/jdl/exporters/jhipster-entity-exporter.spec.ts b/jdl/exporters/jhipster-entity-exporter.spec.ts
index 8c18f0cb1f75..48383971b1fa 100644
--- a/jdl/exporters/jhipster-entity-exporter.spec.ts
+++ b/jdl/exporters/jhipster-entity-exporter.spec.ts
@@ -68,7 +68,7 @@ describe('jdl - JHipsterEntityExporter', () => {
               ],
               relationships: [],
               changelogDate: '42',
-              javadoc: '',
+              documentation: '',
               entityTableName: 'a',
               dto: NO_DTO,
               pagination: NO_PAGINATION,
@@ -127,7 +127,7 @@ describe('jdl - JHipsterEntityExporter', () => {
               ],
               relationships: [],
               changelogDate: '42',
-              javadoc: '',
+              documentation: '',
               entityTableName: 'a',
               dto: NO_DTO,
               pagination: NO_PAGINATION,
@@ -152,6 +152,7 @@ describe('jdl - JHipsterEntityExporter', () => {
   {
     "applications": [],
     "changelogDate": "42",
+    "documentation": "",
     "dto": "no",
     "entityTableName": "a",
     "fields": [
@@ -162,7 +163,6 @@ describe('jdl - JHipsterEntityExporter', () => {
       },
     ],
     "fluentMethods": true,
-    "javadoc": "",
     "jpaMetamodelFiltering": false,
     "name": "A",
     "pagination": "no",
diff --git a/jdl/jdl-importer.spec.ts b/jdl/jdl-importer.spec.ts
index 5408de2b474a..c6e960e7f073 100644
--- a/jdl/jdl-importer.spec.ts
+++ b/jdl/jdl-importer.spec.ts
@@ -83,7 +83,7 @@ relationship OneToMany {
             return 1;
           })
           .map(exportedEntity => {
-            exportedEntity.javadoc = exportedEntity.javadoc || '';
+            exportedEntity.documentation = exportedEntity.documentation || '';
             return exportedEntity;
           });
       });
diff --git a/jdl/jdl-importer.ts b/jdl/jdl-importer.ts
index ccac1021abdf..de0e144975e3 100644
--- a/jdl/jdl-importer.ts
+++ b/jdl/jdl-importer.ts
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import * as JDLReader from './readers/jdl-reader.js';
 import ParsedJDLToJDLObjectConverter from './converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js';
 import { readJSONFile } from './readers/json-file-reader.js';
diff --git a/jdl/jhipster/default-application-options.spec.ts b/jdl/jhipster/default-application-options.spec.ts
index cb1f31bea933..78a1db931e8c 100644
--- a/jdl/jhipster/default-application-options.spec.ts
+++ b/jdl/jhipster/default-application-options.spec.ts
@@ -231,7 +231,7 @@ describe('jdl - DefaultApplicationOptions', () => {
         expect(options.serviceDiscoveryType).to.equal('consul');
       });
       it('should set the client skipping option to true', () => {
-        expect(options.skipClient).to.be.true;
+        expect(options.clientFramework).to.equal('no');
       });
       it('should unset the client theme option', () => {
         expect(options.clientTheme).to.be.undefined;
diff --git a/jdl/jhipster/default-application-options.ts b/jdl/jhipster/default-application-options.ts
index 97a9783a7ebe..2091054031e8 100644
--- a/jdl/jhipster/default-application-options.ts
+++ b/jdl/jhipster/default-application-options.ts
@@ -104,6 +104,9 @@ export function getConfigForClientApplication(options: any = {}): any {
   if (options[SKIP_CLIENT]) {
     options[CLIENT_FRAMEWORK] = NO_CLIENT_FRAMEWORK;
   }
+  if (options[OptionNames.MICROFRONTEND] === undefined) {
+    options[OptionNames.MICROFRONTEND] = Boolean(options[OptionNames.MICROFRONTENDS]?.length);
+  }
   const clientFramework = options[CLIENT_FRAMEWORK];
   if (clientFramework !== NO_CLIENT_FRAMEWORK) {
     if (!options[CLIENT_THEME]) {
@@ -257,11 +260,9 @@ export function getServerConfigForMicroserviceApplication(customOptions: any = {
     [SERVER_PORT]: DEFAULT_SERVER_PORT,
     [SERVICE_DISCOVERY_TYPE]: CONSUL,
     [SKIP_USER_MANAGEMENT]: true,
+    [CLIENT_FRAMEWORK]: NO_CLIENT_FRAMEWORK,
     ...customOptions,
   };
-  if (options[SKIP_CLIENT] === undefined) {
-    options[SKIP_CLIENT] = options[CLIENT_FRAMEWORK] === undefined || options[CLIENT_FRAMEWORK] === NO_CLIENT_FRAMEWORK;
-  }
 
   options[WITH_ADMIN_UI] = false;
   return {
diff --git a/jdl/jhipster/entity-table-name-creator.ts b/jdl/jhipster/entity-table-name-creator.ts
index c4f84267c3e1..61ecfeedce6d 100644
--- a/jdl/jhipster/entity-table-name-creator.ts
+++ b/jdl/jhipster/entity-table-name-creator.ts
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 
 /**
  * Returns an entity table name based on the passed entity name.
diff --git a/jdl/jhipster/field-types.ts b/jdl/jhipster/field-types.ts
index 51934a8aacab..5f3f70125e18 100644
--- a/jdl/jhipster/field-types.ts
+++ b/jdl/jhipster/field-types.ts
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import validations from './validations.js';
 import JDLEnum from '../models/jdl-enum.js';
 import databaseTypes from './database-types.js';
diff --git a/jdl/jhipster/json-entity.spec.ts b/jdl/jhipster/json-entity.spec.ts
index c4b3b2be1530..933980b39906 100644
--- a/jdl/jhipster/json-entity.spec.ts
+++ b/jdl/jhipster/json-entity.spec.ts
@@ -52,12 +52,12 @@ describe('jdl - JSONEntity', () => {
         jestExpect(entity).toMatchInlineSnapshot(`
 JSONEntity {
   "applications": [],
+  "documentation": undefined,
   "dto": undefined,
   "embedded": undefined,
   "entityTableName": undefined,
   "fields": [],
   "fluentMethods": undefined,
-  "javadoc": undefined,
   "jpaMetamodelFiltering": undefined,
   "name": "Toto",
   "pagination": undefined,
@@ -78,7 +78,7 @@ JSONEntity {
           entityTableName: 'titi',
           fields: [42],
           fluentMethods: true,
-          javadoc: '',
+          documentation: '',
           jpaMetamodelFiltering: true,
           pagination: 'pagination',
           readOnly: true,
@@ -100,6 +100,7 @@ JSONEntity {
   "angularJSSuffix": "yes",
   "applications": [],
   "clientRootFolder": "oh",
+  "documentation": "",
   "dto": "mapstruct",
   "embedded": true,
   "entityTableName": "titi",
@@ -107,7 +108,6 @@ JSONEntity {
     42,
   ],
   "fluentMethods": true,
-  "javadoc": "",
   "jpaMetamodelFiltering": true,
   "microserviceName": "nope",
   "name": "Titi",
@@ -262,7 +262,7 @@ JSONEntity {
       before(() => {
         jsonEntity = new JSONEntity({
           entityName: 'Toto',
-          javadoc: 'A comment',
+          documentation: 'A comment',
         });
         jsonEntity.setOptions({
           dto: 'mapstruct',
@@ -274,12 +274,12 @@ JSONEntity {
         jestExpect(jsonEntity).toMatchInlineSnapshot(`
 JSONEntity {
   "applications": [],
+  "documentation": "A comment",
   "dto": "mapstruct",
   "embedded": undefined,
   "entityTableName": undefined,
   "fields": [],
   "fluentMethods": undefined,
-  "javadoc": "A comment",
   "jpaMetamodelFiltering": undefined,
   "name": "Toto",
   "pagination": "pagination",
diff --git a/jdl/jhipster/json-entity.ts b/jdl/jhipster/json-entity.ts
index 393ccd488ae9..fa4d55f12999 100644
--- a/jdl/jhipster/json-entity.ts
+++ b/jdl/jhipster/json-entity.ts
@@ -32,7 +32,7 @@ class JSONEntity {
    *        - entityName, the entity name (mandatory)
    *        - fields, a field iterable
    *        - relationships, a relationship iterable
-   *        - javadoc,
+   *        - documentation,
    *        - entityTableName, defaults to the snake-cased entity name,
    *        - dto, defaults to 'no',
    *        - pagination, defaults to 'no',
@@ -51,7 +51,7 @@ class JSONEntity {
     this.name = merged.name;
     this.fields = merged.fields;
     this.relationships = merged.relationships;
-    this.javadoc = merged.javadoc;
+    this.documentation = merged.documentation;
     this.entityTableName = merged.entityTableName;
     this.dto = merged.dto;
     this.pagination = merged.pagination;
diff --git a/jdl/jhipster/relationship-types.ts b/jdl/jhipster/relationship-types.ts
index 6ade3856bcb0..664784ea36d5 100644
--- a/jdl/jhipster/relationship-types.ts
+++ b/jdl/jhipster/relationship-types.ts
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { JDLRelationshipType, RelationshipType, relationshipTypes } from '../basic-types/relationships.js';
 
 const { camelCase, upperFirst } = _;
diff --git a/jdl/models/jdl-application-configuration-factory.ts b/jdl/models/jdl-application-configuration-factory.ts
index c2a162b8b1a7..ff125b70033e 100644
--- a/jdl/models/jdl-application-configuration-factory.ts
+++ b/jdl/models/jdl-application-configuration-factory.ts
@@ -35,9 +35,6 @@ export default function createApplicationConfigurationFromObject(configurationOb
       logger.debug(`Unrecognized application option name and value: '${optionName}' and '${optionValue}'.`);
       return;
     }
-    if (!applicationDefinition.doesOptionValueExist(optionName, optionValue)) {
-      throw new Error(`Unknown value '${optionValue}' for option '${optionName}'.`);
-    }
     configuration.setOption(createJDLConfigurationOption(optionName, optionValue));
   });
   return configuration;
diff --git a/jdl/models/jdl-deployment.ts b/jdl/models/jdl-deployment.ts
index 3679da1bcb1f..ddd46220f8c0 100644
--- a/jdl/models/jdl-deployment.ts
+++ b/jdl/models/jdl-deployment.ts
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { deploymentOptions, applicationOptions, serviceDiscoveryTypes } from '../jhipster/index.mjs';
 import { merge } from '../utils/object-utils.js';
 import { join } from '../utils/set-utils.js';
diff --git a/jdl/models/jdl-enum.ts b/jdl/models/jdl-enum.ts
index fd950f879597..03239fd2e792 100644
--- a/jdl/models/jdl-enum.ts
+++ b/jdl/models/jdl-enum.ts
@@ -44,13 +44,13 @@ export default class JDLEnum {
   }
 
   getValueJavadocs() {
-    const javadocs = {};
+    const documentations = {};
     this.values.forEach(jdlEnumValue => {
       if (jdlEnumValue.comment) {
-        javadocs[jdlEnumValue.name] = jdlEnumValue.comment;
+        documentations[jdlEnumValue.name] = jdlEnumValue.comment;
       }
     });
-    return javadocs;
+    return documentations;
   }
 
   toString() {
diff --git a/jdl/parsing/api.ts b/jdl/parsing/api.ts
index e3582a17300c..c0b40824e32c 100644
--- a/jdl/parsing/api.ts
+++ b/jdl/parsing/api.ts
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { EOF } from 'chevrotain';
 import JDLAstBuilderVisitor from './jdl-ast-builder-visitor.js';
 import { JDLLexer, tokens } from './lexer/lexer.js';
diff --git a/jdl/parsing/dsl-api.spec.ts b/jdl/parsing/dsl-api.spec.ts
index 9b7afde9367c..da2d16dbe663 100644
--- a/jdl/parsing/dsl-api.spec.ts
+++ b/jdl/parsing/dsl-api.spec.ts
@@ -42,11 +42,11 @@ describe('jdl - JDL DSL API', () => {
               name: 'field',
               type: 'String',
               validations: [],
-              javadoc: null,
+              documentation: null,
               annotations: [{ optionName: 'Id', type: 'UNARY' }],
             },
           ],
-          javadoc: null,
+          documentation: null,
         });
       });
     });
diff --git a/jdl/parsing/grammar.spec.ts b/jdl/parsing/grammar.spec.ts
index 5ac3cdb5fdee..af04052e777c 100644
--- a/jdl/parsing/grammar.spec.ts
+++ b/jdl/parsing/grammar.spec.ts
@@ -380,7 +380,7 @@ entity C
 {
   "annotations": [],
   "body": [],
-  "javadoc": null,
+  "documentation": null,
   "name": "A",
   "tableName": "A",
 }
@@ -400,7 +400,7 @@ entity C
 {
   "annotations": [],
   "body": [],
-  "javadoc": null,
+  "documentation": null,
   "name": "A",
   "tableName": "a_table",
 }
@@ -479,7 +479,7 @@ entity A`);
     },
   ],
   "body": [],
-  "javadoc": null,
+  "documentation": null,
   "name": "A",
   "tableName": "A",
 }
@@ -500,7 +500,7 @@ entity A`);
 {
   "annotations": [],
   "body": [],
-  "javadoc": "A comment",
+  "documentation": "A comment",
   "name": "A",
   "tableName": "A",
 }
@@ -524,7 +524,7 @@ entity A`);
 {
   "annotations": [],
   "body": [],
-  "javadoc": "
+  "documentation": "
  * Big
  * comment.
 ",
@@ -559,7 +559,7 @@ entity A`);
     },
   ],
   "body": [],
-  "javadoc": "A comment",
+  "documentation": "A comment",
   "name": "A",
   "tableName": "A",
 }
@@ -608,13 +608,13 @@ entity A`);
           "type": "UNARY",
         },
       ],
-      "javadoc": "field comment",
+      "documentation": "field comment",
       "name": "name",
       "type": "String",
       "validations": [],
     },
   ],
-  "javadoc": null,
+  "documentation": null,
   "name": "A",
   "tableName": "A",
 }
@@ -1023,7 +1023,7 @@ entity A {
       it('should parse them', () => {
         jestExpect(parsedEnum).toMatchInlineSnapshot(`
 {
-  "javadoc": null,
+  "documentation": null,
   "name": "MyEnum",
   "values": [
     {
@@ -1057,7 +1057,7 @@ entity A {
       it('should parse them', () => {
         jestExpect(parsedEnum).toMatchInlineSnapshot(`
 {
-  "javadoc": null,
+  "documentation": null,
   "name": "MyEnum",
   "values": [
     {
@@ -1096,7 +1096,7 @@ entity A {
       it('should parse it', () => {
         jestExpect(parsedEnum).toMatchInlineSnapshot(`
 {
-  "javadoc": null,
+  "documentation": null,
   "name": "MyEnum",
   "values": [
     {
@@ -1137,7 +1137,7 @@ entity A {
       it('should parse it', () => {
         jestExpect(parsedEnum).toMatchInlineSnapshot(`
 {
-  "javadoc": "country enum",
+  "documentation": "country enum",
   "name": "MyEnum",
   "values": [
     {
@@ -1192,7 +1192,7 @@ entity A {
       it('should parse it', () => {
         jestExpect(parsedEnum).toMatchInlineSnapshot(`
 {
-  "javadoc": "country enum",
+  "documentation": "country enum",
   "name": "MyEnum",
   "values": [
     {
@@ -1248,7 +1248,7 @@ entity A {
       it('should parse it', () => {
         jestExpect(parsedEnum).toMatchInlineSnapshot(`
 {
-  "javadoc": null,
+  "documentation": null,
   "name": "MyEnum",
   "values": [
     {
@@ -1302,7 +1302,7 @@ entity A {
         it('should parse it', () => {
           jestExpect(parsedEnum).toMatchInlineSnapshot(`
 {
-  "javadoc": null,
+  "documentation": null,
   "name": "MyEnum",
   "values": [
     {
@@ -1339,7 +1339,7 @@ entity A {
         it('should parse it', () => {
           jestExpect(parsedEnum).toMatchInlineSnapshot(`
 {
-  "javadoc": null,
+  "documentation": null,
   "name": "MyEnum",
   "values": [
     {
@@ -1388,8 +1388,8 @@ entity A {
 {
   "cardinality": "OneToOne",
   "from": {
+    "documentation": null,
     "injectedField": null,
-    "javadoc": null,
     "name": "A",
   },
   "options": {
@@ -1398,8 +1398,8 @@ entity A {
     "source": [],
   },
   "to": {
+    "documentation": null,
     "injectedField": null,
-    "javadoc": null,
     "name": "B",
   },
 }
@@ -1588,8 +1588,8 @@ entity A {
   {
     "cardinality": "OneToOne",
     "from": {
+      "documentation": null,
       "injectedField": null,
-      "javadoc": null,
       "name": "A",
     },
     "options": {
@@ -1603,16 +1603,16 @@ entity A {
       "source": [],
     },
     "to": {
+      "documentation": null,
       "injectedField": null,
-      "javadoc": null,
       "name": "B",
     },
   },
   {
     "cardinality": "OneToOne",
     "from": {
+      "documentation": null,
       "injectedField": null,
-      "javadoc": null,
       "name": "B",
     },
     "options": {
@@ -1621,16 +1621,16 @@ entity A {
       "source": [],
     },
     "to": {
+      "documentation": null,
       "injectedField": null,
-      "javadoc": null,
       "name": "C",
     },
   },
   {
     "cardinality": "OneToOne",
     "from": {
+      "documentation": null,
       "injectedField": null,
-      "javadoc": null,
       "name": "D",
     },
     "options": {
@@ -1644,8 +1644,8 @@ entity A {
       "source": [],
     },
     "to": {
+      "documentation": null,
       "injectedField": null,
-      "javadoc": null,
       "name": "E",
     },
   },
@@ -1669,8 +1669,8 @@ entity A {
   {
     "cardinality": "OneToOne",
     "from": {
+      "documentation": null,
       "injectedField": null,
-      "javadoc": null,
       "name": "A",
     },
     "options": {
@@ -1684,8 +1684,8 @@ entity A {
       ],
     },
     "to": {
+      "documentation": null,
       "injectedField": null,
-      "javadoc": null,
       "name": "B",
     },
   },
@@ -1707,8 +1707,8 @@ entity A {
   {
     "cardinality": "OneToOne",
     "from": {
+      "documentation": null,
       "injectedField": null,
-      "javadoc": null,
       "name": "A",
     },
     "options": {
@@ -1722,8 +1722,8 @@ entity A {
       "source": [],
     },
     "to": {
+      "documentation": null,
       "injectedField": null,
-      "javadoc": null,
       "name": "B",
     },
   },
@@ -1745,8 +1745,8 @@ entity A {
   {
     "cardinality": "OneToOne",
     "from": {
+      "documentation": null,
       "injectedField": null,
-      "javadoc": null,
       "name": "A",
     },
     "options": {
@@ -1765,8 +1765,8 @@ entity A {
       ],
     },
     "to": {
+      "documentation": null,
       "injectedField": null,
-      "javadoc": null,
       "name": "B",
     },
   },
diff --git a/jdl/parsing/jdl-ast-builder-visitor.ts b/jdl/parsing/jdl-ast-builder-visitor.ts
index 36f306f4c9c9..4a07773aa4e5 100644
--- a/jdl/parsing/jdl-ast-builder-visitor.ts
+++ b/jdl/parsing/jdl-ast-builder-visitor.ts
@@ -137,9 +137,9 @@ export default class JDLAstBuilderVisitor extends BaseJDLCSTVisitor {
       });
     }
 
-    let javadoc = null;
+    let documentation = null;
     if (context.JAVADOC) {
-      javadoc = trimComment(context.JAVADOC[0].image);
+      documentation = trimComment(context.JAVADOC[0].image);
     }
 
     const name = context.NAME[0].image;
@@ -159,7 +159,7 @@ export default class JDLAstBuilderVisitor extends BaseJDLCSTVisitor {
       name,
       tableName,
       body,
-      javadoc,
+      documentation,
     };
   }
 
@@ -208,7 +208,7 @@ export default class JDLAstBuilderVisitor extends BaseJDLCSTVisitor {
       // this.visit(context.type) is equivalent to this.visit(context.type[0])
       type: this.visit(context.type),
       validations,
-      javadoc: comment,
+      documentation: comment,
       annotations,
     };
   }
@@ -302,7 +302,7 @@ export default class JDLAstBuilderVisitor extends BaseJDLCSTVisitor {
   }
 
   relationshipSide(context) {
-    const javadoc = this.visit(context.comment);
+    const documentation = this.visit(context.comment);
     const name = context.NAME[0].image;
 
     const required = !!context.REQUIRED;
@@ -319,7 +319,7 @@ export default class JDLAstBuilderVisitor extends BaseJDLCSTVisitor {
     const ast: any = {
       name,
       injectedField,
-      javadoc,
+      documentation,
       required,
     };
 
@@ -345,12 +345,12 @@ export default class JDLAstBuilderVisitor extends BaseJDLCSTVisitor {
   enumDeclaration(context) {
     const name = context.NAME[0].image;
     const values = this.visit(context.enumPropList);
-    let javadoc = null;
+    let documentation = null;
     if (context.JAVADOC) {
-      javadoc = trimComment(context.JAVADOC[0].image);
+      documentation = trimComment(context.JAVADOC[0].image);
     }
 
-    return { name, values, javadoc };
+    return { name, values, documentation };
   }
 
   enumPropList(context) {
diff --git a/jdl/parsing/lexer/token-creator.ts b/jdl/parsing/lexer/token-creator.ts
index a538e61b0130..7588c7f113e9 100644
--- a/jdl/parsing/lexer/token-creator.ts
+++ b/jdl/parsing/lexer/token-creator.ts
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { createToken, ITokenConfig } from 'chevrotain';
 
 import { NAME, KEYWORD, namePattern } from './shared-tokens.js';
diff --git a/jdl/parsing/self-checks/parsing-system-checker.ts b/jdl/parsing/self-checks/parsing-system-checker.ts
index 000ce01267ec..3484aea8a915 100644
--- a/jdl/parsing/self-checks/parsing-system-checker.ts
+++ b/jdl/parsing/self-checks/parsing-system-checker.ts
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { Lexer } from 'chevrotain';
 import TokenCollectorVisitor from './token-collector-visitor.js';
 
diff --git a/jdl/parsing/validator.ts b/jdl/parsing/validator.ts
index 906c3742ef3c..1c8e8738ea01 100644
--- a/jdl/parsing/validator.ts
+++ b/jdl/parsing/validator.ts
@@ -18,7 +18,7 @@
  */
 /* eslint-disable no-useless-escape */
 
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { tokenMatcher as matchesToken } from 'chevrotain';
 
 import JDLParser from './jdl-parser.js';
diff --git a/jdl/utils/object-utils.spec.ts b/jdl/utils/object-utils.spec.ts
index d37c42b17fa5..bfca61ac2f30 100644
--- a/jdl/utils/object-utils.spec.ts
+++ b/jdl/utils/object-utils.spec.ts
@@ -225,7 +225,7 @@ describe('jdl - ObjectUtils', () => {
             name: 'MyEntity',
             fields: [],
             relationships: [],
-            javadoc: undefined,
+            documentation: undefined,
           };
           const secondObject = {
             name: 'MyEntity',
@@ -701,7 +701,7 @@ describe('jdl - ObjectUtils', () => {
 
         before(() => {
           const firstObject = {
-            javadoc: 'My first comment',
+            documentation: 'My first comment',
             fields: [
               {
                 id: 1,
@@ -727,7 +727,7 @@ describe('jdl - ObjectUtils', () => {
             service: 'no',
           };
           const secondObject = {
-            javadoc: 'My Second Comment',
+            documentation: 'My Second Comment',
             fields: [
               {
                 id: 1,
@@ -761,7 +761,7 @@ describe('jdl - ObjectUtils', () => {
       });
       context('as they do not have the same number of attributes', () => {
         type ObjectType = {
-          javadoc: string;
+          documentation: string;
           fields: (
             | { id: number; theAnswer: number; notTheAnswer?: undefined }
             | { id: number; notTheAnswer: number; theAnswer?: undefined }
@@ -779,7 +779,7 @@ describe('jdl - ObjectUtils', () => {
 
         before(() => {
           firstObject = {
-            javadoc: 'My first comment',
+            documentation: 'My first comment',
             fields: [
               {
                 id: 1,
@@ -805,7 +805,7 @@ describe('jdl - ObjectUtils', () => {
             service: 'no',
           };
           secondObject = {
-            javadoc: 'My first comment',
+            documentation: 'My first comment',
             fields: [
               {
                 id: 1,
diff --git a/jdl/utils/object-utils.ts b/jdl/utils/object-utils.ts
index 78fa9c7d7f0c..8b04a9975cbe 100644
--- a/jdl/utils/object-utils.ts
+++ b/jdl/utils/object-utils.ts
@@ -54,7 +54,7 @@ export function areEntitiesEqual(firstEntity: any, secondEntity: any) {
   if (
     firstEntity.fields.length !== secondEntity.fields.length ||
     firstEntity.relationships.length !== secondEntity.relationships.length ||
-    firstEntity.javadoc !== secondEntity.javadoc ||
+    firstEntity.documentation !== secondEntity.documentation ||
     firstEntity.entityTableName !== secondEntity.entityTableName ||
     Object.keys(firstEntity).length !== Object.keys(secondEntity).length
   ) {
diff --git a/lib/internal/config-def.mts b/lib/internal/config-def.mts
new file mode 100644
index 000000000000..76ece69887ed
--- /dev/null
+++ b/lib/internal/config-def.mts
@@ -0,0 +1,62 @@
+import type { ConfigSpec, JHipsterConfigs, JHipsterOption } from '../../generators/base/api.mjs';
+import type CoreGenerator from '../../generators/base-core/index.mjs';
+import { upperFirstCamelCase } from '../../generators/base/support/string.mjs';
+
+export const convertConfigToOption = (name: string, config?: ConfigSpec): JHipsterOption | undefined => {
+  if (!config?.cli?.type) return undefined;
+  const choices = config.choices?.map(choice => (typeof choice === 'string' ? choice : choice.value)) as any;
+  return {
+    name,
+    description: config.description,
+    choices,
+    scope: config.scope ?? 'storage',
+    ...(config.prompt && typeof config.default !== 'function' ? {} : { default: config.default }),
+    ...config.cli,
+  };
+};
+
+export function loadConfig(
+  this: CoreGenerator | void,
+  configsDef: JHipsterConfigs | undefined,
+  { application, config }: { application: any; config?: any },
+) {
+  if (configsDef) {
+    for (const [name, def] of Object.entries(configsDef)) {
+      let value = application[name];
+      if (value === undefined || value === null) {
+        let source = config;
+        if (!source) {
+          if (def.scope === 'generator') {
+            // eslint-disable-next-line @typescript-eslint/no-this-alias
+            source = this;
+          } else if (def.scope === 'blueprint') {
+            source = (this as any).blueprintStorage.getAll();
+          } else {
+            source = (this as any).jhipsterConfigWithDefaults;
+          }
+        }
+
+        value = application[name] = source[name] ?? undefined;
+        if (value === undefined && def.default) {
+          application[name] = typeof def.default === 'function' ? def.default(source) : def.default;
+        }
+      }
+    }
+  }
+}
+
+export const loadDerivedConfig = (configsDef: JHipsterConfigs | undefined, { application }) => {
+  if (configsDef) {
+    for (const [name, def] of Object.entries(configsDef)) {
+      if (def.choices) {
+        const configVal = application[name];
+        for (const choice of def.choices) {
+          const choiceVal = typeof choice === 'string' ? choice : choice.value;
+          const prop = `${name}${upperFirstCamelCase(choiceVal)}`;
+          application[prop] = application[prop] ?? ([].concat(configVal) as any).includes(choiceVal);
+        }
+        application[`${name}Any`] = application[`${name}Any`] ?? !application[`${name}No`];
+      }
+    }
+  }
+};
diff --git a/lib/internal/index.mts b/lib/internal/index.mts
new file mode 100644
index 000000000000..f77c772d620e
--- /dev/null
+++ b/lib/internal/index.mts
@@ -0,0 +1 @@
+export * from './config-def.mjs';
diff --git a/package-lock.json b/package-lock.json
index ce59bfb70da0..14418b2819bd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,29 +1,29 @@
 {
   "name": "generator-jhipster",
-  "version": "8.0.0-beta.3",
+  "version": "8.0.0-rc.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "generator-jhipster",
-      "version": "8.0.0-beta.3",
+      "version": "8.0.0-rc.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@faker-js/faker": "8.0.2",
+        "@faker-js/faker": "8.2.0",
         "@iarna/toml": "3.0.0",
-        "@types/ejs": "3.1.2",
-        "@types/lodash": "4.14.198",
-        "@typescript-eslint/eslint-plugin": "6.7.0",
-        "@typescript-eslint/parser": "6.7.0",
-        "@yeoman/adapter": "1.2.0",
-        "@yeoman/conflicter": "1.0.10",
+        "@types/ejs": "3.1.4",
+        "@types/lodash": "4.14.200",
+        "@typescript-eslint/eslint-plugin": "6.8.0",
+        "@typescript-eslint/parser": "6.8.0",
+        "@yeoman/adapter": "1.4.0",
+        "@yeoman/conflicter": "1.1.0",
         "@yeoman/namespace": "1.0.0",
         "@yeoman/transform": "1.2.0",
-        "@yeoman/types": "1.0.1",
-        "axios": "1.5.0",
+        "@yeoman/types": "1.1.1",
+        "axios": "1.5.1",
         "chalk": "5.3.0",
         "chevrotain": "11.0.3",
-        "commander": "11.0.0",
+        "commander": "11.1.0",
         "conf": "11.0.2",
         "debug": "4.3.4",
         "didyoumean": "1.2.2",
@@ -31,43 +31,42 @@
         "dot-properties": "1.0.1",
         "ejs": "3.1.9",
         "escape-string-regexp": "5.0.0",
-        "eslint": "8.49.0",
+        "eslint": "8.52.0",
         "eslint-plugin-import": "2.28.1",
         "eslint-plugin-unused-imports": "3.0.0",
         "execa": "8.0.1",
-        "fast-xml-parser": "4.2.7",
-        "glob": "10.3.4",
+        "fast-xml-parser": "4.3.2",
+        "glob": "10.3.10",
         "insight": "0.11.1",
         "isbinaryfile": "5.0.0",
         "java-lint": "0.1.0",
         "js-yaml": "4.1.0",
         "latest-version": "7.0.0",
-        "lodash": "4.17.21",
-        "mem-fs": "3.0.0",
-        "mem-fs-editor": "10.0.2",
+        "lodash-es": "4.17.21",
+        "mem-fs": "4.0.0",
+        "mem-fs-editor": "10.0.3",
         "minimatch": "9.0.3",
         "normalize-path": "3.0.0",
         "os-locale": "6.0.2",
         "p-queue": "7.4.1",
-        "p-transform": "4.0.5",
+        "p-transform": "4.1.3",
         "parse-gitignore": "2.0.0",
         "pluralize": "8.0.0",
         "prettier": "3.0.3",
         "prettier-plugin-java": "2.3.1",
-        "prettier-plugin-packagejson": "2.4.5",
-        "prettier-plugin-properties": "0.2.0",
+        "prettier-plugin-packagejson": "2.4.6",
+        "prettier-plugin-properties": "0.3.0",
         "progress": "2.0.3",
         "randexp": "0.5.3",
         "run-async": "3.0.0",
         "semver": "7.5.4",
-        "shelljs": "0.8.5",
-        "simple-git": "3.19.1",
-        "type-fest": "4.3.1",
+        "simple-git": "3.20.0",
+        "type-fest": "4.5.0",
         "uuid": "9.0.1",
-        "winston": "3.10.0",
-        "yaml": "2.3.2",
-        "yeoman-environment": "4.0.0-beta.4",
-        "yeoman-generator": "6.0.0-rc.4"
+        "winston": "3.11.0",
+        "yaml": "2.3.3",
+        "yeoman-environment": "4.0.0",
+        "yeoman-generator": "6.0.1"
       },
       "bin": {
         "jhipster": "dist/cli/jhipster.cjs"
@@ -75,40 +74,39 @@
       "devDependencies": {
         "@actions/core": "1.10.1",
         "@node-loaders/esbuildx": "1.2.0",
-        "@types/chai": "4.3.6",
+        "@types/chai": "4.3.9",
         "@types/glob": "npm:noist@1.0.0",
         "@types/minimatch": "npm:noist@1.0.0",
-        "@types/mocha": "10.0.1",
-        "@types/node": "18.17.16",
-        "@types/shelljs": "0.8.12",
-        "@types/sinon-chai": "3.2.9",
-        "chai": "4.3.8",
+        "@types/mocha": "10.0.3",
+        "@types/node": "18.18.6",
+        "@types/sinon-chai": "3.2.11",
+        "chai": "4.3.10",
         "chokidar": "3.5.3",
-        "concurrently": "8.2.1",
+        "concurrently": "8.2.2",
         "cpy-cli": "5.0.0",
         "ejs-lint": "2.0.0",
         "eslint-config-airbnb-base": "15.0.0",
         "eslint-config-prettier": "9.0.0",
         "eslint-plugin-chai-friendly": "0.7.2",
-        "eslint-plugin-mocha": "10.1.0",
-        "eslint-plugin-prettier": "5.0.0",
+        "eslint-plugin-mocha": "10.2.0",
+        "eslint-plugin-prettier": "5.0.1",
         "esmocha": "1.0.1",
         "fs-extra": "11.1.1",
-        "jest-extended": "4.0.1",
+        "jest-extended": "4.0.2",
         "jsdoc": "4.0.2",
-        "octokit": "3.1.0",
+        "octokit": "3.1.1",
         "open-cli": "7.2.0",
         "prettier2": "npm:prettier@2.8.8",
-        "rimraf": "5.0.1",
-        "sinon": "16.0.0",
+        "rimraf": "5.0.5",
+        "sinon": "17.0.0",
         "sinon-chai": "3.7.0",
         "sort-keys": "5.0.0",
         "typescript": "5.2.2",
         "yeoman-assert": "3.1.1",
-        "yeoman-test": "8.0.0-rc.1"
+        "yeoman-test": "8.1.0"
       },
       "engines": {
-        "node": "^18.13.0 || >= 20.2.0",
+        "node": "^18.13.0 || >= 20.6.1",
         "npm": ">=8.0.0"
       },
       "funding": {
@@ -116,7 +114,7 @@
         "url": "https://opencollective.com/generator-jhipster"
       },
       "peerDependencies": {
-        "yeoman-test": "8.0.0-rc.1"
+        "yeoman-test": "8.1.0"
       },
       "peerDependenciesMeta": {
         "yeoman-test": {
@@ -152,12 +150,13 @@
       }
     },
     "node_modules/@actions/http-client": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.1.1.tgz",
-      "integrity": "sha512-qhrkRMB40bbbLo7gF+0vu+X+UawOvQQqNAA/5Unx774RS8poaOhThDOG6BGmxvAnxhQnDp2BG/ZUm65xZILTpw==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.2.0.tgz",
+      "integrity": "sha512-q+epW0trjVUUHboliPb4UF9g2msf+w61b32tAkFEwL/IwP0DQWgbCMM0Hbe3e3WXSKz5VcUXbzJQgy8Hkra/Lg==",
       "dev": true,
       "dependencies": {
-        "tunnel": "^0.0.6"
+        "tunnel": "^0.0.6",
+        "undici": "^5.25.4"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -237,31 +236,31 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz",
-      "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz",
+      "integrity": "sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.22.19",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.19.tgz",
-      "integrity": "sha512-Q8Yj5X4LHVYTbLCKVz0//2D2aDmHF4xzCdEttYvKOnWvErGsa6geHXD6w46x64n5tP69VfeH+IfSrdyH3MLhwA==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz",
+      "integrity": "sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==",
       "dev": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.22.15",
+        "@babel/generator": "^7.23.0",
         "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-module-transforms": "^7.22.19",
-        "@babel/helpers": "^7.22.15",
-        "@babel/parser": "^7.22.16",
+        "@babel/helper-module-transforms": "^7.23.0",
+        "@babel/helpers": "^7.23.2",
+        "@babel/parser": "^7.23.0",
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.22.19",
-        "@babel/types": "^7.22.19",
-        "convert-source-map": "^1.7.0",
+        "@babel/traverse": "^7.23.2",
+        "@babel/types": "^7.23.0",
+        "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
         "json5": "^2.2.3",
@@ -285,12 +284,12 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.15.tgz",
-      "integrity": "sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.15",
+        "@babel/types": "^7.23.0",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -325,22 +324,22 @@
       }
     },
     "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
-      "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
-      "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.23.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -371,16 +370,16 @@
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.22.19",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.19.tgz",
-      "integrity": "sha512-m6h1cJvn+OJ+R3jOHp30faq5xKJ7VbjwDj5RGgHuRlU9hrMeKsGC+JpihkR5w1g7IfseCPPtZ0r7/hB4UKaYlA==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz",
+      "integrity": "sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-module-imports": "^7.22.15",
         "@babel/helper-simple-access": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.19"
+        "@babel/helper-validator-identifier": "^7.22.20"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -432,9 +431,9 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.19",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.19.tgz",
-      "integrity": "sha512-Tinq7ybnEPFFXhlYOYFiSjespWQk0dq2dRNAiMdRTOYQzEGqnnNyrTxPYHP5r6wGjlF1rFgABdDV0g8EwD6Qbg==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -449,25 +448,25 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.15.tgz",
-      "integrity": "sha512-7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz",
+      "integrity": "sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==",
       "dev": true,
       "dependencies": {
         "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.22.15",
-        "@babel/types": "^7.22.15"
+        "@babel/traverse": "^7.23.2",
+        "@babel/types": "^7.23.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.22.13",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.13.tgz",
-      "integrity": "sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
+      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
       },
@@ -527,9 +526,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.22.16",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.16.tgz",
-      "integrity": "sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
+      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
       "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -716,9 +715,9 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.15.tgz",
-      "integrity": "sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz",
+      "integrity": "sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==",
       "dev": true,
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
@@ -742,19 +741,19 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.22.19",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.19.tgz",
-      "integrity": "sha512-ZCcpVPK64krfdScRbpxF6xA5fz7IOsfMwx1tcACvCzt6JY+0aHkBk7eIU8FRDSZRU5Zei6Z4JfgAxN1bqXGECg==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.22.15",
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
+        "@babel/generator": "^7.23.0",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.22.16",
-        "@babel/types": "^7.22.19",
+        "@babel/parser": "^7.23.0",
+        "@babel/types": "^7.23.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -772,13 +771,13 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.22.19",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.19.tgz",
-      "integrity": "sha512-P7LAw/LbojPzkgp5oznjE6tQEIWbp4PkkfrZDINTro9zgBRtI324/EYsiSI7lhPbpIQ+DCeR2NNmMWANGGfZsg==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
+      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.19",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -820,9 +819,9 @@
       "integrity": "sha512-YslZMgtJUyuMbZ+aKvfF3x1f5liK4mWNxghFRv7jqRR9C3R3fAOGTTKvxXDa2Y1s9zSbcpuO0cAxDYsc9SrXoQ=="
     },
     "node_modules/@colors/colors": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
-      "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz",
+      "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==",
       "engines": {
         "node": ">=0.1.90"
       }
@@ -1204,9 +1203,9 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.8.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.1.tgz",
-      "integrity": "sha512-PWiOzLIUAjN/w5K17PoF4n6sKBw0gqLHPhywmYHP4t1VFQQVYeb1yWsJwnMVEMl3tUHME7X/SJPZLmtG7XBDxQ==",
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.1.tgz",
+      "integrity": "sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==",
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
@@ -1274,17 +1273,17 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.49.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.49.0.tgz",
-      "integrity": "sha512-1S8uAY/MTJqVx0SC4epBq+N2yhuwtNwLbJYNZyhL2pO1ZVKn5HFXav5T41Ryzy9K9V7ZId2JB2oy/W4aCd9/2w==",
+      "version": "8.52.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz",
+      "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
     "node_modules/@faker-js/faker": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-8.0.2.tgz",
-      "integrity": "sha512-Uo3pGspElQW91PCvKSIAXoEgAUlRnH29sX2/p89kg7sP1m2PzCufHINd0FhTXQf6DYGiUlVncdSPa2F9wxed2A==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-8.2.0.tgz",
+      "integrity": "sha512-VacmzZqVxdWdf9y64lDOMZNDMM/FQdtM9IsaOPKOm2suYwEatb8VkdHqOzXcDnZbk7YDE2BmsJmy/2Hmkn563g==",
       "funding": [
         {
           "type": "opencollective",
@@ -1296,12 +1295,21 @@
         "npm": ">=6.14.13"
       }
     },
+    "node_modules/@fastify/busboy": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.0.0.tgz",
+      "integrity": "sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.11",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz",
-      "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==",
+      "version": "0.11.13",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz",
+      "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==",
       "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.1",
+        "@humanwhocodes/object-schema": "^2.0.1",
         "debug": "^4.1.1",
         "minimatch": "^3.0.5"
       },
@@ -1342,9 +1350,9 @@
       }
     },
     "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz",
+      "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw=="
     },
     "node_modules/@iarna/toml": {
       "version": "3.0.0",
@@ -1674,12 +1682,6 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/@jest/transform/node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true
-    },
     "node_modules/@jest/transform/node_modules/slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
@@ -1818,9 +1820,9 @@
       "dev": true
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.19",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
-      "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
+      "version": "0.3.20",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
+      "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
       "dev": true,
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
@@ -1853,9 +1855,12 @@
       "integrity": "sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw=="
     },
     "node_modules/@ljharb/through": {
-      "version": "2.3.9",
-      "resolved": "https://registry.npmjs.org/@ljharb/through/-/through-2.3.9.tgz",
-      "integrity": "sha512-yN599ZBuMPPK4tdoToLlvgJB4CLK8fGl7ntfy0Wn7U6ttNvHYurd81bfUiK/6sMkiIwm65R6ck4L6+Y3DfVbNQ==",
+      "version": "2.3.11",
+      "resolved": "https://registry.npmjs.org/@ljharb/through/-/through-2.3.11.tgz",
+      "integrity": "sha512-ccfcIDlogiXNq5KcbAwbaO7lMh3Tm1i3khMPYpxlK8hH/W53zN81KM9coerRLOnTGu3nfXIniAmQbRI9OxbC0w==",
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
       "engines": {
         "node": ">= 0.4"
       }
@@ -2046,42 +2051,113 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@npmcli/agent": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.0.tgz",
+      "integrity": "sha512-2yThA1Es98orMkpSLVqlDZAMPK3jHJhifP2gnNUdk1754uZ8yI5c+ulCoVG+WlntQA6MzhrURMXjSd9Z7dJ2/Q==",
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.1",
+        "lru-cache": "^10.0.1",
+        "socks-proxy-agent": "^8.0.1"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@npmcli/agent/node_modules/agent-base": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
+      "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
+      "dependencies": {
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@npmcli/agent/node_modules/http-proxy-agent": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
+      "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@npmcli/agent/node_modules/https-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==",
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@npmcli/agent/node_modules/lru-cache": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz",
+      "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==",
+      "engines": {
+        "node": "14 || >=16.14"
+      }
+    },
+    "node_modules/@npmcli/agent/node_modules/socks-proxy-agent": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz",
+      "integrity": "sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==",
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "^4.3.4",
+        "socks": "^2.7.1"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/@npmcli/arborist": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-6.3.0.tgz",
-      "integrity": "sha512-XrS14qBDhK95RdGhjTSx8AgeZPNah949qp3b0v3GUFOugtPc9Z85rpWid57mONS8gHbuGIHjFzuA+5hSM7BuBA==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-7.2.0.tgz",
+      "integrity": "sha512-J6XCan+5nV6F94E0+9z//OnZADcqHw6HGDO0ynX+Ayd6GEopK0odq99V+UQjb8P1zexTmCWGvxp4jU5OM6NTtg==",
       "dependencies": {
         "@isaacs/string-locale-compare": "^1.1.0",
         "@npmcli/fs": "^3.1.0",
         "@npmcli/installed-package-contents": "^2.0.2",
         "@npmcli/map-workspaces": "^3.0.2",
-        "@npmcli/metavuln-calculator": "^5.0.0",
+        "@npmcli/metavuln-calculator": "^7.0.0",
         "@npmcli/name-from-folder": "^2.0.0",
         "@npmcli/node-gyp": "^3.0.0",
-        "@npmcli/package-json": "^4.0.0",
-        "@npmcli/query": "^3.0.0",
-        "@npmcli/run-script": "^6.0.0",
+        "@npmcli/package-json": "^5.0.0",
+        "@npmcli/query": "^3.0.1",
+        "@npmcli/run-script": "^7.0.1",
         "bin-links": "^4.0.1",
-        "cacache": "^17.0.4",
+        "cacache": "^18.0.0",
         "common-ancestor-path": "^1.0.1",
-        "hosted-git-info": "^6.1.1",
+        "hosted-git-info": "^7.0.1",
         "json-parse-even-better-errors": "^3.0.0",
         "json-stringify-nice": "^1.1.4",
         "minimatch": "^9.0.0",
         "nopt": "^7.0.0",
-        "npm-install-checks": "^6.0.0",
-        "npm-package-arg": "^10.1.0",
-        "npm-pick-manifest": "^8.0.1",
-        "npm-registry-fetch": "^14.0.3",
+        "npm-install-checks": "^6.2.0",
+        "npm-package-arg": "^11.0.1",
+        "npm-pick-manifest": "^9.0.0",
+        "npm-registry-fetch": "^16.0.0",
         "npmlog": "^7.0.1",
-        "pacote": "^15.0.8",
+        "pacote": "^17.0.4",
         "parse-conflict-json": "^3.0.0",
         "proc-log": "^3.0.0",
         "promise-all-reject-late": "^1.0.0",
         "promise-call-limit": "^1.0.2",
         "read-package-json-fast": "^3.0.2",
         "semver": "^7.3.7",
-        "ssri": "^10.0.1",
+        "ssri": "^10.0.5",
         "treeverse": "^3.0.0",
         "walk-up-path": "^3.0.1"
       },
@@ -2089,18 +2165,18 @@
         "arborist": "bin/index.js"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/@npmcli/arborist/node_modules/hosted-git-info": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
-      "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.1.tgz",
+      "integrity": "sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==",
       "dependencies": {
-        "lru-cache": "^7.5.1"
+        "lru-cache": "^10.0.1"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/@npmcli/arborist/node_modules/json-parse-even-better-errors": {
@@ -2112,11 +2188,11 @@
       }
     },
     "node_modules/@npmcli/arborist/node_modules/lru-cache": {
-      "version": "7.18.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz",
+      "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==",
       "engines": {
-        "node": ">=12"
+        "node": "14 || >=16.14"
       }
     },
     "node_modules/@npmcli/fs": {
@@ -2131,43 +2207,51 @@
       }
     },
     "node_modules/@npmcli/git": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.1.0.tgz",
-      "integrity": "sha512-9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-5.0.3.tgz",
+      "integrity": "sha512-UZp9NwK+AynTrKvHn5k3KviW/hA5eENmFsu3iAPe7sWRt0lFUdsY/wXIYjpDFe7cdSNwOIzbObfwgt6eL5/2zw==",
       "dependencies": {
-        "@npmcli/promise-spawn": "^6.0.0",
-        "lru-cache": "^7.4.4",
-        "npm-pick-manifest": "^8.0.0",
+        "@npmcli/promise-spawn": "^7.0.0",
+        "lru-cache": "^10.0.1",
+        "npm-pick-manifest": "^9.0.0",
         "proc-log": "^3.0.0",
         "promise-inflight": "^1.0.1",
         "promise-retry": "^2.0.1",
         "semver": "^7.3.5",
-        "which": "^3.0.0"
+        "which": "^4.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@npmcli/git/node_modules/isexe": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+      "engines": {
+        "node": ">=16"
       }
     },
     "node_modules/@npmcli/git/node_modules/lru-cache": {
-      "version": "7.18.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz",
+      "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==",
       "engines": {
-        "node": ">=12"
+        "node": "14 || >=16.14"
       }
     },
     "node_modules/@npmcli/git/node_modules/which": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz",
-      "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
+      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
       "dependencies": {
-        "isexe": "^2.0.0"
+        "isexe": "^3.1.1"
       },
       "bin": {
         "node-which": "bin/which.js"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.13.0 || >=18.0.0"
       }
     },
     "node_modules/@npmcli/installed-package-contents": {
@@ -2200,17 +2284,17 @@
       }
     },
     "node_modules/@npmcli/metavuln-calculator": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/metavuln-calculator/-/metavuln-calculator-5.0.1.tgz",
-      "integrity": "sha512-qb8Q9wIIlEPj3WeA1Lba91R4ZboPL0uspzV0F9uwP+9AYMVB2zOoa7Pbk12g6D2NHAinSbHh6QYmGuRyHZ874Q==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/metavuln-calculator/-/metavuln-calculator-7.0.0.tgz",
+      "integrity": "sha512-Pw0tyX02VkpqlIQlG2TeiJNsdrecYeUU0ubZZa9pi3N37GCsxI+en43u4hYFdq+eSx1A9a9vwFAUyqEtKFsbHQ==",
       "dependencies": {
-        "cacache": "^17.0.0",
+        "cacache": "^18.0.0",
         "json-parse-even-better-errors": "^3.0.0",
-        "pacote": "^15.0.0",
+        "pacote": "^17.0.0",
         "semver": "^7.3.5"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/@npmcli/metavuln-calculator/node_modules/json-parse-even-better-errors": {
@@ -2238,31 +2322,31 @@
       }
     },
     "node_modules/@npmcli/package-json": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-4.0.1.tgz",
-      "integrity": "sha512-lRCEGdHZomFsURroh522YvA/2cVb9oPIJrjHanCJZkiasz1BzcnLr3tBJhlV7S86MBJBuAQ33is2D60YitZL2Q==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-5.0.0.tgz",
+      "integrity": "sha512-OI2zdYBLhQ7kpNPaJxiflofYIpkNLi+lnGdzqUOfRmCF3r2l1nadcjtCYMJKv/Utm/ZtlffaUuTiAktPHbc17g==",
       "dependencies": {
-        "@npmcli/git": "^4.1.0",
+        "@npmcli/git": "^5.0.0",
         "glob": "^10.2.2",
-        "hosted-git-info": "^6.1.1",
+        "hosted-git-info": "^7.0.0",
         "json-parse-even-better-errors": "^3.0.0",
-        "normalize-package-data": "^5.0.0",
+        "normalize-package-data": "^6.0.0",
         "proc-log": "^3.0.0",
         "semver": "^7.5.3"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/@npmcli/package-json/node_modules/hosted-git-info": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
-      "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.1.tgz",
+      "integrity": "sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==",
       "dependencies": {
-        "lru-cache": "^7.5.1"
+        "lru-cache": "^10.0.1"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/@npmcli/package-json/node_modules/json-parse-even-better-errors": {
@@ -2274,50 +2358,58 @@
       }
     },
     "node_modules/@npmcli/package-json/node_modules/lru-cache": {
-      "version": "7.18.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz",
+      "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==",
       "engines": {
-        "node": ">=12"
+        "node": "14 || >=16.14"
       }
     },
     "node_modules/@npmcli/package-json/node_modules/normalize-package-data": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz",
-      "integrity": "sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.0.tgz",
+      "integrity": "sha512-UL7ELRVxYBHBgYEtZCXjxuD5vPxnmvMGq0jp/dGPKKrN7tfsBh2IY7TlJ15WWwdjRWD3RJbnsygUurTK3xkPkg==",
       "dependencies": {
-        "hosted-git-info": "^6.0.0",
+        "hosted-git-info": "^7.0.0",
         "is-core-module": "^2.8.1",
         "semver": "^7.3.5",
         "validate-npm-package-license": "^3.0.4"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/@npmcli/promise-spawn": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-6.0.2.tgz",
-      "integrity": "sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-7.0.0.tgz",
+      "integrity": "sha512-wBqcGsMELZna0jDblGd7UXgOby45TQaMWmbFwWX+SEotk4HV6zG2t6rT9siyLhPk4P6YYqgfL1UO8nMWDBVJXQ==",
       "dependencies": {
-        "which": "^3.0.0"
+        "which": "^4.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@npmcli/promise-spawn/node_modules/isexe": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+      "engines": {
+        "node": ">=16"
       }
     },
     "node_modules/@npmcli/promise-spawn/node_modules/which": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz",
-      "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
+      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
       "dependencies": {
-        "isexe": "^2.0.0"
+        "isexe": "^3.1.1"
       },
       "bin": {
         "node-which": "bin/which.js"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.13.0 || >=18.0.0"
       }
     },
     "node_modules/@npmcli/query": {
@@ -2332,46 +2424,54 @@
       }
     },
     "node_modules/@npmcli/run-script": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.2.tgz",
-      "integrity": "sha512-NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-7.0.1.tgz",
+      "integrity": "sha512-Od/JMrgkjZ8alyBE0IzeqZDiF1jgMez9Gkc/OYrCkHHiXNwM0wc6s7+h+xM7kYDZkS0tAoOLr9VvygyE5+2F7g==",
       "dependencies": {
         "@npmcli/node-gyp": "^3.0.0",
-        "@npmcli/promise-spawn": "^6.0.0",
+        "@npmcli/promise-spawn": "^7.0.0",
         "node-gyp": "^9.0.0",
         "read-package-json-fast": "^3.0.0",
-        "which": "^3.0.0"
+        "which": "^4.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@npmcli/run-script/node_modules/isexe": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+      "engines": {
+        "node": ">=16"
       }
     },
     "node_modules/@npmcli/run-script/node_modules/which": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz",
-      "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
+      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
       "dependencies": {
-        "isexe": "^2.0.0"
+        "isexe": "^3.1.1"
       },
       "bin": {
         "node-which": "bin/which.js"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.13.0 || >=18.0.0"
       }
     },
     "node_modules/@octokit/app": {
-      "version": "14.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/app/-/app-14.0.0.tgz",
-      "integrity": "sha512-g/zDXttroZ9Se08shK0d0d/j0cgSA+h4WV7qGUevNEM0piNBkIlfb4Fm6bSwCNAZhNf72mBgERmYOoxicPkqdw==",
+      "version": "14.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/app/-/app-14.0.1.tgz",
+      "integrity": "sha512-4opdXcWBVhzd6FOxlaxDKXXqi9Vz2hsDSWQGNo49HbYFAX11UqMpksMjEdfvHy0x19Pse8Nvn+R6inNb/V398w==",
       "dev": true,
       "dependencies": {
         "@octokit/auth-app": "^6.0.0",
         "@octokit/auth-unauthenticated": "^5.0.0",
         "@octokit/core": "^5.0.0",
         "@octokit/oauth-app": "^6.0.0",
-        "@octokit/plugin-paginate-rest": "^8.0.0",
-        "@octokit/types": "^11.1.0",
+        "@octokit/plugin-paginate-rest": "^9.0.0",
+        "@octokit/types": "^12.0.0",
         "@octokit/webhooks": "^12.0.1"
       },
       "engines": {
@@ -2379,16 +2479,16 @@
       }
     },
     "node_modules/@octokit/auth-app": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-app/-/auth-app-6.0.0.tgz",
-      "integrity": "sha512-OKct7Rukf3g9DjpzcpdacQsdmd6oPrJ7fZND22JkjzhDvfhttUOnmh+qPS4kHhaNNyTxqSThnfrUWvkqNLd1nw==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-app/-/auth-app-6.0.1.tgz",
+      "integrity": "sha512-tjCD4nzQNZgmLH62+PSnTF6eGerisFgV4v6euhqJik6yWV96e1ZiiGj+NXIqbgnpjLmtnBqVUrNyGKu3DoGEGA==",
       "dev": true,
       "dependencies": {
         "@octokit/auth-oauth-app": "^7.0.0",
         "@octokit/auth-oauth-user": "^4.0.0",
         "@octokit/request": "^8.0.2",
         "@octokit/request-error": "^5.0.0",
-        "@octokit/types": "^11.0.0",
+        "@octokit/types": "^12.0.0",
         "deprecation": "^2.3.1",
         "lru-cache": "^10.0.0",
         "universal-github-app-jwt": "^1.1.1",
@@ -2408,15 +2508,15 @@
       }
     },
     "node_modules/@octokit/auth-oauth-app": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-app/-/auth-oauth-app-7.0.0.tgz",
-      "integrity": "sha512-8JvJEXGoEqrbzLwt3SwIUvkDd+1wrM8up0KawvDIElB8rbxPbvWppGO0SLKAWSJ0q8ILcVq+mWck6pDcZ3a9KA==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-app/-/auth-oauth-app-7.0.1.tgz",
+      "integrity": "sha512-RE0KK0DCjCHXHlQBoubwlLijXEKfhMhKm9gO56xYvFmP1QTMb+vvwRPmQLLx0V+5AvV9N9I3lr1WyTzwL3rMDg==",
       "dev": true,
       "dependencies": {
         "@octokit/auth-oauth-device": "^6.0.0",
         "@octokit/auth-oauth-user": "^4.0.0",
         "@octokit/request": "^8.0.2",
-        "@octokit/types": "^11.0.0",
+        "@octokit/types": "^12.0.0",
         "@types/btoa-lite": "^1.0.0",
         "btoa-lite": "^1.0.0",
         "universal-user-agent": "^6.0.0"
@@ -2426,14 +2526,14 @@
       }
     },
     "node_modules/@octokit/auth-oauth-device": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-device/-/auth-oauth-device-6.0.0.tgz",
-      "integrity": "sha512-Zgf/LKhwWk54rJaTGYVYtbKgUty+ouil6VQeRd+pCw7Gd0ECoSWaZuHK6uDGC/HtnWHjpSWFhzxPauDoHcNRtg==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-device/-/auth-oauth-device-6.0.1.tgz",
+      "integrity": "sha512-yxU0rkL65QkjbqQedgVx3gmW7YM5fF+r5uaSj9tM/cQGVqloXcqP2xK90eTyYvl29arFVCW8Vz4H/t47mL0ELw==",
       "dev": true,
       "dependencies": {
         "@octokit/oauth-methods": "^4.0.0",
         "@octokit/request": "^8.0.0",
-        "@octokit/types": "^11.0.0",
+        "@octokit/types": "^12.0.0",
         "universal-user-agent": "^6.0.0"
       },
       "engines": {
@@ -2441,15 +2541,15 @@
       }
     },
     "node_modules/@octokit/auth-oauth-user": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-user/-/auth-oauth-user-4.0.0.tgz",
-      "integrity": "sha512-VOm5aIkVGHaOhIvsF/4YmSjoYDzzrKbbYkdSEO0KqHK7I8SlO3ZndSikQ1fBlNPUEH0ve2BOTxLrVvI1qBf9/Q==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-user/-/auth-oauth-user-4.0.1.tgz",
+      "integrity": "sha512-N94wWW09d0hleCnrO5wt5MxekatqEJ4zf+1vSe8MKMrhZ7gAXKFOKrDEZW2INltvBWJCyDUELgGRv8gfErH1Iw==",
       "dev": true,
       "dependencies": {
         "@octokit/auth-oauth-device": "^6.0.0",
         "@octokit/oauth-methods": "^4.0.0",
         "@octokit/request": "^8.0.2",
-        "@octokit/types": "^11.0.0",
+        "@octokit/types": "^12.0.0",
         "btoa-lite": "^1.0.0",
         "universal-user-agent": "^6.0.0"
       },
@@ -2466,28 +2566,28 @@
       }
     },
     "node_modules/@octokit/auth-unauthenticated": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-unauthenticated/-/auth-unauthenticated-5.0.0.tgz",
-      "integrity": "sha512-AjOI6FNB2dweJ85p6rf7D4EhE4y6VBcwYfX/7KJkR5Q9fD9ET6NABAjajUTSNFfCxmNIaQgISggZ3pkgwtTqsA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-unauthenticated/-/auth-unauthenticated-5.0.1.tgz",
+      "integrity": "sha512-oxeWzmBFxWd+XolxKTc4zr+h3mt+yofn4r7OfoIkR/Cj/o70eEGmPsFbueyJE2iBAGpjgTnEOKM3pnuEGVmiqg==",
       "dev": true,
       "dependencies": {
         "@octokit/request-error": "^5.0.0",
-        "@octokit/types": "^11.0.0"
+        "@octokit/types": "^12.0.0"
       },
       "engines": {
         "node": ">= 18"
       }
     },
     "node_modules/@octokit/core": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.0.0.tgz",
-      "integrity": "sha512-YbAtMWIrbZ9FCXbLwT9wWB8TyLjq9mxpKdgB3dUNxQcIVTf9hJ70gRPwAcqGZdY6WdJPZ0I7jLaaNDCiloGN2A==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.0.1.tgz",
+      "integrity": "sha512-lyeeeZyESFo+ffI801SaBKmCfsvarO+dgV8/0gD8u1d87clbEdWsP5yC+dSj3zLhb2eIf5SJrn6vDz9AheETHw==",
       "dependencies": {
         "@octokit/auth-token": "^4.0.0",
         "@octokit/graphql": "^7.0.0",
         "@octokit/request": "^8.0.2",
         "@octokit/request-error": "^5.0.0",
-        "@octokit/types": "^11.0.0",
+        "@octokit/types": "^12.0.0",
         "before-after-hook": "^2.2.0",
         "universal-user-agent": "^6.0.0"
       },
@@ -2496,11 +2596,11 @@
       }
     },
     "node_modules/@octokit/endpoint": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.0.tgz",
-      "integrity": "sha512-szrQhiqJ88gghWY2Htt8MqUDO6++E/EIXqJ2ZEp5ma3uGS46o7LZAzSLt49myB7rT+Hfw5Y6gO3LmOxGzHijAQ==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.1.tgz",
+      "integrity": "sha512-hRlOKAovtINHQPYHZlfyFwaM8OyetxeoC81lAkBy34uLb8exrZB50SQdeW3EROqiY9G9yxQTpp5OHTV54QD+vA==",
       "dependencies": {
-        "@octokit/types": "^11.0.0",
+        "@octokit/types": "^12.0.0",
         "is-plain-object": "^5.0.0",
         "universal-user-agent": "^6.0.0"
       },
@@ -2509,12 +2609,12 @@
       }
     },
     "node_modules/@octokit/graphql": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-7.0.1.tgz",
-      "integrity": "sha512-T5S3oZ1JOE58gom6MIcrgwZXzTaxRnxBso58xhozxHpOqSTgDS6YNeEUvZ/kRvXgPrRz/KHnZhtb7jUMRi9E6w==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-7.0.2.tgz",
+      "integrity": "sha512-OJ2iGMtj5Tg3s6RaXH22cJcxXRi7Y3EBqbHTBRq+PQAqfaS8f/236fUrWhfSn8P4jovyzqucxme7/vWSSZBX2Q==",
       "dependencies": {
         "@octokit/request": "^8.0.1",
-        "@octokit/types": "^11.0.0",
+        "@octokit/types": "^12.0.0",
         "universal-user-agent": "^6.0.0"
       },
       "engines": {
@@ -2565,10 +2665,25 @@
         "node": ">= 18"
       }
     },
+    "node_modules/@octokit/oauth-methods/node_modules/@octokit/openapi-types": {
+      "version": "18.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-18.1.1.tgz",
+      "integrity": "sha512-VRaeH8nCDtF5aXWnjPuEMIYf1itK/s3JYyJcWFJT8X9pSNnBtriDf7wlEWsGuhPLl4QIH4xM8fqTXDwJ3Mu6sw==",
+      "dev": true
+    },
+    "node_modules/@octokit/oauth-methods/node_modules/@octokit/types": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-11.1.0.tgz",
+      "integrity": "sha512-Fz0+7GyLm/bHt8fwEqgvRBWwIV1S6wRRyq+V6exRKLVWaKGsuy6H9QFYeBVDV7rK6fO3XwHgQOPxv+cLj2zpXQ==",
+      "dev": true,
+      "dependencies": {
+        "@octokit/openapi-types": "^18.0.0"
+      }
+    },
     "node_modules/@octokit/openapi-types": {
-      "version": "18.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-18.0.0.tgz",
-      "integrity": "sha512-V8GImKs3TeQRxRtXFpG2wl19V7444NIOTDF24AWuIbmNaNYOQMWRbjcGDXV5B+0n887fgDcuMNOmlul+k+oJtw=="
+      "version": "19.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-19.0.0.tgz",
+      "integrity": "sha512-PclQ6JGMTE9iUStpzMkwLCISFn/wDeRjkZFIKALpvJQNBGwDoYYi2fFvuHwssoQ1rXI5mfh6jgTgWuddeUzfWw=="
     },
     "node_modules/@octokit/plugin-paginate-graphql": {
       "version": "4.0.0",
@@ -2583,12 +2698,12 @@
       }
     },
     "node_modules/@octokit/plugin-paginate-rest": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-8.0.0.tgz",
-      "integrity": "sha512-2xZ+baZWUg+qudVXnnvXz7qfrTmDeYPCzangBVq/1gXxii/OiS//4shJp9dnCCvj1x+JAm9ji1Egwm1BA47lPQ==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-9.0.0.tgz",
+      "integrity": "sha512-oIJzCpttmBTlEhBmRvb+b9rlnGpmFgDtZ0bB6nq39qIod6A5DP+7RkVLMOixIgRCYSHDTeayWqmiJ2SZ6xgfdw==",
       "dev": true,
       "dependencies": {
-        "@octokit/types": "^11.0.0"
+        "@octokit/types": "^12.0.0"
       },
       "engines": {
         "node": ">= 18"
@@ -2606,12 +2721,12 @@
       }
     },
     "node_modules/@octokit/plugin-rest-endpoint-methods": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-9.0.0.tgz",
-      "integrity": "sha512-KquMF/VB1IkKNiVnzJKspY5mFgGyLd7HzdJfVEGTJFzqu9BRFNWt+nwTCMuUiWc72gLQhRWYubTwOkQj+w/1PA==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-10.0.1.tgz",
+      "integrity": "sha512-fgS6HPkPvJiz8CCliewLyym9qAx0RZ/LKh3sATaPfM41y/O2wQ4Z9MrdYeGPVh04wYmHFmWiGlKPC7jWVtZXQA==",
       "dev": true,
       "dependencies": {
-        "@octokit/types": "^11.0.0"
+        "@octokit/types": "^12.0.0"
       },
       "engines": {
         "node": ">= 18"
@@ -2621,13 +2736,13 @@
       }
     },
     "node_modules/@octokit/plugin-retry": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-retry/-/plugin-retry-6.0.0.tgz",
-      "integrity": "sha512-a1/A4A+PB1QoAHQfLJxGHhLfSAT03bR1jJz3GgQJZvty2ozawFWs93MiBQXO7SL2YbO7CIq0Goj4qLOBj8JeMQ==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-retry/-/plugin-retry-6.0.1.tgz",
+      "integrity": "sha512-SKs+Tz9oj0g4p28qkZwl/topGcb0k0qPNX/i7vBKmDsjoeqnVfFUquqrE/O9oJY7+oLzdCtkiWSXLpLjvl6uog==",
       "dev": true,
       "dependencies": {
         "@octokit/request-error": "^5.0.0",
-        "@octokit/types": "^11.0.0",
+        "@octokit/types": "^12.0.0",
         "bottleneck": "^2.15.3"
       },
       "engines": {
@@ -2638,12 +2753,12 @@
       }
     },
     "node_modules/@octokit/plugin-throttling": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-throttling/-/plugin-throttling-7.0.0.tgz",
-      "integrity": "sha512-KL2k/d0uANc8XqP5S64YcNFCudR3F5AaKO39XWdUtlJIjT9Ni79ekWJ6Kj5xvAw87udkOMEPcVf9xEge2+ahew==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-throttling/-/plugin-throttling-8.0.0.tgz",
+      "integrity": "sha512-OkMbHYUidj81q92YRkPzWmwXkEtsI3KOcSkNm763aqUOh9IEplyX05XjKAdZFANAvaYH0Q4JBZwu4h2VnPVXZA==",
       "dev": true,
       "dependencies": {
-        "@octokit/types": "^11.0.0",
+        "@octokit/types": "^12.0.0",
         "bottleneck": "^2.15.3"
       },
       "engines": {
@@ -2654,13 +2769,13 @@
       }
     },
     "node_modules/@octokit/request": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.1.1.tgz",
-      "integrity": "sha512-8N+tdUz4aCqQmXl8FpHYfKG9GelDFd7XGVzyN8rc6WxVlYcfpHECnuRkgquzz+WzvHTK62co5di8gSXnzASZPQ==",
+      "version": "8.1.4",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.1.4.tgz",
+      "integrity": "sha512-M0aaFfpGPEKrg7XoA/gwgRvc9MSXHRO2Ioki1qrPDbl1e9YhjIwVoHE7HIKmv/m3idzldj//xBujcFNqGX6ENA==",
       "dependencies": {
         "@octokit/endpoint": "^9.0.0",
         "@octokit/request-error": "^5.0.0",
-        "@octokit/types": "^11.1.0",
+        "@octokit/types": "^12.0.0",
         "is-plain-object": "^5.0.0",
         "universal-user-agent": "^6.0.0"
       },
@@ -2669,11 +2784,11 @@
       }
     },
     "node_modules/@octokit/request-error": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-5.0.0.tgz",
-      "integrity": "sha512-1ue0DH0Lif5iEqT52+Rf/hf0RmGO9NWFjrzmrkArpG9trFfDM/efx00BJHdLGuro4BR/gECxCU2Twf5OKrRFsQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-5.0.1.tgz",
+      "integrity": "sha512-X7pnyTMV7MgtGmiXBwmO6M5kIPrntOXdyKZLigNfQWSEQzVxR4a4vo49vJjTWX70mPndj8KhfT4Dx+2Ng3vnBQ==",
       "dependencies": {
-        "@octokit/types": "^11.0.0",
+        "@octokit/types": "^12.0.0",
         "deprecation": "^2.0.0",
         "once": "^1.4.0"
       },
@@ -2794,11 +2909,11 @@
       }
     },
     "node_modules/@octokit/types": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-11.1.0.tgz",
-      "integrity": "sha512-Fz0+7GyLm/bHt8fwEqgvRBWwIV1S6wRRyq+V6exRKLVWaKGsuy6H9QFYeBVDV7rK6fO3XwHgQOPxv+cLj2zpXQ==",
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.0.0.tgz",
+      "integrity": "sha512-EzD434aHTFifGudYAygnFlS1Tl6KhbTynEWELQXIbTY8Msvb5nEqTZIm7sbPEt4mQYLZwu3zPKVdeIrw0g7ovg==",
       "dependencies": {
-        "@octokit/openapi-types": "^18.0.0"
+        "@octokit/openapi-types": "^19.0.0"
       }
     },
     "node_modules/@octokit/webhooks": {
@@ -2897,14 +3012,14 @@
       }
     },
     "node_modules/@sigstore/bundle": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-1.1.0.tgz",
-      "integrity": "sha512-PFutXEy0SmQxYI4texPw3dd2KewuNqv7OuK1ZFtY2fM754yhvG2KdgwIhRnoEE2uHdtdGNQ8s0lb94dW9sELog==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.1.0.tgz",
+      "integrity": "sha512-89uOo6yh/oxaU8AeOUnVrTdVMcGk9Q1hJa7Hkvalc6G3Z3CupWk4Xe9djSgJm9fMkH69s0P0cVHUoKSOemLdng==",
       "dependencies": {
-        "@sigstore/protobuf-specs": "^0.2.0"
+        "@sigstore/protobuf-specs": "^0.2.1"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/@sigstore/protobuf-specs": {
@@ -2916,28 +3031,49 @@
       }
     },
     "node_modules/@sigstore/sign": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-1.0.0.tgz",
-      "integrity": "sha512-INxFVNQteLtcfGmcoldzV6Je0sbbfh9I16DM4yJPw3j5+TFP8X6uIiA18mvpEa9yyeycAKgPmOA3X9hVdVTPUA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-2.2.0.tgz",
+      "integrity": "sha512-AAbmnEHDQv6CSfrWA5wXslGtzLPtAtHZleKOgxdQYvx/s76Fk6T6ZVt7w2IGV9j1UrFeBocTTQxaXG2oRrDhYA==",
       "dependencies": {
-        "@sigstore/bundle": "^1.1.0",
-        "@sigstore/protobuf-specs": "^0.2.0",
-        "make-fetch-happen": "^11.0.1"
+        "@sigstore/bundle": "^2.1.0",
+        "@sigstore/protobuf-specs": "^0.2.1",
+        "make-fetch-happen": "^13.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@sigstore/sign/node_modules/make-fetch-happen": {
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.0.tgz",
+      "integrity": "sha512-7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A==",
+      "dependencies": {
+        "@npmcli/agent": "^2.0.0",
+        "cacache": "^18.0.0",
+        "http-cache-semantics": "^4.1.1",
+        "is-lambda": "^1.0.1",
+        "minipass": "^7.0.2",
+        "minipass-fetch": "^3.0.0",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "negotiator": "^0.6.3",
+        "promise-retry": "^2.0.1",
+        "ssri": "^10.0.0"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/@sigstore/tuf": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.3.tgz",
-      "integrity": "sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.2.0.tgz",
+      "integrity": "sha512-KKATZ5orWfqd9ZG6MN8PtCIx4eevWSuGRKQvofnWXRpyMyUEpmrzg5M5BrCpjM+NfZ0RbNGOh5tCz/P2uoRqOA==",
       "dependencies": {
-        "@sigstore/protobuf-specs": "^0.2.0",
-        "tuf-js": "^1.1.7"
+        "@sigstore/protobuf-specs": "^0.2.1",
+        "tuf-js": "^2.1.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/@sinclair/typebox": {
@@ -2967,9 +3103,9 @@
       }
     },
     "node_modules/@sinonjs/fake-timers": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
-      "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
+      "version": "11.2.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-11.2.2.tgz",
+      "integrity": "sha512-G2piCSxQ7oWOxwGSAyFHfPIsyeJGXYtc6mFbnFA+kRXkiEnTl8c/8jul2S329iFBnDI9HGoeWWAZvuvOkZccgw==",
       "dev": true,
       "dependencies": {
         "@sinonjs/commons": "^3.0.0"
@@ -3027,47 +3163,47 @@
       }
     },
     "node_modules/@tufjs/canonical-json": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz",
-      "integrity": "sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz",
+      "integrity": "sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/@tufjs/models": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-1.0.4.tgz",
-      "integrity": "sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-2.0.0.tgz",
+      "integrity": "sha512-c8nj8BaOExmZKO2DXhDfegyhSGcG9E/mPN3U13L+/PsoWm1uaGiHHjxqSHQiasDBQwDA3aHuw9+9spYAP1qvvg==",
       "dependencies": {
-        "@tufjs/canonical-json": "1.0.0",
-        "minimatch": "^9.0.0"
+        "@tufjs/canonical-json": "2.0.0",
+        "minimatch": "^9.0.3"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/@types/aws-lambda": {
-      "version": "8.10.121",
-      "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.121.tgz",
-      "integrity": "sha512-Y/jsUwO18HuC0a39BuMQkSOd/kMGATh/h5LNksw8FlTafbQ3Ge3578ZoT8w8gSOsWl2qH1p/SS/R61vc0X5jIQ==",
+      "version": "8.10.125",
+      "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.125.tgz",
+      "integrity": "sha512-Vqw/WMlV4O1fJT6capim01v7VLDZkcX1n6Yhb52E7IfnMqYbNfwHfyDV8rRN42NLBtdDvfaqcCqs2K0fr5ljZw==",
       "dev": true
     },
     "node_modules/@types/btoa-lite": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/btoa-lite/-/btoa-lite-1.0.0.tgz",
-      "integrity": "sha512-wJsiX1tosQ+J5+bY5LrSahHxr2wT+uME5UDwdN1kg4frt40euqA+wzECkmq4t5QbveHiJepfdThgQrPw6KiSlg==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@types/btoa-lite/-/btoa-lite-1.0.1.tgz",
+      "integrity": "sha512-YwCjy5v1THSaj5KrBz0SKwKYtjwT0YpOm8VB4TR6DzyvTa503T+rE0Ku6Q3DUKtm1rzNrEXyqdYHpcLiYN6oXg==",
       "dev": true
     },
     "node_modules/@types/chai": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.6.tgz",
-      "integrity": "sha512-VOVRLM1mBxIRxydiViqPcKn6MIxZytrbMpd6RJLIWKxUNr3zux8no0Oc7kJx0WAPIitgZ0gkrDS+btlqQpubpw==",
+      "version": "4.3.9",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.9.tgz",
+      "integrity": "sha512-69TtiDzu0bcmKQv3yg1Zx409/Kd7r0b5F1PfpYJfSHzLGtB53547V4u+9iqKYsTu/O2ai6KTb0TInNpvuQ3qmg==",
       "dev": true
     },
     "node_modules/@types/ejs": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.2.tgz",
-      "integrity": "sha512-ZmiaE3wglXVWBM9fyVC17aGPkLo/UgaOjEiI2FXQfyczrCefORPxIe+2dVmnmk3zkVIbizjrlQzmPGhSYGXG5g=="
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.4.tgz",
+      "integrity": "sha512-fnM/NjByiWdSRJRrmGxgqOSAnmOnsvX1QcNYk5TVyIIj+7ZqOKMb9gQa4OIl/lil2w/8TiTWV+nz3q8yqxez/w=="
     },
     "node_modules/@types/expect": {
       "version": "1.20.4",
@@ -3082,56 +3218,56 @@
       "dev": true
     },
     "node_modules/@types/graceful-fs": {
-      "version": "4.1.6",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz",
-      "integrity": "sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==",
+      "version": "4.1.8",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.8.tgz",
+      "integrity": "sha512-NhRH7YzWq8WiNKVavKPBmtLYZHxNY19Hh+az28O/phfp68CF45pMFud+ZzJ8ewnxnC5smIdF3dqFeiSUQ5I+pw==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/http-cache-semantics": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
-      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz",
+      "integrity": "sha512-V46MYLFp08Wf2mmaBhvgjStM3tPa+2GAdy/iqoX+noX1//zje2x4XmrIU0cAwyClATsTmahbtoQ2EwP7I5WSiA=="
     },
     "node_modules/@types/inquirer": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-9.0.3.tgz",
-      "integrity": "sha512-CzNkWqQftcmk2jaCWdBTf9Sm7xSw4rkI1zpU/Udw3HX5//adEZUIm9STtoRP1qgWj0CWQtJ9UTvqmO2NNjhMJw==",
+      "version": "9.0.6",
+      "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-9.0.6.tgz",
+      "integrity": "sha512-1Go1AAP/yOy3Pth5Xf1DC3nfZ03cJLCPx6E2YnSN/5I3w1jHBVH4170DkZ+JxfmA7c9kL9+bf9z3FRGa4kNAqg==",
       "dependencies": {
         "@types/through": "*",
         "rxjs": "^7.2.0"
       }
     },
     "node_modules/@types/istanbul-lib-coverage": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
-      "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz",
+      "integrity": "sha512-zONci81DZYCZjiLe0r6equvZut0b+dBRPBN5kBDjsONnutYNtJMoWQ9uR2RkL1gLG9NMTzvf+29e5RFfPbeKhQ==",
       "dev": true
     },
     "node_modules/@types/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.2.tgz",
+      "integrity": "sha512-8toY6FgdltSdONav1XtUHl4LN1yTmLza+EuDazb/fEmRNCwjyqNVIQWs2IfC74IqjHkREs/nQ2FWq5kZU9IC0w==",
       "dev": true,
       "dependencies": {
         "@types/istanbul-lib-coverage": "*"
       }
     },
     "node_modules/@types/istanbul-reports": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
-      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.3.tgz",
+      "integrity": "sha512-1nESsePMBlf0RPRffLZi5ujYh7IH1BWL4y9pr+Bn3cJBdxz+RTP8bUFljLz9HvzhhOSWKdyBZ4DIivdL6rvgZg==",
       "dev": true,
       "dependencies": {
         "@types/istanbul-lib-report": "*"
       }
     },
     "node_modules/@types/json-schema": {
-      "version": "7.0.13",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz",
-      "integrity": "sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ=="
+      "version": "7.0.14",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.14.tgz",
+      "integrity": "sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw=="
     },
     "node_modules/@types/json5": {
       "version": "0.0.29",
@@ -3139,29 +3275,29 @@
       "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
     },
     "node_modules/@types/jsonwebtoken": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.3.tgz",
-      "integrity": "sha512-b0jGiOgHtZ2jqdPgPnP6WLCXZk1T8p06A/vPGzUvxpFGgKMbjXJDjC5m52ErqBnIuWZFgGoIJyRdeG5AyreJjA==",
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.4.tgz",
+      "integrity": "sha512-8UYapdmR0QlxgvJmyE8lP7guxD0UGVMfknsdtCFZh4ovShdBl3iOI4zdvqBHrB/IS+xUj3PSx73Qkey1fhWz+g==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/linkify-it": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.3.tgz",
-      "integrity": "sha512-pTjcqY9E4nOI55Wgpz7eiI8+LzdYnw3qxXCfHyBDdPbYvbyLgWLJGh8EdPvqawwMK1Uo1794AUkkR38Fr0g+2g==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.4.tgz",
+      "integrity": "sha512-hPpIeeHb/2UuCw06kSNAOVWgehBLXEo0/fUs0mw3W2qhqX89PI2yvok83MnuctYGCPrabGIoi0fFso4DQ+sNUQ==",
       "dev": true
     },
     "node_modules/@types/lodash": {
-      "version": "4.14.198",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.198.tgz",
-      "integrity": "sha512-trNJ/vtMZYMLhfN45uLq4ShQSw0/S7xCTLLVM+WM1rmFpba/VS42jVUgaO3w/NOLiWR/09lnYk0yMaA/atdIsg=="
+      "version": "4.14.200",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.200.tgz",
+      "integrity": "sha512-YI/M/4HRImtNf3pJgbF+W6FrXovqj+T+/HpENLTooK9PnkacBsDpeP3IpHab40CClUfhNmdM2WTNP2sa2dni5Q=="
     },
     "node_modules/@types/lodash-es": {
-      "version": "4.17.9",
-      "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.9.tgz",
-      "integrity": "sha512-ZTcmhiI3NNU7dEvWLZJkzG6ao49zOIjEgIE0RgV7wbPxU0f2xT3VSAHw2gmst8swH6V0YkLRGp4qPlX/6I90MQ==",
+      "version": "4.17.10",
+      "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.10.tgz",
+      "integrity": "sha512-YJP+w/2khSBwbUSFdGsSqmDvmnN3cCKoPOL7Zjle6s30ZtemkkqhjVfFqGwPN7ASil5VyjE2GtyU/yqYY6mC0A==",
       "dependencies": {
         "@types/lodash": "*"
       }
@@ -3177,9 +3313,9 @@
       }
     },
     "node_modules/@types/mdurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.2.tgz",
-      "integrity": "sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.4.tgz",
+      "integrity": "sha512-ARVxjAEX5TARFRzpDRVC6cEk0hUIXCCwaMhz8y7S1/PxU6zZS1UMjyobz7q4w/D/R552r4++EhwmXK1N2rAy0A==",
       "dev": true
     },
     "node_modules/@types/minimatch": {
@@ -3190,71 +3326,45 @@
       "dev": true
     },
     "node_modules/@types/minimist": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
-      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.4.tgz",
+      "integrity": "sha512-Kfe/D3hxHTusnPNRbycJE1N77WHDsdS4AjUYIzlDzhDrS47NrwuL3YW4VITxwR7KCVpzwgy4Rbj829KSSQmwXQ==",
       "dev": true
     },
     "node_modules/@types/mocha": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.1.tgz",
-      "integrity": "sha512-/fvYntiO1GeICvqbQ3doGDIP97vWmvFt83GKguJ6prmQM2iXZfFcq6YE8KteFyRtX2/h5Hf91BYvPodJKFYv5Q==",
+      "version": "10.0.3",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.3.tgz",
+      "integrity": "sha512-RsOPImTriV/OE4A9qKjMtk2MnXiuLLbcO3nCXK+kvq4nr0iMfFgpjaX3MPLb6f7+EL1FGSelYvuJMV6REH+ZPQ==",
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "18.17.16",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.16.tgz",
-      "integrity": "sha512-e0zgs7qe1XH/X3KEPnldfkD07LH9O1B9T31U8qoO7lqGSjj3/IrBuvqMeJ1aYejXRK3KOphIUDw6pLIplEW17A=="
+      "version": "18.18.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.6.tgz",
+      "integrity": "sha512-wf3Vz+jCmOQ2HV1YUJuCWdL64adYxumkrxtc+H1VUQlnQI04+5HtH+qZCOE21lBE7gIrt+CwX2Wv8Acrw5Ak6w=="
     },
     "node_modules/@types/normalize-package-data": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
-      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw=="
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.3.tgz",
+      "integrity": "sha512-ehPtgRgaULsFG8x0NeYJvmyH1hmlfsNLujHe9dQEia/7MAJYdzMSi19JtchUHjmBA6XC/75dK55mzZH+RyieSg=="
     },
     "node_modules/@types/semver": {
-      "version": "7.5.2",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.2.tgz",
-      "integrity": "sha512-7aqorHYgdNO4DM36stTiGO3DvKoex9TQRwsJU6vMaFGyqpBA1MNZkz+PG3gaNUPpTAOYhT1WR7M1JyA3fbS9Cw=="
-    },
-    "node_modules/@types/shelljs": {
-      "version": "0.8.12",
-      "resolved": "https://registry.npmjs.org/@types/shelljs/-/shelljs-0.8.12.tgz",
-      "integrity": "sha512-ZA8U81/gldY+rR5zl/7HSHrG2KDfEb3lzG6uCUDhW1DTQE9yC/VBQ45fXnXq8f3CgInfhZmjtdu/WOUlrXRQUg==",
-      "dev": true,
-      "dependencies": {
-        "@types/glob": "~7.2.0",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/shelljs/node_modules/@types/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
-      "dev": true,
-      "dependencies": {
-        "@types/minimatch": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/shelljs/node_modules/@types/minimatch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
-      "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
-      "dev": true
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ=="
     },
     "node_modules/@types/sinon": {
-      "version": "10.0.16",
-      "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.16.tgz",
-      "integrity": "sha512-j2Du5SYpXZjJVJtXBokASpPRj+e2z+VUhCPHmM6WMfe3dpHu6iVKJMU6AiBcMp/XTAYnEj6Wc1trJUWwZ0QaAQ==",
+      "version": "10.0.20",
+      "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.20.tgz",
+      "integrity": "sha512-2APKKruFNCAZgx3daAyACGzWuJ028VVCUDk6o2rw/Z4PXT0ogwdV4KUegW0MwVs0Zu59auPXbbuBJHF12Sx1Eg==",
       "dev": true,
       "dependencies": {
         "@types/sinonjs__fake-timers": "*"
       }
     },
     "node_modules/@types/sinon-chai": {
-      "version": "3.2.9",
-      "resolved": "https://registry.npmjs.org/@types/sinon-chai/-/sinon-chai-3.2.9.tgz",
-      "integrity": "sha512-/19t63pFYU0ikrdbXKBWj9PCdnKyTd0Qkz0X91Ta081cYsq90OxYdcWwK/dwEoDa6dtXgj2HJfmzgq+QZTHdmQ==",
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/@types/sinon-chai/-/sinon-chai-3.2.11.tgz",
+      "integrity": "sha512-1C5SBFzwn9hjiMr1xfqbULcSI9qXVpkGZT/LYbbd3jWiTo2MSvA+iFfwODlSoAXGeCgBw6S509dxy8zSIacr3Q==",
       "dev": true,
       "dependencies": {
         "@types/chai": "*",
@@ -3262,64 +3372,64 @@
       }
     },
     "node_modules/@types/sinonjs__fake-timers": {
-      "version": "8.1.2",
-      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.2.tgz",
-      "integrity": "sha512-9GcLXF0/v3t80caGs5p2rRfkB+a8VBGLJZVih6CNFkx8IZ994wiKKLSRs9nuFwk1HevWs/1mnUmkApGrSGsShA==",
+      "version": "8.1.4",
+      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.4.tgz",
+      "integrity": "sha512-GDV68H0mBSN449sa5HEj51E0wfpVQb8xNSMzxf/PrypMFcLTMwJMOM/cgXiv71Mq5drkOQmUGvL1okOZcu6RrQ==",
       "dev": true
     },
     "node_modules/@types/stack-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
-      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.2.tgz",
+      "integrity": "sha512-g7CK9nHdwjK2n0ymT2CW698FuWJRIx+RP6embAzZ2Qi8/ilIrA1Imt2LVSeHUzKvpoi7BhmmQcXz95eS0f2JXw==",
       "dev": true
     },
     "node_modules/@types/through": {
-      "version": "0.0.31",
-      "resolved": "https://registry.npmjs.org/@types/through/-/through-0.0.31.tgz",
-      "integrity": "sha512-LpKpmb7FGevYgXnBXYs6HWnmiFyVG07Pt1cnbgM1IhEacITTiUaBXXvOR3Y50ksaJWGSfhbEvQFivQEFGCC55w==",
+      "version": "0.0.32",
+      "resolved": "https://registry.npmjs.org/@types/through/-/through-0.0.32.tgz",
+      "integrity": "sha512-7XsfXIsjdfJM2wFDRAtEWp3zb2aVPk5QeyZxGlVK57q4u26DczMHhJmlhr0Jqv0THwxam/L8REXkj8M2I/lcvw==",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/triple-beam": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.3.tgz",
-      "integrity": "sha512-6tOUG+nVHn0cJbVp25JFayS5UE6+xlbcNF9Lo9mU7U0zk3zeUShZied4YEQZjy1JBF043FSkdXw8YkUJuVtB5g=="
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.4.tgz",
+      "integrity": "sha512-HlJjF3wxV4R2VQkFpKe0YqJLilYNgtRtsqqZtby7RkVsSs+i+vbyzjtUwpFEdUCKcrGzCiEJE7F/0mKjh0sunA=="
     },
     "node_modules/@types/vinyl": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.7.tgz",
-      "integrity": "sha512-4UqPv+2567NhMQuMLdKAyK4yzrfCqwaTt6bLhHEs8PFcxbHILsrxaY63n4wgE/BRLDWDQeI+WcTmkXKExh9hQg==",
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.9.tgz",
+      "integrity": "sha512-KCr4aTEUkzSF89qw09e2oxsC/RXXT3K5ZPv4gvj3XTiWVrxNoi7WrqNTahNE/Hul5C9z3B8w+yWNTQgua12oag==",
       "dependencies": {
         "@types/expect": "^1.20.4",
         "@types/node": "*"
       }
     },
     "node_modules/@types/yargs": {
-      "version": "17.0.24",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
-      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "version": "17.0.29",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz",
+      "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==",
       "dev": true,
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
     "node_modules/@types/yargs-parser": {
-      "version": "21.0.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
-      "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
+      "version": "21.0.2",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.2.tgz",
+      "integrity": "sha512-5qcvofLPbfjmBfKaLfj/+f+Sbd6pN4zl7w7VSVI5uz7m9QZTuB2aZAa2uo1wHFBNN2x6g/SoTkXmd8mQnQF2Cw==",
       "dev": true
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.0.tgz",
-      "integrity": "sha512-gUqtknHm0TDs1LhY12K2NA3Rmlmp88jK9Tx8vGZMfHeNMLE3GH2e9TRub+y+SOjuYgtOmok+wt1AyDPZqxbNag==",
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.8.0.tgz",
+      "integrity": "sha512-GosF4238Tkes2SHPQ1i8f6rMtG6zlKwMEB0abqSJ3Npvos+doIlc/ATG+vX1G9coDF3Ex78zM3heXHLyWEwLUw==",
       "dependencies": {
         "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.7.0",
-        "@typescript-eslint/type-utils": "6.7.0",
-        "@typescript-eslint/utils": "6.7.0",
-        "@typescript-eslint/visitor-keys": "6.7.0",
+        "@typescript-eslint/scope-manager": "6.8.0",
+        "@typescript-eslint/type-utils": "6.8.0",
+        "@typescript-eslint/utils": "6.8.0",
+        "@typescript-eslint/visitor-keys": "6.8.0",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
         "ignore": "^5.2.4",
@@ -3345,14 +3455,14 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.7.0.tgz",
-      "integrity": "sha512-jZKYwqNpNm5kzPVP5z1JXAuxjtl2uG+5NpaMocFPTNC2EdYIgbXIPImObOkhbONxtFTTdoZstLZefbaK+wXZng==",
-      "dependencies": {
-        "@typescript-eslint/scope-manager": "6.7.0",
-        "@typescript-eslint/types": "6.7.0",
-        "@typescript-eslint/typescript-estree": "6.7.0",
-        "@typescript-eslint/visitor-keys": "6.7.0",
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.8.0.tgz",
+      "integrity": "sha512-5tNs6Bw0j6BdWuP8Fx+VH4G9fEPDxnVI7yH1IAPkQH5RUtvKwRoqdecAPdQXv4rSOADAaz1LFBZvZG7VbXivSg==",
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "6.8.0",
+        "@typescript-eslint/types": "6.8.0",
+        "@typescript-eslint/typescript-estree": "6.8.0",
+        "@typescript-eslint/visitor-keys": "6.8.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -3372,12 +3482,12 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.7.0.tgz",
-      "integrity": "sha512-lAT1Uau20lQyjoLUQ5FUMSX/dS07qux9rYd5FGzKz/Kf8W8ccuvMyldb8hadHdK/qOI7aikvQWqulnEq2nCEYA==",
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.8.0.tgz",
+      "integrity": "sha512-xe0HNBVwCph7rak+ZHcFD6A+q50SMsFwcmfdjs9Kz4qDh5hWhaPhFjRs/SODEhroBI5Ruyvyz9LfwUJ624O40g==",
       "dependencies": {
-        "@typescript-eslint/types": "6.7.0",
-        "@typescript-eslint/visitor-keys": "6.7.0"
+        "@typescript-eslint/types": "6.8.0",
+        "@typescript-eslint/visitor-keys": "6.8.0"
       },
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -3388,12 +3498,12 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.7.0.tgz",
-      "integrity": "sha512-f/QabJgDAlpSz3qduCyQT0Fw7hHpmhOzY/Rv6zO3yO+HVIdPfIWhrQoAyG+uZVtWAIS85zAyzgAFfyEr+MgBpg==",
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.8.0.tgz",
+      "integrity": "sha512-RYOJdlkTJIXW7GSldUIHqc/Hkto8E+fZN96dMIFhuTJcQwdRoGN2rEWA8U6oXbLo0qufH7NPElUb+MceHtz54g==",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "6.7.0",
-        "@typescript-eslint/utils": "6.7.0",
+        "@typescript-eslint/typescript-estree": "6.8.0",
+        "@typescript-eslint/utils": "6.8.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.0.1"
       },
@@ -3414,9 +3524,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.7.0.tgz",
-      "integrity": "sha512-ihPfvOp7pOcN/ysoj0RpBPOx3HQTJTrIN8UZK+WFd3/iDeFHHqeyYxa4hQk4rMhsz9H9mXpR61IzwlBVGXtl9Q==",
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.8.0.tgz",
+      "integrity": "sha512-p5qOxSum7W3k+llc7owEStXlGmSl8FcGvhYt8Vjy7FqEnmkCVlM3P57XQEGj58oqaBWDQXbJDZxwUWMS/EAPNQ==",
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
       },
@@ -3426,12 +3536,12 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.0.tgz",
-      "integrity": "sha512-dPvkXj3n6e9yd/0LfojNU8VMUGHWiLuBZvbM6V6QYD+2qxqInE7J+J/ieY2iGwR9ivf/R/haWGkIj04WVUeiSQ==",
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.8.0.tgz",
+      "integrity": "sha512-ISgV0lQ8XgW+mvv5My/+iTUdRmGspducmQcDw5JxznasXNnZn3SKNrTRuMsEXv+V/O+Lw9AGcQCfVaOPCAk/Zg==",
       "dependencies": {
-        "@typescript-eslint/types": "6.7.0",
-        "@typescript-eslint/visitor-keys": "6.7.0",
+        "@typescript-eslint/types": "6.8.0",
+        "@typescript-eslint/visitor-keys": "6.8.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -3452,16 +3562,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.7.0.tgz",
-      "integrity": "sha512-MfCq3cM0vh2slSikQYqK2Gq52gvOhe57vD2RM3V4gQRZYX4rDPnKLu5p6cm89+LJiGlwEXU8hkYxhqqEC/V3qA==",
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.8.0.tgz",
+      "integrity": "sha512-dKs1itdE2qFG4jr0dlYLQVppqTE+Itt7GmIf/vX6CSvsW+3ov8PbWauVKyyfNngokhIO9sKZeRGCUo1+N7U98Q==",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.12",
         "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.7.0",
-        "@typescript-eslint/types": "6.7.0",
-        "@typescript-eslint/typescript-estree": "6.7.0",
+        "@typescript-eslint/scope-manager": "6.8.0",
+        "@typescript-eslint/types": "6.8.0",
+        "@typescript-eslint/typescript-estree": "6.8.0",
         "semver": "^7.5.4"
       },
       "engines": {
@@ -3476,11 +3586,11 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.0.tgz",
-      "integrity": "sha512-/C1RVgKFDmGMcVGeD8HjKv2bd72oI1KxQDeY8uc66gw9R0OK0eMq48cA+jv9/2Ag6cdrsUGySm1yzYmfz0hxwQ==",
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.8.0.tgz",
+      "integrity": "sha512-oqAnbA7c+pgOhW2OhGvxm0t1BULX5peQI/rLsNDpGM78EebV3C9IGbX5HNZabuZ6UQrYveCLjKo8Iy/lLlBkkg==",
       "dependencies": {
-        "@typescript-eslint/types": "6.7.0",
+        "@typescript-eslint/types": "6.8.0",
         "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
@@ -3491,10 +3601,15 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@yeoman/adapter": {
+    "node_modules/@ungap/structured-clone": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@yeoman/adapter/-/adapter-1.2.0.tgz",
-      "integrity": "sha512-QusuF/ROQ52ADqPLWhISUjQeDVzbWADw4lc3xHVQWtzM7p0SYbPbOrtX98aeIGja8E/B8npMTnRnf/oF+UETVg==",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ=="
+    },
+    "node_modules/@yeoman/adapter": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@yeoman/adapter/-/adapter-1.4.0.tgz",
+      "integrity": "sha512-JroPWaZ8fALkfRt1FVM8/jz0kGOviVkKaCR4y0EM9Si2B9UD4UySGLCrjyUWeWBGqgr2iGAQ0ehoHjRAlyzsFg==",
       "dependencies": {
         "@types/inquirer": "^9.0.3",
         "chalk": "^5.2.0",
@@ -3508,13 +3623,13 @@
         "node": "^16.13.0 || >=18.12.0"
       },
       "peerDependencies": {
-        "@yeoman/types": "^1.0.0"
+        "@yeoman/types": "^1.1.0"
       }
     },
     "node_modules/@yeoman/conflicter": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/@yeoman/conflicter/-/conflicter-1.0.10.tgz",
-      "integrity": "sha512-lMIjLYBCLk/3y9dC1/ZTb3wR/AwRWQGyA1mh+9hW6PXeqnFcSLbEHsfWOpmIuXPEK5bX2OJiCAecn9Gh0X4EQw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@yeoman/conflicter/-/conflicter-1.1.0.tgz",
+      "integrity": "sha512-TCh8zVOBYkVXdMllUzrTgkY2qwqnbtZCMOSP3t++xfATXXFTvo3m/j3MJZwi3dHDJw/+TmtKStymTVbvrRCdyA==",
       "dependencies": {
         "@types/node": "^16.18.28",
         "@yeoman/transform": "^1.2.0",
@@ -3523,24 +3638,27 @@
         "dateformat": "^5.0.3",
         "diff": "^5.1.0",
         "isbinaryfile": "^5.0.0",
-        "mem-fs": "^3.0.0",
         "mem-fs-editor": "^10.0.2",
         "minimatch": "^9.0.0",
         "p-transform": "^4.0.5",
         "pretty-bytes": "^6.1.0",
         "textextensions": "^5.16.0"
       },
+      "acceptDependencies": {
+        "mem-fs": ">=3.0.0"
+      },
       "engines": {
         "node": "^16.13.0 || >=18.12.0"
       },
       "peerDependencies": {
-        "@yeoman/types": "^1.0.0"
+        "@yeoman/types": "^1.0.0",
+        "mem-fs": "^3.0.0"
       }
     },
     "node_modules/@yeoman/conflicter/node_modules/@types/node": {
-      "version": "16.18.51",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.51.tgz",
-      "integrity": "sha512-LKA7ZhY30I8PiUOzBzhtnIULQTACpiEpPXLiYMWyS+tPAORf+rmXUadHZXB/KFrFyMjeHeKc1GFvLd+3f7LE3w=="
+      "version": "16.18.59",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.59.tgz",
+      "integrity": "sha512-PJ1w2cNeKUEdey4LiPra0ZuxZFOGvetswE8qHRriV/sUkL5Al4tTmPV9D2+Y/TPIxTHHgxTfRjZVKWhPw/ORhQ=="
     },
     "node_modules/@yeoman/namespace": {
       "version": "1.0.0",
@@ -3564,17 +3682,21 @@
       }
     },
     "node_modules/@yeoman/transform/node_modules/@types/node": {
-      "version": "16.18.51",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.51.tgz",
-      "integrity": "sha512-LKA7ZhY30I8PiUOzBzhtnIULQTACpiEpPXLiYMWyS+tPAORf+rmXUadHZXB/KFrFyMjeHeKc1GFvLd+3f7LE3w=="
+      "version": "16.18.59",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.59.tgz",
+      "integrity": "sha512-PJ1w2cNeKUEdey4LiPra0ZuxZFOGvetswE8qHRriV/sUkL5Al4tTmPV9D2+Y/TPIxTHHgxTfRjZVKWhPw/ORhQ=="
     },
     "node_modules/@yeoman/types": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@yeoman/types/-/types-1.0.1.tgz",
-      "integrity": "sha512-uLRh1e6OSzIMOYISr8ySl3rypG2hFvtTwiKUP8uY4bhgSDH8jF0APYOJuFEen1VxmY5HbACZuVXmVdfZ6DJuWg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@yeoman/types/-/types-1.1.1.tgz",
+      "integrity": "sha512-BErzFIs5ETmbwSCBT24ZL+TVjFik+CbrHpeO1DUeWwwx3nfE6IJOp5hAwSdnASsPQAbtaBHrt/if6Q/3HTCS3g==",
       "dependencies": {
         "@types/node": "^16.18.26"
       },
+      "acceptDependencies": {
+        "mem-fs": "^4.0.0-beta.1",
+        "mem-fs-editor": ">=10.0.2"
+      },
       "engines": {
         "node": "^16.13.0 || >=18.12.0"
       },
@@ -3596,9 +3718,9 @@
       }
     },
     "node_modules/@yeoman/types/node_modules/@types/node": {
-      "version": "16.18.51",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.51.tgz",
-      "integrity": "sha512-LKA7ZhY30I8PiUOzBzhtnIULQTACpiEpPXLiYMWyS+tPAORf+rmXUadHZXB/KFrFyMjeHeKc1GFvLd+3f7LE3w=="
+      "version": "16.18.59",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.59.tgz",
+      "integrity": "sha512-PJ1w2cNeKUEdey4LiPra0ZuxZFOGvetswE8qHRriV/sUkL5Al4tTmPV9D2+Y/TPIxTHHgxTfRjZVKWhPw/ORhQ=="
     },
     "node_modules/abbrev": {
       "version": "2.0.0",
@@ -4029,9 +4151,9 @@
       "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg=="
     },
     "node_modules/axios": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.0.tgz",
-      "integrity": "sha512-D4DdjDo5CY50Qms0qGQTTw6Q44jl7zRwY7bthds06pUGfChBCTcQs+N743eFWGEd6pRTMd6A+I87aWyFV5wiZQ==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
+      "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -4123,9 +4245,9 @@
       }
     },
     "node_modules/bin-links": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-4.0.2.tgz",
-      "integrity": "sha512-jxJ0PbXR8eQyPlExCvCs3JFnikvs1Yp4gUJt6nmgathdOwvur+q22KWC3h20gvWl4T/14DXKj2IlkJwwZkZPOw==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-4.0.3.tgz",
+      "integrity": "sha512-obsRaULtJurnfox/MDwgq6Yo9kzbv1CPTk/1/s7Z/61Lezc8IKkFCOXNeVLXz0456WRzBQmSsDWlai2tIhBsfA==",
       "dependencies": {
         "cmd-shim": "^6.0.0",
         "npm-normalize-package-bin": "^3.0.0",
@@ -4177,48 +4299,6 @@
         "readable-stream": "^3.4.0"
       }
     },
-    "node_modules/bl/node_modules/buffer": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.2.1"
-      }
-    },
-    "node_modules/bl/node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
     "node_modules/bl/node_modules/readable-stream": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
@@ -4282,9 +4362,9 @@
       "peer": true
     },
     "node_modules/browserslist": {
-      "version": "4.21.10",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz",
-      "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
+      "version": "4.22.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz",
+      "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==",
       "dev": true,
       "funding": [
         {
@@ -4301,10 +4381,10 @@
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001517",
-        "electron-to-chromium": "^1.4.477",
+        "caniuse-lite": "^1.0.30001541",
+        "electron-to-chromium": "^1.4.535",
         "node-releases": "^2.0.13",
-        "update-browserslist-db": "^1.0.11"
+        "update-browserslist-db": "^1.0.13"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -4328,6 +4408,29 @@
       "integrity": "sha512-gvW7InbIyF8AicrqWoptdW08pUxuhq8BEgowNajy9RhiE86fmGAGl+bLKo6oB8QP0CkqHLowfN0oJdKC/J6LbA==",
       "dev": true
     },
+    "node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
     "node_modules/buffer-equal-constant-time": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
@@ -4357,14 +4460,14 @@
       }
     },
     "node_modules/cacache": {
-      "version": "17.1.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz",
-      "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==",
+      "version": "18.0.0",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.0.tgz",
+      "integrity": "sha512-I7mVOPl3PUCeRub1U8YoGz2Lqv9WOBpobZ8RyWFXmReuILz+3OAyTa5oH3QPdtKZD7N0Yk00aLfzn0qvp8dZ1w==",
       "dependencies": {
         "@npmcli/fs": "^3.1.0",
         "fs-minipass": "^3.0.0",
         "glob": "^10.2.2",
-        "lru-cache": "^7.7.1",
+        "lru-cache": "^10.0.1",
         "minipass": "^7.0.3",
         "minipass-collect": "^1.0.2",
         "minipass-flush": "^1.0.5",
@@ -4375,15 +4478,15 @@
         "unique-filename": "^3.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/cacache/node_modules/lru-cache": {
-      "version": "7.18.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz",
+      "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==",
       "engines": {
-        "node": ">=12"
+        "node": "14 || >=16.14"
       }
     },
     "node_modules/cacache/node_modules/p-map": {
@@ -4409,11 +4512,11 @@
       }
     },
     "node_modules/cacheable-request": {
-      "version": "10.2.13",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.13.tgz",
-      "integrity": "sha512-3SD4rrMu1msNGEtNSt8Od6enwdo//U9s4ykmXfA2TD58kcLkCobtCDiby7kNyj7a/Q7lz/mAesAFI54rTdnvBA==",
+      "version": "10.2.14",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.14.tgz",
+      "integrity": "sha512-zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ==",
       "dependencies": {
-        "@types/http-cache-semantics": "^4.0.1",
+        "@types/http-cache-semantics": "^4.0.2",
         "get-stream": "^6.0.1",
         "http-cache-semantics": "^4.1.1",
         "keyv": "^4.5.3",
@@ -4437,12 +4540,13 @@
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
+      "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.1",
+        "set-function-length": "^1.1.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -4520,9 +4624,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001534",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001534.tgz",
-      "integrity": "sha512-vlPVrhsCS7XaSh2VvWluIQEzVhefrUQcEsQWSS5A5V+dM07uv1qHeQzAOTGIMy9i3e9bH15+muvI/UHojVgS/Q==",
+      "version": "1.0.30001551",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001551.tgz",
+      "integrity": "sha512-vtBAez47BoGMMzlbYhfXrMV1kvRF2WP/lqiMuDu1Sb4EE4LKEgjopFDSRtZfdVnslNRpOqV/woE+Xgrwj6VQlg==",
       "dev": true,
       "funding": [
         {
@@ -4557,18 +4661,18 @@
       }
     },
     "node_modules/chai": {
-      "version": "4.3.8",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.8.tgz",
-      "integrity": "sha512-vX4YvVVtxlfSZ2VecZgFUTU5qPCYsobVI2O9FmwEXBhDigYGQA6jRXCycIs1yJnnWbZ6/+a2zNIF5DfVCcJBFQ==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz",
+      "integrity": "sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==",
       "dev": true,
       "dependencies": {
         "assertion-error": "^1.1.0",
-        "check-error": "^1.0.2",
-        "deep-eql": "^4.1.2",
-        "get-func-name": "^2.0.0",
-        "loupe": "^2.3.1",
+        "check-error": "^1.0.3",
+        "deep-eql": "^4.1.3",
+        "get-func-name": "^2.0.2",
+        "loupe": "^2.3.6",
         "pathval": "^1.1.1",
-        "type-detect": "^4.0.5"
+        "type-detect": "^4.0.8"
       },
       "engines": {
         "node": ">=4"
@@ -4591,10 +4695,13 @@
       "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
     },
     "node_modules/check-error": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
+      "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
       "dev": true,
+      "dependencies": {
+        "get-func-name": "^2.0.2"
+      },
       "engines": {
         "node": "*"
       }
@@ -4648,9 +4755,9 @@
       }
     },
     "node_modules/ci-info": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
-      "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
       "dev": true,
       "funding": [
         {
@@ -4789,9 +4896,9 @@
       "integrity": "sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag=="
     },
     "node_modules/cmd-shim": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-6.0.1.tgz",
-      "integrity": "sha512-S9iI9y0nKR4hwEQsVWpyxld/6kRfGepGfzff83FcaiEBpmvlbA2nnGe7Cylgrx2f/p1P5S5wpRm9oL8z1PbS3Q==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-6.0.2.tgz",
+      "integrity": "sha512-+FFYbB0YLaAkhkcrjkyNLYDiOsFSfRjwjY19LXk/psmMx1z00xlCv7hhQoTGXXIKi+YXHL/iiFo8NqMVQX9nOw==",
       "engines": {
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
@@ -4864,9 +4971,9 @@
       }
     },
     "node_modules/commander": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-11.0.0.tgz",
-      "integrity": "sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz",
+      "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==",
       "engines": {
         "node": ">=16"
       }
@@ -4887,9 +4994,9 @@
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
     },
     "node_modules/concurrently": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-8.2.1.tgz",
-      "integrity": "sha512-nVraf3aXOpIcNud5pB9M82p1tynmZkrSGQ1p6X/VY8cJ+2LMVqAgXsJxYYefACSHbTYlm92O1xuhdGTjwoEvbQ==",
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-8.2.2.tgz",
+      "integrity": "sha512-1dP4gpXFhei8IOtlXRE/T/4H88ElHgTiUzh71YUmtjTEHMSRS2Z/fgOxHSxxusGHogsRfxNq1vyAwxSC+EVyDg==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.1.2",
@@ -5016,9 +5123,9 @@
       "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="
     },
     "node_modules/convert-source-map": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
       "dev": true
     },
     "node_modules/core-util-is": {
@@ -5434,9 +5541,9 @@
       }
     },
     "node_modules/define-data-property": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz",
-      "integrity": "sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
+      "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
       "dependencies": {
         "get-intrinsic": "^1.2.1",
         "gopd": "^1.0.1",
@@ -5500,9 +5607,9 @@
       }
     },
     "node_modules/detect-newline": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-4.0.0.tgz",
-      "integrity": "sha512-1aXUEPdfGdzVPFpzGJJNgq9o81bGg1s09uxTWsqBlo9PI332uyJRQq13+LK/UN4JfxJbFdCXonUFQ9R/p7yCtw==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-4.0.1.tgz",
+      "integrity": "sha512-qE3Veg1YXzGHQhlA6jzebZN2qVf6NX+A7m7qlhCGG30dJixrAQhYOsJjsnBjJkCSmuOPpCk30145fr8FV0bzog==",
       "engines": {
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
@@ -5713,9 +5820,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.523",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.523.tgz",
-      "integrity": "sha512-9AreocSUWnzNtvLcbpng6N+GkXnCcBR80IQkxRC9Dfdyg4gaWNUPBujAHUpKkiUkoSoR9UlhA4zD/IgBklmhzg==",
+      "version": "1.4.563",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.563.tgz",
+      "integrity": "sha512-dg5gj5qOgfZNkPNeyKBZQAQitIQ/xwfIDmEQJHCbXaD9ebTZxwJXUsDYcBlAvZGZLi+/354l35J1wkmP6CqYaw==",
       "dev": true
     },
     "node_modules/emoji-regex": {
@@ -5937,17 +6044,18 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.49.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.49.0.tgz",
-      "integrity": "sha512-jw03ENfm6VJI0jA9U+8H5zfl5b+FvuU3YYvZRdZHOlU2ggJkxrlkJH4HcDrZpj6YwD8kuYqvQM8LyesoazrSOQ==",
+      "version": "8.52.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz",
+      "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.49.0",
-        "@humanwhocodes/config-array": "^0.11.11",
+        "@eslint/js": "8.52.0",
+        "@humanwhocodes/config-array": "^0.11.13",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
+        "@ungap/structured-clone": "^1.2.0",
         "ajv": "^6.12.4",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
@@ -6161,13 +6269,13 @@
       }
     },
     "node_modules/eslint-plugin-mocha": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-10.1.0.tgz",
-      "integrity": "sha512-xLqqWUF17llsogVOC+8C6/jvQ+4IoOREbN7ZCHuOHuD6cT5cDD4h7f2LgsZuzMAiwswWE21tO7ExaknHVDrSkw==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-10.2.0.tgz",
+      "integrity": "sha512-ZhdxzSZnd1P9LqDPF0DBcFLpRIGdh1zkF2JHnQklKQOvrQtT73kdP5K9V2mzvbLR+cCAO9OI48NXK/Ax9/ciCQ==",
       "dev": true,
       "dependencies": {
         "eslint-utils": "^3.0.0",
-        "rambda": "^7.1.0"
+        "rambda": "^7.4.0"
       },
       "engines": {
         "node": ">=14.0.0"
@@ -6177,9 +6285,9 @@
       }
     },
     "node_modules/eslint-plugin-prettier": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.0.tgz",
-      "integrity": "sha512-AgaZCVuYDXHUGxj/ZGu1u8H8CYgDY3iG6w5kUFw4AzMVXzB7VvbKgYR4nATIN+OvUrghMbiDLeimVjVY5ilq3w==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.1.tgz",
+      "integrity": "sha512-m3u5RnR56asrwV/lDC4GHorlW75DsFfmUcjfCYylTUs85dBRnB7VM6xG8eCMJdeDRnppzmxZVf1GEPJvl1JmNg==",
       "dev": true,
       "dependencies": {
         "prettier-linter-helpers": "^1.0.0",
@@ -6634,6 +6742,14 @@
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
       "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA=="
     },
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
     "node_modules/execa": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz",
@@ -6745,17 +6861,17 @@
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
     },
     "node_modules/fast-xml-parser": {
-      "version": "4.2.7",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.7.tgz",
-      "integrity": "sha512-J8r6BriSLO1uj2miOk1NW0YVm8AGOOu3Si2HQp/cSmo6EA4m3fcwu2WKjJ4RK9wMLBtg69y1kS8baDiQBR41Ig==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.3.2.tgz",
+      "integrity": "sha512-rmrXUXwbJedoXkStenj1kkljNF7ugn5ZjR9FJcwmCfcCbtOMDghPajbc+Tck6vE6F5XsDmx+Pr2le9fw8+pXBg==",
       "funding": [
-        {
-          "type": "paypal",
-          "url": "https://paypal.me/naturalintelligence"
-        },
         {
           "type": "github",
           "url": "https://github.com/sponsors/NaturalIntelligence"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/naturalintelligence"
         }
       ],
       "dependencies": {
@@ -6897,11 +7013,11 @@
       }
     },
     "node_modules/flat-cache": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.0.tgz",
-      "integrity": "sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz",
+      "integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==",
       "dependencies": {
-        "flatted": "^3.2.7",
+        "flatted": "^3.2.9",
         "keyv": "^4.5.3",
         "rimraf": "^3.0.2"
       },
@@ -6963,22 +7079,22 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
+      "version": "3.2.9",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
+      "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ=="
     },
     "node_modules/fly-import": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/fly-import/-/fly-import-0.3.1.tgz",
-      "integrity": "sha512-cMY2tQvNW/LsgOu5ecwQAH+bwHZMxAC9GXtlv4nzSU/E3q/eqdX/rr2ncPCcnxruQatB/IRn1C26GPffcW6kZg==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/fly-import/-/fly-import-0.4.0.tgz",
+      "integrity": "sha512-sgIZHb7m0eze7hneKzuzXPLWs3RD9vK93Kqc4hvm/eiptVLbYHz4zZp0ckUAXUCoxq5/yGjfh7OUUJOWP9VqGA==",
       "dependencies": {
-        "@npmcli/arborist": "^6.2.9",
+        "@npmcli/arborist": "^7.2.0",
         "env-paths": "^3.0.0",
         "registry-auth-token": "^5.0.2",
         "registry-url": "^6.0.1"
       },
       "engines": {
-        "node": "^16.13.0 || >=18.12.0"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/fn.name": {
@@ -6987,9 +7103,9 @@
       "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+      "version": "1.15.3",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
+      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
       "funding": [
         {
           "type": "individual",
@@ -7102,9 +7218,12 @@
       }
     },
     "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/function.prototype.name": {
       "version": "1.1.6",
@@ -7168,9 +7287,9 @@
       }
     },
     "node_modules/get-func-name": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
+      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
       "dev": true,
       "engines": {
         "node": "*"
@@ -7237,9 +7356,9 @@
       }
     },
     "node_modules/get-tsconfig": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.0.tgz",
-      "integrity": "sha512-pmjiZ7xtB8URYm74PlGJozDNyhvsVLUcpBa8DZBG3bWHwaHa9bPiRpiSfovw+fjhwONSCWKRyk+JQHEGZmMrzw==",
+      "version": "4.7.2",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.2.tgz",
+      "integrity": "sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==",
       "dev": true,
       "dependencies": {
         "resolve-pkg-maps": "^1.0.0"
@@ -7279,18 +7398,18 @@
       }
     },
     "node_modules/glob": {
-      "version": "10.3.4",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.4.tgz",
-      "integrity": "sha512-6LFElP3A+i/Q8XQKEvZjkEWEOTgAIALR9AO2rwT8bgPhDd1anmqDJDZ6lLddI4ehxxxR1S5RIqKe1uapMQfYaQ==",
+      "version": "10.3.10",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
+      "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
       "dependencies": {
         "foreground-child": "^3.1.0",
-        "jackspeak": "^2.0.3",
+        "jackspeak": "^2.3.5",
         "minimatch": "^9.0.1",
         "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
         "path-scurry": "^1.10.1"
       },
       "bin": {
-        "glob": "dist/cjs/src/bin.js"
+        "glob": "dist/esm/bin.mjs"
       },
       "engines": {
         "node": ">=16 || 14 >=14.17"
@@ -7311,9 +7430,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "13.21.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
-      "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
+      "version": "13.23.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
+      "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
       "dependencies": {
         "type-fest": "^0.20.2"
       },
@@ -7491,12 +7610,9 @@
       }
     },
     "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz",
+      "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==",
       "engines": {
         "node": ">= 0.4.0"
       }
@@ -7583,6 +7699,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
       "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+      "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -7594,6 +7711,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
       "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -7604,7 +7722,8 @@
     "node_modules/hosted-git-info/node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
     },
     "node_modules/http-cache-semantics": {
       "version": "4.1.1",
@@ -7690,9 +7809,23 @@
       }
     },
     "node_modules/ieee754": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
     },
     "node_modules/ignore": {
       "version": "5.2.4",
@@ -8404,14 +8537,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/interpret": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
     "node_modules/invert-kv": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-3.0.1.tgz",
@@ -8798,6 +8923,11 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
+    },
     "node_modules/isbinaryfile": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-5.0.0.tgz",
@@ -8854,9 +8984,9 @@
       }
     },
     "node_modules/jackspeak": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.3.tgz",
-      "integrity": "sha512-R2bUw+kVZFS/h1AZqBKrSgDmdmjApzgY0AlCPumopFiAlbUxE2gf+SCuBzQ0cP5hHmUmFYF5yw55T97Th5Kstg==",
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
+      "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
       "dependencies": {
         "@isaacs/cliui": "^8.0.2"
       },
@@ -9077,9 +9207,9 @@
       }
     },
     "node_modules/jest-extended": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/jest-extended/-/jest-extended-4.0.1.tgz",
-      "integrity": "sha512-KM6dwuBUAgy6QONuR19CGubZB9Hkjqvl/d5Yc/FXsdB8+gsGxB2VQ+NEdOrr95J4GMPeLnDoPOKyi6+mKCCnZQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/jest-extended/-/jest-extended-4.0.2.tgz",
+      "integrity": "sha512-FH7aaPgtGYHc9mRjriS0ZEHYM5/W69tLrFTIdzm+yJgeoCmmrSB/luSfMSqWP9O29QWHPEmJ4qmU6EwsZideog==",
       "dev": true,
       "dependencies": {
         "jest-diff": "^29.0.0",
@@ -9593,7 +9723,8 @@
     "node_modules/json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
     },
     "node_modules/json-schema": {
       "version": "0.4.0",
@@ -9746,9 +9877,9 @@
       }
     },
     "node_modules/keyv": {
-      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz",
-      "integrity": "sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==",
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
       "dependencies": {
         "json-buffer": "3.0.1"
       }
@@ -9816,7 +9947,8 @@
     "node_modules/lines-and-columns": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
     },
     "node_modules/linkify-it": {
       "version": "3.0.3",
@@ -9925,25 +10057,28 @@
       }
     },
     "node_modules/logform": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/logform/-/logform-2.5.1.tgz",
-      "integrity": "sha512-9FyqAm9o9NKKfiAKfZoYo9bGXXuwMkxQiQttkT4YjjVtQVIQtK6LmVtlxmCaFswo6N4AfEkHqZTV0taDtPotNg==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/logform/-/logform-2.6.0.tgz",
+      "integrity": "sha512-1ulHeNPp6k/LD8H91o7VYFBng5i1BDE7HoKxVbZiGFidS1Rj65qcywLxX+pVfAPoQJEjRdvKcusKwOupHCVOVQ==",
       "dependencies": {
-        "@colors/colors": "1.5.0",
+        "@colors/colors": "1.6.0",
         "@types/triple-beam": "^1.3.2",
         "fecha": "^4.2.0",
         "ms": "^2.1.1",
         "safe-stable-stringify": "^2.3.1",
         "triple-beam": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 12.0.0"
       }
     },
     "node_modules/loupe": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz",
-      "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==",
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
+      "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
       "dev": true,
       "dependencies": {
-        "get-func-name": "^2.0.0"
+        "get-func-name": "^2.0.1"
       }
     },
     "node_modules/lowercase-keys": {
@@ -10002,6 +10137,36 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/make-fetch-happen/node_modules/cacache": {
+      "version": "17.1.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz",
+      "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==",
+      "dependencies": {
+        "@npmcli/fs": "^3.1.0",
+        "fs-minipass": "^3.0.0",
+        "glob": "^10.2.2",
+        "lru-cache": "^7.7.1",
+        "minipass": "^7.0.3",
+        "minipass-collect": "^1.0.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "p-map": "^4.0.0",
+        "ssri": "^10.0.0",
+        "tar": "^6.1.11",
+        "unique-filename": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/cacache/node_modules/minipass": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
+      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
     "node_modules/make-fetch-happen/node_modules/lru-cache": {
       "version": "7.18.3",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
@@ -10018,15 +10183,29 @@
         "node": ">=8"
       }
     },
-    "node_modules/makeerror": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
-      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
-      "dev": true,
+    "node_modules/make-fetch-happen/node_modules/p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
       "dependencies": {
-        "tmpl": "1.0.5"
-      }
-    },
+        "aggregate-error": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/makeerror": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+      "dev": true,
+      "dependencies": {
+        "tmpl": "1.0.5"
+      }
+    },
     "node_modules/map-obj": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
@@ -10084,23 +10263,23 @@
       "dev": true
     },
     "node_modules/mem-fs": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mem-fs/-/mem-fs-3.0.0.tgz",
-      "integrity": "sha512-ORIMUgVVaKTsruUnt8qka8CD0T05mQnW5m7OZ/JtyUcfXKZ5vvHNf34CHvfbpd+WYm+6iWXKS5MvO6zhjJWlrg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mem-fs/-/mem-fs-4.0.0.tgz",
+      "integrity": "sha512-GCt8Xh5cRZ1ep45A8T+NlUYCPHzSj5JG2Xo7CA4Z8ISZ8Ovw0UQhQGt+J/z2xk7M3F9F4X9ZjSYk9UYlLLy4Wg==",
       "dependencies": {
-        "@types/node": "^18.15.11",
-        "@types/vinyl": "^2.0.7",
+        "@types/node": "^20.8.3",
+        "@types/vinyl": "^2.0.8",
         "vinyl": "^3.0.0",
         "vinyl-file": "^5.0.0"
       },
       "engines": {
-        "node": ">=16.13.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/mem-fs-editor": {
-      "version": "10.0.2",
-      "resolved": "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-10.0.2.tgz",
-      "integrity": "sha512-9lhR40QDM8okLk3abz3ZaoaLZA+Pt7qLgFG2m1P74+Ax+DnLSnlhyXQ+8r56OuTJpSS1llqqr77jiZBRb1gNHg==",
+      "version": "10.0.3",
+      "resolved": "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-10.0.3.tgz",
+      "integrity": "sha512-EfE+MKDgfplq6wtS0mRP/4hKNBLfVqc1dhnNEIJRQS9neTCAI3SkHQDToh9fvp02QtICiyGVR1/jJPFE7AFIpQ==",
       "dependencies": {
         "@types/ejs": "^3.1.2",
         "binaryextensions": "^4.16.0",
@@ -10116,6 +10295,9 @@
         "textextensions": "^5.13.0",
         "vinyl": "^3.0.0"
       },
+      "acceptDependencies": {
+        "mem-fs": "^4.0.0"
+      },
       "engines": {
         "node": ">=16.13.0"
       }
@@ -10149,6 +10331,14 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/mem-fs/node_modules/@types/node": {
+      "version": "20.8.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.7.tgz",
+      "integrity": "sha512-21TKHHh3eUHIi2MloeptJWALuCu5H7HQTdTrWIFReA8ad+aggoX+lRes3ex7/FtpC+sVUpFMQ+QTfYr74mruiQ==",
+      "dependencies": {
+        "undici-types": "~5.25.1"
+      }
+    },
     "node_modules/meow": {
       "version": "12.1.1",
       "resolved": "https://registry.npmjs.org/meow/-/meow-12.1.1.tgz",
@@ -10291,9 +10481,9 @@
       }
     },
     "node_modules/minipass": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz",
-      "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
+      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
       "engines": {
         "node": ">=16 || 14 >=14.17"
       }
@@ -11027,9 +11217,9 @@
       "dev": true
     },
     "node_modules/nise": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.4.tgz",
-      "integrity": "sha512-8+Ib8rRJ4L0o3kfmyVCL7gzrohyDe0cMFTBa2d364yIrEGMEoetznKJx899YxjybU6bL9SQkYPSBBs1gyYs8Xg==",
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.5.tgz",
+      "integrity": "sha512-VJuPIfUFaXNRzETTQEEItTOP8Y171ijr+JLq42wHes3DiryR8vT+1TXQW/Rx8JNUhyYYWyIvjXTU6dOhJcs9Nw==",
       "dev": true,
       "dependencies": {
         "@sinonjs/commons": "^2.0.0",
@@ -11048,6 +11238,24 @@
         "type-detect": "4.0.8"
       }
     },
+    "node_modules/nise/node_modules/@sinonjs/fake-timers": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
+      "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
+      "dev": true,
+      "dependencies": {
+        "@sinonjs/commons": "^3.0.0"
+      }
+    },
+    "node_modules/nise/node_modules/@sinonjs/fake-timers/node_modules/@sinonjs/commons": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz",
+      "integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==",
+      "dev": true,
+      "dependencies": {
+        "type-detect": "4.0.8"
+      }
+    },
     "node_modules/node-fetch": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
@@ -11263,6 +11471,7 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
       "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+      "dev": true,
       "dependencies": {
         "hosted-git-info": "^4.0.1",
         "is-core-module": "^2.5.0",
@@ -11304,9 +11513,9 @@
       }
     },
     "node_modules/npm-install-checks": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.2.0.tgz",
-      "integrity": "sha512-744wat5wAAHsxa4590mWO0tJ8PKxR8ORZsH9wGpQc3nWTzozMAgBN/XyqYw7mg3yqLM8dLwEnwSfKMmXAjF69g==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz",
+      "integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==",
       "dependencies": {
         "semver": "^7.1.1"
       },
@@ -11323,42 +11532,42 @@
       }
     },
     "node_modules/npm-package-arg": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz",
-      "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==",
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.1.tgz",
+      "integrity": "sha512-M7s1BD4NxdAvBKUPqqRW957Xwcl/4Zvo8Aj+ANrzvIPzGJZElrH7Z//rSaec2ORcND6FHHLnZeY8qgTpXDMFQQ==",
       "dependencies": {
-        "hosted-git-info": "^6.0.0",
+        "hosted-git-info": "^7.0.0",
         "proc-log": "^3.0.0",
         "semver": "^7.3.5",
         "validate-npm-package-name": "^5.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/npm-package-arg/node_modules/hosted-git-info": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
-      "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.1.tgz",
+      "integrity": "sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==",
       "dependencies": {
-        "lru-cache": "^7.5.1"
+        "lru-cache": "^10.0.1"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/npm-package-arg/node_modules/lru-cache": {
-      "version": "7.18.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz",
+      "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==",
       "engines": {
-        "node": ">=12"
+        "node": "14 || >=16.14"
       }
     },
     "node_modules/npm-packlist": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-7.0.4.tgz",
-      "integrity": "sha512-d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-8.0.0.tgz",
+      "integrity": "sha512-ErAGFB5kJUciPy1mmx/C2YFbvxoJ0QJ9uwkCZOeR6CqLLISPZBOiFModAbSXnjjlwW5lOhuhXva+fURsSGJqyw==",
       "dependencies": {
         "ignore-walk": "^6.0.0"
       },
@@ -11367,42 +11576,55 @@
       }
     },
     "node_modules/npm-pick-manifest": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.2.tgz",
-      "integrity": "sha512-1dKY+86/AIiq1tkKVD3l0WI+Gd3vkknVGAggsFeBkTvbhMQ1OND/LKkYv4JtXPKUJ8bOTCyLiqEg2P6QNdK+Gg==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.0.0.tgz",
+      "integrity": "sha512-VfvRSs/b6n9ol4Qb+bDwNGUXutpy76x6MARw/XssevE0TnctIKcmklJZM5Z7nqs5z5aW+0S63pgCNbpkUNNXBg==",
       "dependencies": {
         "npm-install-checks": "^6.0.0",
         "npm-normalize-package-bin": "^3.0.0",
-        "npm-package-arg": "^10.0.0",
+        "npm-package-arg": "^11.0.0",
         "semver": "^7.3.5"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/npm-registry-fetch": {
-      "version": "14.0.5",
-      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.5.tgz",
-      "integrity": "sha512-kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA==",
+      "version": "16.1.0",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-16.1.0.tgz",
+      "integrity": "sha512-PQCELXKt8Azvxnt5Y85GseQDJJlglTFM9L9U9gkv2y4e9s0k3GVDdOx3YoB6gm2Do0hlkzC39iCGXby+Wve1Bw==",
       "dependencies": {
-        "make-fetch-happen": "^11.0.0",
-        "minipass": "^5.0.0",
+        "make-fetch-happen": "^13.0.0",
+        "minipass": "^7.0.2",
         "minipass-fetch": "^3.0.0",
         "minipass-json-stream": "^1.0.1",
         "minizlib": "^2.1.2",
-        "npm-package-arg": "^10.0.0",
+        "npm-package-arg": "^11.0.0",
         "proc-log": "^3.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
-    "node_modules/npm-registry-fetch/node_modules/minipass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+    "node_modules/npm-registry-fetch/node_modules/make-fetch-happen": {
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.0.tgz",
+      "integrity": "sha512-7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A==",
+      "dependencies": {
+        "@npmcli/agent": "^2.0.0",
+        "cacache": "^18.0.0",
+        "http-cache-semantics": "^4.1.1",
+        "is-lambda": "^1.0.1",
+        "minipass": "^7.0.2",
+        "minipass-fetch": "^3.0.0",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "negotiator": "^0.6.3",
+        "promise-retry": "^2.0.1",
+        "ssri": "^10.0.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/npm-run-path": {
@@ -11453,9 +11675,9 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -11543,21 +11765,21 @@
       }
     },
     "node_modules/octokit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/octokit/-/octokit-3.1.0.tgz",
-      "integrity": "sha512-dmIH5D+edpb4/ASd6ZGo6BiRR1g4ytu8lG4f+6XN/2AW+CSuTsT0nj1d6rv/HKgoflMQ1+rb3KlVWcvrmgQZhw==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/octokit/-/octokit-3.1.1.tgz",
+      "integrity": "sha512-AKJs5XYs7iAh7bskkYpxhUIpsYZdLqjnlnqrN5s9FFZuJ/a6ATUHivGpUKDpGB/xa+LGDtG9Lu8bOCfPM84vHQ==",
       "dev": true,
       "dependencies": {
         "@octokit/app": "^14.0.0",
         "@octokit/core": "^5.0.0",
         "@octokit/oauth-app": "^6.0.0",
         "@octokit/plugin-paginate-graphql": "^4.0.0",
-        "@octokit/plugin-paginate-rest": "^8.0.0",
-        "@octokit/plugin-rest-endpoint-methods": "^9.0.0",
+        "@octokit/plugin-paginate-rest": "^9.0.0",
+        "@octokit/plugin-rest-endpoint-methods": "^10.0.0",
         "@octokit/plugin-retry": "^6.0.0",
-        "@octokit/plugin-throttling": "^7.0.0",
+        "@octokit/plugin-throttling": "^8.0.0",
         "@octokit/request-error": "^5.0.0",
-        "@octokit/types": "^11.1.0"
+        "@octokit/types": "^12.0.0"
       },
       "engines": {
         "node": ">= 18"
@@ -12046,9 +12268,9 @@
       }
     },
     "node_modules/p-transform": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/p-transform/-/p-transform-4.0.5.tgz",
-      "integrity": "sha512-tex6AuOS4oRn/XePj9q9BKMhaAPU6aSjHfz/uyb+MvRKCgPQg8/ndA/cPCiCg2k/4Nur3L009EGQcD9jmI4Qrw==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/p-transform/-/p-transform-4.1.3.tgz",
+      "integrity": "sha512-s7Fg3C3kTi/C3dj8ov8/qI6PnCQhYB/muOLQ9hwc3g/X+DwNtnJ/IBeODwb7QJ83DZL78cjD/BUhQKYSYxj1+w==",
       "dependencies": {
         "@types/node": "^16.18.31",
         "p-queue": "^7.3.0",
@@ -12059,9 +12281,9 @@
       }
     },
     "node_modules/p-transform/node_modules/@types/node": {
-      "version": "16.18.51",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.51.tgz",
-      "integrity": "sha512-LKA7ZhY30I8PiUOzBzhtnIULQTACpiEpPXLiYMWyS+tPAORf+rmXUadHZXB/KFrFyMjeHeKc1GFvLd+3f7LE3w=="
+      "version": "16.18.59",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.59.tgz",
+      "integrity": "sha512-PJ1w2cNeKUEdey4LiPra0ZuxZFOGvetswE8qHRriV/sUkL5Al4tTmPV9D2+Y/TPIxTHHgxTfRjZVKWhPw/ORhQ=="
     },
     "node_modules/p-try": {
       "version": "2.2.0",
@@ -12089,26 +12311,26 @@
       }
     },
     "node_modules/pacote": {
-      "version": "15.2.0",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.2.0.tgz",
-      "integrity": "sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA==",
+      "version": "17.0.4",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-17.0.4.tgz",
+      "integrity": "sha512-eGdLHrV/g5b5MtD5cTPyss+JxOlaOloSMG3UwPMAvL8ywaLJ6beONPF40K4KKl/UI6q5hTKCJq5rCu8tkF+7Dg==",
       "dependencies": {
-        "@npmcli/git": "^4.0.0",
+        "@npmcli/git": "^5.0.0",
         "@npmcli/installed-package-contents": "^2.0.1",
-        "@npmcli/promise-spawn": "^6.0.1",
-        "@npmcli/run-script": "^6.0.0",
-        "cacache": "^17.0.0",
+        "@npmcli/promise-spawn": "^7.0.0",
+        "@npmcli/run-script": "^7.0.0",
+        "cacache": "^18.0.0",
         "fs-minipass": "^3.0.0",
-        "minipass": "^5.0.0",
-        "npm-package-arg": "^10.0.0",
-        "npm-packlist": "^7.0.0",
-        "npm-pick-manifest": "^8.0.0",
-        "npm-registry-fetch": "^14.0.0",
+        "minipass": "^7.0.2",
+        "npm-package-arg": "^11.0.0",
+        "npm-packlist": "^8.0.0",
+        "npm-pick-manifest": "^9.0.0",
+        "npm-registry-fetch": "^16.0.0",
         "proc-log": "^3.0.0",
         "promise-retry": "^2.0.1",
-        "read-package-json": "^6.0.0",
+        "read-package-json": "^7.0.0",
         "read-package-json-fast": "^3.0.0",
-        "sigstore": "^1.3.0",
+        "sigstore": "^2.0.0",
         "ssri": "^10.0.0",
         "tar": "^6.1.11"
       },
@@ -12116,15 +12338,7 @@
         "pacote": "lib/bin.js"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/pacote/node_modules/minipass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-      "engines": {
-        "node": ">=8"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/parent-module": {
@@ -12171,6 +12385,7 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
       "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
@@ -12443,11 +12658,11 @@
       }
     },
     "node_modules/prettier-plugin-packagejson": {
-      "version": "2.4.5",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-packagejson/-/prettier-plugin-packagejson-2.4.5.tgz",
-      "integrity": "sha512-glG71jE1gO3y5+JNAhC8X+4yrlN28rub6Aj461SKbaPie9RgMiHKcInH2Moi2VGOfkTXaEHBhg4uVMBqa+kBUA==",
+      "version": "2.4.6",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-packagejson/-/prettier-plugin-packagejson-2.4.6.tgz",
+      "integrity": "sha512-5JGfzkJRL0DLNyhwmiAV9mV0hZLHDwddFCs2lc9CNxOChpoWUQVe8K4qTMktmevmDlMpok2uT10nvHUyU59sNw==",
       "dependencies": {
-        "sort-package-json": "2.5.1",
+        "sort-package-json": "2.6.0",
         "synckit": "0.8.5"
       },
       "peerDependencies": {
@@ -12460,11 +12675,14 @@
       }
     },
     "node_modules/prettier-plugin-properties": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-properties/-/prettier-plugin-properties-0.2.0.tgz",
-      "integrity": "sha512-Mt+z2nPkG+apJJLxfv8/Z/knhF/pTFUyxTeaRCuvQhs33rzQEkquGXSyKyvcWfijOTlOvB6KnmSJXpmblLNYrQ==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-properties/-/prettier-plugin-properties-0.3.0.tgz",
+      "integrity": "sha512-j2h4NbG6hIaRx0W7CDPUH+yDbzXHmI2urPC1EC8pYrsS5R5AYgAmcSDN0oea+C5mBiN6BK0AkiSKPj0RC17NDQ==",
       "dependencies": {
         "dot-properties": "^1.0.0"
+      },
+      "peerDependencies": {
+        "prettier": ">= 2.3.0"
       }
     },
     "node_modules/prettier2": {
@@ -12716,17 +12934,17 @@
       "dev": true
     },
     "node_modules/read-package-json": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.4.tgz",
-      "integrity": "sha512-AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-7.0.0.tgz",
+      "integrity": "sha512-uL4Z10OKV4p6vbdvIXB+OzhInYtIozl/VxUBPgNkBuUi2DeRonnuspmaVAMcrkmfjKGNmRndyQAbE7/AmzGwFg==",
       "dependencies": {
         "glob": "^10.2.2",
         "json-parse-even-better-errors": "^3.0.0",
-        "normalize-package-data": "^5.0.0",
+        "normalize-package-data": "^6.0.0",
         "npm-normalize-package-bin": "^3.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/read-package-json-fast": {
@@ -12750,14 +12968,14 @@
       }
     },
     "node_modules/read-package-json/node_modules/hosted-git-info": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
-      "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.1.tgz",
+      "integrity": "sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==",
       "dependencies": {
-        "lru-cache": "^7.5.1"
+        "lru-cache": "^10.0.1"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/read-package-json/node_modules/json-parse-even-better-errors": {
@@ -12769,31 +12987,32 @@
       }
     },
     "node_modules/read-package-json/node_modules/lru-cache": {
-      "version": "7.18.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz",
+      "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==",
       "engines": {
-        "node": ">=12"
+        "node": "14 || >=16.14"
       }
     },
     "node_modules/read-package-json/node_modules/normalize-package-data": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz",
-      "integrity": "sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.0.tgz",
+      "integrity": "sha512-UL7ELRVxYBHBgYEtZCXjxuD5vPxnmvMGq0jp/dGPKKrN7tfsBh2IY7TlJ15WWwdjRWD3RJbnsygUurTK3xkPkg==",
       "dependencies": {
-        "hosted-git-info": "^6.0.0",
+        "hosted-git-info": "^7.0.0",
         "is-core-module": "^2.8.1",
         "semver": "^7.3.5",
         "validate-npm-package-license": "^3.0.4"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/read-pkg": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-7.1.0.tgz",
       "integrity": "sha512-5iOehe+WF75IccPc30bWTbpdDQLOCc3Uu8bi3Dte3Eueij81yx1Mrufk8qBx/YAbR4uL1FdUr+7BKXDwEtisXg==",
+      "dev": true,
       "dependencies": {
         "@types/normalize-package-data": "^2.4.1",
         "normalize-package-data": "^3.0.2",
@@ -12811,6 +13030,7 @@
       "version": "9.1.0",
       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-9.1.0.tgz",
       "integrity": "sha512-vaMRR1AC1nrd5CQM0PhlRsO5oc2AAigqr7cCrZ/MW/Rsaflz4RlgzkpL4qoU/z1F6wrbd85iFv1OQj/y5RdGvg==",
+      "dev": true,
       "dependencies": {
         "find-up": "^6.3.0",
         "read-pkg": "^7.1.0",
@@ -12827,6 +13047,7 @@
       "version": "2.19.0",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
       "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+      "dev": true,
       "engines": {
         "node": ">=12.20"
       },
@@ -12838,6 +13059,7 @@
       "version": "2.19.0",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
       "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+      "dev": true,
       "engines": {
         "node": ">=12.20"
       },
@@ -12860,56 +13082,6 @@
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "node_modules/readable-stream/node_modules/buffer": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.2.1"
-      }
-    },
-    "node_modules/readable-stream/node_modules/events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "engines": {
-        "node": ">=0.8.x"
-      }
-    },
-    "node_modules/readable-stream/node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
     "node_modules/readable-web-to-node-stream": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz",
@@ -12952,17 +13124,6 @@
         "node": ">=8.10.0"
       }
     },
-    "node_modules/rechoir": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-      "integrity": "sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==",
-      "dependencies": {
-        "resolve": "^1.1.6"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
     "node_modules/redent": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/redent/-/redent-4.0.0.tgz",
@@ -13153,9 +13314,9 @@
       }
     },
     "node_modules/resolve": {
-      "version": "1.22.6",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.6.tgz",
-      "integrity": "sha512-njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw==",
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
       "dependencies": {
         "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
@@ -13269,15 +13430,15 @@
       }
     },
     "node_modules/rimraf": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.1.tgz",
-      "integrity": "sha512-OfFZdwtd3lZ+XZzYP/6gTACubwFcHdLRqS9UX3UwpU2dnGQYkPFISRwvM3w9IiB2w7bW5qGo/uAwE4SmXXSKvg==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz",
+      "integrity": "sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==",
       "dev": true,
       "dependencies": {
-        "glob": "^10.2.5"
+        "glob": "^10.3.7"
       },
       "bin": {
-        "rimraf": "dist/cjs/src/bin.js"
+        "rimraf": "dist/esm/bin.mjs"
       },
       "engines": {
         "node": ">=14"
@@ -13453,11 +13614,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/safe-array-concat/node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
-    },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -13548,6 +13704,20 @@
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
       "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
     },
+    "node_modules/set-function-length": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
+      "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
+      "dependencies": {
+        "define-data-property": "^1.1.1",
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/set-function-name": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
@@ -13589,61 +13759,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/shelljs": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz",
-      "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==",
-      "dependencies": {
-        "glob": "^7.0.0",
-        "interpret": "^1.0.0",
-        "rechoir": "^0.6.2"
-      },
-      "bin": {
-        "shjs": "bin/shjs"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/shelljs/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/shelljs/node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/shelljs/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/side-channel": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
@@ -13669,27 +13784,23 @@
       }
     },
     "node_modules/sigstore": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.9.0.tgz",
-      "integrity": "sha512-0Zjz0oe37d08VeOtBIuB6cRriqXse2e8w+7yIy2XSXjshRKxbc2KkhXjL229jXSxEm7UbcjS76wcJDGQddVI9A==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-2.1.0.tgz",
+      "integrity": "sha512-kPIj+ZLkyI3QaM0qX8V/nSsweYND3W448pwkDgS6CQ74MfhEkIR8ToK5Iyx46KJYRjseVcD3Rp9zAmUAj6ZjPw==",
       "dependencies": {
-        "@sigstore/bundle": "^1.1.0",
-        "@sigstore/protobuf-specs": "^0.2.0",
-        "@sigstore/sign": "^1.0.0",
-        "@sigstore/tuf": "^1.0.3",
-        "make-fetch-happen": "^11.0.1"
-      },
-      "bin": {
-        "sigstore": "bin/sigstore.js"
+        "@sigstore/bundle": "^2.1.0",
+        "@sigstore/protobuf-specs": "^0.2.1",
+        "@sigstore/sign": "^2.1.0",
+        "@sigstore/tuf": "^2.1.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/simple-git": {
-      "version": "3.19.1",
-      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.19.1.tgz",
-      "integrity": "sha512-Ck+rcjVaE1HotraRAS8u/+xgTvToTuoMkT9/l9lvuP5jftwnYUp6DwuJzsKErHgfyRk8IB8pqGHWEbM3tLgV1w==",
+      "version": "3.20.0",
+      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.20.0.tgz",
+      "integrity": "sha512-ozK8tl2hvLts8ijTs18iFruE+RoqmC/mqZhjs/+V7gS5W68JpJ3+FCTmLVqmR59MaUQ52MfGQuWsIqfsTbbJ0Q==",
       "dependencies": {
         "@kwsites/file-exists": "^1.1.1",
         "@kwsites/promise-deferred": "^1.1.1",
@@ -13714,16 +13825,16 @@
       "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
     },
     "node_modules/sinon": {
-      "version": "16.0.0",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-16.0.0.tgz",
-      "integrity": "sha512-B8AaZZm9CT5pqe4l4uWJztfD/mOTa7dL8Qo0W4+s+t74xECOgSZDDQCBjNgIK3+n4kyxQrSTv2V5ul8K25qkiQ==",
+      "version": "17.0.0",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-17.0.0.tgz",
+      "integrity": "sha512-p4lJiYKBoOEVUxxVIC9H1MM2znG1/c8gud++I2BauJA5hsz7hHsst35eurNWXTusBsIq66FzOQbZ/uMdpvbPIQ==",
       "dev": true,
       "dependencies": {
         "@sinonjs/commons": "^3.0.0",
-        "@sinonjs/fake-timers": "^10.3.0",
+        "@sinonjs/fake-timers": "^11.2.2",
         "@sinonjs/samsam": "^8.0.0",
         "diff": "^5.1.0",
-        "nise": "^5.1.4",
+        "nise": "^5.1.5",
         "supports-color": "^7.2.0"
       },
       "funding": {
@@ -13819,9 +13930,9 @@
       "integrity": "sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg=="
     },
     "node_modules/sort-package-json": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/sort-package-json/-/sort-package-json-2.5.1.tgz",
-      "integrity": "sha512-vx/KoZxm8YNMUqdlw7SGTfqR5pqZ/sUfgOuRtDILiOy/3AvzhAibyUe2cY3OpLs3oRSow9up4yLVtQaM24rbDQ==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/sort-package-json/-/sort-package-json-2.6.0.tgz",
+      "integrity": "sha512-XSQ+lY9bAYA8ZsoChcEoPlgcSMaheziEp1beox1JVxy1SV4F2jSq9+h2rJ+3mC/Dhu9Ius1DLnInD5AWcsDXZw==",
       "dependencies": {
         "detect-indent": "^7.0.1",
         "detect-newline": "^4.0.0",
@@ -13894,9 +14005,9 @@
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz",
-      "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w=="
+      "version": "3.0.16",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz",
+      "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw=="
     },
     "node_modules/sprintf-js": {
       "version": "1.0.3",
@@ -13905,9 +14016,9 @@
       "dev": true
     },
     "node_modules/sshpk": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
-      "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
+      "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
       "dependencies": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",
@@ -14487,26 +14598,6 @@
         "url": "https://github.com/sponsors/Borewit"
       }
     },
-    "node_modules/token-types/node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
     "node_modules/tough-cookie": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
@@ -14610,16 +14701,37 @@
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/tuf-js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.7.tgz",
-      "integrity": "sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-2.1.0.tgz",
+      "integrity": "sha512-eD7YPPjVlMzdggrOeE8zwoegUaG/rt6Bt3jwoQPunRiNVzgcCE009UDFJKJjG+Gk9wFu6W/Vi+P5d/5QpdD9jA==",
       "dependencies": {
-        "@tufjs/models": "1.0.4",
+        "@tufjs/models": "2.0.0",
         "debug": "^4.3.4",
-        "make-fetch-happen": "^11.1.1"
+        "make-fetch-happen": "^13.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/tuf-js/node_modules/make-fetch-happen": {
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.0.tgz",
+      "integrity": "sha512-7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A==",
+      "dependencies": {
+        "@npmcli/agent": "^2.0.0",
+        "cacache": "^18.0.0",
+        "http-cache-semantics": "^4.1.1",
+        "is-lambda": "^1.0.1",
+        "minipass": "^7.0.2",
+        "minipass-fetch": "^3.0.0",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "negotiator": "^0.6.3",
+        "promise-retry": "^2.0.1",
+        "ssri": "^10.0.0"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/tunnel": {
@@ -14668,9 +14780,9 @@
       }
     },
     "node_modules/type-fest": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.3.1.tgz",
-      "integrity": "sha512-pphNW/msgOUSkJbH58x8sqpq8uQj6b0ZKGxEsLKMUnGorRcDjrUaLS+39+/ub41JNTwrrMyJcUB8+YZs3mbwqw==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.5.0.tgz",
+      "integrity": "sha512-diLQivFzddJl4ylL3jxSkEc39Tpw7o1QeEHIPxVwryDK2lpB7Nqhzhuo6v5/Ls08Z0yPSAhsyAWlv1/H0ciNmw==",
       "engines": {
         "node": ">=16"
       },
@@ -14777,6 +14889,23 @@
       "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==",
       "dev": true
     },
+    "node_modules/undici": {
+      "version": "5.26.4",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.26.4.tgz",
+      "integrity": "sha512-OG+QOf0fTLtazL9P9X7yqWxQ+Z0395Wk6DSkyTxtaq3wQEjIroVe7Y4asCX/vcCxYpNGMnwz8F0qbRYUoaQVMw==",
+      "dev": true,
+      "dependencies": {
+        "@fastify/busboy": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.0"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.25.3",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.25.3.tgz",
+      "integrity": "sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA=="
+    },
     "node_modules/unique-filename": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
@@ -14847,9 +14976,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
-      "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
+      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
       "dev": true,
       "funding": [
         {
@@ -14976,14 +15105,14 @@
       }
     },
     "node_modules/vscode-languageserver-textdocument": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.8.tgz",
-      "integrity": "sha512-1bonkGqQs5/fxGT5UchTgjGVnfysL0O8v1AYMBjqTbWQTFn721zaPGDYFkOKtfDgFiSgXM3KwaG3FMGfW4Ed9Q=="
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz",
+      "integrity": "sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA=="
     },
     "node_modules/vscode-languageserver-types": {
-      "version": "3.17.3",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz",
-      "integrity": "sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA=="
+      "version": "3.17.5",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz",
+      "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg=="
     },
     "node_modules/walk-up-path": {
       "version": "3.0.1",
@@ -15115,12 +15244,12 @@
       "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
-      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz",
+      "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==",
       "dependencies": {
         "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.4",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
         "has-tostringtag": "^1.0.0"
@@ -15256,11 +15385,11 @@
       }
     },
     "node_modules/winston": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/winston/-/winston-3.10.0.tgz",
-      "integrity": "sha512-nT6SIDaE9B7ZRO0u3UvdrimG0HkB7dSTAgInQnNR2SOPJ4bvq5q79+pXLftKmP52lJGW15+H5MCK0nM9D3KB/g==",
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-3.11.0.tgz",
+      "integrity": "sha512-L3yR6/MzZAOl0DsysUXHVjOwv8mKZ71TrA/41EIduGpOOV5LQVodqN+QdQ6BS6PJ/RdIshZhq84P/fStEZkk7g==",
       "dependencies": {
-        "@colors/colors": "1.5.0",
+        "@colors/colors": "^1.6.0",
         "@dabh/diagnostics": "^2.0.2",
         "async": "^3.2.3",
         "is-stream": "^2.0.0",
@@ -15277,16 +15406,16 @@
       }
     },
     "node_modules/winston-transport": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz",
-      "integrity": "sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.6.0.tgz",
+      "integrity": "sha512-wbBA9PbPAHxKiygo7ub7BYRiKxms0tpfU2ljtWzb3SjRjv5yl6Ozuy/TkXf00HTAt+Uylo3gSkNwzc4ME0wiIg==",
       "dependencies": {
         "logform": "^2.3.2",
         "readable-stream": "^3.6.0",
         "triple-beam": "^1.3.0"
       },
       "engines": {
-        "node": ">= 6.4.0"
+        "node": ">= 12.0.0"
       }
     },
     "node_modules/winston-transport/node_modules/readable-stream": {
@@ -15483,9 +15612,9 @@
       "dev": true
     },
     "node_modules/yaml": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.2.tgz",
-      "integrity": "sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.3.tgz",
+      "integrity": "sha512-zw0VAJxgeZ6+++/su5AFoqBbZbrEakwu+X0M5HmcwUiBL7AzcuPKjj5we4xfQLp78LkEMpD0cOnUhmgOVy3KdQ==",
       "engines": {
         "node": ">= 14"
       }
@@ -15576,28 +15705,27 @@
       }
     },
     "node_modules/yeoman-environment": {
-      "version": "4.0.0-beta.4",
-      "resolved": "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-4.0.0-beta.4.tgz",
-      "integrity": "sha512-CZu9c94CdDPtim/K6T9rCzo3Se8JN52OlZFf4aPOkq5zbIdJmAC4yU+75metlNiGwFaery5cPMyWz7C/9lbFnA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-4.0.0.tgz",
+      "integrity": "sha512-pdr9XhhIfRQmjG+VO2J0420SeI/E5O+dM8CLIG1+8q01kqtiZoxgfI1WGeMiZMIVv4jr8w63qhHVYr7gpRLDVA==",
       "dependencies": {
-        "@yeoman/adapter": "^1.1.0",
-        "@yeoman/conflicter": "^1.0.7",
+        "@yeoman/adapter": "^1.4.0",
+        "@yeoman/conflicter": "^2.0.0-alpha.2",
         "@yeoman/namespace": "^1.0.0",
         "@yeoman/transform": "^1.2.0",
         "arrify": "^3.0.0",
-        "chalk": "^5.2.0",
-        "commander": "^11.0.0",
+        "chalk": "^5.3.0",
+        "commander": "^11.1.0",
         "debug": "^4.3.4",
         "execa": "^8.0.1",
-        "fly-import": "^0.3.0",
-        "globby": "^13.1.4",
+        "fly-import": "^0.4.0",
+        "globby": "^13.2.2",
         "grouped-queue": "^2.0.0",
         "locate-path": "^7.2.0",
         "lodash-es": "^4.17.21",
-        "mem-fs": "^3.0.0",
-        "mem-fs-editor": "^10.0.1",
-        "semver": "^7.5.0",
-        "slash": "^5.0.1",
+        "mem-fs-editor": "^11.0.0",
+        "semver": "^7.5.4",
+        "slash": "^5.1.0",
         "untildify": "^5.0.0",
         "which-package-manager": "^0.0.1"
       },
@@ -15605,13 +15733,44 @@
         "yoe": "bin/bin.cjs"
       },
       "engines": {
-        "node": "^16.13.0 || >=18.12.0"
+        "node": "^18.17.0 || >=20.5.0"
       },
       "peerDependencies": {
-        "@yeoman/types": "^1.0.1",
-        "mem-fs": "^3.0.0"
+        "@yeoman/types": "^1.1.1",
+        "mem-fs": "^4.0.0"
       }
     },
+    "node_modules/yeoman-environment/node_modules/@yeoman/conflicter": {
+      "version": "2.0.0-alpha.2",
+      "resolved": "https://registry.npmjs.org/@yeoman/conflicter/-/conflicter-2.0.0-alpha.2.tgz",
+      "integrity": "sha512-oyiCcwek6wN9IAnwTZyCV1bYmcLRFoODmHu0USDbAQ+rjOUqt0HjnBqiNZX3bYsa8GtoIT0mYCYHDoLsRj+/hg==",
+      "dependencies": {
+        "@types/node": "^16.18.28",
+        "@yeoman/transform": "^1.2.0",
+        "binary-extensions": "^2.2.0",
+        "cli-table": "^0.3.11",
+        "dateformat": "^5.0.3",
+        "diff": "^5.1.0",
+        "isbinaryfile": "^5.0.0",
+        "mem-fs-editor": "^11.0.0",
+        "minimatch": "^9.0.0",
+        "p-transform": "^4.1.3",
+        "pretty-bytes": "^6.1.0",
+        "textextensions": "^5.16.0"
+      },
+      "engines": {
+        "node": ">=18.12.0"
+      },
+      "peerDependencies": {
+        "@yeoman/types": "^1.0.0",
+        "mem-fs": "^4.0.0"
+      }
+    },
+    "node_modules/yeoman-environment/node_modules/@yeoman/conflicter/node_modules/@types/node": {
+      "version": "16.18.59",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.59.tgz",
+      "integrity": "sha512-PJ1w2cNeKUEdey4LiPra0ZuxZFOGvetswE8qHRriV/sUkL5Al4tTmPV9D2+Y/TPIxTHHgxTfRjZVKWhPw/ORhQ=="
+    },
     "node_modules/yeoman-environment/node_modules/globby": {
       "version": "13.2.2",
       "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
@@ -15641,6 +15800,32 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/yeoman-environment/node_modules/mem-fs-editor": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-11.0.0.tgz",
+      "integrity": "sha512-D9+DPIDohRxYUO95vR3RxJZUNkCmehOHqIoJVm9OxChMadCsNdiTB1nuU4zaHJonUMASYdfKN2USxnB9z0ccXg==",
+      "dependencies": {
+        "@types/ejs": "^3.1.3",
+        "@types/node": "^18.18.5",
+        "binaryextensions": "^4.18.0",
+        "commondir": "^1.0.1",
+        "deep-extend": "^0.6.0",
+        "ejs": "^3.1.9",
+        "globby": "^13.2.2",
+        "isbinaryfile": "^5.0.0",
+        "minimatch": "^9.0.3",
+        "multimatch": "^6.0.0",
+        "normalize-path": "^3.0.0",
+        "textextensions": "^5.16.0",
+        "vinyl": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "peerDependencies": {
+        "mem-fs": "^4.0.0"
+      }
+    },
     "node_modules/yeoman-environment/node_modules/untildify": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/untildify/-/untildify-5.0.0.tgz",
@@ -15650,23 +15835,23 @@
       }
     },
     "node_modules/yeoman-generator": {
-      "version": "6.0.0-rc.4",
-      "resolved": "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-6.0.0-rc.4.tgz",
-      "integrity": "sha512-QMD/qdV2p7X+CQIIuL+RANEzRVx5VqPvNEEa5Z/3AqcjLQaqtsTaPOQd5zk06fLiVYh3j/POKQbygZncTYZJTg==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-6.0.1.tgz",
+      "integrity": "sha512-6mZ6w/tsjW2hcUzBCggm2mhzwYE/qvtqd/hW9kAV9KT5iYT95CrmVLs4fvmiVbhYg7SXorgQGDlQeR32UAt7Vw==",
       "dependencies": {
         "@types/lodash-es": "^4.17.7",
         "@types/node": "^16.18.3",
         "@yeoman/namespace": "^1.0.0",
         "chalk": "^5.1.2",
         "debug": "^4.1.1",
-        "execa": "^7.1.1",
+        "execa": "^8.0.1",
         "github-username": "^7.0.0",
         "json-schema": "^0.4.0",
         "latest-version": "^7.0.0",
         "lodash-es": "^4.17.21",
         "mem-fs-editor": "^10.0.1",
         "minimist": "^1.2.8",
-        "read-pkg-up": "^9.1.0",
+        "read-pkg-up": "^10.1.0",
         "semver": "^7.5.0",
         "simple-git": "^3.18.0",
         "sort-keys": "^5.0.0",
@@ -15686,78 +15871,148 @@
       }
     },
     "node_modules/yeoman-generator/node_modules/@types/node": {
-      "version": "16.18.51",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.51.tgz",
-      "integrity": "sha512-LKA7ZhY30I8PiUOzBzhtnIULQTACpiEpPXLiYMWyS+tPAORf+rmXUadHZXB/KFrFyMjeHeKc1GFvLd+3f7LE3w=="
+      "version": "16.18.59",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.59.tgz",
+      "integrity": "sha512-PJ1w2cNeKUEdey4LiPra0ZuxZFOGvetswE8qHRriV/sUkL5Al4tTmPV9D2+Y/TPIxTHHgxTfRjZVKWhPw/ORhQ=="
     },
-    "node_modules/yeoman-generator/node_modules/execa": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz",
-      "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==",
+    "node_modules/yeoman-generator/node_modules/hosted-git-info": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.1.tgz",
+      "integrity": "sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==",
       "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.1",
-        "human-signals": "^4.3.0",
-        "is-stream": "^3.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^5.1.0",
-        "onetime": "^6.0.0",
-        "signal-exit": "^3.0.7",
-        "strip-final-newline": "^3.0.0"
+        "lru-cache": "^10.0.1"
       },
       "engines": {
-        "node": "^14.18.0 || ^16.14.0 || >=18.0.0"
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/yeoman-generator/node_modules/json-parse-even-better-errors": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz",
+      "integrity": "sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/yeoman-generator/node_modules/lines-and-columns": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.3.tgz",
+      "integrity": "sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      }
+    },
+    "node_modules/yeoman-generator/node_modules/lru-cache": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz",
+      "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==",
+      "engines": {
+        "node": "14 || >=16.14"
+      }
+    },
+    "node_modules/yeoman-generator/node_modules/normalize-package-data": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.0.tgz",
+      "integrity": "sha512-UL7ELRVxYBHBgYEtZCXjxuD5vPxnmvMGq0jp/dGPKKrN7tfsBh2IY7TlJ15WWwdjRWD3RJbnsygUurTK3xkPkg==",
+      "dependencies": {
+        "hosted-git-info": "^7.0.0",
+        "is-core-module": "^2.8.1",
+        "semver": "^7.3.5",
+        "validate-npm-package-license": "^3.0.4"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/yeoman-generator/node_modules/parse-json": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-7.1.0.tgz",
+      "integrity": "sha512-ihtdrgbqdONYD156Ap6qTcaGcGdkdAxodO1wLqQ/j7HP1u2sFYppINiq4jyC8F+Nm+4fVufylCV00QmkTHkSUg==",
+      "dependencies": {
+        "@babel/code-frame": "^7.21.4",
+        "error-ex": "^1.3.2",
+        "json-parse-even-better-errors": "^3.0.0",
+        "lines-and-columns": "^2.0.3",
+        "type-fest": "^3.8.0"
+      },
+      "engines": {
+        "node": ">=16"
       },
       "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/yeoman-generator/node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+    "node_modules/yeoman-generator/node_modules/parse-json/node_modules/type-fest": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz",
+      "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==",
       "engines": {
-        "node": ">=10"
+        "node": ">=14.16"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/yeoman-generator/node_modules/human-signals": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz",
-      "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==",
+    "node_modules/yeoman-generator/node_modules/read-pkg": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-8.1.0.tgz",
+      "integrity": "sha512-PORM8AgzXeskHO/WEv312k9U03B8K9JSiWF/8N9sUuFjBa+9SF2u6K7VClzXwDXab51jCd8Nd36CNM+zR97ScQ==",
+      "dependencies": {
+        "@types/normalize-package-data": "^2.4.1",
+        "normalize-package-data": "^6.0.0",
+        "parse-json": "^7.0.0",
+        "type-fest": "^4.2.0"
+      },
       "engines": {
-        "node": ">=14.18.0"
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/yeoman-generator/node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
+    "node_modules/yeoman-generator/node_modules/read-pkg-up": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-10.1.0.tgz",
+      "integrity": "sha512-aNtBq4jR8NawpKJQldrQcSW9y/d+KWH4v24HWkHljOZ7H0av+YTGANBzRh9A5pw7v/bLVsLVPpOhJ7gHNVy8lA==",
+      "dependencies": {
+        "find-up": "^6.3.0",
+        "read-pkg": "^8.1.0",
+        "type-fest": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/yeoman-test": {
-      "version": "8.0.0-rc.1",
-      "resolved": "https://registry.npmjs.org/yeoman-test/-/yeoman-test-8.0.0-rc.1.tgz",
-      "integrity": "sha512-0RMJkXZodZvc2724z0Z4uhAcGSodLnZCzPvJHP/x4A0HZabFYQgRzKeZmRNLiWiaNURV3EJlQ67dRpqWL9I8Ig==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/yeoman-test/-/yeoman-test-8.1.0.tgz",
+      "integrity": "sha512-MLCxHSiiX5LCm3aseyG2y/sPdk/QcS7zUqvmjoqAGRVutcEpC7xfOz2bxKoBa9ZrRfNGpv/NjhJrV2Hs6qpNAA==",
       "dev": true,
       "dependencies": {
-        "@yeoman/adapter": "^1.1.0",
+        "@yeoman/adapter": "^1.4.0",
         "inquirer": "^9.2.2",
         "lodash-es": "^4.17.21",
-        "mem-fs": "^3.0.0",
-        "mem-fs-editor": "^10.0.2",
-        "sinon": "^15.1.0",
+        "mem-fs-editor": "^10.0.3",
+        "sinon": "^16.0.0",
         "temp-dir": "^3.0.0",
-        "type-fest": "^3.10.0"
+        "type-fest": "^4.3.1"
+      },
+      "acceptDependencies": {
+        "mem-fs": "^4.0.0-beta.1",
+        "yeoman-environment": ">=4.0.0-beta.6",
+        "yeoman-generator": ">=6.0.0"
       },
       "engines": {
         "node": "^16.17.0 || >=18.12.0"
       },
       "peerDependencies": {
-        "@yeoman/types": "^1.0.1",
-        "yeoman-environment": "^3.18.3 || ^4.0.0-alpha.6",
-        "yeoman-generator": "^5.9.0 || ^6.0.0-beta.4"
+        "@yeoman/types": "^1.1.0",
+        "mem-fs": "^3.0.0",
+        "yeoman-environment": "^3.18.3",
+        "yeoman-generator": "^5.9.0 || >=6.0.0"
       },
       "peerDependenciesMeta": {
         "yeoman-environment": {
@@ -15768,10 +16023,19 @@
         }
       }
     },
+    "node_modules/yeoman-test/node_modules/@sinonjs/fake-timers": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
+      "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
+      "dev": true,
+      "dependencies": {
+        "@sinonjs/commons": "^3.0.0"
+      }
+    },
     "node_modules/yeoman-test/node_modules/sinon": {
-      "version": "15.2.0",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-15.2.0.tgz",
-      "integrity": "sha512-nPS85arNqwBXaIsFCkolHjGIkFo+Oxu9vbgmBJizLAhqe6P2o3Qmj3KCUoRkfhHtvgDhZdWD3risLHAUJ8npjw==",
+      "version": "16.1.3",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-16.1.3.tgz",
+      "integrity": "sha512-mjnWWeyxcAf9nC0bXcPmiDut+oE8HYridTNzBbF98AYVLmWwGRp2ISEpyhYflG1ifILT+eNn3BmKUJPxjXUPlA==",
       "dev": true,
       "dependencies": {
         "@sinonjs/commons": "^3.0.0",
@@ -15798,18 +16062,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/yeoman-test/node_modules/type-fest": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz",
-      "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/yocto-queue": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
diff --git a/package.json b/package.json
index de11d99e0cfe..e2f633b4e6e8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-jhipster",
-  "version": "8.0.0-beta.3",
+  "version": "8.0.0-rc.1",
   "description": "Spring Boot + Angular/React/Vue in one handy generator",
   "keywords": [
     "yeoman-generator",
@@ -103,21 +103,21 @@
     "watch": "concurrently \"tsc --watch\" \"node ./watch.mjs\""
   },
   "dependencies": {
-    "@faker-js/faker": "8.0.2",
+    "@faker-js/faker": "8.2.0",
     "@iarna/toml": "3.0.0",
-    "@types/ejs": "3.1.2",
-    "@types/lodash": "4.14.198",
-    "@typescript-eslint/eslint-plugin": "6.7.0",
-    "@typescript-eslint/parser": "6.7.0",
-    "@yeoman/adapter": "1.2.0",
-    "@yeoman/conflicter": "1.0.10",
+    "@types/ejs": "3.1.4",
+    "@types/lodash": "4.14.200",
+    "@typescript-eslint/eslint-plugin": "6.8.0",
+    "@typescript-eslint/parser": "6.8.0",
+    "@yeoman/adapter": "1.4.0",
+    "@yeoman/conflicter": "1.1.0",
     "@yeoman/namespace": "1.0.0",
     "@yeoman/transform": "1.2.0",
-    "@yeoman/types": "1.0.1",
-    "axios": "1.5.0",
+    "@yeoman/types": "1.1.1",
+    "axios": "1.5.1",
     "chalk": "5.3.0",
     "chevrotain": "11.0.3",
-    "commander": "11.0.0",
+    "commander": "11.1.0",
     "conf": "11.0.2",
     "debug": "4.3.4",
     "didyoumean": "1.2.2",
@@ -125,81 +125,79 @@
     "dot-properties": "1.0.1",
     "ejs": "3.1.9",
     "escape-string-regexp": "5.0.0",
-    "eslint": "8.49.0",
+    "eslint": "8.52.0",
     "eslint-plugin-import": "2.28.1",
     "eslint-plugin-unused-imports": "3.0.0",
     "execa": "8.0.1",
-    "fast-xml-parser": "4.2.7",
-    "glob": "10.3.4",
+    "fast-xml-parser": "4.3.2",
+    "glob": "10.3.10",
     "insight": "0.11.1",
     "isbinaryfile": "5.0.0",
     "java-lint": "0.1.0",
     "js-yaml": "4.1.0",
     "latest-version": "7.0.0",
-    "lodash": "4.17.21",
-    "mem-fs": "3.0.0",
-    "mem-fs-editor": "10.0.2",
+    "lodash-es": "4.17.21",
+    "mem-fs": "4.0.0",
+    "mem-fs-editor": "10.0.3",
     "minimatch": "9.0.3",
     "normalize-path": "3.0.0",
     "os-locale": "6.0.2",
     "p-queue": "7.4.1",
-    "p-transform": "4.0.5",
+    "p-transform": "4.1.3",
     "parse-gitignore": "2.0.0",
     "pluralize": "8.0.0",
     "prettier": "3.0.3",
     "prettier-plugin-java": "2.3.1",
-    "prettier-plugin-packagejson": "2.4.5",
-    "prettier-plugin-properties": "0.2.0",
+    "prettier-plugin-packagejson": "2.4.6",
+    "prettier-plugin-properties": "0.3.0",
     "progress": "2.0.3",
     "randexp": "0.5.3",
     "run-async": "3.0.0",
     "semver": "7.5.4",
-    "shelljs": "0.8.5",
-    "simple-git": "3.19.1",
-    "type-fest": "4.3.1",
+    "simple-git": "3.20.0",
+    "type-fest": "4.5.0",
     "uuid": "9.0.1",
-    "winston": "3.10.0",
-    "yaml": "2.3.2",
-    "yeoman-environment": "4.0.0-beta.4",
-    "yeoman-generator": "6.0.0-rc.4"
+    "winston": "3.11.0",
+    "yaml": "2.3.3",
+    "yeoman-environment": "4.0.0",
+    "yeoman-generator": "6.0.1"
   },
   "devDependencies": {
     "@actions/core": "1.10.1",
     "@node-loaders/esbuildx": "1.2.0",
-    "@types/chai": "4.3.6",
+    "@types/chai": "4.3.9",
     "@types/glob": "npm:noist@1.0.0",
     "@types/minimatch": "npm:noist@1.0.0",
-    "@types/mocha": "10.0.1",
-    "@types/node": "18.17.16",
-    "@types/shelljs": "0.8.12",
-    "@types/sinon-chai": "3.2.9",
-    "chai": "4.3.8",
+    "@types/mocha": "10.0.3",
+    "@types/node": "18.18.6",
+    "@types/sinon-chai": "3.2.11",
+    "chai": "4.3.10",
     "chokidar": "3.5.3",
-    "concurrently": "8.2.1",
+    "concurrently": "8.2.2",
     "cpy-cli": "5.0.0",
     "ejs-lint": "2.0.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-prettier": "9.0.0",
     "eslint-plugin-chai-friendly": "0.7.2",
-    "eslint-plugin-mocha": "10.1.0",
-    "eslint-plugin-prettier": "5.0.0",
+    "eslint-plugin-mocha": "10.2.0",
+    "eslint-plugin-prettier": "5.0.1",
     "esmocha": "1.0.1",
     "fs-extra": "11.1.1",
-    "jest-extended": "4.0.1",
+    "jest-extended": "4.0.2",
     "jsdoc": "4.0.2",
-    "octokit": "3.1.0",
+    "octokit": "3.1.1",
     "open-cli": "7.2.0",
     "prettier2": "npm:prettier@2.8.8",
-    "rimraf": "5.0.1",
-    "sinon": "16.0.0",
+    "rimraf": "5.0.5",
+    "sinon": "17.0.0",
     "sinon-chai": "3.7.0",
     "sort-keys": "5.0.0",
     "typescript": "5.2.2",
     "yeoman-assert": "3.1.1",
-    "yeoman-test": "8.0.0-rc.1"
+    "yeoman-test": "8.1.0"
   },
   "peerDependencies": {
-    "yeoman-test": "8.0.0-rc.1"
+    "yeoman-test": "8.1.0"
   },
   "peerDependenciesMeta": {
     "yeoman-test": {
@@ -207,20 +205,12 @@
     }
   },
   "engines": {
-    "node": "^18.13.0 || >= 20.2.0",
+    "node": "^18.13.0 || >= 20.6.1",
     "npm": ">=8.0.0"
   },
   "collective": {
     "type": "opencollective",
     "url": "https://opencollective.com/generator-jhipster",
     "logo": "https://opencollective.com/opencollective/logo.txt"
-  },
-  "overrides": {
-    "@types/shelljs": {
-      "@types/glob": {
-        "@types/minimatch": "3.0.5",
-        ".": "7.2.0"
-      }
-    }
   }
 }
diff --git a/rfcs/5-jhipster-rfc-inclusive-property-in-generator.md b/rfcs/5-jhipster-rfc-inclusive-property-in-generator.md
index b2f58899edb9..fc8760999bbc 100644
--- a/rfcs/5-jhipster-rfc-inclusive-property-in-generator.md
+++ b/rfcs/5-jhipster-rfc-inclusive-property-in-generator.md
@@ -92,7 +92,7 @@ the resulting (simplified) json object used by the generator
 
 [drawbacks]: #drawbacks
 
-Blueprint with additional options will have to override objects definiton: an overridable api should be provided at the generator-core level to let the blueprint developer to add its own attributes at each level
+Blueprint with additional options will have to override objects definition: an overridable api should be provided at the generator-core level to let the blueprint developer to add its own attributes at each level
 
 ## Rationale and alternatives
 
diff --git a/test-integration/jdl-samples/ms-react-consul-jwt-cassandra-redis/blog-store.jdl b/test-integration/jdl-samples/ms-react-consul-jwt-cassandra-redis/blog-store.jdl
index 6b6db1c9135b..7ee1ddf37b1f 100644
--- a/test-integration/jdl-samples/ms-react-consul-jwt-cassandra-redis/blog-store.jdl
+++ b/test-integration/jdl-samples/ms-react-consul-jwt-cassandra-redis/blog-store.jdl
@@ -123,6 +123,7 @@ entity Tag {
 
 @ChangelogDate(20210408164813)
 entity Product {
+  @Id id UUID
   title String required
   price BigDecimal required min(0)
   image ImageBlob
@@ -130,6 +131,7 @@ entity Product {
 
 @ChangelogDate(20210408164814)
 entity Notification {
+  @Id id UUID
   title String required
 }
 
diff --git a/test-integration/samples/jdl-default/app.jdl b/test-integration/samples/jdl-default/app.jdl
index 3b1df7d3b063..ce0fe6e13ff4 100644
--- a/test-integration/samples/jdl-default/app.jdl
+++ b/test-integration/samples/jdl-default/app.jdl
@@ -81,7 +81,7 @@ entity Job {
 
 /**
  * The Employee entity.
- * Second line in javadoc.
+ * Second line in documentation.
  */
 entity Employee {
   /**
diff --git a/test-integration/scripts/99-build-changes.sh b/test-integration/scripts/99-build-changes.sh
index cbaba577dfaf..c5a9d2ee84d6 100755
--- a/test-integration/scripts/99-build-changes.sh
+++ b/test-integration/scripts/99-build-changes.sh
@@ -94,6 +94,7 @@ git -c color.ui=always diff --exit-code @~1 -- \
   'generators/cucumber' \
   'generators/gatling' \
   'generators/gradle' \
+  'generators/java' \
   'generators/liquibase' \
   'generators/maven' \
   'generators/server' \
diff --git a/test/__snapshots__/api.spec.mjs.snap b/test/__snapshots__/api.spec.mjs.snap
index c5db911607fc..db09e33aa251 100644
--- a/test/__snapshots__/api.spec.mjs.snap
+++ b/test/__snapshots__/api.spec.mjs.snap
@@ -40,8 +40,6 @@ exports[`public api generator-jhipster/generators should match snapshot 1`] = `
   "GENERATOR_LANGUAGES": "languages",
   "GENERATOR_LIQUIBASE": "liquibase",
   "GENERATOR_MAVEN": "maven",
-  "GENERATOR_OPENAPI_CLIENT": "openapi-client",
-  "GENERATOR_PAGE": "page",
   "GENERATOR_PROJECT_NAME": "project-name",
   "GENERATOR_REACT": "react",
   "GENERATOR_SERVER": "server",
diff --git a/test/needle-api/needle-client-angular-generator.spec.mts b/test/needle-api/needle-client-angular-generator.spec.mts
index fec683dbfa7d..824dbb280f36 100644
--- a/test/needle-api/needle-client-angular-generator.spec.mts
+++ b/test/needle-api/needle-client-angular-generator.spec.mts
@@ -7,8 +7,7 @@ import BaseApplicationGenerator from '../../generators/base-application/index.mj
 
 const mockAngularBlueprintSubGen = class extends AngularGenerator {
   constructor(args, opts, features) {
-    super(args, opts, features);
-    this.sbsBlueprint = true;
+    super(args, opts, { ...features, sbsBlueprint: true });
   }
 
   get [BaseApplicationGenerator.POST_WRITING_ENTITIES]() {
@@ -47,7 +46,6 @@ describe('needle API Angular angular generator : JHipster with blueprint', () =>
         skipServer: true,
       })
       .withOptions({
-        defaults: true,
         blueprint: 'myblueprint2',
       })
       .withGenerators([[mockAngularBlueprintSubGen, { namespace: 'jhipster-myblueprint2:angular' }]]);
@@ -97,8 +95,11 @@ describe('needle API Angular angular generator : JHipster with blueprint', () =>
   });
   it('should bail on any file change adding same needles again', async () => {
     await runResult
-      .create('jhipster-myblueprint2:angular')
+      .create('jhipster:angular')
       .withGenerators([[mockAngularBlueprintSubGen, { namespace: 'jhipster-myblueprint2:angular' }]])
-      .withOptions({ force: false });
+      .withOptions({
+        blueprint: 'myblueprint2',
+        force: false,
+      });
   });
 });
diff --git a/test/needle-api/needle-client-react-generator.spec.mts b/test/needle-api/needle-client-react-generator.spec.mts
index 2117e0fd66db..b795f6875e2d 100644
--- a/test/needle-api/needle-client-react-generator.spec.mts
+++ b/test/needle-api/needle-client-react-generator.spec.mts
@@ -46,6 +46,7 @@ describe('needle API React: JHipster client generator with blueprint', () => {
         auth: 'jwt',
         db: 'mysql',
         blueprint: 'myblueprint',
+        ignoreNeedlesError: true,
       })
       .withGenerators([[mockReactBlueprintSubGen, { namespace: 'jhipster-myblueprint:react' }]])
       .withAnswers({
diff --git a/test/needle-api/needle-client-react.spec.mts b/test/needle-api/needle-client-react.spec.mts
index f29e9884c878..4730483ff0fd 100644
--- a/test/needle-api/needle-client-react.spec.mts
+++ b/test/needle-api/needle-client-react.spec.mts
@@ -39,6 +39,7 @@ describe('needle API React: JHipster react generator with blueprint', () => {
         auth: 'jwt',
         db: 'mysql',
         blueprint: 'myblueprint',
+        ignoreNeedlesError: true,
       })
       .withGenerators([[mockBlueprintSubGen, { namespace: 'jhipster-myblueprint:react' }]])
       .withAnswers({
diff --git a/test/support/client-samples.mts b/test/support/client-samples.mts
index 12c7f4c3347b..42a922c59bd5 100644
--- a/test/support/client-samples.mts
+++ b/test/support/client-samples.mts
@@ -5,11 +5,7 @@ const CLIENT_ADDITIONAL_CONFIG_MATRIX = {
   withAdminUi: [false, true],
   skipJhipsterDependencies: [false, true],
   enableTranslation: [false, true],
-  clientSrcDir: [
-    undefined,
-    { value: 'src/', additional: { clientTestDir: 'test/' } },
-    { value: 'src/main/webapp2/', additional: { clientTestDir: 'src/test/javascript2/' } },
-  ],
+  clientRootDir: [undefined, { value: 'clientRoot/' }, { value: '' }],
   websocket: [false, true],
 };
 
diff --git a/testing/helpers.mts b/testing/helpers.mts
index 728e0c9316f0..1ea4784c5d93 100644
--- a/testing/helpers.mts
+++ b/testing/helpers.mts
@@ -1,7 +1,7 @@
 /* eslint-disable max-classes-per-file */
 import type { BaseEnvironmentOptions, GetGeneratorConstructor, BaseGenerator as YeomanGenerator } from '@yeoman/types';
 import { YeomanTest, RunContext, RunContextSettings, RunResult, result } from 'yeoman-test';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 
 import { basename, join } from 'path';
 import EnvironmentBuilder from '../cli/environment-builder.mjs';
@@ -103,6 +103,7 @@ export const createBlueprintFiles = (
 
 class JHipsterRunContext extends RunContext<GeneratorTestType> {
   public sharedSource!: Record<string, any>;
+  private sharedData!: Record<string, any>;
   private sharedApplication!: Record<string, any>;
   private sharedControl!: Record<string, any>;
   private workspaceApplications: string[] = [];
@@ -200,25 +201,31 @@ class JHipsterRunContext extends RunContext<GeneratorTestType> {
       },
     );
 
-    return this.onBeforePrepare(() => defineDefaults()).withSharedApplication({ sharedSource: this.sharedSource });
+    return this.onBeforePrepare(() => defineDefaults()).withSharedData({ sharedSource: this.sharedSource });
   }
 
   withControl(sharedControl: Record<string, any>): this {
-    this.sharedControl = {};
+    this.sharedControl = this.sharedControl ?? {};
     Object.assign(this.sharedControl, sharedControl);
-    return this.withSharedApplication({ control: this.sharedControl });
+    return this.withSharedData({ control: this.sharedControl });
   }
 
-  private withSharedApplication(sharedApplication: Record<string, any>): this {
-    if (!this.sharedApplication) {
+  withSharedApplication(sharedApplication: Record<string, any>): this {
+    this.sharedApplication = this.sharedApplication ?? {};
+    Object.assign(this.sharedApplication, sharedApplication);
+    return this.withSharedData({ sharedApplication: this.sharedApplication });
+  }
+
+  private withSharedData(sharedData: Record<string, any>): this {
+    if (!this.sharedData) {
       const applicationId = 'test-application';
-      this.sharedApplication = { ...sharedApplication };
-      set((this as any).envOptions, `sharedOptions.sharedData.applications.${applicationId}`, this.sharedApplication);
+      this.sharedData = { ...sharedData };
+      set((this as any).envOptions, `sharedOptions.sharedData.applications.${applicationId}`, this.sharedData);
       return this.withOptions({
         applicationId,
       });
     }
-    Object.assign(this.sharedApplication, sharedApplication);
+    Object.assign(this.sharedData, sharedData);
     return this;
   }
 
diff --git a/watch.mjs b/watch.mjs
index 8f44889568f1..3177153d5a5a 100755
--- a/watch.mjs
+++ b/watch.mjs
@@ -18,6 +18,7 @@ const chokidarConfig = {
 const copy = (event, path) => {
   if (['add', 'change'].includes(event)) {
     copyFileSync(join(__dirname, path), join(__dirname, 'dist', path));
+    // eslint-disable-next-line no-console
     console.log(event, path);
   }
 };