generator-jhipster 8.6.0 → 8.7.0

package/dist/generators/feign-client/templates/src/main/java/_package_/client/AuthorizationHeaderUtil.java.ejs

@@ -56,7 +56,7 @@ public class AuthorizationHeaderUtil {
 
     private final OAuth2AuthorizedClientService clientService;
     private final RestTemplateBuilder restTemplateBuilder;
-    private static final Logger log = LoggerFactory.getLogger(AuthorizationHeaderUtil.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AuthorizationHeaderUtil.class);
 
     public AuthorizationHeaderUtil(OAuth2AuthorizedClientService clientService, RestTemplateBuilder restTemplateBuilder) {
         this.clientService = clientService;
@@ -82,7 +82,7 @@ public class AuthorizationHeaderUtil {
                 String tokenType = accessToken.getTokenType().getValue();
                 String accessTokenValue = accessToken.getTokenValue();
                 if (isExpired(accessToken)) {
-                    log.info("AccessToken expired, refreshing automatically");
+                    LOG.info("AccessToken expired, refreshing automatically");
                     accessTokenValue = refreshToken(client, oauthToken);
                     if (null == accessTokenValue) {
                         SecurityContextHolder.getContext().setAuthentication(null);
@@ -105,7 +105,7 @@ public class AuthorizationHeaderUtil {
     private String refreshToken(OAuth2AuthorizedClient client, OAuth2AuthenticationToken oauthToken) {
         OAuth2AccessTokenResponse atr = refreshTokenClient(client);
         if (atr == null || atr.getAccessToken() == null) {
-            log.info("Failed to refresh token for user");
+            LOG.info("Failed to refresh token for user");
             return null;
         }
 
@@ -136,7 +136,7 @@ public class AuthorizationHeaderUtil {
             ResponseEntity<OAuthIdpTokenResponseDTO> responseEntity = r.exchange(requestEntity, OAuthIdpTokenResponseDTO.class);
             return toOAuth2AccessTokenResponse(responseEntity.getBody());
         } catch (OAuth2AuthorizationException e) {
-            log.error("Unable to refresh token", e);
+            LOG.error("Unable to refresh token", e);
             throw new OAuth2AuthenticationException(e.getError(), e);
         }
     }

package/dist/generators/gatling/entity-files.js

@@ -1,3 +1,21 @@
+/**
+ * Copyright 2013-2024 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 { TEST_DIR } from '../generator-constants.js';
 export const gatlingFiles = {
     gatlingFiles: [

package/dist/generators/gatling/files.js

@@ -1,4 +1,22 @@
-import { TEST_DIR, GRADLE_BUILD_SRC_MAIN_DIR } from '../generator-constants.js';
+/**
+ * Copyright 2013-2024 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 { GRADLE_BUILD_SRC_MAIN_DIR, TEST_DIR } from '../generator-constants.js';
 const gatlingFiles = {
     gatlingFiles: [
         {

package/dist/generators/gatling/templates/src/test/java/gatling/simulations/_entityClass_GatlingTest.java.ejs

@@ -60,12 +60,12 @@ public class <%= entityClass %>GatlingTest extends Simulation {
 <%_ } _%>
         ;
 
-    Map<String, String> headers_http = Map.of(
+    Map<String, String> headersHttp = Map.of(
         "Accept", "application/json"
     );
 <%_ if (authenticationUsesCsrf) { _%>
 
-    Map<String, String> headers_http_authenticated = Map.of(
+    Map<String, String> headersHttpAuthenticated = Map.of(
         "Accept", "application/json",
         "X-XSRF-TOKEN", "${xsrf_token}"
     );
@@ -77,12 +77,12 @@ public class <%= entityClass %>GatlingTest extends Simulation {
 <%_ } _%>
 <%_ if (authenticationTypeJwt) { _%>
 
-    Map<String, String> headers_http_authentication = Map.of(
+    Map<String, String> headersHttpAuthentication = Map.of(
         "Content-Type", "application/json",
         "Accept", "application/json"
     );
 
-    Map<String, String> headers_http_authenticated = Map.of(
+    Map<String, String> headersHttpAuthenticated = Map.of(
         "Accept", "application/json",
         "Authorization", "${access_token}"
     );
@@ -90,7 +90,7 @@ public class <%= entityClass %>GatlingTest extends Simulation {
 
     ChainBuilder scn = exec(http("First unauthenticated request")
         .get("/api/account")
-        .headers(headers_http)
+        .headers(headersHttp)
 <%_ if ((applicationTypeMicroservice || applicationTypeGateway) && authenticationTypeOauth2) { _%>
         .check(status().is(302))
 <%_ } else { _%>
@@ -104,7 +104,7 @@ public class <%= entityClass %>GatlingTest extends Simulation {
         .exec(http("Authentication")
 <%_ if (authenticationTypeSession) { _%>
         .post("/api/authentication")
-        .headers(headers_http_authenticated)
+        .headers(headersHttpAuthenticated)
         .formParam("username", "admin")
         .formParam("password", "admin")
         .formParam("remember-me", "true")
@@ -143,25 +143,25 @@ public class <%= entityClass %>GatlingTest extends Simulation {
         .check(status().is(200))).exitHereIfFailed()
 <%_ } else if (authenticationTypeJwt) { _%>
         .post("/api/authenticate")
-        .headers(headers_http_authentication)
+        .headers(headersHttpAuthentication)
         .body(StringBody("{\"username\":\"admin\", \"password\":\"admin\"}")).asJson()
         .check(header("Authorization").saveAs("access_token"))).exitHereIfFailed()
 <%_ } _%>
         .pause(2)
         .exec(http("Authenticated request")
         .get("/api/account")
-        .headers(headers_http_authenticated)
+        .headers(headersHttpAuthenticated)
         .check(status().is(200)))
         .pause(10)
         .repeat(2).on(
             exec(http("Get all <%= entityInstancePlural %>")
             .get("<% if (applicationTypeMicroservice) { %>/services/<%= baseName.toLowerCase() %><% } %>/api/<%= entityApiUrl %>")
-            .headers(headers_http_authenticated)
+            .headers(headersHttpAuthenticated)
             .check(status().is(200)))
             .pause(Duration.ofSeconds(10), Duration.ofSeconds(20))
             .exec(http("Create new <%= entityInstance %>")
             .post("<% if (applicationTypeMicroservice) { %>/services/<%= baseName.toLowerCase() %><% } %>/api/<%= entityApiUrl %>")
-            .headers(headers_http_authenticated)
+            .headers(headersHttpAuthenticated)
             .body(StringBody("{" +
 <%_ fields.filter(f => !(f.id && f.autoGenerate)).forEach((field, idx) => { _%>
                 "<%= idx === 0 ? '' : ', ' %>\"<%= field.fieldName %>\": <% if (field.fieldTypeString) { %>\"SAMPLE_TEXT\"<% } else if (field.fieldTypeNumeric) { %>0<% } else if (field.fieldTypeTemporal) { %>\"2020-01-01T00:00:00.000Z\"<% } else if (field.fieldIsEnum) { %>\"<%= field.enumValues[0].name %>\"<% } else { %>null<% } %>" +
@@ -173,12 +173,12 @@ public class <%= entityClass %>GatlingTest extends Simulation {
             .repeat(5).on(
                 exec(http("Get created <%= entityInstance %>")
                 .get("<% if (applicationTypeMicroservice) { %>/services/<%= baseName.toLowerCase() %><% } %>${new_<%= entityInstance %>_url}")
-                .headers(headers_http_authenticated))
+                .headers(headersHttpAuthenticated))
                 .pause(10)
             )
             .exec(http("Delete created <%= entityInstance %>")
             .delete("<% if (applicationTypeMicroservice) { %>/services/<%= baseName.toLowerCase() %><% } %>${new_<%= entityInstance %>_url}")
-            .headers(headers_http_authenticated))
+            .headers(headersHttpAuthenticated))
             .pause(10)
         );
 

package/dist/generators/generate-blueprint/files.js

@@ -16,15 +16,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { asWriteFilesSection } from '../base-application/support/task-type-inference.js';
 import { LOCAL_BLUEPRINT_OPTION } from './constants.js';
-export const files = {
+export const files = asWriteFilesSection({
     baseFiles: [
         {
             condition: ctx => !ctx[LOCAL_BLUEPRINT_OPTION],
             templates: [
                 '.github/workflows/generator.yml',
                 '.prettierignore.jhi.blueprint',
-                'eslint.config.js',
+                { sourceFile: 'eslint.config.js.jhi.blueprint', destinationFile: ctx => `${ctx.eslintConfigFile}.jhi.blueprint` },
                 'README.md',
                 'tsconfig.json',
                 'vitest.config.ts',
@@ -58,7 +59,7 @@ export const files = {
             templates: ['cli/commands.cjs'],
         },
     ],
-};
+});
 export const generatorFiles = {
     generator: [
         {

package/dist/generators/generate-blueprint/generator.js

@@ -17,15 +17,14 @@
  * limitations under the License.
  */
 import chalk from 'chalk';
-import { camelCase, upperFirst, snakeCase } from 'lodash-es';
-import BaseGenerator from '../base/index.js';
+import { camelCase, snakeCase, upperFirst } from 'lodash-es';
+import BaseGenerator from '../base-application/index.js';
 import { PRIORITY_NAMES_LIST as BASE_PRIORITY_NAMES_LIST } from '../base/priorities.js';
-import { requiredConfig, defaultConfig, defaultSubGeneratorConfig, allGeneratorsConfig, prompts, subGeneratorPrompts, GENERATE_SNAPSHOTS, LINK_JHIPSTER_DEPENDENCY, ALL_GENERATORS, GENERATORS, PRIORITIES, SUB_GENERATORS, ADDITIONAL_SUB_GENERATORS, WRITTEN, LOCAL_BLUEPRINT_OPTION, ALL_PRIORITIES, DYNAMIC, } from './constants.js';
 import * as GENERATOR_LIST from '../generator-list.js';
-import { files, generatorFiles } from './files.js';
 import { packageJson } from '../../lib/index.js';
-import { SKIP_COMMIT_HOOK } from '../init/constants.js';
 import { BLUEPRINT_API_VERSION, NODE_VERSION } from '../generator-constants.js';
+import { files, generatorFiles } from './files.js';
+import { ADDITIONAL_SUB_GENERATORS, ALL_GENERATORS, ALL_PRIORITIES, DYNAMIC, GENERATE_SNAPSHOTS, GENERATORS, LINK_JHIPSTER_DEPENDENCY, LOCAL_BLUEPRINT_OPTION, PRIORITIES, SUB_GENERATORS, WRITTEN, allGeneratorsConfig, defaultConfig, defaultSubGeneratorConfig, prompts, requiredConfig, subGeneratorPrompts, } from './constants.js';
 const { GENERATOR_PROJECT_NAME, GENERATOR_INIT } = GENERATOR_LIST;
 const defaultPublishedFiles = ['generators', '!**/__*', '!**/*.snap', '!**/*.spec.?(c|m)js'];
 export default class extends BaseGenerator {
@@ -40,7 +39,6 @@ export default class extends BaseGenerator {
     get initializing() {
         return this.asInitializingTaskGroup({
             async loadOptions() {
-                await this.parseCurrentJHipsterCommand();
                 if (this[ALL_GENERATORS]) {
                     this.config.set(allGeneratorsConfig());
                 }
@@ -98,7 +96,6 @@ export default class extends BaseGenerator {
             conditionalConfig() {
                 if (this.jhipsterConfig[LOCAL_BLUEPRINT_OPTION]) {
                     this.config.defaults({
-                        [SKIP_COMMIT_HOOK]: true,
                         [DYNAMIC]: true,
                         js: false,
                     });
@@ -114,7 +111,7 @@ export default class extends BaseGenerator {
             async compose() {
                 if (this.jhipsterConfig[LOCAL_BLUEPRINT_OPTION])
                     return;
-                const initGenerator = await this.composeWithJHipster(GENERATOR_INIT);
+                const initGenerator = await this.composeWithJHipster(GENERATOR_INIT, { generatorOptions: { packageJsonType: 'module' } });
                 initGenerator.generateReadme = false;
             },
         };
@@ -229,7 +226,6 @@ export default class extends BaseGenerator {
                 this.packageJson.merge({
                     name: `generator-jhipster-${this.jhipsterConfig.baseName}`,
                     keywords: ['yeoman-generator', 'jhipster-blueprint', BLUEPRINT_API_VERSION],
-                    type: 'module',
                     files: defaultPublishedFiles,
                     scripts: {
                         ejslint: 'ejslint generators/**/*.ejs',
@@ -244,8 +240,6 @@ export default class extends BaseGenerator {
                         'ejs-lint': `${mainDependencies['ejs-lint']}`,
                         eslint: `${mainDependencies.eslint}`,
                         globals: `${mainDependencies.globals}`,
-                        'eslint-config-prettier': `${mainDependencies['eslint-config-prettier']}`,
-                        'eslint-plugin-prettier': `${mainDependencies['eslint-plugin-prettier']}`,
                         vitest: mainDependencies.vitest,
                         prettier: `${mainDependencies.prettier}`,
                         /*

package/dist/generators/generate-blueprint/resources/package.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "eslint": "9.5.0",
-    "globals": "15.6.0",
-    "vitest": "1.6.0"
+    "eslint": "9.9.1",
+    "globals": "15.9.0",
+    "vitest": "2.0.5"
   }
 }

package/dist/generators/generate-blueprint/templates/.blueprint/generate-sample/generator.mjs.ejs

@@ -12,9 +12,6 @@ export default class extends BaseGenerator {
 
   get [BaseGenerator.INITIALIZING]() {
     return this.asInitializingTaskGroup({
-      async parseCommand() {
-        await this.parseCurrentJHipsterCommand();
-      },
       async initializeOptions() {
         if (this.sampleName && !this.sampleName.endsWith('.jdl')) {
           this.sampleName += '.jdl';

package/dist/generators/{init/templates/.lintstagedrc.cjs.ejs → generate-blueprint/templates/eslint.config.js.jhi.blueprint.ejs}

@@ -16,6 +16,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-module.exports = {
-  '{,src/**/,webpack/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}': ['prettier --write'],
-};
+<&_ if (fragment.importsSection) { -&>
+import jhipster from 'generator-jhipster/eslint/recommended';
+<&_ } -&>
+<&_ if (fragment.configSection) { -&>
+  jhipster,
+<&_ } -&>

package/dist/generators/generator-constants.js

@@ -21,10 +21,11 @@ import { join } from 'path';
 import { fileURLToPath } from 'url';
 export const BLUEPRINT_API_VERSION = 'jhipster-8';
 // jhipster-bom version
-export const JHIPSTER_DEPENDENCIES_VERSION = '8.6.0';
+export const JHIPSTER_DEPENDENCIES_VERSION = '8.7.0';
 // Version of Java
 export const JAVA_VERSION = '17';
-export const JAVA_COMPATIBLE_VERSIONS = ['17', '18', '19', '20', '21', '22'];
+// Supported Java versions, https://www.oracle.com/java/technologies/java-se-support-roadmap.html
+export const JAVA_COMPATIBLE_VERSIONS = ['17', '21', '22'];
 // Force spring milestone repository. Spring Boot milestones are detected.
 export const ADD_SPRING_MILESTONE_REPOSITORY = false;
 // Version of Node, NPM

package/dist/generators/git/command.js

@@ -1,13 +1,24 @@
 const command = {
-    options: {
+    configs: {
         skipGit: {
             description: 'Skip git repository initialization',
-            type: Boolean,
+            cli: {
+                type: Boolean,
+            },
+            scope: 'generator',
+        },
+        forceGit: {
+            description: 'Force commit to git repository',
+            cli: {
+                type: Boolean,
+            },
             scope: 'generator',
         },
         monorepository: {
-            type: Boolean,
             description: 'Use monorepository',
+            cli: {
+                type: Boolean,
+            },
             scope: 'storage',
         },
     },

package/dist/generators/git/files.js

@@ -16,7 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// eslint-disable-next-line import/prefer-default-export
 export const files = {
     git: [
         {

package/dist/generators/git/generator.js

@@ -16,7 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* eslint-disable consistent-return */
 import chalk from 'chalk';
 import BaseGenerator from '../base/index.js';
 import { files } from './files.js';
@@ -24,10 +23,11 @@ import { files } from './files.js';
  * @class
  * @extends {BaseGenerator}
  */
-export default class InitGenerator extends BaseGenerator {
-    gitInstalled;
+export default class GitGenerator extends BaseGenerator {
     gitInitialized;
     skipGit;
+    forceGit;
+    existingRepository;
     async beforeQueue() {
         if (!this.fromBlueprint) {
             await this.composeWithBlueprints();
@@ -35,13 +35,10 @@ export default class InitGenerator extends BaseGenerator {
     }
     get initializing() {
         return this.asInitializingTaskGroup({
-            async parseCommand() {
-                await this.parseCurrentJHipsterCommand();
-            },
             async checkGit() {
                 if (!this.skipGit) {
-                    this.gitInstalled = (await this.createGit().version()).installed;
-                    if (!this.gitInstalled) {
+                    const gitInstalled = (await this.createGit().version()).installed;
+                    if (!gitInstalled) {
                         this.log.warn('Git repository will not be created, as Git is not installed on your system');
                         this.skipGit = true;
                     }
@@ -57,6 +54,19 @@ export default class InitGenerator extends BaseGenerator {
     get [BaseGenerator.INITIALIZING]() {
         return this.delegateTasksToBlueprint(() => this.initializing);
     }
+    get preparing() {
+        return this.asPreparingTaskGroup({
+            async preparing() {
+                if (!this.skipGit) {
+                    // Force write .yo-rc.json to disk, it's used to check if the application is regenerated
+                    this.jhipsterConfig.skipGit = undefined;
+                }
+            },
+        });
+    }
+    get [BaseGenerator.PREPARING]() {
+        return this.delegateTasksToBlueprint(() => this.preparing);
+    }
     get writing() {
         return this.asWritingTaskGroup({
             async writeFiles() {
@@ -94,23 +104,28 @@ export default class InitGenerator extends BaseGenerator {
                     this.debug('Committing files to git');
                     const git = this.createGit();
                     const repositoryRoot = await git.revparse(['--show-toplevel']);
-                    const result = await git.log(['-n', '1', '--', '.yo-rc.json']).catch(() => { });
-                    if (result && result.total > 0) {
+                    const result = await git.log(['-n', '1', '--', '.yo-rc.json']).catch(() => ({ total: 0 }));
+                    const existingApplication = result.total > 0;
+                    if (existingApplication && !this.forceGit) {
                         this.log.info(`Found .yo-rc.json in Git from ${repositoryRoot}. So we assume this is application regeneration. Therefore automatic Git commit is not done. You can do Git commit manually.`);
                         return;
                     }
-                    try {
+                    if (!this.forceGit) {
                         const statusResult = await git.status();
                         if (statusResult.staged.length > 0) {
                             this.log.verboseInfo(`The repository ${repositoryRoot} has staged files, skipping commit.`);
                             return;
                         }
-                        let commitMsg = `Initial version of ${this.jhipsterConfig.baseName} generated by generator-jhipster@${this.jhipsterConfig.jhipsterVersion}`;
+                    }
+                    try {
+                        let commitMsg = existingApplication
+                            ? `Regenerated ${this.jhipsterConfig.baseName} using generator-jhipster@${this.jhipsterConfig.jhipsterVersion}`
+                            : `Initial version of ${this.jhipsterConfig.baseName} generated by generator-jhipster@${this.jhipsterConfig.jhipsterVersion}`;
                         if (this.jhipsterConfig.blueprints && this.jhipsterConfig.blueprints.length > 0) {
                             const bpInfo = this.jhipsterConfig.blueprints.map(bp => `${bp.name}@${bp.version}`).join(', ');
                             commitMsg += ` with blueprints ${bpInfo}`;
                         }
-                        await git.add(['.']).commit(commitMsg);
+                        await git.add(['.']).commit(commitMsg, { '--allow-empty': null });
                         this.log.ok(`Application successfully committed to Git from ${repositoryRoot}.`);
                     }
                     catch (e) {
@@ -133,11 +148,14 @@ export default class InitGenerator extends BaseGenerator {
     async initializeGitRepository() {
         try {
             const git = this.createGit();
-            if (await git.checkIsRepo('root')) {
-                this.log.info('Using existing git repository.');
-            }
-            else if (await git.checkIsRepo()) {
-                this.log.info('Using existing git repository at parent folder.');
+            if (await git.checkIsRepo()) {
+                if (await git.checkIsRepo('root')) {
+                    this.log.info('Using existing git repository.');
+                }
+                else {
+                    this.log.info('Using existing git repository at parent folder.');
+                }
+                this.existingRepository = true;
             }
             else if (await git.init()) {
                 this.log.ok('Git repository initialized.');

package/dist/generators/gradle/generator.js

@@ -16,15 +16,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* eslint-disable consistent-return */
 import assert from 'assert/strict';
 import BaseApplicationGenerator from '../base-application/index.js';
+import { GRADLE_BUILD_SRC_DIR } from '../generator-constants.js';
+import { mutateData } from '../base/support/config.js';
+import { QUEUES } from '../base/priorities.js';
 import files from './files.js';
 import { GRADLE } from './constants.js';
-import { GRADLE_BUILD_SRC_DIR } from '../generator-constants.js';
 import cleanupOldServerFilesTask from './cleanup.js';
-import { applyFromGradleCallback, addGradleDependenciesCallback, addGradleMavenRepositoryCallback, addGradlePluginCallback, addGradlePluginManagementCallback, addGradlePropertyCallback, addGradleDependenciesCatalogVersionCallback, addGradleDependencyCatalogLibrariesCallback, addGradleDependencyCatalogPluginsCallback, addGradleDependencyFromCatalogCallback, addGradlePluginFromCatalogCallback, sortDependencies, gradleNeedleOptionsWithDefaults, } from './internal/needles.js';
-import { mutateData } from '../base/support/config.js';
+import { addGradleDependenciesCallback, addGradleDependenciesCatalogVersionCallback, addGradleDependencyCatalogLibrariesCallback, addGradleDependencyCatalogPluginsCallback, addGradleMavenRepositoryCallback, addGradlePluginCallback, addGradlePluginFromCatalogCallback, addGradlePluginManagementCallback, addGradlePropertyCallback, applyFromGradleCallback, gradleNeedleOptionsWithDefaults, sortDependencies, } from './internal/needles.js';
+const { PRE_CONFLICTS_QUEUE } = QUEUES;
 export default class GradleGenerator extends BaseApplicationGenerator {
     gradleVersionFromWrapper;
     async beforeQueue() {
@@ -35,28 +36,6 @@ export default class GradleGenerator extends BaseApplicationGenerator {
             await this.dependsOnBootstrapApplicationServer();
         }
     }
-    get initializing() {
-        return this.asInitializingTaskGroup({
-            async parseCommand() {
-                await this.parseCurrentJHipsterCommand();
-            },
-        });
-    }
-    get [BaseApplicationGenerator.INITIALIZING]() {
-        return this.delegateTasksToBlueprint(() => this.initializing);
-    }
-    get prompting() {
-        return this.asPromptingTaskGroup({
-            async promptCommand({ control }) {
-                if (control.existingProject && this.options.askAnswered !== true)
-                    return;
-                await this.promptCurrentJHipsterCommand();
-            },
-        });
-    }
-    get [BaseApplicationGenerator.PROMPTING]() {
-        return this.delegateTasksToBlueprint(() => this.prompting);
-    }
     get configuring() {
         return this.asConfiguringTaskGroup({
             configure() {
@@ -73,9 +52,6 @@ export default class GradleGenerator extends BaseApplicationGenerator {
     }
     get loading() {
         return this.asLoadingTaskGroup({
-            async loadConfig({ application }) {
-                await this.loadCurrentJHipsterCommandConfig(application);
-            },
             loadGradleVersion({ application }) {
                 const propFile = this.readTemplate(this.jhipsterTemplatePath('gradle/wrapper/gradle-wrapper.properties'));
                 this.gradleVersionFromWrapper = propFile?.toString().match(/gradle-(\d+\.\d+(?:\.\d+)?)-/)?.[1];
@@ -104,6 +80,20 @@ export default class GradleGenerator extends BaseApplicationGenerator {
                 source.applyFromGradle = script => this.editFile('build.gradle', applyFromGradleCallback(script));
                 source.addGradleDependencies = (dependencies, options = {}) => {
                     const { gradleFile } = gradleNeedleOptionsWithDefaults(options);
+                    if (gradleFile === 'build.gradle') {
+                        source._gradleDependencies = source._gradleDependencies ?? [];
+                        source._gradleDependencies.push(...dependencies);
+                        this.queueTask({
+                            method: () => {
+                                this.editFile(gradleFile, addGradleDependenciesCallback(source._gradleDependencies.sort(sortDependencies)));
+                                source._gradleDependencies = [];
+                            },
+                            taskName: '_persiteGradleDependencies',
+                            once: true,
+                            queueName: PRE_CONFLICTS_QUEUE,
+                        });
+                        return;
+                    }
                     dependencies = [...dependencies].sort(sortDependencies);
                     this.editFile(gradleFile, addGradleDependenciesCallback(dependencies));
                 };
@@ -121,7 +111,7 @@ export default class GradleGenerator extends BaseApplicationGenerator {
                     const { gradleFile, gradleVersionCatalogFile } = gradleNeedleOptionsWithDefaults(options);
                     libs = [...libs].sort((a, b) => a.libraryName.localeCompare(b.libraryName));
                     this.editFile(gradleVersionCatalogFile, addGradleDependencyCatalogLibrariesCallback(libs));
-                    this.editFile(gradleFile, addGradleDependencyFromCatalogCallback(libs));
+                    source.addGradleDependencies(libs.filter(lib => lib.scope), { gradleFile });
                 };
                 source.addGradleDependencyCatalogLibrary = (lib, options) => source.addGradleDependencyCatalogLibraries([lib], options);
                 source.addGradleDependencyCatalogPlugins = plugins => {

package/dist/generators/gradle/generators/jib/templates/buildSrc/src/main/groovy/jhipster.docker-conventions.gradle.ejs

@@ -21,6 +21,9 @@ plugins {
 }
 
 jib {
+<%_ if (backendTypeSpringBoot) { _%>
+    configurationName = "productionRuntimeClasspath"
+<%_ } _%>
     from {
         image = "<%- dockerContainers.javaJre %>"
         platforms {