generator-jhipster 8.4.0 → 8.6.0

package/dist/generators/server/generator.js

@@ -20,14 +20,14 @@
 /* eslint-disable consistent-return */
 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 { buildJavaGet as javaGetCall, javaBeanCase as javaBeanClassNameFormat, buildJavaGetter as javaGetter, buildJavaSetter as javaSetter, getJavaValueGeneratorForType as getJavaValueForType, getPrimaryKeyValue as getPKValue, hibernateSnakeCase, } from './support/index.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 { applicationTypes, authenticationTypes, buildToolTypes, databaseTypes, fieldTypes, entityOptions, validations, reservedKeywords, searchEngineTypes, clientFrameworkTypes, } from '../../jdl/jhipster/index.js';
+import { applicationTypes, 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 { createNeedleCallback, mutateData } from '../base/support/index.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';
@@ -36,10 +36,9 @@ const { STRING: TYPE_STRING, INTEGER: TYPE_INTEGER, LONG: TYPE_LONG, BIG_DECIMAL
 const { SUPPORTED_VALIDATION_RULES } = validations;
 const { isReservedTableName } = reservedKeywords;
 const { ANGULAR, REACT, VUE } = clientFrameworkTypes;
-const { JWT, OAUTH2, SESSION } = authenticationTypes;
 const { GRADLE, MAVEN } = buildToolTypes;
-const { CASSANDRA, COUCHBASE, MONGODB, NEO4J, SQL, NO: NO_DATABASE } = databaseTypes;
-const { MICROSERVICE, GATEWAY } = applicationTypes;
+const { CASSANDRA, SQL, NO: NO_DATABASE } = databaseTypes;
+const { GATEWAY } = applicationTypes;
 const { NO: NO_SEARCH_ENGINE } = searchEngineTypes;
 const { CommonDBTypes, RelationalOnlyDBTypes } = fieldTypes;
 const { INSTANT } = CommonDBTypes;
@@ -86,36 +85,6 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.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;
-                }
-            },
-            configure() {
-                this._configureServer();
-            },
-            syncUserWithIdp() {
-                if (this.jhipsterConfig.syncUserWithIdp === undefined && this.jhipsterConfig.authenticationType === OAUTH2) {
-                    if (this.isJhipsterVersionLessThan('8.1.1')) {
-                        this.jhipsterConfig.syncUserWithIdp = true;
-                    }
-                }
-                else if (this.jhipsterConfig.syncUserWithIdp && this.jhipsterConfig.authenticationType !== OAUTH2) {
-                    throw new Error(`syncUserWithIdp is only supported with authenticationType ${OAUTH2}`);
-                }
-            },
-        });
-    }
-    get [BaseApplicationGenerator.CONFIGURING]() {
-        return this.delegateTasksToBlueprint(() => this.configuring);
-    }
     get composing() {
         return this.asComposingTaskGroup({
             async composeCommand() {
@@ -251,10 +220,12 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
                 // Don't touch the configuration for microservice entities published at gateways
                 !(applicationTypeGateway && entityConfig.microserviceName) &&
                     !application.searchEngineAny &&
-                    !entityConfig.searchEngine) {
+                    entityConfig.searchEngine !== NO_SEARCH_ENGINE) {
+                    if (entityConfig.searchEngine) {
+                        this.log.warn('Search engine is enabled at entity level, but disabled at application level. Search engine will be disabled');
+                    }
                     // Search engine can only be enabled at entity level and disabled at application level for gateways publishing a microservice entity
                     entityConfig.searchEngine = NO_SEARCH_ENGINE;
-                    this.log.warn('Search engine is enabled at entity level, but disabled at application level. Search engine will be disabled');
                 }
             },
             configureModelFiltering({ application, entityConfig }) {
@@ -457,14 +428,16 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
             packageJsonE2eScripts({ application }) {
                 const scriptsStorage = this.packageJson.createStorage('scripts');
                 const buildCmd = application.buildToolGradle ? 'gradlew' : 'mvnw';
+                const applicationWaitTimeout = WAIT_TIMEOUT * (application.applicationTypeGateway ? 2 : 1);
+                const applicationEndpoint = application.applicationTypeMicroservice
+                    ? `http-get://127.0.0.1:${application.gatewayServerPort}/${application.endpointPrefix}/management/health/readiness`
+                    : 'http-get://127.0.0.1:$npm_package_config_backend_port/management/health';
+                scriptsStorage.set({
+                    'ci:server:await': `echo "Waiting for server at port $npm_package_config_backend_port to start" && wait-on -t ${applicationWaitTimeout} ${applicationEndpoint} && echo "Server at port $npm_package_config_backend_port started"`,
+                });
                 // TODO add e2eTests property to application.
                 if (this.jhipsterConfig.testFrameworks?.includes('cypress')) {
-                    const applicationWaitTimeout = WAIT_TIMEOUT * (application.applicationTypeGateway ? 2 : 1);
-                    const applicationEndpoint = application.applicationTypeMicroservice
-                        ? `http-get://127.0.0.1:${application.gatewayServerPort}/${application.endpointPrefix}/management/health/readiness`
-                        : 'http-get://127.0.0.1:$npm_package_config_backend_port/management/health';
                     scriptsStorage.set({
-                        'ci:server:await': `echo "Waiting for server at port $npm_package_config_backend_port to start" && wait-on -t ${applicationWaitTimeout} ${applicationEndpoint} && echo "Server at port $npm_package_config_backend_port started"`,
                         'pree2e:headless': 'npm run ci:server:await',
                         'ci:e2e:run': 'concurrently -k -s first "npm run ci:e2e:server:start" "npm run e2e:headless"',
                         'e2e:dev': `concurrently -k -s first "./${buildCmd}" "npm run e2e"`,
@@ -477,38 +450,6 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.POST_WRITING]() {
         return this.delegateTasksToBlueprint(() => this.postWriting);
     }
-    _configureServer(config = this.jhipsterConfigWithDefaults, dest = this.jhipsterConfig) {
-        // Generate JWT secret key if key does not already exist in config
-        if ((config.authenticationType === JWT || config.applicationType === MICROSERVICE || config.applicationType === GATEWAY) &&
-            config.jwtSecretKey === undefined) {
-            dest.jwtSecretKey = createBase64Secret(64, this.options.reproducibleTests);
-        }
-        // Generate remember me key if key does not already exist in config
-        if (config.authenticationType === SESSION && !dest.rememberMeKey) {
-            dest.rememberMeKey = createSecret();
-        }
-        if (config.authenticationType === OAUTH2) {
-            dest.skipUserManagement = true;
-        }
-        if (!config.databaseType && config.prodDatabaseType) {
-            dest.databaseType = getDBTypeFromDBValue(config.prodDatabaseType);
-        }
-        if (!config.devDatabaseType && config.prodDatabaseType) {
-            dest.devDatabaseType = config.prodDatabaseType;
-        }
-        const databaseType = config.databaseType;
-        if (databaseType === NO_DATABASE) {
-            dest.devDatabaseType = NO_DATABASE;
-            dest.prodDatabaseType = NO_DATABASE;
-            dest.enableHibernateCache = false;
-            dest.skipUserManagement = true;
-        }
-        else if ([MONGODB, NEO4J, COUCHBASE, CASSANDRA].includes(databaseType)) {
-            dest.devDatabaseType = databaseType;
-            dest.prodDatabaseType = databaseType;
-            dest.enableHibernateCache = false;
-        }
-    }
     /**
      * Validate the entityTableName
      * @return {true|string} true for a valid value or error message.

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

@@ -20,11 +20,13 @@ 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';
+import { jdlRoutesOptions } from '../../spring-cloud/generators/gateway/jdl/jdl-routes-option.js';
 const jdlOptions = [
     databaseMigrationOption,
     messageBrokerOption,
     feignClientDefinition,
     syncUserWithIdpDefinition,
+    jdlRoutesOptions,
 ];
 const applicationConfig = {
     tokenConfigs: jdlOptions.map(option => ({
@@ -45,7 +47,7 @@ const applicationConfig = {
     optionsTypes: Object.fromEntries(jdlOptions.map(option => [
         option.name,
         {
-            type: messageBrokerOption.type,
+            type: option.type,
         },
     ])),
 };

package/dist/generators/server/resources/Dockerfile

@@ -10,15 +10,15 @@ LABEL ALIAS=jhipster-control-center
 FROM jhipster/consul-config-loader:v0.4.1
 LABEL ALIAS=consul-config-loader
 
-FROM postgres:16.2
+FROM postgres:16.3
 LABEL ALIAS=postgresql
 
-FROM quay.io/keycloak/keycloak:24.0.3
+FROM quay.io/keycloak/keycloak:25.0.1
 LABEL ALIAS=keycloak
 
-FROM mysql:8.3.0
+FROM mysql:8.4.0
 
-FROM mariadb:11.3.2
+FROM mariadb:11.4.2
 
 FROM mongo:7.0.6
 LABEL ALIAS=mongodb
@@ -31,14 +31,14 @@ FROM cassandra:5.0
 FROM mcr.microsoft.com/mssql/server:2019-CU16-GDR1-ubuntu-20.04
 LABEL ALIAS=mssql
 
-FROM neo4j:5.19.0
+FROM neo4j:5.20.0
 
 FROM hazelcast/management-center:5.4.1
 LABEL ALIAS=hazelcast
 
-FROM memcached:1.6.26-alpine
+FROM memcached:1.6.28-alpine
 
-FROM redis:7.2.4
+FROM redis:7.2.5
 
 FROM confluentinc/cp-kafka:7.6.1
 LABEL ALIAS=kafka
@@ -46,16 +46,16 @@ LABEL ALIAS=kafka
 FROM confluentinc/cp-zookeeper:7.6.1
 LABEL ALIAS=zookeeper
 
-FROM apachepulsar/pulsar:3.2.2
+FROM apachepulsar/pulsar:3.2.3
 LABEL ALIAS=pulsar
 
-FROM sonarqube:10.5.0-community
+FROM sonarqube:10.5.1-community
 LABEL ALIAS=sonar
 
-FROM docker.io/bitnami/consul:1.18.1
+FROM docker.io/bitnami/consul:1.19.0
 LABEL ALIAS=consul
 
-FROM prom/prometheus:v2.51.2
+FROM prom/prometheus:v2.53.0
 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.2
+FROM grafana/grafana:11.0.0
 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.3
+FROM openzipkin/zipkin:3.4
 LABEL ALIAS=zipkin

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

@@ -1,5 +1,5 @@
 [libraries]
-spring-cloud-dependencies = { module = 'org.springframework.cloud:spring-cloud-dependencies', version = '2023.0.1' }
+spring-cloud-dependencies = { module = 'org.springframework.cloud:spring-cloud-dependencies', version = '2023.0.2' }
 
 springdoc = { module = 'org.springdoc:springdoc-openapi-starter-webmvc-api', version = '2.5.0' }
 
@@ -7,11 +7,11 @@ feign-reactor-bom = { module = 'com.playtika.reactivefeign:feign-reactor-bom', v
 
 # Cucumber
 testng = { module = 'org.testng:testng', version = '7.10.2' }
-cucumber-bom = { module = 'io.cucumber:cucumber-bom', version = '7.17.0' }
+cucumber-bom = { module = 'io.cucumber:cucumber-bom', version = '7.18.0' }
 
-mongock-bom = { module = 'io.mongock:mongock-bom', version = '5.4.2' }
+mongock-bom = { module = 'io.mongock:mongock-bom', version = '5.4.4' }
 
-neo4j-migrations-spring-boot-starter = { module = 'eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter', version = '2.10.0' }
+neo4j-migrations-spring-boot-starter = { module = 'eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter', version = '2.10.3' }
 
 # Cassandra
 lz4-java = { module = 'org.lz4:lz4-java', version = '1.8.0' }
@@ -29,8 +29,10 @@ spotless-gradle-plugin = { id = 'com.diffplug.spotless', version = '6.25.0' }
 
 gradle-modernizer-plugin = { id = 'com.github.andygoossens.gradle-modernizer-plugin', version = '1.9.2' }
 
-gradle-enterprise = { id = 'com.gradle.enterprise', version = '3.17.2' }
+gradle-enterprise = { id = 'com.gradle.enterprise', version = '3.17.5' }
 
-common-custom-user-data-gradle-plugin = { id = 'com.gradle.common-custom-user-data-gradle-plugin', version = '2.0.1' }
+common-custom-user-data-gradle-plugin = { id = 'com.gradle.common-custom-user-data-gradle-plugin', version = '2.0.2' }
 
-gatling-gradle = { id = 'io.gatling.gradle', version = '3.11.1' }
+gatling-gradle = { id = 'io.gatling.gradle', version = '3.11.4' }
+
+gradle-openapi-generator = { id = 'org.openapi.generator', version = '7.5.0' }

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

@@ -11,38 +11,38 @@
         <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.11.1</gatling.version>
+        <gatling.version>3.11.4</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>
+        <picocli.version>4.7.6</picocli.version>
 
         <!-- Plugin versions -->
-        <checkstyle.version>10.16.0</checkstyle.version>
+        <checkstyle.version>10.17.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.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.2</jib-maven-plugin.version>
+        <gatling-maven-plugin.version>4.9.4</gatling-maven-plugin.version>
+        <git-commit-id-maven-plugin.version>9.0.0</git-commit-id-maven-plugin.version>
+        <jib-maven-plugin.version>3.4.3</jib-maven-plugin.version>
         <lifecycle-mapping.version>1.0.0</lifecycle-mapping.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-checkstyle-plugin.version>3.4.0</maven-checkstyle-plugin.version>
+        <maven-clean-plugin.version>3.4.0</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.4.1</maven-jar-plugin.version>
-        <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
+        <maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
+        <maven-failsafe-plugin.version>3.3.0</maven-failsafe-plugin.version>
+        <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
+        <maven-javadoc-plugin.version>3.7.0</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>
-        <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>3.3.0</maven-surefire-plugin.version>
         <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
-        <modernizer-maven-plugin.version>2.8.0</modernizer-maven-plugin.version>
+        <modernizer-maven-plugin.version>2.9.0</modernizer-maven-plugin.version>
         <nohttp-checkstyle.version>0.0.11</nohttp-checkstyle.version>
-        <openapi-generator-maven-plugin.version>7.5.0</openapi-generator-maven-plugin.version>
+        <openapi-generator-maven-plugin.version>7.6.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>
+        <sonar-maven-plugin.version>4.0.0.4121</sonar-maven-plugin.version>
         <spotless-maven-plugin.version>2.43.0</spotless-maven-plugin.version>
     </properties>
 

package/dist/generators/server/support/config.js

@@ -3,18 +3,14 @@ import { databaseTypes, monitoringTypes, authenticationTypes, buildToolTypes, ca
 import { prepareSqlApplicationProperties } from '../../spring-data-relational/support/index.js';
 import { CLIENT_DIST_DIR, CLIENT_MAIN_SRC_DIR, CLIENT_TEST_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR, SERVER_TEST_RES_DIR, SERVER_TEST_SRC_DIR, } from '../../generator-constants.js';
 import { MESSAGE_BROKER_KAFKA, MESSAGE_BROKER_NO, MESSAGE_BROKER_PULSAR } from '../../server/options/index.js';
-const { SQL, MONGODB, COUCHBASE, NEO4J, CASSANDRA } = databaseTypes;
-const NO_DATABASE = databaseTypes.NO;
+const { NO: NO_DATABASE, SQL, MONGODB, COUCHBASE, NEO4J, CASSANDRA } = databaseTypes;
 const { PROMETHEUS, ELK } = monitoringTypes;
 const { OAUTH2, SESSION } = authenticationTypes;
-const { CAFFEINE, EHCACHE, REDIS, HAZELCAST, INFINISPAN, MEMCACHED } = cacheTypes;
+const { NO: NO_CACHE, CAFFEINE, EHCACHE, REDIS, HAZELCAST, INFINISPAN, MEMCACHED } = cacheTypes;
 const { GRADLE, MAVEN } = buildToolTypes;
 const { SPRING_WEBSOCKET } = websocketTypes;
-const { CONSUL, EUREKA } = serviceDiscoveryTypes;
-const { ELASTICSEARCH } = searchEngineTypes;
-const NO_CACHE = cacheTypes.NO;
-const NO_SERVICE_DISCOVERY = serviceDiscoveryTypes.NO;
-const NO_SEARCH_ENGINE = searchEngineTypes.NO;
+const { NO: NO_SERVICE_DISCOVERY, CONSUL, EUREKA } = serviceDiscoveryTypes;
+const { NO: NO_SEARCH_ENGINE, ELASTICSEARCH } = searchEngineTypes;
 /**
  * Load server configs into application.
  * all variables should be set to dest,

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

@@ -23,9 +23,8 @@ import { mutateData, normalizePathEnd } from '../../base/support/index.js';
 import { hibernateSnakeCase } from './string.js';
 import { getDatabaseTypeData } from './database.js';
 import { formatDocAsApiDescription, formatDocAsJavaDoc } from '../../java/support/doc.js';
-const { ELASTICSEARCH } = searchEngineTypes;
-const NO_SEARCH_ENGINE = searchEngineTypes.NO;
-const { POSTGRESQL, MYSQL, MARIADB, COUCHBASE, SQL } = databaseTypes;
+const { NO: NO_SEARCH_ENGINE, ELASTICSEARCH } = searchEngineTypes;
+const { POSTGRESQL, MYSQL, MARIADB, COUCHBASE, SQL, NEO4J } = databaseTypes;
 export default function prepareEntity(entity) {
     const { entityPackage, packageName, packageFolder, persistClass } = entity;
     let { entityAbsolutePackage = packageName, entityAbsoluteFolder = packageFolder, entityJavaPackageFolder } = entity;
@@ -81,9 +80,9 @@ export function preparePostEntityServerDerivedProperties(entity) {
         .filter(relationship => relationship.ignoreOtherSideProperty === undefined)
         .forEach(relationship => {
         relationship.ignoreOtherSideProperty =
-            entity.databaseType !== 'neo4j' &&
-                !relationship.embedded &&
-                !!relationship.otherEntity &&
+            entity.databaseType !== NEO4J &&
+                !entity.embedded &&
+                !relationship.otherEntity.embedded &&
                 relationship.otherEntity.relationships.length > 0;
     });
     entity.relationshipsContainOtherSideIgnore = entity.relationships.some(relationship => relationship.ignoreOtherSideProperty);

package/dist/generators/server/support/relationship.js

@@ -17,17 +17,20 @@
  * limitations under the License.
  */
 import { addOtherRelationship } from '../../base-application/support/index.js';
+import { databaseTypes } from '../../../jdl/index.js';
+const { NO: NO_DATABASE, SQL, NEO4J } = databaseTypes;
 // eslint-disable-next-line import/prefer-default-export
 export const addEntitiesOtherRelationships = (entities) => {
     const result = { warning: [] };
     for (const entity of entities.filter(entity => !entity.builtIn)) {
         for (const relationship of entity.relationships ?? []) {
             if (!relationship.otherRelationship &&
+                !relationship.otherEntity.embedded &&
                 (relationship.otherEntityRelationshipName ||
                     relationship.relationshipType === 'many-to-many' ||
                     // OneToOne back reference is required due to filtering
-                    (relationship.relationshipType === 'one-to-one' && entity.databaseType === 'sql') ||
-                    (relationship.relationshipType === 'one-to-many' && entity.databaseType !== 'neo4j' && entity.databaseType !== 'no'))) {
+                    (relationship.relationshipType === 'one-to-one' && entity.databaseType === SQL) ||
+                    (relationship.relationshipType === 'one-to-many' && entity.databaseType !== NEO4J && entity.databaseType !== NO_DATABASE))) {
                 if (relationship.otherEntity.builtIn) {
                     result.warning.push(`Ignoring '${entity.name}' definitions as it is using a built-in Entity '${relationship.otherEntityName}': 'otherEntityRelationshipName' is set with value '${relationship.otherEntityRelationshipName}' at relationship '${relationship.relationshipName}' but no back-reference was found`);
                 }

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

@@ -124,6 +124,7 @@ test {
     // see https://github.com/jhipster/generator-jhipster/pull/2771 and https://github.com/jhipster/generator-jhipster/pull/4484
     // ignoreFailures true
     reports.html.required = false
+    testLogging.exceptionFormat "full"
 <%_ if (reactive) { _%>
 
     if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_13)) {
@@ -134,7 +135,6 @@ test {
 <%_ } _%>
 }
 
-
 check.dependsOn integrationTest
 task testReport(type: TestReport) {
     destinationDirectory = file("$buildDir/reports/tests")
@@ -172,8 +172,7 @@ dependencies {
     testRuntimeOnly("com.tngtech.archunit:archunit-junit5-engine:${archunitJunit5Version}") {
         exclude group: "org.slf4j", module: "slf4j-api"
     }
-    implementation "io.dropwizard.metrics:metrics-core"
-    implementation "io.micrometer:micrometer-registry-prometheus"
+    implementation "io.micrometer:micrometer-registry-prometheus-simpleclient"
 <%_ if (reactive) { _%>
     runtimeOnly "io.netty:netty-tcnative-boringssl-static"
 <%_ } _%>
@@ -237,6 +236,9 @@ if (addSpringMilestoneRepository) { _%>
 <%_ if (serviceDiscoveryAny && serviceDiscoveryEureka) { _%>
     implementation "org.springframework.cloud:spring-cloud-starter-config"
 <%_ } _%>
+<%_ if (applicationTypeGateway && !reactive) { _%>
+    implementation "org.springframework.cloud:spring-cloud-starter-loadbalancer"
+<%_ } _%>
 <%_ if (serviceDiscoveryAny && serviceDiscoveryConsul) { _%>
     implementation "org.springframework.cloud:spring-cloud-starter-consul-config"
 <%_ } _%>

package/dist/generators/server/templates/gradle/profile_dev.gradle.ejs

@@ -163,7 +163,7 @@ processResources {
     inputs.property('springProfiles', springProfiles)
     filesMatching("**/application.yml") {
         filter {
-            it.replace("#project.version#", version)
+            it.replace("@project.version@", version)
         }
 <%_ if (!serviceDiscoveryAny) { _%>
         filter {
@@ -191,6 +191,7 @@ task integrationTest(type: Test) {
 <%_ } _%>
     testLogging {
         events 'FAILED', 'SKIPPED'
+        exceptionFormat "full"
     }
     systemProperty('spring.profiles.active', 'testdev')
     systemProperty('java.security.egd', 'file:/dev/./urandom')

package/dist/generators/server/templates/gradle/profile_prod.gradle.ejs

@@ -98,7 +98,7 @@ processResources {
     inputs.property('springProfiles', springProfiles)
     filesMatching("**/application.yml") {
         filter {
-            it.replace("#project.version#", version)
+            it.replace("@project.version@", version)
         }
 <%_ if (!serviceDiscoveryAny) { _%>
         filter {
@@ -126,6 +126,7 @@ task integrationTest(type: Test) {
 <%_ } _%>
     testLogging {
         events 'FAILED', 'SKIPPED'
+        exceptionFormat "full"
     }
     systemProperty('spring.profiles.active', 'testprod')
     systemProperty('java.security.egd', 'file:/dev/./urandom')

package/dist/generators/server/templates/gradle.properties.ejs

@@ -32,7 +32,7 @@ blockhoundJunitPlatformVersion=<%- javaDependencies['blockhound-junit-platform']
 # gradle plugin version
 gitPropertiesPluginVersion=<%- javaDependencies['gradle-git-properties'] %>
 <%_ if (enableSwaggerCodegen) { _%>
-openapiPluginVersion=<%- javaDependencies['openapi-generator-maven-plugin'] %>
+openapiPluginVersion=<%- javaDependencies['gradle-openapi-generator'] %>
 <%_ } _%>
 <%_ if (enableGradleEnterprise) { _%>
 gradleEnterprisePluginVersion=<%- javaDependencies['gradle-enterprise'] %>

package/dist/generators/server/templates/pom.xml.ejs

@@ -113,10 +113,6 @@
             <version>${archunit-junit5.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.dropwizard.metrics</groupId>
-            <artifactId>metrics-core</artifactId>
-        </dependency>
 <%_ if (reactive) { _%>
         <dependency>
             <groupId>io.micrometer</groupId>
@@ -126,7 +122,7 @@
 <%_ } _%>
         <dependency>
             <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-registry-prometheus</artifactId>
+            <artifactId>micrometer-registry-prometheus-simpleclient</artifactId>
         </dependency>
 <%_ if (reactive) { _%>
         <dependency>
@@ -282,6 +278,12 @@
             <artifactId>spring-cloud-starter-config</artifactId>
         </dependency>
 <%_ } _%>
+<%_ if (applicationTypeGateway && !reactive) { _%>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+        </dependency>
+<%_ } _%>
 <%_ if (serviceDiscoveryAny && serviceDiscoveryConsul) { _%>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -488,32 +490,6 @@
                         </rules>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <version>${maven-resources-plugin.version}</version>
-                    <executions>
-                        <execution>
-                            <id>config-resources</id>
-                            <phase>validate</phase>
-                            <goals>
-                                <goal>copy-resources</goal>
-                            </goals>
-                            <configuration>
-                                <outputDirectory>${project.build.directory}/classes</outputDirectory>
-                                <resources>
-                                    <resource>
-                                        <directory><%= SERVER_MAIN_RES_DIR %></directory>
-                                        <filtering>true</filtering>
-                                        <includes>
-                                            <include>config/*.yml</include>
-                                        </includes>
-                                    </resource>
-                                </resources>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>

package/dist/generators/server/templates/src/main/java/_package_/_entityPackage_/service/dto/_dtoClass_.java.ejs

@@ -88,7 +88,7 @@ public class <%- dtoClass %> implements Serializable {
     @NotNull
   <%_ } _%>
   <%_ if (property.propertyApiDescription) { _%>
-    @Schema(description = "<%- property.propertyApiDescription %>"<% if (required) { %>, required = true<% } %>)
+    @Schema(description = "<%- property.propertyApiDescription %>"<% if (required) { %>, requiredMode = Schema.RequiredMode.REQUIRED<% } %>)
   <%_ } _%>
   <%_ if (property.fieldTypeBytes && databaseTypeSql) { _%>
     @Lob

package/dist/generators/server/templates/src/main/java/_package_/config/AsyncConfiguration.java.ejs

@@ -40,7 +40,7 @@ import java.util.concurrent.Executor;
 @Profile("!testdev & !testprod")
 public class AsyncConfiguration implements AsyncConfigurer {
 
-    private final Logger log = LoggerFactory.getLogger(AsyncConfiguration.class);
+    private static final Logger log = LoggerFactory.getLogger(AsyncConfiguration.class);
 
     private final TaskExecutionProperties taskExecutionProperties;
 

package/dist/generators/server/templates/src/main/java/_package_/config/Constants.java.ejs

@@ -31,9 +31,7 @@ public final class Constants {
 <%_ if (generateBuiltInUserEntity || databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase) { _%>
     public static final String SYSTEM = "system";
 <%_ } _%>
-<%_ if (generateUserManagement || authenticationTypeOauth2) { _%>
     public static final String DEFAULT_LANGUAGE = "<%= nativeLanguage %>";
-<%_ } _%>
 <%_ if (databaseTypeCouchbase) { _%>
     public static final String ID_DELIMITER = "__";
 <%_ } _%>