generator-jhipster 8.5.0 → 8.6.0

package/dist/generators/common/resources/package.json

@@ -2,7 +2,7 @@
   "devDependencies": {
     "concurrently": "8.2.2",
     "husky": "9.0.11",
-    "lint-staged": "15.2.5",
+    "lint-staged": "15.2.7",
     "npm": "10.8.1",
     "wait-on": "7.2.0"
   }

package/dist/generators/docker/templates/docker/keycloak.yml.ejs

@@ -33,6 +33,7 @@ services:
       - KC_HTTP_PORT=9080
       - KC_HTTPS_PORT=9443
       - KC_HEALTH_ENABLED=true
+      - KC_HTTP_MANAGEMENT_PORT=9990
     # If you want to expose these ports outside your dev PC,
     # remove the "127.0.0.1:" prefix
     ports:
@@ -42,5 +43,5 @@ services:
       test: 'bash /opt/keycloak/health-check.sh'
       interval: 5s
       timeout: 5s
-      retries: 20
+      retries: 40
       start_period: 10s

package/dist/generators/docker/templates/docker/mariadb.yml.ejs

@@ -32,7 +32,7 @@ services:
     # remove the "127.0.0.1:" prefix
     ports:
       - 127.0.0.1:3306:3306
-    command: mariadbd --lower_case_table_names=1 --skip-ssl --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
+    command: mariadbd --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
     healthcheck:
       test: ["CMD", "/usr/local/bin/healthcheck.sh", "--connect", "--innodb_initialized"]
       interval: 5s

package/dist/generators/docker/templates/docker/mysql.yml.ejs

@@ -23,7 +23,6 @@ services:
     image: <%- dockerContainers.mysql %>
     volumes:
       - ./config/mysql:/etc/mysql/conf.d
-    #   - ~/volumes/jhipster/<%= baseName %>/mysql/:/var/lib/mysql/
     environment:
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
       - MYSQL_DATABASE=<%= baseName.toLowerCase() %>
@@ -31,7 +30,7 @@ services:
     # remove the "127.0.0.1:" prefix
     ports:
       - 127.0.0.1:3306:3306
-    command: mysqld --lower_case_table_names=1 --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
+    command: mysqld --lower_case_table_names=1 --skip-mysqlx --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
     healthcheck:
       test: ["CMD", "mysql", "-e", "SHOW DATABASES;"]
       interval: 5s

package/dist/generators/docker/templates/docker/realm-config/keycloak-health-check.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
-exec 3<>/dev/tcp/localhost/9080
+exec 3<>/dev/tcp/localhost/9990
 
-echo -e "GET /health/ready HTTP/1.1\nhost: localhost:9080\n" >&3
+echo -e "GET /health/ready HTTP/1.1\nhost: localhost:9990\n" >&3
 
 timeout --preserve-status 1 cat <&3 | grep -m 1 status | grep -m 1 UP
 ERROR=$?

package/dist/generators/docker-compose/templates/docker-compose.yml.ejs

@@ -122,6 +122,7 @@ services:
       - KC_HTTP_PORT=9080
       - KC_HTTPS_PORT=9443
       - KC_HEALTH_ENABLED=true
+      - KC_HTTP_MANAGEMENT_PORT=9990
     ports:
       - 9080:9080
       - 9443:9443

package/dist/generators/docker-compose/templates/realm-config/keycloak-health-check.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
-exec 3<>/dev/tcp/localhost/9080
+exec 3<>/dev/tcp/localhost/9990
 
-echo -e "GET /health/ready HTTP/1.1\nhost: localhost:9080\n" >&3
+echo -e "GET /health/ready HTTP/1.1\nhost: localhost:9990\n" >&3
 
 timeout --preserve-status 1 cat <&3 | grep -m 1 status | grep -m 1 UP
 ERROR=$?

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

package/dist/generators/gatling/generator.js

@@ -71,7 +71,6 @@ export default class GatlingGenerator extends BaseApplicationGenerator {
                                 additionalContent: `
 <configuration>
     <runMultipleSimulations>true</runMultipleSimulations>
-    <resourcesFolder>\${project.basedir}/src/test/gatling/conf</resourcesFolder>
 </configuration>
 `,
                             },

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

@@ -22,9 +22,9 @@ export const files = {
         {
             condition: ctx => !ctx[LOCAL_BLUEPRINT_OPTION],
             templates: [
-                '.eslintrc.json',
                 '.github/workflows/generator.yml',
                 '.prettierignore.jhi.blueprint',
+                'eslint.config.js',
                 'README.md',
                 'tsconfig.json',
                 'vitest.config.ts',
@@ -41,6 +41,8 @@ export const files = {
                 '.blueprint/github-build-matrix/build-matrix.mjs',
                 '.blueprint/github-build-matrix/generator.mjs',
                 '.blueprint/github-build-matrix/index.mjs',
+                '.github/workflows/build-cache.yml',
+                '.github/workflows/samples.yml',
             ],
         },
         {

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

@@ -27,6 +27,7 @@ import { packageJson } from '../../lib/index.js';
 import { SKIP_COMMIT_HOOK } from '../init/constants.js';
 import { BLUEPRINT_API_VERSION, NODE_VERSION } from '../generator-constants.js';
 const { GENERATOR_PROJECT_NAME, GENERATOR_INIT } = GENERATOR_LIST;
+const defaultPublishedFiles = ['generators', '!**/__*', '!**/*.snap', '!**/*.spec.?(c|m)js'];
 export default class extends BaseGenerator {
     async _beforeQueue() {
         if (!this.fromBlueprint) {
@@ -136,7 +137,7 @@ export default class extends BaseGenerator {
         return this.delegateTasksToBlueprint(() => this.loading);
     }
     get preparing() {
-        return {
+        return this.asPreparingTaskGroup({
             prepareCommands() {
                 this.application.commands = [];
                 this.application.nodeVersion = NODE_VERSION;
@@ -159,13 +160,16 @@ export default class extends BaseGenerator {
                     this.application.cliName = cliName ?? `jhipster-${baseName}`;
                 }
             },
-        };
+        });
     }
     get [BaseGenerator.PREPARING]() {
         return this.delegateTasksToBlueprint(() => this.preparing);
     }
     get writing() {
-        return {
+        return this.asWritingTaskGroup({
+            async cleanup({ control }) {
+                await control.cleanupFiles({ '8.5.1': ['.eslintrc.json'] });
+            },
             async writing() {
                 this.application.sampleWritten = this.jhipsterConfig.sampleWritten;
                 await this.writeFiles({
@@ -206,7 +210,7 @@ export default class extends BaseGenerator {
                     subGeneratorStorage.set(WRITTEN, true);
                 }
             },
-        };
+        });
     }
     get [BaseGenerator.WRITING]() {
         return this.delegateTasksToBlueprint(() => this.writing);
@@ -226,7 +230,7 @@ export default class extends BaseGenerator {
                     name: `generator-jhipster-${this.jhipsterConfig.baseName}`,
                     keywords: ['yeoman-generator', 'jhipster-blueprint', BLUEPRINT_API_VERSION],
                     type: 'module',
-                    files: ['generators'],
+                    files: defaultPublishedFiles,
                     scripts: {
                         ejslint: 'ejslint generators/**/*.ejs',
                         lint: 'eslint .',
@@ -239,8 +243,8 @@ export default class extends BaseGenerator {
                     devDependencies: {
                         'ejs-lint': `${mainDependencies['ejs-lint']}`,
                         eslint: `${mainDependencies.eslint}`,
+                        globals: `${mainDependencies.globals}`,
                         'eslint-config-prettier': `${mainDependencies['eslint-config-prettier']}`,
-                        'eslint-plugin-import': `${mainDependencies['eslint-plugin-import']}`,
                         'eslint-plugin-prettier': `${mainDependencies['eslint-plugin-prettier']}`,
                         vitest: mainDependencies.vitest,
                         prettier: `${mainDependencies.prettier}`,
@@ -263,7 +267,7 @@ export default class extends BaseGenerator {
                     bin: {
                         [cliName]: 'cli/cli.cjs',
                     },
-                    files: ['cli', 'generators'],
+                    files: ['cli', ...defaultPublishedFiles],
                 });
             },
             addGeneratorJHipsterDependency() {
@@ -278,6 +282,9 @@ export default class extends BaseGenerator {
                         peerDependencies: {
                             'generator-jhipster': `^${packagejs.version}`,
                         },
+                        engines: {
+                            'generator-jhipster': `^${packagejs.version}`,
+                        },
                     });
                 }
                 else {
@@ -285,6 +292,9 @@ export default class extends BaseGenerator {
                         dependencies: {
                             'generator-jhipster': `${packagejs.version}`,
                         },
+                        engines: {
+                            'generator-jhipster': `${packagejs.version}`,
+                        },
                     });
                 }
             },

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

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

package/dist/generators/generate-blueprint/templates/.blueprint/github-build-matrix/generator.mjs.ejs

@@ -1,6 +1,7 @@
 import { existsSync, appendFileSync } from 'node:fs';
 import os from 'node:os';
 import BaseGenerator from 'generator-jhipster/generators/base';
+import { setGithubTaskOutput } from 'generator-jhipster/testing';
 import { buildMatrix } from './build-matrix.mjs';
 
 export default class extends BaseGenerator {
@@ -12,12 +13,7 @@ export default class extends BaseGenerator {
     return this.asWritingTaskGroup({
       async buildMatrix() {
         const matrix = await buildMatrix(this.templatePath('../../generate-sample/templates/samples'));
-        const matrixoutput = `matrix<<EOF${os.EOL}${JSON.stringify(matrix)}${os.EOL}EOF${os.EOL}`;
-        const filePath = process.env['GITHUB_OUTPUT'];
-        console.log(matrixoutput);
-        if (filePath && existsSync(filePath)) {
-          appendFileSync(filePath, matrixoutput, { encoding: 'utf8' });
-        }
+        setGithubTaskOutput('matrix', matrix);
       },
     });
   }

package/dist/generators/generate-blueprint/templates/.github/workflows/build-cache.yml.ejs

@@ -0,0 +1,39 @@
+name: build-cache
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 0'
+jobs:
+  build-cache:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ${{ github.workspace }}/app
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: generator-jhipster-<%= baseName %>
+      - uses: jhipster/actions/setup-runner@v0
+        with:
+          node-version: 20
+          binary-dir: ${{ github.workspace }}/generator-jhipster-<%= baseName %>/cli/
+      - uses: jhipster/actions/cache-npm-dependencies@v0
+        with:
+          generator-path: generator-jhipster-<%= baseName %>
+        if: always()
+      - run: cli.cjs generate-sample --all
+        continue-on-error: true
+      - run: npm run backend:build-cache --workspaces
+        continue-on-error: true
+      - uses: jhipster/actions/save-cache@v0
+        if: always()
+        with:
+          key: ${{ github.run_id }}
+          npm: true
+          maven: true
+          gradle: true
+      - uses: jhipster/actions/restore-cache@v0
+        with:
+          npm: true
+          maven: true
+          gradle: true

package/dist/generators/generate-blueprint/templates/.github/workflows/samples.yml.ejs

@@ -0,0 +1,105 @@
+name: Verify Sample Projects
+on:
+  push:
+    branches:
+      - 'main'
+      - '**maintenance'
+    paths-ignore:
+      - 'package*.json'
+  pull_request:
+    branches:
+      - '*'
+permissions:
+  contents: read
+jobs:
+  build-matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.build.outputs.matrix }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: <%- nodeVersion.split('.', 2)[0] %>
+      - id: build
+        run: |
+          npm install
+          ./cli/cli.cjs github-build-matrix
+  samples:
+    name: ${{ matrix.sample-name }}
+    runs-on: ubuntu-latest
+    needs: build-matrix
+    defaults:
+      run:
+        working-directory: ${{ github.workspace }}/app
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      matrix: ${{fromJson(needs.build-matrix.outputs.matrix)}}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: generator-jhipster-<%= baseName %>
+          fetch-depth: 2
+      - uses: jhipster/actions/setup-runner@v0
+        with:
+          java-version: ${{ matrix.java-version }}
+          node-version: ${{ matrix.node-version }}
+          maven-cache: true
+          gradle-cache: true
+          binary-dir: ${{ github.workspace }}/generator-jhipster-<%= baseName %>/cli/
+      - name: 'Install blueprint'
+        run: npm install
+        working-directory: ${{ github.workspace }}/generator-jhipster-<%= baseName %>
+      - name: 'Generate Project'
+        run: cli.cjs generate-sample ${{ matrix.sample-name }} --skip-jhipster-dependencies --force
+      - uses: jhipster/actions/compare-sample@v0
+        id: compare
+        if: >-
+          github.event.pull_request &&
+          !contains(github.event.pull_request.labels.*.name, 'pr: disable-compare')
+        with:
+          generator-path: generator-jhipster-<%= baseName %>
+          cmd: cli.cjs generate-sample ${{ matrix.sample-name }} --skip-jhipster-dependencies --force --skip-install
+      - run: npm run ci:backend:test
+        if: steps.compare.outputs.equals != 'true'
+        id: backend
+      - run: npm run ci:frontend:test --if-present
+        if: steps.compare.outputs.equals != 'true'
+      - run: npm run ci:e2e:package
+        if: steps.compare.outputs.equals != 'true'
+      - run: npm run ci:e2e:prepare
+        if: steps.compare.outputs.equals != 'true'
+      - run: npm run ci:e2e:run --if-present
+        if: steps.compare.outputs.equals != 'true'
+        id: e2e
+      - name: 'BACKEND: Store failure logs'
+        uses: actions/upload-artifact@v4
+        if: always() && steps.backend.outcome == 'failure'
+        with:
+          name: log-${{ matrix.sample-name }}
+          path: |
+            ${{ github.workspace }}/app/build/test-results/**/*.xml
+            ${{ github.workspace }}/app/target/surefire-reports
+      - name: 'E2E: Store failure screenshots'
+        uses: actions/upload-artifact@v4
+        if: always() && steps.e2e.outcome == 'failure'
+        with:
+          name: screenshots-${{ matrix.sample-name }}
+          path: ${{ github.workspace }}/app/**/cypress/screenshots
+      - name: Dump docker logs
+        if: always()
+        uses: jwalton/gh-docker-logs@v2
+  check-samples:
+    permissions:
+      contents: none
+    runs-on: ubuntu-latest
+    needs: [samples]
+    if: always()
+    steps:
+      - run: |
+          echo '${{ toJSON(needs) }}'
+          if [ 'skipped' == '${{ needs.samples.result }}' ] || [ 'success' == '${{ needs.samples.result }}' ] || [ 'closed' == '${{ github.event.action }}' ]; then
+            exit 0
+          fi
+          exit 1

package/dist/generators/generate-blueprint/templates/.prettierignore.jhi.blueprint.ejs

@@ -18,5 +18,5 @@
 -%>
 <&_ if (!fragment.section) { -&>
 # blueprint rules:
-**/templates/**/
+generators/**/templates/**/
 <&_ } -&>

package/dist/generators/generate-blueprint/templates/eslint.config.js.ejs

@@ -0,0 +1,33 @@
+<%#
+ 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 globals from 'globals';
+import prettierRecommended from 'eslint-plugin-prettier/recommended';
+import jhipsterRecommended from 'generator-jhipster/eslint/recommended';
+
+export default [
+  {
+    languageOptions: {
+      globals: {
+        ...globals.node,
+      },
+    },
+  },
+  jhipsterRecommended,
+  prettierRecommended,
+];

package/dist/generators/generator-constants.js

@@ -21,10 +21,10 @@ import { join } from 'path';
 import { fileURLToPath } from 'url';
 export const BLUEPRINT_API_VERSION = 'jhipster-8';
 // jhipster-bom version
-export const JHIPSTER_DEPENDENCIES_VERSION = '8.5.0';
+export const JHIPSTER_DEPENDENCIES_VERSION = '8.6.0';
 // Version of Java
 export const JAVA_VERSION = '17';
-export const JAVA_COMPATIBLE_VERSIONS = ['17', '18', '19', '20', '21'];
+export const JAVA_COMPATIBLE_VERSIONS = ['17', '18', '19', '20', '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/gradle/templates/gradle/wrapper/gradle-wrapper.properties

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

package/dist/generators/heroku/generator.js

@@ -476,7 +476,7 @@ export default class HerokuGenerator extends BaseGenerator {
      * @param {string} other - explicit other thing: build, dependencies...
      */
     addMavenProfile(profileId, other) {
-        createPomStorage(this).addProfile({ id: profileId, content: other });
+        createPomStorage(this, { sortFile: false }).addProfile({ id: profileId, content: other });
     }
     /**
      * @param  {string} command

package/dist/generators/info/support/extract-info.js

@@ -0,0 +1,60 @@
+import { GENERATOR_JHIPSTER } from '../../generator-constants.js';
+export const extractDataFromInfo = (info) => {
+    const regexp = /<summary>(?<title>(?:(?!<\/summary>).)+)<\/summary>\s+<pre>(?<body>(?:(?!<\/pre>).)+)/gs;
+    let yoRcContent;
+    let jdlEntitiesDefinitions;
+    let jdlDefinitions;
+    let workspacesFolders;
+    const files = [];
+    for (const match of info.matchAll(regexp)) {
+        const { title, body } = match.groups ?? {};
+        if (title?.trim() && body?.trim()) {
+            if (title.includes('.yo-rc.json file')) {
+                if (title.includes(' for ')) {
+                    const folder = title.split(' for ')[1].trim();
+                    files.push({ filename: `${folder}/.yo-rc.json`, content: body.trim() });
+                }
+                else {
+                    yoRcContent = body.trim();
+                }
+            }
+            else if (title.includes('JDL entity definitions')) {
+                jdlEntitiesDefinitions = body.trim();
+            }
+            else if (title.includes('JDL definitions')) {
+                // JDL definitions can be be a placehoder
+                if (body.includes('application')) {
+                    jdlDefinitions = body.trim();
+                }
+            }
+        }
+    }
+    let yoRcBlank = true;
+    let yoRcValid = false;
+    if (yoRcContent) {
+        yoRcBlank = false;
+        try {
+            let content = JSON.parse(yoRcContent);
+            content = GENERATOR_JHIPSTER in content ? content : { [GENERATOR_JHIPSTER]: content };
+            workspacesFolders = content[GENERATOR_JHIPSTER].appsFolders;
+            yoRcContent = JSON.stringify(content);
+            yoRcValid = true;
+        }
+        catch (error) {
+            // eslint-disable-next-line no-console
+            console.log('Invalid .yo-rc.json file', error);
+        }
+    }
+    if (jdlDefinitions) {
+        files.push({ filename: 'app.jdl', content: jdlDefinitions });
+        yoRcContent = undefined;
+        jdlEntitiesDefinitions = undefined;
+    }
+    if (jdlEntitiesDefinitions) {
+        files.push({ filename: 'entities.jdl', content: jdlEntitiesDefinitions });
+    }
+    if (yoRcContent) {
+        files.push({ filename: '.yo-rc.json', content: yoRcContent });
+    }
+    return { yoRcContent, jdlEntitiesDefinitions, jdlDefinitions, yoRcBlank, yoRcValid, files, workspacesFolders };
+};

package/dist/generators/info/support/index.js

@@ -17,3 +17,4 @@
  * limitations under the License.
  */
 export * from './utils.js';
+export * from './extract-info.js';

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

@@ -1 +1 @@
-20.14.0
+20.15.0

package/dist/generators/init/resources/package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "husky": "7.0.2",
-    "lint-staged": "11.0.0"
+    "husky": "9.0.11",
+    "lint-staged": "15.2.7"
   }
 }

package/dist/generators/java/generators/bootstrap/generator.js

@@ -19,7 +19,7 @@
 import { isFileStateModified } from 'mem-fs-editor/state';
 import BaseApplicationGenerator from '../../../base-application/index.js';
 import { JAVA_COMPATIBLE_VERSIONS } from '../../../generator-constants.js';
-import { packageInfoTransform, generatedAnnotationTransform, checkJava, isReservedJavaKeyword, matchMainJavaFiles, javaMainPackageTemplatesBlock, } from '../../support/index.js';
+import { packageInfoTransform, generatedAnnotationTransform, checkJava, isReservedJavaKeyword, matchMainJavaFiles, javaMainPackageTemplatesBlock, addJavaImport, addJavaAnnotation, } from '../../support/index.js';
 export default class BootstrapGenerator extends BaseApplicationGenerator {
     packageInfoFile;
     async beforeQueue() {
@@ -87,6 +87,9 @@ export default class BootstrapGenerator extends BaseApplicationGenerator {
                 source.hasJavaProperty = (property) => application.javaProperties[property] !== undefined;
                 source.hasJavaManagedProperty = (property) => application.javaManagedProperties[property] !== undefined;
             },
+            needles({ source }) {
+                source.editJavaFile = (file, { staticImports = [], imports = [], annotations = [] }, ...editFileCallback) => this.editFile(file, ...staticImports.map(classPath => addJavaImport(classPath, { staticImport: true })), ...imports.map(classPath => addJavaImport(classPath)), ...annotations.map(annotation => addJavaAnnotation(annotation)), ...editFileCallback);
+            },
         });
     }
     get [BaseApplicationGenerator.PREPARING]() {
@@ -102,7 +105,7 @@ export default class BootstrapGenerator extends BaseApplicationGenerator {
                 application.domains = entityPackages;
             },
             generatedAnnotation({ application }) {
-                if (this.jhipsterConfig.withGeneratedFlag) {
+                if (this.jhipsterConfig.withGeneratedFlag && application.backendTypeJavaAny) {
                     this.queueTransformStream({
                         name: 'adding @GeneratedByJHipster annotations',
                         filter: file => isFileStateModified(file) && file.path.startsWith(this.destinationPath()) && file.path.endsWith('.java'),
@@ -111,6 +114,8 @@ export default class BootstrapGenerator extends BaseApplicationGenerator {
                 }
             },
             generatedPackageInfo({ application }) {
+                if (!application.backendTypeJavaAny)
+                    return;
                 const { srcMainJava } = application;
                 if (this.packageInfoFile && srcMainJava) {
                     const mainPackageMatch = matchMainJavaFiles(srcMainJava);
@@ -145,6 +150,8 @@ export default class BootstrapGenerator extends BaseApplicationGenerator {
     get writing() {
         return this.asWritingTaskGroup({
             async writing({ application }) {
+                if (!application.backendTypeJavaAny)
+                    return;
                 await this.writeFiles({
                     blocks: [
                         javaMainPackageTemplatesBlock({

package/dist/generators/java/generators/build-tool/command.js

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import { buildToolTypes } from '../../../../jdl/index.js';
-import { GENERATOR_GRADLE } from '../../../generator-list.js';
+import { GENERATOR_GRADLE, GENERATOR_MAVEN } from '../../../generator-list.js';
 const { GRADLE, MAVEN } = buildToolTypes;
 const command = {
     options: {},
@@ -40,6 +40,6 @@ const command = {
             scope: 'storage',
         },
     },
-    import: [GENERATOR_GRADLE],
+    import: [GENERATOR_GRADLE, GENERATOR_MAVEN],
 };
 export default command;

package/dist/generators/java/generators/node/templates/npmw

@@ -1,15 +1,11 @@
 #!/bin/sh
 
-basedir=`dirname "$0"`
+basedir=$(dirname "$0")
 
 if [ -f "$basedir/mvnw" ]; then
   bindir="$basedir/target/node"
   repodir="$basedir/target/node/node_modules"
   installCommand="$basedir/mvnw --batch-mode -ntp -Pwebapp frontend:install-node-and-npm@install-node-and-npm"
-
-  PATH="$basedir/$builddir/:$PATH"
-  NPM_EXE="$basedir/$builddir/node_modules/npm/bin/npm-cli.js"
-  NODE_EXE="$basedir/$builddir/node"
 elif [ -f "$basedir/gradlew" ]; then
   bindir="$basedir/build/node/bin"
   repodir="$basedir/build/node/lib/node_modules"

package/dist/generators/java/support/add-java-annotation.js

@@ -40,7 +40,7 @@ const addJavaAnnotationToContent = (content, annotationDef) => {
             throw new Error(`Annotation already exists: ${annotation} replace is not implemented yet.`);
         }
         // add the annotation before class or interface
-        content = content.replace(/\n([a-w ]*(class|@?interface|enum) )/g, `\n@${annotationToAdd}\n$1`);
+        content = content.replace(/\n([a-w ]*(class|@?interface|enum) )/, `\n@${annotationToAdd}\n$1`);
     }
     return content;
 };