generator-jhipster 8.3.0 → 8.5.0

package/dist/generators/server/resources/Dockerfile

@@ -10,13 +10,13 @@ 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.2
+FROM quay.io/keycloak/keycloak:24.0.4
 LABEL ALIAS=keycloak
 
-FROM mysql:8.3.0
+FROM mysql:8.4.0
 
 FROM mariadb:11.3.2
 
@@ -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.20.0
 
-FROM hazelcast/management-center:5.3.3
+FROM hazelcast/management-center:5.4.1
 LABEL ALIAS=hazelcast
 
-FROM memcached:1.6.26-alpine
+FROM memcached:1.6.27-alpine
 
-FROM redis:7.2.4
+FROM redis:7.2.5
 
-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.2
+FROM apachepulsar/pulsar:3.2.3
 LABEL ALIAS=pulsar
 
-FROM sonarqube:10.4.1-community
+FROM sonarqube:10.5.1-community
 LABEL ALIAS=sonar
 
-FROM docker.io/bitnami/consul:1.18.1
+FROM docker.io/bitnami/consul:1.18.2
 LABEL ALIAS=consul
 
-FROM prom/prometheus:v2.51.1
+FROM prom/prometheus:v2.52.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.1
+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.1
+FROM openzipkin/zipkin:3.4
 LABEL ALIAS=zipkin

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

@@ -1,27 +1,27 @@
 [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' }
 
 feign-reactor-bom = { module = 'com.playtika.reactivefeign:feign-reactor-bom', version = '4.0.3' }
 
 # Cucumber
-testng = { module = 'org.testng:testng', version = '7.10.0' }
-cucumber-bom = { module = 'io.cucumber:cucumber-bom', version = '7.16.1' }
+testng = { module = 'org.testng:testng', version = '7.10.2' }
+cucumber-bom = { module = 'io.cucumber:cucumber-bom', version = '7.18.0' }
 
-mongock-bom = { module = 'io.mongock:mongock-bom', version = '5.4.1' }
+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' }
+neo4j-migrations-spring-boot-starter = { module = 'eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter', version = '2.10.1' }
 
 # 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.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 = '5.0.0.4638' }
 
@@ -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' }
+gradle-enterprise = { id = 'com.gradle.enterprise', version = '3.17.4' }
 
-common-custom-user-data-gradle-plugin = { id = 'com.gradle.common-custom-user-data-gradle-plugin', version = '2.0' }
+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.5.1' }
+gatling-gradle = { id = 'io.gatling.gradle', version = '3.11.3' }
+
+gradle-openapi-generator = { id = 'org.openapi.generator', version = '7.5.0' }

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

@@ -8,20 +8,20 @@
 
     <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.5</gatling.version>
+        <gatling.version>3.11.3</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.15.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.8.2</gatling-maven-plugin.version>
+        <gatling-maven-plugin.version>4.9.1</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>
         <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
@@ -30,17 +30,17 @@
         <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-enforcer-plugin.version>3.5.0</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>
         <maven-surefire-plugin.version>3.2.5</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.4.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>
         <spotless-maven-plugin.version>2.43.0</spotless-maven-plugin.version>

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/prepare-field.js

@@ -22,6 +22,7 @@ import { databaseTypes, entityOptions, fieldTypes, reservedKeywords } from '../.
 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;
@@ -37,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) {

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

@@ -1,7 +1,12 @@
+import { mutateData } from '../../base/support/config.js';
 import { formatDocAsApiDescription, formatDocAsJavaDoc } from '../../java/support/doc.js';
 export function prepareRelationship({ relationship }) {
     if (relationship.documentation) {
-        relationship.relationshipJavadoc = formatDocAsJavaDoc(relationship.documentation, 4);
-        relationship.relationshipApiDescription = formatDocAsApiDescription(relationship.documentation);
+        mutateData(relationship, {
+            __override__: false,
+            relationshipJavadoc: formatDocAsJavaDoc(relationship.documentation, 4),
+            relationshipApiDescription: formatDocAsApiDescription(relationship.documentation),
+            propertyApiDescription: ({ relationshipApiDescription }) => relationshipApiDescription,
+        });
     }
 }

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

@@ -167,14 +167,14 @@ processResources {
         }
 <%_ if (!serviceDiscoveryAny) { _%>
         filter {
-            it.replace("#spring.profiles.active#", springProfiles)
+            it.replace("@spring.profiles.active@", springProfiles)
         }
 <%_ } _%>
     }
 <%_ if (serviceDiscoveryEureka || serviceDiscoveryConsul) { _%>
     filesMatching("**/bootstrap.yml") {
         filter {
-            it.replace("#spring.profiles.active#", springProfiles)
+            it.replace("@spring.profiles.active@", springProfiles)
         }
     }
 <%_ } _%>
@@ -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

@@ -102,14 +102,14 @@ processResources {
         }
 <%_ if (!serviceDiscoveryAny) { _%>
         filter {
-            it.replace("#spring.profiles.active#", springProfiles)
+            it.replace("@spring.profiles.active@", springProfiles)
         }
 <%_ } _%>
     }
 <%_ if (serviceDiscoveryEureka || serviceDiscoveryConsul) { _%>
     filesMatching("**/bootstrap.yml") {
         filter {
-            it.replace("#spring.profiles.active#", springProfiles)
+            it.replace("@spring.profiles.active@", springProfiles)
         }
     }
 <%_ } _%>
@@ -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>
@@ -501,10 +503,6 @@
                             </goals>
                             <configuration>
                                 <outputDirectory>${project.build.directory}/classes</outputDirectory>
-                                <useDefaultDelimiters>false</useDefaultDelimiters>
-                                <delimiters>
-                                    <delimiter>#</delimiter>
-                                </delimiters>
                                 <resources>
                                     <resource>
                                         <directory><%= SERVER_MAIN_RES_DIR %></directory>

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/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 = "__";
 <%_ } _%>

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

@@ -27,9 +27,6 @@ import static org.springframework.security.web.util.matcher.AntPathRequestMatche
 <%_ } _%>
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-<%_ if (authenticationTypeOauth2) { _%>
-import org.springframework.core.convert.converter.Converter;
-<%_ } _%>
 <%_ if (devDatabaseTypeH2Any) { _%>
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.Profiles;
@@ -54,6 +51,10 @@ import tech.jhipster.web.filter.CookieCsrfFilter;
 <%_ if (!skipClient) { _%>
 import <%= packageName %>.web.filter.SpaWebFilter;
 <%_ } _%>
+<%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%>
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+<%_ } _%>
 <%_ if (authenticationTypeJwt || (authenticationTypeOauth2 && applicationTypeMicroservice)) { _%>
 import org.springframework.security.config.http.SessionCreationPolicy;
 <%_ } _%>
@@ -66,7 +67,6 @@ import static org.springframework.security.oauth2.core.oidc.StandardClaimNames.P
 
 import <%= packageName %>.security.oauth2.AudienceValidator;
 import <%= packageName %>.security.SecurityUtils;
-import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.oauth2.client.userinfo.OAuth2UserService;
 import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserRequest;
 import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserService;
@@ -75,7 +75,6 @@ import org.springframework.security.oauth2.core.OAuth2TokenValidator;
 import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
 import org.springframework.security.oauth2.core.oidc.user.OidcUser;
 import org.springframework.security.oauth2.jwt.*;
-import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationConverter;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.GrantedAuthority;
   <%_ if (!applicationTypeMicroservice) { _%>
@@ -84,6 +83,9 @@ import org.springframework.security.oauth2.core.oidc.user.OidcUserAuthority;
   <%_ } _%>
 import java.util.*;
 <%_ } _%>
+<%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%>
+import java.util.function.Supplier;
+<%_ } _%>
 <%_ if (authenticationTypeSession) { _%>
 import org.springframework.http.HttpStatus;
 import org.springframework.security.web.authentication.HttpStatusEntryPoint;
@@ -94,11 +96,7 @@ import org.springframework.security.web.authentication.RememberMeServices;
   <%_ } _%>
 <%_ } _%>
 <%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%>
-import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
-import org.springframework.security.web.csrf.CsrfTokenRequestAttributeHandler;
-<%_ } _%>
-<%_ if (authenticationTypeOauth2) { _%>
-import <%= packageName %>.security.oauth2.JwtGrantedAuthorityConverter;
+import org.springframework.security.web.csrf.*;
 <%_ } _%>
 <%_ if (authenticationTypeJwt) { _%>
 import org.springframework.security.oauth2.server.resource.web.BearerTokenAuthenticationEntryPoint;
@@ -112,6 +110,9 @@ import <%= packageName %>.security.oauth2.CustomClaimConverter;
 <%_ if(!skipClient) { _%>
 import org.springframework.security.web.header.writers.ReferrerPolicyHeaderWriter;
 <%_ } _%>
+<%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%>
+import org.springframework.util.StringUtils;
+<%_ } _%>
 import org.springframework.security.web.servlet.util.matcher.MvcRequestMatcher;
 import org.springframework.web.servlet.handler.HandlerMappingIntrospector;
 
@@ -126,7 +127,7 @@ public class SecurityConfiguration {
 
     private final Environment env;
 <%_ } _%>
-    
+
     private final JHipsterProperties jHipsterProperties;
 <%_ if (authenticationTypeSession && generateUserManagement) { _%>
 
@@ -141,7 +142,7 @@ public class SecurityConfiguration {
     public SecurityConfiguration(<% if (devDatabaseTypeH2Any) { %>Environment env, <% } %><% if (authenticationTypeSession && generateUserManagement) { %>RememberMeServices rememberMeServices, <% } %> JHipsterProperties jHipsterProperties) {
 <%_ if (devDatabaseTypeH2Any) { _%>
         this.env = env;
-<%_ } _%>       
+<%_ } _%>
 <%_ if (authenticationTypeSession && generateUserManagement) { _%>
         this.rememberMeServices = rememberMeServices;
 <%_ } _%>
@@ -164,8 +165,7 @@ public class SecurityConfiguration {
             .csrf(csrf -> csrf
 <%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%>
                 .csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())
-                // See https://stackoverflow.com/q/74447118/65681
-                .csrfTokenRequestHandler(new CsrfTokenRequestAttributeHandler()))
+                .csrfTokenRequestHandler(new SpaCsrfTokenRequestHandler()))
 <%_ } else { _%>
                 .disable())
 <%_ } _%>
@@ -284,9 +284,7 @@ public class SecurityConfiguration {
   <%_ } else { _%>
             .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
   <%_ } _%>
-            .oauth2ResourceServer(oauth2 -> oauth2
-                .jwt(jwt -> jwt
-                    .jwtAuthenticationConverter(authenticationConverter())))
+            .oauth2ResourceServer(oauth2 -> oauth2.jwt(withDefaults()))
             .oauth2Client(withDefaults());
 <%_ } _%>
 <%_ if (devDatabaseTypeH2Any) { _%>
@@ -307,13 +305,6 @@ public class SecurityConfiguration {
     }
 <%_ if (authenticationTypeOauth2) { _%>
 
-    Converter<Jwt, AbstractAuthenticationToken> authenticationConverter() {
-        JwtAuthenticationConverter jwtAuthenticationConverter = new JwtAuthenticationConverter();
-        jwtAuthenticationConverter.setJwtGrantedAuthoritiesConverter(new JwtGrantedAuthorityConverter());
-        jwtAuthenticationConverter.setPrincipalClaimName(PREFERRED_USERNAME);
-        return jwtAuthenticationConverter;
-    }
-
     OAuth2UserService<OidcUserRequest, OidcUser> oidcUserService() {
         final OidcUserService delegate = new OidcUserService();
 
@@ -364,4 +355,46 @@ public class SecurityConfiguration {
         return jwtDecoder;
     }
 <%_ } _%>
+<%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%>
+
+    /**
+     * Custom CSRF handler to provide BREACH protection.
+     *
+     * @see <a href="https://docs.spring.io/spring-security/reference/servlet/exploits/csrf.html#csrf-integration-javascript-spa">Spring Security Documentation - Integrating with CSRF Protection</a>
+     * @see <a href="https://github.com/jhipster/generator-jhipster/pull/25907">JHipster - use customized SpaCsrfTokenRequestHandler to handle CSRF token</a>
+     * @see <a href="https://stackoverflow.com/q/74447118/65681">CSRF protection not working with Spring Security 6</a>
+     */
+    static final class SpaCsrfTokenRequestHandler extends CsrfTokenRequestAttributeHandler {
+        private final CsrfTokenRequestHandler delegate = new XorCsrfTokenRequestAttributeHandler();
+
+        @Override
+        public void handle(HttpServletRequest request, HttpServletResponse response, Supplier<CsrfToken> csrfToken) {
+            /*
+             * Always use XorCsrfTokenRequestAttributeHandler to provide BREACH protection of
+             * the CsrfToken when it is rendered in the response body.
+             */
+            this.delegate.handle(request, response, csrfToken);
+        }
+
+        @Override
+        public String resolveCsrfTokenValue(HttpServletRequest request, CsrfToken csrfToken) {
+            /*
+             * If the request contains a request header, use CsrfTokenRequestAttributeHandler
+             * to resolve the CsrfToken. This applies when a single-page application includes
+             * the header value automatically, which was obtained via a cookie containing the
+             * raw CsrfToken.
+             */
+            if (StringUtils.hasText(request.getHeader(csrfToken.getHeaderName()))) {
+                return super.resolveCsrfTokenValue(request, csrfToken);
+            }
+            /*
+             * In all other cases (e.g. if the request contains a request parameter), use
+             * XorCsrfTokenRequestAttributeHandler to resolve the CsrfToken. This applies
+             * when a server-side rendered form includes the _csrf request parameter as a
+             * hidden input.
+             */
+            return this.delegate.resolveCsrfTokenValue(request, csrfToken);
+        }
+    }
+<%_ } _%>
 }