generator-jhipster 8.0.0-beta.1 → 8.0.0-beta.3

package/dist/generators/cloudfoundry/generator.mjs

@@ -27,6 +27,10 @@ import statistics from '../statistics.mjs';
 import { CLIENT_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR } from '../generator-constants.mjs';
 import { GENERATOR_CLOUDFOUNDRY } from '../generator-list.mjs';
 import { cacheTypes, buildToolTypes, databaseTypes } from '../../jdl/jhipster/index.mjs';
+import { getFrontendAppName } from '../base/support/index.mjs';
+import { buildApplication } from '../server/internal/index.mjs';
+import { loadAppConfig, loadDerivedAppConfig } from '../app/support/index.mjs';
+import { loadDerivedPlatformConfig, loadDerivedServerConfig, loadPlatformConfig, loadServerConfig } from '../server/support/index.mjs';
 const { MEMCACHED } = cacheTypes;
 const { GRADLE, MAVEN } = buildToolTypes;
 const cacheProviders = cacheTypes;
@@ -46,18 +50,19 @@ export default class CloudfoundryGenerator extends BaseGenerator {
                 this.log.log(chalk.bold('CloudFoundry configuration is starting'));
             },
             getSharedConfig() {
-                this.loadAppConfig();
-                this.loadServerConfig();
-                this.loadPlatformConfig();
-                this.loadDerivedAppConfig();
-                this.loadDerivedServerConfig();
+                loadAppConfig({ config: this.jhipsterConfigWithDefaults, application: this, useVersionPlaceholders: this.useVersionPlaceholders });
+                loadServerConfig({ config: this.jhipsterConfigWithDefaults, application: this });
+                loadPlatformConfig({ config: this.jhipsterConfigWithDefaults, application: this });
+                loadDerivedAppConfig({ application: this });
+                loadDerivedPlatformConfig({ application: this });
+                loadDerivedServerConfig({ application: this });
             },
             getConfig() {
                 const configuration = this.config;
                 this.env.options.appPath = configuration.get('appPath') || CLIENT_MAIN_SRC_DIR;
                 this.cacheProvider = this.cacheProvider || NO_CACHE_PROVIDER;
                 this.enableHibernateCache = this.enableHibernateCache && ![NO_CACHE_PROVIDER, MEMCACHED].includes(this.cacheProvider);
-                this.frontendAppName = this.getFrontendAppName();
+                this.frontendAppName = getFrontendAppName({ baseName: this.jhipsterConfig.baseName });
             },
         };
     }
@@ -110,7 +115,7 @@ export default class CloudfoundryGenerator extends BaseGenerator {
                     return;
                 const done = this.async();
                 this.log.log(chalk.bold('\nChecking for an existing Cloud Foundry hosting environment...'));
-                exec(`cf app ${this.cloudfoundryDeployedName} `, {}, (err, stdout, stderr) => {
+                exec(`cf app ${this.cloudfoundryDeployedName} `, {}, (_err, stdout) => {
                     // Unauthenticated
                     if (stdout.search('cf login') >= 0) {
                         this.log.error("Error: Not authenticated. Run 'cf login' to login to your cloudfoundry account and try again.");
@@ -126,7 +131,7 @@ export default class CloudfoundryGenerator extends BaseGenerator {
                 this.log.log(chalk.bold('\nCreating your Cloud Foundry hosting environment, this may take a couple minutes...'));
                 if (this.databaseType !== 'no') {
                     this.log.log(chalk.bold('Creating the database'));
-                    const child = exec(`cf create-service ${this.cloudfoundryDatabaseServiceName} ${this.cloudfoundryDatabaseServicePlan} ${this.cloudfoundryDeployedName}`, {}, (err, stdout, stderr) => {
+                    const child = exec(`cf create-service ${this.cloudfoundryDatabaseServiceName} ${this.cloudfoundryDatabaseServicePlan} ${this.cloudfoundryDeployedName}`, {}, () => {
                         done();
                     });
                     child.stdout.on('data', data => {
@@ -142,7 +147,7 @@ export default class CloudfoundryGenerator extends BaseGenerator {
                     return;
                 const done = this.async();
                 this.log.log(chalk.bold(`\nBuilding the application with the ${this.cloudfoundryProfile} profile`));
-                const child = this.buildApplication(this.buildTool, this.cloudfoundryProfile, false, err => {
+                const child = buildApplication(this.buildTool, this.cloudfoundryProfile, false, err => {
                     if (err) {
                         this.log.error(err);
                     }
@@ -196,7 +201,7 @@ export default class CloudfoundryGenerator extends BaseGenerator {
                 if (this.abort || !this.cloudfoundry_remote_exists)
                     return;
                 this.log.log(chalk.bold('\nRestarting your cloudfoundry app.\n'));
-                exec(`cf restart ${this.cloudfoundryDeployedName}`, (err, stdout, stderr) => {
+                exec(`cf restart ${this.cloudfoundryDeployedName}`, () => {
                     this.log.log(chalk.green('\nYour app should now be live'));
                 });
             },

package/dist/generators/cloudfoundry/prompts.mjs

@@ -24,7 +24,7 @@ export default {
     prompting,
 };
 async function prompting() {
-    const databaseType = this.databaseType;
+    const databaseType = this.databaseType ?? this.jhipsterConfig.databaseType;
     const prompts = [
         {
             name: 'cloudfoundryDeployedName',
@@ -48,13 +48,13 @@ async function prompting() {
             default: 0,
         },
         {
-            when: response => databaseType !== NO_DATABASE,
+            when: () => databaseType !== NO_DATABASE,
             name: 'cloudfoundryDatabaseServiceName',
             message: 'What is the name of your database service?',
             default: 'elephantsql',
         },
         {
-            when: response => databaseType !== NO_DATABASE,
+            when: () => databaseType !== NO_DATABASE,
             name: 'cloudfoundryDatabaseServicePlan',
             message: 'What is the name of your database plan?',
             default: 'turtle',

package/dist/generators/common/generator.mjs

@@ -17,23 +17,19 @@
  * limitations under the License.
  */
 /* eslint-disable consistent-return */
-import _ from 'lodash';
+import { isFilePending } from 'mem-fs-editor/state';
 import BaseApplicationGenerator from '../base-application/index.mjs';
 import { writeFiles, prettierConfigFiles } from './files.mjs';
 import { MAIN_DIR, TEST_DIR, SERVER_MAIN_RES_DIR, JHIPSTER_DOCUMENTATION_URL, JHIPSTER_DOCUMENTATION_ARCHIVE_PATH, } from '../generator-constants.mjs';
 import { clientFrameworkTypes } from '../../jdl/jhipster/index.mjs';
-import { packageJson } from '../../lib/index.mjs';
 import { GENERATOR_COMMON, GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_GIT } from '../generator-list.mjs';
 import command from './command.mjs';
+import { createPrettierTransform } from '../bootstrap/support/prettier-support.mjs';
+import { loadStoredAppOptions } from '../app/support/index.mjs';
 const { REACT, ANGULAR } = clientFrameworkTypes;
-/**
- * @class
- * @extends {BaseApplicationGenerator<import('../bootstrap-application-base/types.js').CommonClientServerApplication>}
- */
 export default class CommonGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
-        this.loadStoredAppOptions();
-        this.loadRuntimeOptions();
+        loadStoredAppOptions.call(this);
         await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
         await this.dependsOnJHipster(GENERATOR_GIT);
         if (!this.fromBlueprint) {
@@ -133,7 +129,13 @@ export default class CommonGenerator extends BaseApplicationGenerator {
         return this.delegateTasksToBlueprint(() => this.writing);
     }
     get postWriting() {
-        return {
+        return this.asPostWritingTaskGroup({
+            async formatSonarProperties() {
+                this.queueTransformStream(await createPrettierTransform.call(this, { extensions: 'properties', prettierProperties: true }), {
+                    name: 'prettifying sonar-project.properties',
+                    streamOptions: { filter: file => isFilePending(file) && file.path.endsWith('sonar-project.properties') },
+                });
+            },
             addCommitHookDependencies({ application }) {
                 if (application.skipCommitHook)
                     return;
@@ -147,7 +149,7 @@ export default class CommonGenerator extends BaseApplicationGenerator {
                     },
                 });
             },
-        };
+        });
     }
     get [BaseApplicationGenerator.POST_WRITING]() {
         return this.delegateTasksToBlueprint(() => this.postWriting);

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

@@ -1,9 +1,9 @@
 {
   "devDependencies": {
-    "concurrently": "8.1.0",
+    "concurrently": "8.2.1",
     "husky": "8.0.3",
-    "lint-staged": "13.2.2",
-    "npm": "9.7.1",
+    "lint-staged": "14.0.1",
+    "npm": "10.0.0",
     "wait-on": "7.0.1"
   }
 }

package/dist/generators/common/templates/.prettierrc.ejs

@@ -10,8 +10,12 @@ arrowParens: avoid
 
 # jsx and tsx rules:
 bracketSameLine: false
-<%_ if (!skipServer) { _%>
 
+plugins:
+  - prettier-plugin-packagejson
+<%_ if (!skipServer) { _%>
+  - prettier-plugin-java
+  
 # java rules:
 overrides:
   - files: "*.java"

package/dist/generators/common/templates/sonar-project.properties.ejs

@@ -37,10 +37,23 @@ sonar.javascript.lcov.reportPaths=<%_ if (buildToolMaven) { _%>target<%_ } else
 
 sonar.sourceEncoding=UTF-8
 sonar.exclusions=<%= clientSrcDir %>content/**/*.*, <%= clientSrcDir %>i18n/*.js, <%= clientDistDir %>**/*.*
+<%_ if (!skipServer) { _%>
 
-sonar.issue.ignore.multicriteria=<%_ if (!skipServer) { _%>S3437,<% if (authenticationTypeJwt) { %>S4502,<% } %>S4684,S5145,UndocumentedApi<%_ } _%>
+sonar.issue.ignore.multicriteria=\
+  <%_ if (gatlingTests) { _%>
+  S2187,\
+  <%_ } _%>
+  S3437,\
+  <%_ if (authenticationTypeJwt) { _%>
+  S4502,\
+  <%_ } _%>
+  S4684,S5145,UndocumentedApi
 
-<%_ if (!skipServer) { _%>
+  <%_ if (gatlingTests) { _%>
+# Rule https://rules.sonarsource.com/java/RSPEC-2187 is ignored, gatling tests are not supported by sonar
+sonar.issue.ignore.multicriteria.S2187.resourceKey=<%= TEST_DIR %>java/gatling/**/*
+sonar.issue.ignore.multicriteria.S2187.ruleKey=java:S2187
+  <%_ } _%>
 # Rule https://rules.sonarsource.com/java/RSPEC-3437 is ignored, as a JPA-managed field cannot be transient
 sonar.issue.ignore.multicriteria.S3437.resourceKey=<%= MAIN_DIR %>java/**/*
 sonar.issue.ignore.multicriteria.S3437.ruleKey=squid:S3437

package/dist/generators/cucumber/generator.mjs

@@ -71,6 +71,10 @@ export default class CucumberGenerator extends BaseApplicationGenerator {
               newenvironment="true"
               maxmemory="512m"
               classpathref="maven.test.classpath">
+            <jvmarg value="-Dspring.profiles.active=testprod"/>${application.reactive
+                                    ? `
+            <jvmarg value="-XX:+AllowRedefinitionToAddDeleteMethods"/>`
+                                    : ''}
             <arg value="--include-engine"/>
             <arg value="cucumber"/>
             <arg value="--scan-classpath"/>

package/dist/generators/cucumber/templates/src/test/java/package/cucumber/stepdefs/UserStepDefs.java.ejs

@@ -64,7 +64,7 @@ public class UserStepDefs extends StepDefs {
     public void setup() {
         List<GrantedAuthority> grantedAuthorities = new ArrayList<>();
         grantedAuthorities.add(new SimpleGrantedAuthority(AuthoritiesConstants.ADMIN));
-        User principal = new User("username", "", true, true, true, true, grantedAuthorities);
+        User principal = new User("admin", "", true, true, true, true, grantedAuthorities);
         Authentication authentication = new UsernamePasswordAuthenticationToken(
             principal,
             principal.getPassword(),

package/dist/generators/cypress/generator.mjs

@@ -1,3 +1,21 @@
+/**
+ * Copyright 2013-2023 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 import { stringHashCode, createFaker } from '../base/support/index.mjs';
 import BaseApplicationGenerator from '../base-application/index.mjs';
 import { cypressFiles, cypressEntityFiles } from './files.mjs';
@@ -7,13 +25,6 @@ import { GENERATOR_CYPRESS, GENERATOR_BOOTSTRAP_APPLICATION } from '../generator
 import { generateTestEntity as entityWithFakeValues } from '../client/support/index.mjs';
 const { ANGULAR } = clientFrameworkTypes;
 export default class CypressGenerator extends BaseApplicationGenerator {
-    constructor(args, options, features) {
-        super(args, options, features);
-        if (this.options.help) {
-            return;
-        }
-        this.loadRuntimeOptions();
-    }
     async beforeQueue() {
         // TODO depend on GENERATOR_BOOTSTRAP_APPLICATION_CLIENT.
         await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
@@ -177,8 +188,8 @@ export default class CypressGenerator extends BaseApplicationGenerator {
                     },
                 });
             },
-            configureCoverage({ application }) {
-                const { cypressCoverage, clientFramework, clientFrameworkAngular, dasherizedBaseName } = application;
+            configureCoverage({ application, source }) {
+                const { cypressCoverage, clientFrameworkAngular, dasherizedBaseName } = application;
                 if (!cypressCoverage)
                     return;
                 this.packageJson.merge({
@@ -200,7 +211,8 @@ export default class CypressGenerator extends BaseApplicationGenerator {
                 if (clientFrameworkAngular) {
                     // Add 'ng build --configuration instrumenter' support
                     this.createStorage('angular.json').setPath(`projects.${dasherizedBaseName}.architect.build.configurations.instrumenter`, {});
-                    this.addWebpackConfig(`targetOptions.configuration === 'instrumenter'
+                    source.addWebpackConfig?.({
+                        config: `targetOptions.configuration === 'instrumenter'
       ? {
           module: {
             rules: [
@@ -221,7 +233,8 @@ export default class CypressGenerator extends BaseApplicationGenerator {
             ],
           },
         }
-      : {}`, clientFramework);
+      : {}`,
+                    });
                 }
             },
         });
@@ -229,7 +242,7 @@ export default class CypressGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.POST_WRITING]() {
         return this.delegateTasksToBlueprint(() => this.postWriting);
     }
-    generateTestEntity(references, index = 'random') {
+    generateTestEntity(references) {
         return entityWithFakeValues(references);
     }
 }

package/dist/generators/cypress/templates/src/test/javascript/cypress/.eslintrc.json.ejs

@@ -14,6 +14,7 @@
     "plugin:cypress/recommended"
   ],
   "rules": {
-   "@typescript-eslint/no-namespace": ["error", { "allowDeclarations": true }]
+   "@typescript-eslint/no-namespace": ["error", { "allowDeclarations": true }],
+   "@typescript-eslint/no-unused-vars": "off"
   }
 }

package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/entity/_entity_.cy.ts.ejs

@@ -306,10 +306,11 @@ describe('<%= entityClass %> e2e test', () => {
   <%_ fields.filter(field => (!field.id || !field.autoGenerate) && !field.hidden && !field.readonly).forEach((field) => {
     const fieldName = field.fieldName;
     const fieldIsEnum = field.fieldIsEnum;
-    const fieldValue = !entityFakeData ? field.generateFakeData('cypress') : entityFakeData[field.fieldName];
+    let fieldValue = !entityFakeData ? field.generateFakeData('cypress') : entityFakeData[field.fieldName];
     if (fieldValue === undefined) {
         return;
     }
+    fieldValue = typeof fieldValue === 'string' ? fieldValue.replaceAll("'", "\\'") : fieldValue;
   _%>
 
     <%_ if (field.fieldTypeBoolean) { _%>
@@ -321,15 +322,15 @@ describe('<%= entityClass %> e2e test', () => {
       cy.setFieldImageAsBytesOfEntity('<%= fieldName %>', 'integration-test.png', 'image/png');
 
     <%_ } else if (fieldIsEnum) { _%>
-      cy.get(`[data-cy="<%= fieldName %>"]`).select('<%= fieldValue %>');
+      cy.get(`[data-cy="<%= fieldName %>"]`).select('<%- fieldValue %>');
 
     <%_ } else if (field.fieldTypeString || field.fieldTypeNumeric || field.fieldTypeLocalDate || field.fieldTypeTimed || field.fieldTypeDuration) { _%>
-      cy.get(`[data-cy="<%= fieldName %>"]`).type('<%= fieldValue %>');
-      <% if (field.fieldTypeLocalDate || field.fieldTypeTimed || field.fieldTypeDuration) { %>cy.get(`[data-cy="<%= fieldName %>"]`).blur();<% } %> cy.get(`[data-cy="<%= fieldName %>"]`).should('have.value', '<%= fieldValue %>');
+      cy.get(`[data-cy="<%= fieldName %>"]`).type('<%- fieldValue %>');
+      <% if (field.fieldTypeLocalDate || field.fieldTypeTimed || field.fieldTypeDuration) { %>cy.get(`[data-cy="<%= fieldName %>"]`).blur();<% } %> cy.get(`[data-cy="<%= fieldName %>"]`).should('have.value', '<%- fieldValue %>');
 
     <%_ } else { _%>
-      cy.get(`[data-cy="<%= fieldName %>"]`).type('<%= fieldValue %>');
-      cy.get(`[data-cy="<%= fieldName %>"]`).invoke('val').should('match', new RegExp('<%= fieldValue %>'));
+      cy.get(`[data-cy="<%= fieldName %>"]`).type('<%- fieldValue %>');
+      cy.get(`[data-cy="<%= fieldName %>"]`).invoke('val').should('match', new RegExp('<%- fieldValue %>'));
 
     <%_ } _%>
   <%_ }); _%>

package/dist/generators/docker/generator.mjs

@@ -18,11 +18,12 @@
  */
 /* eslint-disable camelcase */
 import BaseApplicationGenerator from '../base-application/index.mjs';
-import { createDockerComposeFile, createDockerExtendedServices } from '../base-docker/utils.mjs';
+import { createDockerComposeFile, createDockerExtendedServices } from '../docker/support/index.mjs';
 import { GENERATOR_BOOTSTRAP_APPLICATION_SERVER, GENERATOR_DOCKER } from '../generator-list.mjs';
 import { dockerFiles } from './files.mjs';
 import { SERVICE_COMPLETED_SUCCESSFULLY, SERVICE_HEALTHY } from './constants.mjs';
 import { stringHashCode, createFaker } from '../base/support/index.mjs';
+import { getJdbcUrl, getR2dbcUrl } from '../spring-data-relational/support/index.mjs';
 export default class DockerGenerator extends BaseApplicationGenerator {
     hasServicesFile = false;
     async beforeQueue() {
@@ -79,7 +80,7 @@ export default class DockerGenerator extends BaseApplicationGenerator {
                 if (application.authenticationTypeOauth2) {
                     const faker = await createFaker();
                     faker.seed(stringHashCode(application.baseName));
-                    application.keycloakSecrets = Array.from(Array(6), () => faker.datatype.uuid());
+                    application.keycloakSecrets = Array.from(Array(6), () => faker.string.uuid());
                 }
                 await this.writeFiles({
                     sections: dockerFiles,
@@ -143,7 +144,7 @@ export default class DockerGenerator extends BaseApplicationGenerator {
             },
             packageJsonScripts({ application }) {
                 const scriptsStorage = this.packageJson.createStorage('scripts');
-                const { databaseType, databaseTypeSql, prodDatabaseType, prodDatabaseTypeNo, prodDatabaseTypeMysql, prodDatabaseTypeOracle } = application;
+                const { databaseType, databaseTypeSql, prodDatabaseType, prodDatabaseTypeNo, prodDatabaseTypeOracle } = application;
                 let postServicesSleep;
                 if (databaseTypeSql) {
                     if (prodDatabaseTypeNo || prodDatabaseTypeOracle) {
@@ -203,4 +204,24 @@ export default class DockerGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.POST_WRITING]() {
         return this.asPostWritingTaskGroup(this.delegateToBlueprint ? {} : this.postWriting);
     }
+    /**
+     * @private
+     * Returns the JDBC URL for a databaseType
+     *
+     * @param {string} databaseType
+     * @param {*} options: databaseName, and required infos that depends of databaseType (hostname, localDirectory, ...)
+     */
+    getJDBCUrl(databaseType, options = {}) {
+        return getJdbcUrl(databaseType, options);
+    }
+    /**
+     * @private
+     * Returns the R2DBC URL for a databaseType
+     *
+     * @param {string} databaseType
+     * @param {*} options: databaseName, and required infos that depends of databaseType (hostname, localDirectory, ...)
+     */
+    getR2DBCUrl(databaseType, options = {}) {
+        return getR2dbcUrl(databaseType, options);
+    }
 }

package/dist/generators/{base-docker/utils.mjs → docker/support/docker-compose-file.mjs}

@@ -1,3 +1,21 @@
+/**
+ * Copyright 2013-2023 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /**
  * Creates EditFileCallback that creates a base docker compose yml file if empty.
  *

package/dist/generators/docker/support/index.mjs

@@ -0,0 +1,20 @@
+/**
+ * Copyright 2013-2023 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export * from './check-docker.mjs';
+export * from './docker-compose-file.mjs';

package/dist/generators/docker/templates/src/main/docker/app.yml.ejs

@@ -44,8 +44,7 @@ _%>
       - SPRING_LIQUIBASE_URL=<%- this.getJDBCUrl(prodDatabaseType, { hostname: prodDatabaseType, databaseName: databaseName }) %>
 <%_ } _%>
 <%_ if (databaseTypeMongodb) { _%>
-      - SPRING_DATA_MONGODB_URI=mongodb://mongodb:27017<% if (reactive) { %>/?waitQueueMultiple=1000<% } %>
-      - SPRING_DATA_MONGODB_DATABASE=<%= baseName %>
+      - SPRING_DATA_MONGODB_URI=mongodb://mongodb:27017/<%= baseName %><% if (reactive) { %>?waitQueueMultiple=1000<% } %>
 <%_ } _%>
 <%_ if (databaseTypeNeo4j) { _%>
       - SPRING_NEO4J_URI=bolt://neo4j:7687

package/dist/generators/docker/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs

@@ -2576,7 +2576,7 @@
     "frontendUrl": "",
     "acr.loa.map": "[]"
   },
-  "keycloakVersion": "21.1.1",
+  "keycloakVersion": "22.0.1",
   "userManagedAccessAllowed": false,
   "clientProfiles": {
     "profiles": []

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

@@ -22,17 +22,17 @@ services:
   mariadb:
     image: <%- dockerContainers.mariadb %>
     volumes:
-      - ./config/mariadb:/etc/mysql/conf.d
+      - ./config/mariadb:/etc/mariadb/conf.d
     # volumes:
-    #   - ~/volumes/jhipster/<%= baseName %>/mysql/:/var/lib/mysql/
+    #   - ~/volumes/jhipster/<%= baseName %>/mariadb/:/var/lib/mariadb/
     environment:
-      - MYSQL_ALLOW_EMPTY_PASSWORD=yes
-      - MYSQL_DATABASE=<%= baseName.toLowerCase() %>
+      - MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=yes
+      - MARIADB_DATABASE=<%= baseName.toLowerCase() %>
     # If you want to expose these ports outside your dev PC,
     # remove the "127.0.0.1:" prefix
     ports:
       - 127.0.0.1:3306:3306
-    command: mysqld --lower_case_table_names=1 --skip-ssl --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
+    command: mariadbd --lower_case_table_names=1 --skip-ssl --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-compose/command.mjs

@@ -0,0 +1,10 @@
+const command = {
+    arguments: {
+        appsFolders: {
+            type: Array,
+            description: 'Application folders',
+        },
+    },
+    options: {},
+};
+export default command;

package/dist/generators/docker-compose/files.mjs

@@ -28,34 +28,27 @@ export function writeFiles() {
                 this.removeFile('realm-config/jhipster-users-0.json');
             }
         },
-        writeDockerCompose() {
-            this.writeFile('docker-compose.yml.ejs', 'docker-compose.yml');
-            this.writeFile('README-DOCKER-COMPOSE.md.ejs', 'README-DOCKER-COMPOSE.md');
+        writeDockerCompose({ deployment }) {
+            this.writeFile('docker-compose.yml.ejs', 'docker-compose.yml', deployment);
+            this.writeFile('README-DOCKER-COMPOSE.md.ejs', 'README-DOCKER-COMPOSE.md', deployment);
         },
-        writeRegistryFiles() {
-            if (this.serviceDiscoveryAny) {
-                this.writeFile('central-server-config/application.yml.ejs', 'central-server-config/application.yml');
+        writeRegistryFiles({ deployment }) {
+            if (deployment.serviceDiscoveryAny) {
+                this.writeFile('central-server-config/application.yml.ejs', 'central-server-config/application.yml', deployment);
             }
         },
-        writeKeycloakFiles() {
-            if (this.authenticationType === OAUTH2 && this.applicationType !== MICROSERVICE) {
-                this.writeFile('realm-config/keycloak-health-check.sh', 'realm-config/keycloak-health-check.sh');
-                this.writeFile('realm-config/jhipster-realm.json.ejs', 'realm-config/jhipster-realm.json');
+        writeKeycloakFiles({ deployment }) {
+            if (deployment.authenticationType === OAUTH2 && deployment.applicationType !== MICROSERVICE) {
+                this.writeFile('realm-config/keycloak-health-check.sh', 'realm-config/keycloak-health-check.sh', deployment);
+                this.writeFile('realm-config/jhipster-realm.json.ejs', 'realm-config/jhipster-realm.json', deployment);
             }
         },
-        writePrometheusFiles() {
-            if (this.monitoring !== PROMETHEUS)
+        writePrometheusFiles({ deployment }) {
+            if (deployment.monitoring !== PROMETHEUS)
                 return;
-            // Generate a list of target apps to monitor for the prometheus config
-            const appsToMonitor = [];
-            for (let i = 0; i < this.appConfigs.length; i++) {
-                appsToMonitor.push(`        - ${this.appConfigs[i].baseName}:${this.appConfigs[i].composePort}`);
-            }
-            // Format the application target list as a YAML array
-            this.appsToMonitorList = appsToMonitor.join('\n').replace(/'/g, '');
-            this.writeFile('prometheus-conf/prometheus.yml.ejs', 'prometheus-conf/prometheus.yml');
-            this.writeFile('prometheus-conf/alert_rules.yml.ejs', 'prometheus-conf/alert_rules.yml');
-            this.writeFile('alertmanager-conf/config.yml.ejs', 'alertmanager-conf/config.yml');
+            this.writeFile('prometheus-conf/prometheus.yml.ejs', 'prometheus-conf/prometheus.yml', deployment);
+            this.writeFile('prometheus-conf/alert_rules.yml.ejs', 'prometheus-conf/alert_rules.yml', deployment);
+            this.writeFile('alertmanager-conf/config.yml.ejs', 'alertmanager-conf/config.yml', deployment);
         },
     };
 }