generator-jhipster 8.2.1 → 8.3.0

package/dist/generators/entity/prompts.js

@@ -18,7 +18,7 @@
  */
 import fs from 'fs';
 import chalk from 'chalk';
-import * as _ from 'lodash-es';
+import { isArray, lowerFirst, snakeCase, uniq, upperFirst } from 'lodash-es';
 import { reservedKeywords, databaseTypes, applicationTypes, entityOptions, fieldTypes, validations, clientFrameworkTypes, } from '../../jdl/jhipster/index.js';
 import { inputIsNumber, inputIsSignedDecimalNumber, inputIsSignedNumber } from './support/index.js';
 const { isReservedPaginationWords, isReservedFieldName, isReservedTableName } = reservedKeywords;
@@ -55,7 +55,7 @@ const prompts = {
 };
 export default prompts;
 const getFieldNameUndercored = fields => ['id'].concat(fields.map(field => {
-    return _.snakeCase(field.fieldName);
+    return snakeCase(field.fieldName);
 }));
 function askForMicroserviceJson() {
     const context = this.entityData;
@@ -413,7 +413,7 @@ async function askForField() {
                 if (input.charAt(0) === input.charAt(0).toUpperCase()) {
                     return 'Your field name cannot start with an upper case letter';
                 }
-                if (input === 'id' || getFieldNameUndercored(this.entityConfig.fields).includes(_.snakeCase(input))) {
+                if (input === 'id' || getFieldNameUndercored(this.entityConfig.fields).includes(snakeCase(input))) {
                     return 'Your field name cannot use an already existing field name';
                 }
                 if ((clientFramework === undefined || clientFramework === ANGULAR) && isReservedFieldName(input, ANGULAR)) {
@@ -504,7 +504,7 @@ async function askForField() {
                     return 'Enum values cannot contain special characters (allowed characters: A-Z, a-z, 0-9 and _)';
                 }
                 const enums = input.replace(/\s/g, '').split(',');
-                if (_.uniq(enums).length !== enums.length) {
+                if (uniq(enums).length !== enums.length) {
                     return `Enum values cannot contain duplicates (typed values: ${input})`;
                 }
                 for (let i = 0; i < enums.length; i++) {
@@ -659,7 +659,7 @@ async function askForField() {
         },
     ]);
     if (answers.fieldIsEnum) {
-        answers.fieldType = _.upperFirst(answers.fieldType);
+        answers.fieldType = upperFirst(answers.fieldType);
         answers.fieldValues = answers.fieldValues.toUpperCase();
     }
     const field = {
@@ -721,7 +721,7 @@ async function askForRelationship(...args) {
                 if (input.charAt(0) === input.charAt(0).toUpperCase()) {
                     return 'Your relationship cannot start with an upper case letter';
                 }
-                if (input === 'id' || getFieldNameUndercored(this.entityConfig.fields).includes(_.snakeCase(input))) {
+                if (input === 'id' || getFieldNameUndercored(this.entityConfig.fields).includes(snakeCase(input))) {
                     return 'Your relationship cannot use an already existing field name';
                 }
                 if (isReservedTableName(input, 'JAVA')) {
@@ -730,7 +730,7 @@ async function askForRelationship(...args) {
                 return true;
             },
             message: 'What is the name of the relationship?',
-            default: response => _.lowerFirst(response.otherEntityName),
+            default: response => lowerFirst(response.otherEntityName),
         },
         {
             type: 'list',
@@ -774,7 +774,7 @@ async function askForRelationship(...args) {
             type: 'input',
             name: 'otherEntityRelationshipName',
             message: 'What is the name of this relationship in the other entity?',
-            default: () => _.lowerFirst(name),
+            default: () => lowerFirst(name),
         },
         {
             type: 'input',
@@ -808,7 +808,7 @@ async function askForRelationship(...args) {
     const relationship = {
         relationshipSide: 'left',
         relationshipName: answers.relationshipName,
-        otherEntityName: _.lowerFirst(answers.otherEntityName),
+        otherEntityName: lowerFirst(answers.otherEntityName),
         relationshipType: answers.relationshipType,
         relationshipValidateRules: answers.relationshipValidateRules,
         otherEntityField: answers.otherEntityField,
@@ -817,7 +817,7 @@ async function askForRelationship(...args) {
         otherEntityRelationshipName: answers.otherEntityRelationshipName,
     };
     if (this.isBuiltInUser(answers.otherEntityName)) {
-        relationship.otherEntityRelationshipName = _.lowerFirst(name);
+        relationship.otherEntityRelationshipName = lowerFirst(name);
     }
     this.entityConfig.relationships = this.entityConfig.relationships.concat(relationship);
     await askForRelationship.call(this, ...args);
@@ -834,7 +834,7 @@ function logFieldsAndRelationships() {
         this.log.log(chalk.white('Fields'));
         this.entityConfig.fields.forEach(field => {
             const validationDetails = [];
-            const fieldValidate = _.isArray(field.fieldValidateRules) && field.fieldValidateRules.length >= 1;
+            const fieldValidate = isArray(field.fieldValidateRules) && field.fieldValidateRules.length >= 1;
             if (fieldValidate === true) {
                 if (field.fieldValidateRules.includes(REQUIRED)) {
                     validationDetails.push(REQUIRED);
@@ -877,7 +877,7 @@ function logFieldsAndRelationships() {
             if (relationship.relationshipValidateRules && relationship.relationshipValidateRules.includes(REQUIRED)) {
                 validationDetails.push(REQUIRED);
             }
-            this.log.log(`${chalk.red(relationship.relationshipName)} ${chalk.white(`(${_.upperFirst(relationship.otherEntityName)})`)} ${chalk.cyan(relationship.relationshipType)} ${chalk.cyan(validationDetails.join(' '))}`);
+            this.log.log(`${chalk.red(relationship.relationshipName)} ${chalk.white(`(${upperFirst(relationship.otherEntityName)})`)} ${chalk.cyan(relationship.relationshipType)} ${chalk.cyan(validationDetails.join(' '))}`);
         });
         this.log.log();
     }

package/dist/generators/feign-client/generator.js

@@ -17,16 +17,15 @@
  * limitations under the License.
  */
 import BaseApplicationGenerator from '../base-application/index.js';
-import { GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_FEIGN_CLIENT } from '../generator-list.js';
 import { feignFiles } from './files.js';
 import cleanupTask from './cleanup.js';
 export default class FeignClientGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_FEIGN_CLIENT);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+            await this.dependsOnBootstrapApplication();
         }
     }
     get writing() {
@@ -60,6 +59,6 @@ export default class FeignClientGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.POST_WRITING]() {
-        return this.asPostWritingTaskGroup(this.delegateTasksToBlueprint(() => this.postWriting));
+        return this.delegateTasksToBlueprint(() => this.postWriting);
     }
 }

package/dist/generators/gatling/generator.js

@@ -17,17 +17,16 @@
  * limitations under the License.
  */
 import BaseApplicationGenerator from '../base-application/index.js';
-import { GENERATOR_GATLING, GENERATOR_BOOTSTRAP_APPLICATION } from '../generator-list.js';
 import writeTask from './files.js';
 import cleanupTask from './cleanup.js';
 import writeEntityTask, { cleanupEntitiesTask } from './entity-files.js';
 export default class GatlingGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_GATLING);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+            await this.dependsOnBootstrapApplication();
         }
     }
     get writing() {

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

@@ -28,6 +28,7 @@ export const files = {
                 'README.md',
                 'tsconfig.json',
                 'vitest.config.ts',
+                'vitest.test-setup.ts',
                 '.blueprint/cli/commands.mjs',
                 '.blueprint/generate-sample/command.mjs',
                 '.blueprint/generate-sample/generator.mjs',

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

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import chalk from 'chalk';
-import lodash from 'lodash';
+import { camelCase, upperFirst, snakeCase } from 'lodash-es';
 import BaseGenerator from '../base/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';
@@ -27,12 +27,11 @@ import { packageJson } from '../../lib/index.js';
 import { SKIP_COMMIT_HOOK } from '../init/constants.js';
 import command from './command.js';
 import { BLUEPRINT_API_VERSION, NODE_VERSION } from '../generator-constants.js';
-const { camelCase, upperFirst, snakeCase } = lodash;
-const { GENERATOR_PROJECT_NAME, GENERATOR_INIT, GENERATOR_GENERATE_BLUEPRINT } = GENERATOR_LIST;
+const { GENERATOR_PROJECT_NAME, GENERATOR_INIT } = GENERATOR_LIST;
 export default class extends BaseGenerator {
     async _beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_GENERATE_BLUEPRINT);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
             await this.dependsOnJHipster(GENERATOR_PROJECT_NAME);

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

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

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

@@ -16,11 +16,29 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
+<%_ if (!sbs && !customGenerator) { _%>
+import { command as jhipsterCommand } from 'generator-jhipster/generators/<%- subGenerator %>';
+
+<%_ } _%>
 /**
  * @type {import('generator-jhipster').JHipsterCommandDefinition}
  */
 const command = {
-  options: {},
+  options: {
+<%_ if (!sbs && !customGenerator) { _%>
+    ...jhipsterCommand.options,
+<%_ } _%>
+  },
+  configs: {
+<%_ if (!sbs && !customGenerator) { _%>
+    ...jhipsterCommand.configs,
+<%_ } _%>
+  },
+  arguments: {
+<%_ if (!sbs && !customGenerator) { _%>
+    ...jhipsterCommand.arguments,
+<%_ } _%>
+  },
 };
 
 export default command;

package/dist/generators/generate-blueprint/templates/vitest.test-setup.ts.ejs

@@ -0,0 +1,6 @@
+import { vi } from 'vitest';
+import { defineDefaults } from 'generator-jhipster/testing';
+
+defineDefaults({
+  mockFactory: () => vi.fn(),
+});

package/dist/generators/generator-constants.js

@@ -16,16 +16,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { readFileSync } from 'fs';
+import { join } from 'path';
+import { fileURLToPath } from 'url';
 export const BLUEPRINT_API_VERSION = 'jhipster-8';
 // jhipster-bom version
-export const JHIPSTER_DEPENDENCIES_VERSION = '8.2.0';
+export const JHIPSTER_DEPENDENCIES_VERSION = '8.3.0';
 // Version of Java
 export const JAVA_VERSION = '17';
 export const JAVA_COMPATIBLE_VERSIONS = ['17', '18', '19', '20', '21'];
 // Force spring milestone repository. Spring Boot milestones are detected.
 export const ADD_SPRING_MILESTONE_REPOSITORY = false;
 // Version of Node, NPM
-export const NODE_VERSION = '20.11.1';
+export const NODE_VERSION = readFileSync(join(fileURLToPath(import.meta.url), '../init/resources/.node-version'), 'utf-8').trim();
 export const OPENAPI_GENERATOR_CLI_VERSION = '2.13.1';
 // The version should be coherent with the one from spring-data-elasticsearch project
 export const ELASTICSEARCH_TAG = '8.10.4';

package/dist/generators/git/generator.js

@@ -19,9 +19,7 @@
 /* eslint-disable consistent-return */
 import chalk from 'chalk';
 import BaseGenerator from '../base/index.js';
-import { GENERATOR_GIT } from '../generator-list.js';
 import { files } from './files.js';
-import command from './command.js';
 /**
  * @class
  * @extends {BaseGenerator}
@@ -32,13 +30,13 @@ export default class InitGenerator extends BaseGenerator {
     skipGit;
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_GIT);
+            await this.composeWithBlueprints();
         }
     }
     get initializing() {
         return this.asInitializingTaskGroup({
-            parseOptions() {
-                this.parseJHipsterOptions(command.options);
+            async parseCommand() {
+                await this.parseCurrentJHipsterCommand();
             },
             async checkGit() {
                 if (!this.skipGit) {

package/dist/generators/gradle/command.js

@@ -0,0 +1,32 @@
+const command = {
+    options: {},
+    configs: {
+        enableGradleEnterprise: {
+            cli: {
+                type: Boolean,
+            },
+            prompt: {
+                type: 'confirm',
+                message: 'Do you want to enable Gradle Enterprise integration?',
+            },
+            default: false,
+            description: 'Enable Gradle Enterprise integration',
+            scope: 'storage',
+        },
+        gradleEnterpriseHost: {
+            cli: {
+                type: String,
+            },
+            prompt: {
+                when: answers => answers.enableGradleEnterprise,
+                type: 'input',
+                message: 'Enter your Gradle Enterprise host',
+                validate: input => (input.length === 0 ? 'Please enter your Gradle Enterprise host' : true),
+            },
+            description: 'Gradle Enterprise Host',
+            scope: 'storage',
+        },
+    },
+    import: [],
+};
+export default command;

package/dist/generators/gradle/constants.js

@@ -16,7 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export const GRADLE_VERSION = '8.6';
 export const GRADLE = 'gradle';
 export const GRADLE_DESCRIPTION = 'Gradle';
 export const BUILD_DESTINATION_VALUE = 'build';

package/dist/generators/gradle/files.js

@@ -19,17 +19,11 @@
 export default {
     gradle: [
         {
-            templates: [
-                '.prettierignore.jhi.gradle',
-                'gradle/wrapper/gradle-wrapper.properties',
-                'buildSrc/build.gradle',
-                'buildSrc/gradle/libs.versions.toml',
-                'gradle/libs.versions.toml',
-            ],
+            templates: ['.prettierignore.jhi.gradle', 'buildSrc/build.gradle', 'buildSrc/gradle/libs.versions.toml', 'gradle/libs.versions.toml'],
         },
         {
             transform: false,
-            templates: ['gradlew', 'gradlew.bat', 'gradle/wrapper/gradle-wrapper.jar'],
+            templates: ['gradlew', 'gradlew.bat', 'gradle/wrapper/gradle-wrapper.jar', 'gradle/wrapper/gradle-wrapper.properties'],
         },
     ],
 };

package/dist/generators/gradle/generator.js

@@ -19,21 +19,44 @@
 /* eslint-disable consistent-return */
 import assert from 'assert/strict';
 import BaseApplicationGenerator from '../base-application/index.js';
-import { GENERATOR_GRADLE, GENERATOR_BOOTSTRAP_APPLICATION_SERVER } from '../generator-list.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, addGradleBuildSrcDependencyCallback, addGradleDependenciesCatalogVersionCallback, addGradleBuildSrcDependencyCatalogVersionCallback, addGradleDependencyCatalogLibrariesCallback, addGradleDependencyCatalogPluginsCallback, addGradleDependencyFromCatalogCallback, addGradlePluginFromCatalogCallback, sortDependencies, } from './internal/needles.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';
 export default class GradleGenerator extends BaseApplicationGenerator {
+    gradleVersionFromWrapper;
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_GRADLE);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_SERVER);
+            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() {
@@ -48,14 +71,39 @@ export default class GradleGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.CONFIGURING]() {
         return this.delegateTasksToBlueprint(() => this.configuring);
     }
+    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];
+                if (!this.gradleVersionFromWrapper) {
+                    throw new Error('Could not determine Gradle version from gradle-wrapper.properties');
+                }
+                mutateData(application, {
+                    gradleVersion: this.useVersionPlaceholders ? 'GRADLE_VERSION' : this.gradleVersionFromWrapper,
+                });
+            },
+        });
+    }
+    get [BaseApplicationGenerator.LOADING]() {
+        return this.delegateTasksToBlueprint(() => this.loading);
+    }
     get preparing() {
         return this.asPreparingTaskGroup({
             async verify({ application }) {
                 assert.equal(application.buildTool, GRADLE);
             },
-            addSourceNeddles({ source }) {
+            prepareConventionsPlugins({ application }) {
+                application.gradleBuildSrc = GRADLE_BUILD_SRC_DIR;
+            },
+            addSourceNeddles({ application, source }) {
+                const { gradleBuildSrc } = application;
                 source.applyFromGradle = script => this.editFile('build.gradle', applyFromGradleCallback(script));
-                source.addGradleDependencies = (dependencies, { gradleFile = 'build.gradle' } = {}) => {
+                source.addGradleDependencies = (dependencies, options = {}) => {
+                    const { gradleFile } = gradleNeedleOptionsWithDefaults(options);
                     dependencies = [...dependencies].sort(sortDependencies);
                     this.editFile(gradleFile, addGradleDependenciesCallback(dependencies));
                 };
@@ -63,13 +111,16 @@ export default class GradleGenerator extends BaseApplicationGenerator {
                 source.addGradlePlugin = plugin => this.editFile('build.gradle', addGradlePluginCallback(plugin));
                 source.addGradleMavenRepository = repository => this.editFile('build.gradle', addGradleMavenRepositoryCallback(repository));
                 source.addGradlePluginManagement = plugin => this.editFile('settings.gradle', addGradlePluginManagementCallback(plugin));
-                source.addGradleProperty = property => this.editFile('gradle.properties', addGradlePropertyCallback(property));
-                source.addGradleBuildSrcDependency = dependency => this.editFile(`${GRADLE_BUILD_SRC_DIR}/build.gradle`, addGradleBuildSrcDependencyCallback(dependency));
-                source.addGradleDependencyCatalogVersions = versions => this.editFile('gradle/libs.versions.toml', addGradleDependenciesCatalogVersionCallback(versions));
-                source.addGradleDependencyCatalogVersion = version => source.addGradleDependencyCatalogVersions([version]);
-                source.addGradleDependencyCatalogLibraries = (libs, { gradleFile = 'build.gradle' } = {}) => {
+                source.addGradleProperty = property => {
+                    application.javaProperties[property.property] = property.value;
+                    this.editFile('gradle.properties', addGradlePropertyCallback(property));
+                };
+                source.addGradleDependencyCatalogVersions = (versions, { gradleVersionCatalogFile = 'gradle/libs.versions.toml' } = {}) => this.editFile(gradleVersionCatalogFile, addGradleDependenciesCatalogVersionCallback(versions));
+                source.addGradleDependencyCatalogVersion = (version, options) => source.addGradleDependencyCatalogVersions([version], options);
+                source.addGradleDependencyCatalogLibraries = (libs, options = {}) => {
+                    const { gradleFile, gradleVersionCatalogFile } = gradleNeedleOptionsWithDefaults(options);
                     libs = [...libs].sort((a, b) => a.libraryName.localeCompare(b.libraryName));
-                    this.editFile('gradle/libs.versions.toml', addGradleDependencyCatalogLibrariesCallback(libs));
+                    this.editFile(gradleVersionCatalogFile, addGradleDependencyCatalogLibrariesCallback(libs));
                     this.editFile(gradleFile, addGradleDependencyFromCatalogCallback(libs));
                 };
                 source.addGradleDependencyCatalogLibrary = (lib, options) => source.addGradleDependencyCatalogLibraries([lib], options);
@@ -78,7 +129,15 @@ export default class GradleGenerator extends BaseApplicationGenerator {
                     this.editFile('build.gradle', addGradlePluginFromCatalogCallback(plugins));
                 };
                 source.addGradleDependencyCatalogPlugin = plugin => source.addGradleDependencyCatalogPlugins([plugin]);
-                source.addGradleBuildSrcDependencyCatalogVersion = version => this.editFile(`${GRADLE_BUILD_SRC_DIR}/gradle/libs.versions.toml`, addGradleBuildSrcDependencyCatalogVersionCallback(version));
+                source.addGradleBuildSrcDependency = dependency => source.addGradleDependencies([dependency], { gradleFile: `${gradleBuildSrc}/build.gradle` });
+                source.addGradleBuildSrcDependencyCatalogVersion = version => source.addGradleDependencyCatalogVersions([version], {
+                    gradleVersionCatalogFile: `${gradleBuildSrc}/gradle/libs.versions.toml`,
+                });
+                source.addGradleBuildSrcDependencyCatalogVersions = versions => source.addGradleDependencyCatalogVersions(versions);
+                source.addGradleBuildSrcDependencyCatalogLibraries = libs => source.addGradleDependencyCatalogLibraries(libs, {
+                    gradleFile: `${gradleBuildSrc}/build.gradle`,
+                    gradleVersionCatalogFile: `${gradleBuildSrc}/gradle/libs.versions.toml`,
+                });
             },
         });
     }
@@ -96,4 +155,17 @@ export default class GradleGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.WRITING]() {
         return this.delegateTasksToBlueprint(() => this.writing);
     }
+    get postWriting() {
+        return this.asPostWritingTaskGroup({
+            updateGradleVersion({ application }) {
+                const { gradleVersion } = application;
+                if (gradleVersion !== this.gradleVersionFromWrapper) {
+                    this.editFile('gradle/wrapper/gradle-wrapper.properties', content => content.replace(`-${this.gradleVersionFromWrapper}-`, `-${gradleVersion}-`));
+                }
+            },
+        });
+    }
+    get [BaseApplicationGenerator.POST_WRITING]() {
+        return this.delegateTasksToBlueprint(() => this.postWriting);
+    }
 }

package/dist/generators/gradle/generators/code-quality/generator.js

@@ -0,0 +1,86 @@
+/**
+ * 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 BaseApplicationGenerator from '../../../base-application/index.js';
+import { GRADLE_BUILD_SRC_MAIN_DIR } from '../../../generator-constants.js';
+import { GENERATOR_GRADLE } from '../../../generator-list.js';
+export default class CodeQualityGenerator extends BaseApplicationGenerator {
+    async beforeQueue() {
+        if (!this.fromBlueprint) {
+            await this.composeWithBlueprints();
+        }
+        if (!this.delegateToBlueprint) {
+            await this.dependsOnBootstrapApplication();
+            await this.dependsOnJHipster(GENERATOR_GRADLE);
+        }
+    }
+    get writing() {
+        return this.asWritingTaskGroup({
+            async writing({ application }) {
+                await this.writeFiles({
+                    blocks: [{ templates: [`${GRADLE_BUILD_SRC_MAIN_DIR}/jhipster.code-quality-conventions.gradle`] }],
+                    context: application,
+                });
+            },
+        });
+    }
+    get [BaseApplicationGenerator.WRITING]() {
+        return this.delegateTasksToBlueprint(() => this.writing);
+    }
+    get postWriting() {
+        return this.asPostWritingTaskGroup({
+            customize({ application, source }) {
+                const { javaDependencies } = application;
+                source.addGradleDependencyCatalogVersions([
+                    { name: 'jacoco', version: javaDependencies['jacoco-maven-plugin'] },
+                    { name: 'checkstyle', version: javaDependencies.checkstyle },
+                ]);
+                source.addGradleBuildSrcDependencyCatalogLibraries?.([
+                    {
+                        libraryName: 'sonarqube-plugin',
+                        module: 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin',
+                        version: javaDependencies['gradle-sonarqube'],
+                        scope: 'implementation',
+                    },
+                    {
+                        libraryName: 'spotless-plugin',
+                        module: 'com.diffplug.spotless:spotless-plugin-gradle',
+                        version: javaDependencies['spotless-gradle-plugin'],
+                        scope: 'implementation',
+                    },
+                    {
+                        libraryName: 'modernizer-plugin',
+                        module: 'com.github.andygoossens:gradle-modernizer-plugin',
+                        version: javaDependencies['gradle-modernizer-plugin'],
+                        scope: 'implementation',
+                    },
+                    {
+                        libraryName: 'nohttp-plugin',
+                        module: 'io.spring.nohttp:nohttp-gradle',
+                        version: javaDependencies['nohttp-checkstyle'],
+                        scope: 'implementation',
+                    },
+                ]);
+                source.addGradlePlugin?.({ id: 'jhipster.code-quality-conventions' });
+            },
+        });
+    }
+    get [BaseApplicationGenerator.POST_WRITING]() {
+        return this.delegateTasksToBlueprint(() => this.postWriting);
+    }
+}

package/dist/generators/{java/cleanup.js → gradle/generators/code-quality/index.js}

@@ -16,8 +16,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/**
- * Removes server files that where generated in previous JHipster versions and therefore
- * need to be removed.
- */
-export default function cleanupTask() { }
+export { default } from './generator.js';