generator-jhipster 8.2.1 → 8.4.0

package/dist/generators/server/generator.js

@@ -21,21 +21,18 @@
 import { existsSync } from 'fs';
 import chalk from 'chalk';
 import { getDBTypeFromDBValue, buildJavaGet as javaGetCall, javaBeanCase as javaBeanClassNameFormat, buildJavaGetter as javaGetter, buildJavaSetter as javaSetter, getJavaValueGeneratorForType as getJavaValueForType, getPrimaryKeyValue as getPKValue, hibernateSnakeCase, } from './support/index.js';
-import { askForOptionalItems, askForServerSideOpts, askForServerTestOpts } from './prompts.js';
-import { GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_COMMON, GENERATOR_CUCUMBER, GENERATOR_DOCKER, GENERATOR_GATLING, GENERATOR_GRADLE, GENERATOR_JAVA, GENERATOR_LANGUAGES, GENERATOR_MAVEN, GENERATOR_SERVER, GENERATOR_SPRING_BOOT, GENERATOR_FEIGN_CLIENT, } from '../generator-list.js';
+import { GENERATOR_COMMON, GENERATOR_SPRING_BOOT } from '../generator-list.js';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { packageJson } from '../../lib/index.js';
 import { SERVER_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_TEST_SRC_DIR, SERVER_TEST_RES_DIR, CLIENT_WEBPACK_DIR, MAIN_DIR, LOGIN_REGEX, TEST_DIR, JAVA_VERSION, JAVA_COMPATIBLE_VERSIONS, JHIPSTER_DEPENDENCIES_VERSION, } from '../generator-constants.js';
-import statistics from '../statistics.js';
-import { applicationTypes, authenticationTypes, buildToolTypes, databaseTypes, fieldTypes, entityOptions, validations, reservedKeywords, searchEngineTypes, clientFrameworkTypes, testFrameworkTypes, } from '../../jdl/jhipster/index.js';
+import { applicationTypes, authenticationTypes, buildToolTypes, databaseTypes, fieldTypes, entityOptions, validations, reservedKeywords, searchEngineTypes, clientFrameworkTypes, } from '../../jdl/jhipster/index.js';
 import { stringifyApplicationData } from '../base-application/support/index.js';
 import { createBase64Secret, createSecret, createNeedleCallback, mutateData } from '../base/support/index.js';
-import command from './command.js';
 import { isReservedPaginationWords } from '../../jdl/jhipster/reserved-keywords.js';
 import { loadStoredAppOptions } from '../app/support/index.js';
+import { isReservedH2Keyword } from '../spring-data-relational/support/h2-reserved-keywords.js';
 const dbTypes = fieldTypes;
 const { STRING: TYPE_STRING, INTEGER: TYPE_INTEGER, LONG: TYPE_LONG, BIG_DECIMAL: TYPE_BIG_DECIMAL, FLOAT: TYPE_FLOAT, DOUBLE: TYPE_DOUBLE, LOCAL_DATE: TYPE_LOCAL_DATE, ZONED_DATE_TIME: TYPE_ZONED_DATE_TIME, INSTANT: TYPE_INSTANT, DURATION: TYPE_DURATION, } = dbTypes.CommonDBTypes;
-const { CUCUMBER, GATLING } = testFrameworkTypes;
 const { SUPPORTED_VALIDATION_RULES } = validations;
 const { isReservedTableName } = reservedKeywords;
 const { ANGULAR, REACT, VUE } = clientFrameworkTypes;
@@ -57,45 +54,45 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
     jhipsterDependenciesVersion;
     /** @type {string} */
     projectVersion;
-    command = command;
     async beforeQueue() {
         if (!this.fromBlueprint) {
             loadStoredAppOptions.call(this);
-            await this.composeWithBlueprints(GENERATOR_SERVER);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+            await this.dependsOnBootstrapApplication();
             await this.dependsOnJHipster(GENERATOR_COMMON);
-            await this.dependsOnJHipster(GENERATOR_JAVA);
         }
     }
     get initializing() {
         return this.asInitializingTaskGroup({
-            loadConfig() {
-                this.parseJHipsterCommand(this.command);
+            async parseCommand() {
+                await this.parseCurrentJHipsterCommand();
             },
         });
     }
     get [BaseApplicationGenerator.INITIALIZING]() {
-        return this.asInitializingTaskGroup(this.delegateTasksToBlueprint(() => this.initializing));
+        return this.delegateTasksToBlueprint(() => this.initializing);
     }
     get prompting() {
         return this.asPromptingTaskGroup({
             async prompting({ control }) {
                 if (control.existingProject && this.options.askAnswered !== true)
                     return;
-                await this.prompt(this.prepareQuestions(this.command.configs));
+                await this.promptCurrentJHipsterCommand();
             },
-            askForServerTestOpts,
-            askForServerSideOpts,
-            askForOptionalItems,
         });
     }
     get [BaseApplicationGenerator.PROMPTING]() {
-        return this.asPromptingTaskGroup(this.delegateTasksToBlueprint(() => this.prompting));
+        return this.delegateTasksToBlueprint(() => this.prompting);
     }
     get configuring() {
         return this.asConfiguringTaskGroup({
+            configuring() {
+                if (process.env.JHI_WAR === '1') {
+                    this.jhipsterConfig.defaultPackaging = 'war';
+                }
+            },
             configServerPort() {
                 if (!this.jhipsterConfig.serverPort && this.jhipsterConfig.applicationIndex) {
                     this.jhipsterConfig.serverPort = 8080 + this.jhipsterConfig.applicationIndex;
@@ -106,20 +103,9 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
             },
             syncUserWithIdp() {
                 if (this.jhipsterConfig.syncUserWithIdp === undefined && this.jhipsterConfig.authenticationType === OAUTH2) {
-                    if (this.jhipsterConfig.databaseType === NO_DATABASE) {
-                        this.jhipsterConfig.syncUserWithIdp = false;
-                    }
-                    else if (this.isJhipsterVersionLessThan('8.1.1')) {
+                    if (this.isJhipsterVersionLessThan('8.1.1')) {
                         this.jhipsterConfig.syncUserWithIdp = true;
                     }
-                    else if (this.jhipsterConfig.applicationType === GATEWAY) {
-                        // For compatibility with v8 microservices allow syncUserWithIdp by default.
-                        // Switch to false at v9.
-                        this.jhipsterConfig.syncUserWithIdp = true;
-                    }
-                    else {
-                        this.jhipsterConfig.syncUserWithIdp = this.getExistingEntities().some(entity => (entity.definition.relationships ?? []).some(relationship => relationship.otherEntityName.toLowerCase() === 'user'));
-                    }
                 }
                 else if (this.jhipsterConfig.syncUserWithIdp && this.jhipsterConfig.authenticationType !== OAUTH2) {
                     throw new Error(`syncUserWithIdp is only supported with authenticationType ${OAUTH2}`);
@@ -128,58 +114,33 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.CONFIGURING]() {
-        return this.asConfiguringTaskGroup(this.delegateTasksToBlueprint(() => this.configuring));
+        return this.delegateTasksToBlueprint(() => this.configuring);
     }
     get composing() {
         return this.asComposingTaskGroup({
+            async composeCommand() {
+                await this.composeCurrentJHipsterCommand();
+            },
             async composeBackendType() {
                 if (!this.jhipsterConfig.backendType || ['spring-boot', 'java'].includes(this.jhipsterConfig.backendType.toLowerCase())) {
                     await this.composeWithJHipster(GENERATOR_SPRING_BOOT);
                 }
             },
-            async composing() {
-                const { buildTool, enableTranslation, testFrameworks, feignClient } = this.jhipsterConfigWithDefaults;
-                if (buildTool === GRADLE) {
-                    await this.composeWithJHipster(GENERATOR_GRADLE);
-                }
-                else if (buildTool === MAVEN) {
-                    await this.composeWithJHipster(GENERATOR_MAVEN);
-                }
-                else {
-                    throw new Error(`Build tool ${buildTool} is not supported`);
-                }
-                await this.composeWithJHipster(GENERATOR_DOCKER);
-                if (enableTranslation) {
-                    await this.composeWithJHipster(GENERATOR_LANGUAGES);
-                }
-                if (testFrameworks?.includes(CUCUMBER)) {
-                    await this.composeWithJHipster(GENERATOR_CUCUMBER);
-                }
-                if (testFrameworks?.includes(GATLING)) {
-                    await this.composeWithJHipster(GENERATOR_GATLING);
-                }
-                if (feignClient) {
-                    await this.composeWithJHipster(GENERATOR_FEIGN_CLIENT);
-                }
-            },
         });
     }
     get [BaseApplicationGenerator.COMPOSING]() {
-        return this.asComposingTaskGroup(this.delegateTasksToBlueprint(() => this.composing));
+        return this.delegateTasksToBlueprint(() => this.composing);
     }
     get loading() {
         return this.asLoadingTaskGroup({
+            async loadCommand({ application }) {
+                await this.loadCurrentJHipsterCommandConfig(application);
+            },
             loadEnvironmentVariables({ application }) {
                 application.packageInfoJavadocs?.push({ packageName: `${application.packageName}.aop.logging`, documentation: 'Logging aspect.' }, { packageName: `${application.packageName}.management`, documentation: 'Application management.' }, { packageName: `${application.packageName}.repository.rowmapper`, documentation: 'Webflux database column mapper.' }, { packageName: `${application.packageName}.security`, documentation: 'Application security utilities.' }, { packageName: `${application.packageName}.service.dto`, documentation: 'Data transfer objects for rest mapping.' }, { packageName: `${application.packageName}.service.mapper`, documentation: 'Data transfer objects mappers.' }, { packageName: `${application.packageName}.web.filter`, documentation: 'Request chain filters.' }, { packageName: `${application.packageName}.web.rest.errors`, documentation: 'Rest layer error handling.' }, { packageName: `${application.packageName}.web.rest.vm`, documentation: 'Rest layer visual models.' });
-                application.defaultPackaging = process.env.JHI_WAR === '1' ? 'war' : 'jar';
                 if (application.defaultPackaging === 'war') {
                     this.log.info(`Using ${application.defaultPackaging} as default packaging`);
                 }
-                const JHI_PROFILE = process.env.JHI_PROFILE;
-                application.defaultEnvironment = (JHI_PROFILE || '').includes('dev') ? 'dev' : 'prod';
-                if (JHI_PROFILE) {
-                    this.log.info(`Using ${application.defaultEnvironment} as default profile`);
-                }
             },
             setupServerconsts({ application }) {
                 // Make constants available in templates
@@ -237,7 +198,7 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.PREPARING]() {
-        return this.asPreparingTaskGroup(this.delegateTasksToBlueprint(() => this.preparing));
+        return this.delegateTasksToBlueprint(() => this.preparing);
     }
     get postPreparing() {
         return this.asPostPreparingTaskGroup({
@@ -322,9 +283,13 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
             configureEntityTable({ application, entityName, entityConfig }) {
                 if ((application.applicationTypeGateway && entityConfig.microserviceName) || entityConfig.skipServer)
                     return;
+                const { jhiTablePrefix, devDatabaseTypeH2Any } = application;
                 const databaseType = entityConfig.prodDatabaseType ?? application.prodDatabaseType ?? entityConfig.databaseType ?? application.databaseType;
                 const entityTableName = entityConfig.entityTableName ?? hibernateSnakeCase(entityName);
-                const fixedEntityTableName = this._fixEntityTableName(entityTableName, databaseType, application.jhiTablePrefix);
+                const fixedEntityTableName = (isReservedTableName(entityTableName, databaseType) || (devDatabaseTypeH2Any && isReservedH2Keyword(entityTableName))) &&
+                    jhiTablePrefix
+                    ? `${jhiTablePrefix}_${entityTableName}`
+                    : entityTableName;
                 if (fixedEntityTableName !== entityTableName) {
                     entityConfig.entityTableName = fixedEntityTableName;
                 }
@@ -385,7 +350,7 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.CONFIGURING_EACH_ENTITY]() {
-        return this.asConfiguringEachEntityTaskGroup(this.delegateTasksToBlueprint(() => this.configuringEachEntity));
+        return this.delegateTasksToBlueprint(() => this.configuringEachEntity);
     }
     get preparingEachEntity() {
         return this.asPreparingEachEntityTaskGroup({
@@ -412,7 +377,7 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.POST_PREPARING_EACH_ENTITY]() {
-        return this.asPostPreparingEachEntityTaskGroup(this.delegateTasksToBlueprint(() => this.postPreparingEachEntity));
+        return this.delegateTasksToBlueprint(() => this.postPreparingEachEntity);
     }
     /** @inheritdoc */
     get default() {
@@ -423,119 +388,17 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
                     throw new Error(`Composite id is not supported. Defined in ${entitiesWithCompositeIds.map(entity => `${entity.name} (${entity.primaryKey.fields.map(field => field.fieldName)})`)}`);
                 }
             },
-            insight({ application }) {
-                statistics.sendSubGenEvent('generator', GENERATOR_SERVER, {
-                    app: {
-                        authenticationType: application.authenticationType,
-                        cacheProvider: application.cacheProvider,
-                        enableHibernateCache: application.enableHibernateCache,
-                        websocket: application.websocket,
-                        databaseType: application.databaseType,
-                        devDatabaseType: application.devDatabaseType,
-                        prodDatabaseType: application.prodDatabaseType,
-                        searchEngine: application.searchEngine,
-                        messageBroker: application.messageBroker,
-                        serviceDiscoveryType: application.serviceDiscoveryType,
-                        buildTool: application.buildTool,
-                        enableSwaggerCodegen: application.enableSwaggerCodegen,
-                        enableGradleEnterprise: application.enableGradleEnterprise,
-                    },
-                });
-            },
         });
     }
     get [BaseApplicationGenerator.DEFAULT]() {
-        return this.asDefaultTaskGroup(this.delegateTasksToBlueprint(() => this.default));
+        return this.delegateTasksToBlueprint(() => this.default);
     }
     get postWriting() {
         return this.asPostWritingTaskGroup({
-            customizeGradle({ application, source }) {
-                if (!application.buildToolGradle)
-                    return;
-                source.addGradleDependencyCatalogVersion?.({ name: 'checkstyle', version: application.javaDependencies.checkstyle });
-                source.addGradleBuildSrcDependencyCatalogVersion?.({ name: 'checkstyle', version: application.javaDependencies.checkstyle });
-                source.addGradleDependencyCatalogVersion?.({ name: 'jacoco', version: application.javaDependencies?.['jacoco-maven-plugin'] });
-                source.addGradleBuildSrcDependencyCatalogVersion?.({
-                    name: 'jacoco',
-                    version: application.javaDependencies?.['jacoco-maven-plugin'],
-                });
-                source.addGradleDependencyCatalogVersion?.({
-                    name: 'sonarqube-plugin',
-                    version: application.javaDependencies?.['gradle-sonarqube'],
-                });
-                source.addGradleBuildSrcDependencyCatalogVersion?.({
-                    name: 'sonarqube-plugin',
-                    version: application.javaDependencies?.['gradle-sonarqube'],
-                });
-                source.addGradleDependencyCatalogVersion?.({
-                    name: 'spotless-plugin',
-                    version: application.javaDependencies?.['spotless-gradle-plugin'],
-                });
-                source.addGradleBuildSrcDependencyCatalogVersion?.({
-                    name: 'spotless-plugin',
-                    version: application.javaDependencies?.['spotless-gradle-plugin'],
-                });
-                source.addGradleDependencyCatalogVersion?.({
-                    name: 'modernizer-plugin',
-                    version: application.javaDependencies?.['gradle-modernizer-plugin'],
-                });
-                source.addGradleBuildSrcDependencyCatalogVersion?.({
-                    name: 'modernizer-plugin',
-                    version: application.javaDependencies?.['gradle-modernizer-plugin'],
-                });
-                source.addGradleDependencyCatalogVersion?.({ name: 'nohttp-plugin', version: application.javaDependencies?.['nohttp-checkstyle'] });
-                source.addGradleBuildSrcDependencyCatalogVersion?.({
-                    name: 'nohttp-plugin',
-                    version: application.javaDependencies?.['nohttp-checkstyle'],
-                });
-                source.addGradleDependencyCatalogVersion?.({ name: 'jib-plugin', version: application.javaDependencies?.['jib-maven-plugin'] });
-                source.addGradleBuildSrcDependencyCatalogVersion?.({
-                    name: 'jib-plugin',
-                    version: application.javaDependencies?.['jib-maven-plugin'],
-                });
-                source.addGradleBuildSrcDependency?.({
-                    groupId: 'org.sonarsource.scanner.gradle',
-                    artifactId: 'sonarqube-gradle-plugin',
-                    // eslint-disable-next-line no-template-curly-in-string
-                    version: '${libs.versions.sonarqube.plugin.get()}',
-                    scope: 'implementation',
-                });
-                source.addGradleBuildSrcDependency?.({
-                    groupId: 'com.diffplug.spotless',
-                    artifactId: 'spotless-plugin-gradle',
-                    // eslint-disable-next-line no-template-curly-in-string
-                    version: '${libs.versions.spotless.plugin.get()}',
-                    scope: 'implementation',
-                });
-                source.addGradleBuildSrcDependency?.({
-                    groupId: 'com.github.andygoossens',
-                    artifactId: 'gradle-modernizer-plugin',
-                    // eslint-disable-next-line no-template-curly-in-string
-                    version: '${libs.versions.modernizer.plugin.get()}',
-                    scope: 'implementation',
-                });
-                source.addGradleBuildSrcDependency?.({
-                    groupId: 'io.spring.nohttp',
-                    artifactId: 'nohttp-gradle',
-                    // eslint-disable-next-line no-template-curly-in-string
-                    version: '${libs.versions.nohttp.plugin.get()}',
-                    scope: 'implementation',
-                });
-                source.addGradleBuildSrcDependency?.({
-                    groupId: 'com.google.cloud.tools',
-                    artifactId: 'jib-gradle-plugin',
-                    // eslint-disable-next-line no-template-curly-in-string
-                    version: '${libs.versions.jib.plugin.get()}',
-                    scope: 'implementation',
-                });
-                source.addGradlePlugin?.({ id: 'jhipster.code-quality-conventions' });
-                source.addGradlePlugin?.({ id: 'jhipster.docker-conventions' });
-            },
             packageJsonScripts({ application }) {
                 const packageJsonConfigStorage = this.packageJson.createStorage('config').createProxy();
                 packageJsonConfigStorage.backend_port = application.gatewayServerPort || application.serverPort;
                 packageJsonConfigStorage.packaging = application.defaultPackaging;
-                packageJsonConfigStorage.default_environment = application.defaultEnvironment;
             },
             packageJsonBackendScripts({ application }) {
                 const scriptsStorage = this.packageJson.createStorage('scripts');
@@ -547,7 +410,7 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
                     const excludeWebapp = application.skipClient ? '' : ' -Dskip.installnodenpm -Dskip.npm';
                     scriptsStorage.set({
                         'app:start': './mvnw',
-                        'backend:info': './mvnw -ntp enforcer:display-info --batch-mode',
+                        'backend:info': './mvnw --version',
                         'backend:doc:test': './mvnw -ntp javadoc:javadoc --batch-mode',
                         'backend:nohttp:test': './mvnw -ntp checkstyle:check --batch-mode',
                         'backend:start': `./mvnw${excludeWebapp}`,
@@ -612,33 +475,7 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.POST_WRITING]() {
-        return this.asPostWritingTaskGroup(this.delegateTasksToBlueprint(() => this.postWriting));
-    }
-    get postWritingEntities() {
-        return this.asPostWritingEntitiesTaskGroup({
-            packageJsonE2eScripts({ application, entities }) {
-                if (application.applicationTypeGateway) {
-                    const { serverPort, lowercaseBaseName } = application;
-                    const microservices = [...new Set(entities.map(entity => entity.microserviceName))].filter(Boolean).map(ms => ms.toLowerCase());
-                    const scriptsStorage = this.packageJson.createStorage('scripts');
-                    const waitServices = microservices
-                        .concat(lowercaseBaseName)
-                        .map(ms => `npm run ci:server:await:${ms}`)
-                        .join(' && ');
-                    scriptsStorage.set({
-                        [`ci:server:await:${lowercaseBaseName}`]: `wait-on -t ${WAIT_TIMEOUT} http-get://127.0.0.1:$npm_package_config_backend_port/management/health`,
-                        ...Object.fromEntries(microservices.map(ms => [
-                            `ci:server:await:${ms}`,
-                            `wait-on -t ${WAIT_TIMEOUT} http-get://127.0.0.1:${serverPort}/services/${ms}/management/health/readiness`,
-                        ])),
-                        'ci:server:await': `echo "Waiting for services to start" && ${waitServices} && echo "Services started"`,
-                    });
-                }
-            },
-        });
-    }
-    get [BaseApplicationGenerator.POST_WRITING_ENTITIES]() {
-        return this.asPostWritingEntitiesTaskGroup(this.delegateTasksToBlueprint(() => this.postWritingEntities));
+        return this.delegateTasksToBlueprint(() => this.postWriting);
     }
     _configureServer(config = this.jhipsterConfigWithDefaults, dest = this.jhipsterConfig) {
         // Generate JWT secret key if key does not already exist in config
@@ -765,12 +602,6 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
             throw new Error(`relationshipSide is missing in .jhipster/${entityName}.json for relationship ${stringifyApplicationData(relationship)}`);
         }
     }
-    _fixEntityTableName(entityTableName, prodDatabaseType, jhiTablePrefix) {
-        if (isReservedTableName(entityTableName, prodDatabaseType) && jhiTablePrefix) {
-            entityTableName = `${jhiTablePrefix}_${entityTableName}`;
-        }
-        return entityTableName;
-    }
     /**
      * @private
      * Return the method name which converts the filter to specification

package/dist/generators/server/jdl/application-definition.js

@@ -16,11 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as _ from 'lodash-es';
+import { upperCase, snakeCase } from 'lodash-es';
 import databaseMigrationOption from '../options/database-migration.js';
 import messageBrokerOption from '../options/message-broker.js';
 import { feignClientDefinition, syncUserWithIdpDefinition } from '../options/index.js';
-const { upperCase, snakeCase } = _;
 const jdlOptions = [
     databaseMigrationOption,
     messageBrokerOption,

package/dist/generators/server/resources/Dockerfile

@@ -13,7 +13,7 @@ LABEL ALIAS=consul-config-loader
 FROM postgres:16.2
 LABEL ALIAS=postgresql
 
-FROM quay.io/keycloak/keycloak:24.0.1
+FROM quay.io/keycloak/keycloak:24.0.3
 LABEL ALIAS=keycloak
 
 FROM mysql:8.3.0
@@ -23,7 +23,7 @@ FROM mariadb:11.3.2
 FROM mongo:7.0.6
 LABEL ALIAS=mongodb
 
-FROM couchbase/server:7.6.0
+FROM couchbase/server:7.6.1
 LABEL ALIAS=couchbase
 
 FROM cassandra:5.0
@@ -31,31 +31,31 @@ FROM cassandra:5.0
 FROM mcr.microsoft.com/mssql/server:2019-CU16-GDR1-ubuntu-20.04
 LABEL ALIAS=mssql
 
-FROM neo4j:5.18.1
+FROM neo4j:5.19.0
 
-FROM hazelcast/management-center:5.3.3
+FROM hazelcast/management-center:5.4.1
 LABEL ALIAS=hazelcast
 
-FROM memcached:1.6.24-alpine
+FROM memcached:1.6.26-alpine
 
 FROM redis:7.2.4
 
-FROM confluentinc/cp-kafka:7.6.0
+FROM confluentinc/cp-kafka:7.6.1
 LABEL ALIAS=kafka
 
-FROM confluentinc/cp-zookeeper:7.6.0
+FROM confluentinc/cp-zookeeper:7.6.1
 LABEL ALIAS=zookeeper
 
-FROM apachepulsar/pulsar:3.2.1
+FROM apachepulsar/pulsar:3.2.2
 LABEL ALIAS=pulsar
 
-FROM sonarqube:10.4.1-community
+FROM sonarqube:10.5.0-community
 LABEL ALIAS=sonar
 
-FROM docker.io/bitnami/consul:1.18.0
+FROM docker.io/bitnami/consul:1.18.1
 LABEL ALIAS=consul
 
-FROM prom/prometheus:v2.51.0
+FROM prom/prometheus:v2.51.2
 LABEL ALIAS=prometheus
 
 FROM prom/alertmanager:v0.27.0
@@ -64,7 +64,7 @@ LABEL ALIAS=prometheus-alertmanager
 FROM quay.io/coreos/prometheus-operator:v0.42.1
 LABEL ALIAS=prometheus-operator
 
-FROM grafana/grafana:10.4.0
+FROM grafana/grafana:10.4.2
 LABEL ALIAS=grafana
 
 FROM quay.io/coreos/grafana-watcher:v0.0.8
@@ -79,5 +79,5 @@ LABEL ALIAS=java-jre
 FROM swaggerapi/swagger-editor:latest
 LABEL ALIAS=swagger-editor
 
-FROM openzipkin/zipkin:3.1
+FROM openzipkin/zipkin:3.3
 LABEL ALIAS=zipkin

package/dist/generators/server/resources/build.gradle

@@ -0,0 +1 @@
+// required by dependabot

package/dist/generators/server/resources/gradle/libs.versions.toml

@@ -1,18 +1,36 @@
+[libraries]
+spring-cloud-dependencies = { module = 'org.springframework.cloud:spring-cloud-dependencies', version = '2023.0.1' }
+
+springdoc = { module = 'org.springdoc:springdoc-openapi-starter-webmvc-api', version = '2.5.0' }
+
+feign-reactor-bom = { module = 'com.playtika.reactivefeign:feign-reactor-bom', version = '4.0.3' }
+
+# Cucumber
+testng = { module = 'org.testng:testng', version = '7.10.2' }
+cucumber-bom = { module = 'io.cucumber:cucumber-bom', version = '7.17.0' }
+
+mongock-bom = { module = 'io.mongock:mongock-bom', version = '5.4.2' }
+
+neo4j-migrations-spring-boot-starter = { module = 'eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter', version = '2.10.0' }
+
+# Cassandra
+lz4-java = { module = 'org.lz4:lz4-java', version = '1.8.0' }
+
 [plugins]
-gradle-git-properties = { id = 'com.gorylenko.gradle-git-properties', version = '2.4.1' }
+gradle-git-properties = { id = 'com.gorylenko.gradle-git-properties', version = '2.4.2' }
 
-node-gradle = { id = 'com.github.node-gradle.node', version = '7.0.1' }
+node-gradle = { id = 'com.github.node-gradle.node', version = '7.0.2' }
 
-gradle-liquibase = { id = 'org.liquibase.gradle', version = '2.2.1' }
+gradle-liquibase = { id = 'org.liquibase.gradle', version = '2.2.2' }
 
-gradle-sonarqube = { id = 'org.sonarqube', version = '4.4.1.3373' }
+gradle-sonarqube = { id = 'org.sonarqube', version = '5.0.0.4638' }
 
-spotless-gradle-plugin = { id = 'com.diffplug.spotless', version = '6.23.3' }
+spotless-gradle-plugin = { id = 'com.diffplug.spotless', version = '6.25.0' }
 
-gradle-modernizer-plugin = { id = 'com.github.andygoossens.gradle-modernizer-plugin', version = '1.9.0' }
+gradle-modernizer-plugin = { id = 'com.github.andygoossens.gradle-modernizer-plugin', version = '1.9.2' }
 
-gradle-enterprise = { id = 'com.gradle.enterprise', version = '3.16.1' }
+gradle-enterprise = { id = 'com.gradle.enterprise', version = '3.17.2' }
 
-common-custom-user-data-gradle-plugin = { id = 'com.gradle.common-custom-user-data-gradle-plugin', version = '1.12.1' }
+common-custom-user-data-gradle-plugin = { id = 'com.gradle.common-custom-user-data-gradle-plugin', version = '2.0.1' }
 
-gatling-gradle = { id = 'io.gatling.gradle', version = '3.10.3' }
+gatling-gradle = { id = 'io.gatling.gradle', version = '3.11.1' }

package/dist/generators/server/resources/pom.xml

@@ -8,34 +8,31 @@
 
     <properties>
         <!-- Dependency versions -->
-        <archunit-junit5.version>1.2.1</archunit-junit5.version>
-        <blockhound-junit-platform.version>1.0.8.RELEASE</blockhound-junit-platform.version>
+        <archunit-junit5.version>1.3.0</archunit-junit5.version>
+        <blockhound-junit-platform.version>1.0.9.RELEASE</blockhound-junit-platform.version>
         <commons-beanutils.version>1.9.4</commons-beanutils.version>
-        <gatling.version>3.10.4</gatling.version>
-        <hazelcast-hibernate53.version>5.1.0</hazelcast-hibernate53.version>
-        <hazelcast-spring.version>5.3.6</hazelcast-spring.version>
+        <gatling.version>3.11.1</gatling.version>
         <jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
         <mapstruct.version>1.5.5.Final</mapstruct.version>
         <micrometer-context-propagation.version>1.1.1</micrometer-context-propagation.version>
         <picocli.version>4.7.5</picocli.version>
-        <typesafe.version>1.4.3</typesafe.version>
 
         <!-- Plugin versions -->
-        <checkstyle.version>10.14.2</checkstyle.version>
+        <checkstyle.version>10.16.0</checkstyle.version>
         <checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
         <frontend-maven-plugin.version>1.15.0</frontend-maven-plugin.version>
-        <gatling-maven-plugin.version>4.8.2</gatling-maven-plugin.version>
+        <gatling-maven-plugin.version>4.9.0</gatling-maven-plugin.version>
         <git-commit-id-maven-plugin.version>8.0.2</git-commit-id-maven-plugin.version>
-        <jib-maven-plugin.version>3.4.1</jib-maven-plugin.version>
+        <jib-maven-plugin.version>3.4.2</jib-maven-plugin.version>
         <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
-        <jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
+        <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
         <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
         <maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
         <maven-clean-plugin.version>3.3.2</maven-clean-plugin.version>
         <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
         <maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
         <maven-failsafe-plugin.version>3.2.5</maven-failsafe-plugin.version>
-        <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
+        <maven-jar-plugin.version>3.4.1</maven-jar-plugin.version>
         <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
         <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
         <maven-site-plugin.version>3.12.1</maven-site-plugin.version>
@@ -43,7 +40,7 @@
         <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
         <modernizer-maven-plugin.version>2.8.0</modernizer-maven-plugin.version>
         <nohttp-checkstyle.version>0.0.11</nohttp-checkstyle.version>
-        <openapi-generator-maven-plugin.version>7.4.0</openapi-generator-maven-plugin.version>
+        <openapi-generator-maven-plugin.version>7.5.0</openapi-generator-maven-plugin.version>
         <properties-maven-plugin.version>1.2.1</properties-maven-plugin.version>
         <sonar-maven-plugin.version>3.11.0.3922</sonar-maven-plugin.version>
         <spotless-maven-plugin.version>2.43.0</spotless-maven-plugin.version>
@@ -56,26 +53,11 @@
               <artifactId>commons-beanutils</artifactId>
               <version>${commons-beanutils.version}</version>
             </dependency>
-            <dependency>
-              <groupId>com.hazelcast</groupId>
-              <artifactId>hazelcast-hibernate53</artifactId>
-              <version>${hazelcast-hibernate53.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>com.hazelcast</groupId>
-              <artifactId>hazelcast-spring</artifactId>
-              <version>${hazelcast-spring.version}</version>
-            </dependency>
             <dependency>
               <groupId>com.tngtech.archunit</groupId>
               <artifactId>archunit-junit5-api</artifactId>
               <version>${archunit-junit5.version}</version>
             </dependency>
-            <dependency>
-              <groupId>com.typesafe</groupId>
-              <artifactId>config</artifactId>
-              <version>${typesafe.version}</version>
-            </dependency>
             <dependency>
               <groupId>io.gatling.highcharts</groupId>
               <artifactId>gatling-charts-highcharts</artifactId>

package/dist/generators/server/support/prepare-field.js

@@ -17,18 +17,18 @@
  * limitations under the License.
  */
 import assert from 'assert';
-import * as _ from 'lodash-es';
+import { snakeCase, upperFirst } from 'lodash-es';
 import { databaseTypes, entityOptions, fieldTypes, reservedKeywords } from '../../../jdl/jhipster/index.js';
 import { getUXConstraintName } from './database.js';
 import { getJavaValueGeneratorForType } from './templates/field-values.js';
 import { formatDocAsApiDescription, formatDocAsJavaDoc } from '../../java/support/doc.js';
+import { mutateData } from '../../base/support/config.js';
 const { isReservedTableName } = reservedKeywords;
 const { CommonDBTypes } = fieldTypes;
 const { MYSQL, SQL } = databaseTypes;
 const { MapperTypes } = entityOptions;
 const { MAPSTRUCT } = MapperTypes;
 const { INTEGER, LONG, UUID } = CommonDBTypes;
-const { snakeCase, upperFirst } = _;
 export default function prepareField(entityWithConfig, field, generator) {
     if (field.mapstructExpression) {
         assert.equal(entityWithConfig.dto, MAPSTRUCT, `@MapstructExpression requires an Entity with mapstruct dto [${entityWithConfig.name}.${field.fieldName}].`);
@@ -38,8 +38,12 @@ export default function prepareField(entityWithConfig, field, generator) {
         field.readonly = true;
     }
     if (field.documentation) {
-        field.fieldJavadoc = formatDocAsJavaDoc(field.documentation, 4);
-        field.fieldApiDescription = formatDocAsApiDescription(field.documentation);
+        mutateData(field, {
+            __override__: false,
+            fieldJavadoc: formatDocAsJavaDoc(field.documentation, 4),
+            fieldApiDescription: formatDocAsApiDescription(field.documentation),
+            propertyApiDescription: ({ fieldApiDescription }) => fieldApiDescription,
+        });
     }
     if (field.id && entityWithConfig.primaryKey) {
         if (field.autoGenerate === undefined) {