generator-jhipster 8.2.1 → 8.4.0

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';

package/dist/generators/gradle/generators/jib/generator.js

@@ -0,0 +1,64 @@
+/**
+ * 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.docker-conventions.gradle`] }],
+                    context: application,
+                });
+            },
+        });
+    }
+    get [BaseApplicationGenerator.WRITING]() {
+        return this.delegateTasksToBlueprint(() => this.writing);
+    }
+    get postWriting() {
+        return this.asPostWritingTaskGroup({
+            customize({ application, source }) {
+                const { javaDependencies } = application;
+                source.addGradleBuildSrcDependencyCatalogLibraries?.([
+                    {
+                        libraryName: 'jib-plugin',
+                        module: 'com.google.cloud.tools:jib-gradle-plugin',
+                        version: javaDependencies['jib-maven-plugin'],
+                        scope: 'implementation',
+                    },
+                ]);
+                source.addGradlePlugin?.({ id: 'jhipster.docker-conventions' });
+            },
+        });
+    }
+    get [BaseApplicationGenerator.POST_WRITING]() {
+        return this.delegateTasksToBlueprint(() => this.postWriting);
+    }
+}

package/dist/generators/{app/prompts.js → gradle/generators/jib/index.js}

@@ -16,18 +16,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import chalk from 'chalk';
-import statistics from '../statistics.js';
-export async function askForInsightOptIn() {
-    if (!statistics.shouldWeAskForOptIn())
-        return;
-    const answers = await this.prompt({
-        type: 'confirm',
-        name: 'insight',
-        message: `May ${chalk.cyan('JHipster')} anonymously report usage statistics to improve the tool over time?`,
-        default: true,
-    });
-    if (answers.insight !== undefined) {
-        statistics.setOptOutStatus(!answers.insight);
-    }
-}
+export { default } from './generator.js';

package/dist/generators/gradle/generators/node-gradle/generator.js

@@ -0,0 +1,64 @@
+/**
+ * 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 NodeGradleGenerator 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.node-gradle-conventions.gradle`] }],
+                    context: application,
+                });
+            },
+        });
+    }
+    get [BaseApplicationGenerator.WRITING]() {
+        return this.delegateTasksToBlueprint(() => this.writing);
+    }
+    get postWriting() {
+        return this.asPostWritingTaskGroup({
+            customize({ application, source }) {
+                source.addGradlePlugin({ id: 'jhipster.node-gradle-conventions' });
+                source.addGradleBuildSrcDependencyCatalogLibraries([
+                    {
+                        libraryName: 'node-gradle',
+                        module: 'com.github.node-gradle:gradle-node-plugin',
+                        version: application.javaDependencies['node-gradle'],
+                        scope: 'implementation',
+                    },
+                ]);
+                source.addGradleProperty({ property: 'nodeInstall', comment: 'Install and use a local version of node and npm.' });
+            },
+        });
+    }
+    get [BaseApplicationGenerator.POST_WRITING]() {
+        return this.delegateTasksToBlueprint(() => this.postWriting);
+    }
+}

package/dist/generators/gradle/generators/node-gradle/index.js

@@ -0,0 +1,19 @@
+/**
+ * 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.
+ */
+export { default } from './generator.js';

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

@@ -0,0 +1,101 @@
+plugins {
+    id "com.github.node-gradle.node"
+}
+
+if (project.hasProperty("nodeInstall")) {
+    node {
+        version = "<%= nodeVersion %>"
+        npmVersion = "<%= nodeDependencies.npm %>"
+        download = true
+    }
+
+    // Copy local node and npm to a fixed location for npmw
+    def deleteOldNpm = tasks.register("deleteOldNpm", Delete) {
+        delete '<%= temporaryDir %>node/lib/node_modules/npm'
+    }
+    def fixedNode = tasks.register("fixedNode", Copy) {
+        from nodeSetup
+        into '<%= temporaryDir %>node'
+        finalizedBy deleteOldNpm
+    }
+    tasks.named("nodeSetup").configure { finalizedBy fixedNode }
+
+    def fixedNpm = tasks.register("fixedNpm", Copy) {
+        from npmSetup
+        into '<%= temporaryDir %>node'
+    }
+    tasks.named("npmSetup").configure { finalizedBy fixedNpm }
+}
+
+<%_ if (!skipClient) { _%>
+task webapp_test(type: NpmTask) {
+    inputs.property('appVersion', project.version)
+    inputs.files("package-lock.json")
+        .withPropertyName('package-lock')
+        .withPathSensitivity(PathSensitivity.RELATIVE)
+    inputs.files("build.gradle")
+        .withPropertyName('build.gradle')
+        .withPathSensitivity(PathSensitivity.RELATIVE)
+  <%_ if (clientFrameworkAngular) { _%>
+    inputs.files("angular.json")
+        .withPropertyName('angular.json')
+        .withPathSensitivity(PathSensitivity.RELATIVE)
+    inputs.files("tsconfig.json", "tsconfig.app.json")
+        .withPropertyName("tsconfig")
+        .withPathSensitivity(PathSensitivity.RELATIVE)
+    inputs.dir("<%= CLIENT_WEBPACK_DIR %>")
+        .withPropertyName("<%= CLIENT_WEBPACK_DIR %>")
+        .withPathSensitivity(PathSensitivity.RELATIVE)
+  <%_ } _%>
+    inputs.dir("<%= clientSrcDir %>")
+        .withPropertyName("webapp-source-dir")
+        .withPathSensitivity(PathSensitivity.RELATIVE)
+  <%_ if (clientFrameworkReact) { _%>
+    inputs.files("tsconfig.json")
+        .withPropertyName("tsconfig")
+        .withPathSensitivity(PathSensitivity.RELATIVE)
+
+    def webpackDevFiles = fileTree("<%= CLIENT_WEBPACK_DIR %>")
+    webpackDevFiles.exclude("webpack.prod.js")
+    inputs.files(webpackDevFiles)
+        .withPropertyName("webpack-dir")
+        .withPathSensitivity(PathSensitivity.RELATIVE)
+  <%_ } _%>
+  <%_ if (clientFrameworkVue) { _%>
+
+    inputs.files("tsconfig.json", "tsconfig.app.json")
+        .withPropertyName("tsconfig")
+        .withPathSensitivity(PathSensitivity.RELATIVE)
+    <%_ if (microfrontend) { _%>
+
+    def webpackDevFiles = fileTree("<%= CLIENT_WEBPACK_DIR %>")
+    webpackDevFiles.exclude("webpack.prod.js")
+    inputs.files(webpackDevFiles)
+        .withPropertyName("webpack-dir")
+        .withPathSensitivity(PathSensitivity.RELATIVE)
+    <%_ } else { _%>
+
+    inputs.files("vite.config.ts")
+        .withPropertyName("vite")
+        .withPathSensitivity(PathSensitivity.RELATIVE)
+    <%_ } _%>
+
+    inputs.files(".postcssrc")
+        .withPropertyName("postcssrc")
+        .withPathSensitivity(PathSensitivity.RELATIVE)
+  <%_ } _%>
+
+    outputs.dir("build/test-results/jest/")
+        .withPropertyName("jest-result-dir")
+    outputs.file("build/test-results/TESTS-results-jest.xml")
+        .withPropertyName("jest-result")
+        outputs.file("build/test-results/clover.xml")
+        .withPropertyName("clover-result")
+
+    dependsOn npmInstall,compileTestJava
+    args = ["run", "webapp:test"]
+}
+
+test.dependsOn webapp_test
+
+<%_ } _%>

package/dist/generators/gradle/index.js

@@ -17,3 +17,4 @@
  * limitations under the License.
  */
 export { default } from './generator.js';
+export { default as command } from './command.js';

package/dist/generators/gradle/internal/needles.js

@@ -28,6 +28,10 @@ const scopeSortOrder = {
     compileOnly: 3,
     runtimeOnly: 4,
 };
+export const gradleNeedleOptionsWithDefaults = (options) => {
+    const { gradleFile = 'build.gradle', gradleVersionCatalogFile = 'gradle/libs.versions.toml' } = options;
+    return { gradleFile, gradleVersionCatalogFile };
+};
 export const sortDependencies = (a, b) => {
     let ret = (scopeSortOrder[a.scope] ?? 100) - (scopeSortOrder[b.scope] ?? 100);
     if (ret === 0) {
@@ -56,6 +60,7 @@ export const addGradleDependenciesCallback = (dependencies) => createNeedleCallb
         ? `${scope} group: "${groupId}", name: "${artifactId}", classifier: "${classifier}"`
         : `${scope} "${groupId}:${artifactId}${version ? `:${version}` : ''}${classifier ? `:${classifier}` : ''}"`),
 });
+/** @deprecated use addGradleDependenciesCallback */
 export const addGradleBuildSrcDependencyCallback = ({ groupId, artifactId, version, scope }) => createNeedleCallback({
     needle: 'gradle-build-src-dependency',
     contentToAdd: `${scope} "${groupId}:${artifactId}${version ? `:${version}` : ''}"`,
@@ -86,6 +91,7 @@ export const addGradlePluginFromCatalogCallback = (plugins) => createNeedleCallb
         .filter(({ addToBuild }) => addToBuild)
         .map(({ pluginName }) => `alias(libs.plugins.${gradleNameToReference(pluginName)})`),
 });
+/** @deprecated use addGradleDependenciesCatalogVersionCallback */
 export const addGradleBuildSrcDependencyCatalogVersionCallback = ({ name, version }) => createNeedleCallback({
     needle: 'gradle-build-src-dependency-catalog-version',
     contentToAdd: `${name} = "${version}"`,
@@ -98,10 +104,10 @@ export const addGradlePluginManagementCallback = ({ id, version }) => createNeed
     needle: 'gradle-plugin-management-plugins',
     contentToAdd: `id "${id}" version "${version}"`,
 });
-export const addGradlePropertyCallback = ({ property, value }) => createNeedleCallback({
+export const addGradlePropertyCallback = ({ comment, property, value }) => createNeedleCallback({
     needle: 'gradle-property',
-    contentToAdd: `${property}=${value}`,
-    contentToCheck: new RegExp(`\n${property}=`),
+    contentToAdd: `${typeof comment === 'string' ? `## ${comment}\n` : ''}${property}${typeof value === 'string' ? `=${value}` : ''}`,
+    contentToCheck: new RegExp(`\n${property}${typeof value === 'string' ? '=' : '\n'}`),
     autoIndent: false,
 });
 export const addGradleMavenRepositoryCallback = ({ url, username, password }) => createNeedleCallback({

package/dist/generators/gradle/templates/buildSrc/build.gradle.ejs

@@ -7,5 +7,6 @@ repositories {
 }
 
 dependencies {
-    // jhipster-needle-gradle-build-src-dependency - JHipster will add additional dependencies for convention plugins here
-}
+    // jhipster-needle-gradle-dependency - JHipster will add additional dependencies for convention plugins here
+    // jhipster-needle-gradle-build-src-dependency - Deprecated: JHipster will add additional dependencies for convention plugins here
+}

package/dist/generators/gradle/templates/buildSrc/gradle/libs.versions.toml.ejs

@@ -1,2 +1,9 @@
 [versions]
-# jhipster-needle-gradle-build-src-dependency-catalog-version - JHipster will add additional versions for convention plugins here
+# jhipster-needle-gradle-dependency-catalog-version - JHipster will add additional versions for convention plugins heref
+# jhipster-needle-gradle-build-src-dependency-catalog-version - Deprecated: JHipster will add additional versions for convention plugins here
+
+[libraries]
+# jhipster-needle-gradle-dependency-catalog-libraries - JHipster will add additional libraries versions
+
+[plugins]
+# jhipster-needle-gradle-dependency-catalog-plugins - JHipster will add additional plugins versions

package/dist/generators/gradle/templates/gradle/wrapper/{gradle-wrapper.properties.ejs → gradle-wrapper.properties}

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-<%= gradleVersion %>-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/dist/generators/heroku/generator.js

@@ -21,9 +21,7 @@ import { kebabCase } from 'lodash-es';
 import chalk from 'chalk';
 import { glob } from 'glob';
 import BaseGenerator from '../base-application/index.js';
-import statistics from '../statistics.js';
 import { JAVA_COMPATIBLE_VERSIONS, JAVA_VERSION, SERVER_MAIN_RES_DIR } from '../generator-constants.js';
-import { GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_HEROKU } from '../generator-list.js';
 import { mavenProfileContent } from './templates.js';
 import { createPomStorage } from '../maven/support/pom-store.js';
 import { addGradlePluginCallback, applyFromGradleCallback } from '../gradle/internal/needles.js';
@@ -57,10 +55,10 @@ export default class HerokuGenerator extends BaseGenerator {
     }
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_HEROKU);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+            await this.dependsOnBootstrapApplication();
         }
     }
     get initializing() {
@@ -187,9 +185,6 @@ export default class HerokuGenerator extends BaseGenerator {
     }
     get default() {
         return this.asDefaultTaskGroup({
-            insight() {
-                statistics.sendSubGenEvent('generator', GENERATOR_HEROKU);
-            },
             async gitInit() {
                 if (!this.herokuDeployType === 'git')
                     return;

package/dist/generators/init/generator.js

@@ -21,7 +21,6 @@ import { GENERATOR_INIT, GENERATOR_GIT, GENERATOR_PROJECT_NAME } from '../genera
 import { defaultConfig } from './config.js';
 import { SKIP_COMMIT_HOOK } from './constants.js';
 import { files, commitHooksFiles, readme } from './files.js';
-import command from './command.js';
 import { packageJson } from '../../lib/index.js';
 /**
  * @class
@@ -31,7 +30,7 @@ export default class InitGenerator extends BaseApplicationGenerator {
     generateReadme = true;
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_INIT);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
             await this.dependsOnJHipster(GENERATOR_PROJECT_NAME);
@@ -39,8 +38,8 @@ export default class InitGenerator extends BaseApplicationGenerator {
     }
     get initializing() {
         return this.asInitializingTaskGroup({
-            loadOptions() {
-                this.parseJHipsterOptions(command.options);
+            async parseCommand() {
+                await this.parseCurrentJHipsterCommand();
             },
         });
     }

package/dist/generators/init/resources/.node-version

@@ -0,0 +1 @@
+20.12.2