generator-jhipster 8.3.0 → 8.4.0

package/dist/generators/server/generator.js

@@ -21,17 +21,16 @@
 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_COMMON, GENERATOR_SERVER, GENERATOR_SPRING_BOOT } 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, } from '../../jdl/jhipster/index.js';
 import { stringifyApplicationData } from '../base-application/support/index.js';
 import { createBase64Secret, createSecret, 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';
 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 { SUPPORTED_VALIDATION_RULES } = validations;
@@ -82,9 +81,6 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
                     return;
                 await this.promptCurrentJHipsterCommand();
             },
-            askForServerTestOpts,
-            askForServerSideOpts,
-            askForOptionalItems,
         });
     }
     get [BaseApplicationGenerator.PROMPTING]() {
@@ -92,6 +88,11 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
     }
     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;
@@ -102,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}`);
@@ -143,17 +133,14 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
     }
     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
@@ -296,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;
                 }
@@ -397,25 +388,6 @@ 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]() {
@@ -427,7 +399,6 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
                 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');
@@ -631,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/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.2
+FROM quay.io/keycloak/keycloak:24.0.3
 LABEL ALIAS=keycloak
 
 FROM mysql:8.3.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.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.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.1
 LABEL ALIAS=consul
 
-FROM prom/prometheus:v2.51.1
+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.1
+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/gradle/libs.versions.toml

@@ -6,10 +6,10 @@ springdoc = { module = 'org.springdoc:springdoc-openapi-starter-webmvc-api', ver
 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.17.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' }
 
@@ -17,11 +17,11 @@ neo4j-migrations-spring-boot-starter = { module = 'eu.michael-simons.neo4j:neo4j
 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,8 @@ 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.2' }
 
-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.1' }

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.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>
 
         <!-- Plugin versions -->
-        <checkstyle.version>10.15.0</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.2</jib-maven-plugin.version>
         <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
@@ -32,7 +32,7 @@
         <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>
@@ -40,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>

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/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)
         }
     }
 <%_ } _%>

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)
         }
     }
 <%_ } _%>

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

@@ -501,10 +501,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_/config/SecurityConfiguration_imperative.java.ejs

@@ -54,6 +54,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;
 <%_ } _%>
@@ -84,6 +88,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,8 +101,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;
+import org.springframework.security.web.csrf.*;
 <%_ } _%>
 <%_ if (authenticationTypeOauth2) { _%>
 import <%= packageName %>.security.oauth2.JwtGrantedAuthorityConverter;
@@ -112,6 +118,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 +135,7 @@ public class SecurityConfiguration {
 
     private final Environment env;
 <%_ } _%>
-    
+
     private final JHipsterProperties jHipsterProperties;
 <%_ if (authenticationTypeSession && generateUserManagement) { _%>
 
@@ -141,7 +150,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 +173,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())
 <%_ } _%>
@@ -364,4 +372,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);
+        }
+    }
+<%_ } _%>
 }

package/dist/generators/server/templates/src/main/resources/config/application.yml.ejs

@@ -245,7 +245,7 @@ spring:
     # The commented value for `active` can be replaced with valid Spring profiles to load.
     # Otherwise, it will be filled in by <%= buildTool %> when building the JAR file
     # Either way, it can be overridden by `--spring.profiles.active` value passed in the commandline or `-Dspring.profiles.active` set in `JAVA_OPTS`
-    active: #spring.profiles.active#
+    active: '@spring.profiles.active@'
     group:
       dev:
         - dev

package/dist/generators/server/templates/src/main/resources/config/bootstrap.yml.ejs

@@ -30,7 +30,7 @@ spring:
     # The commented value for `active` can be replaced with valid Spring profiles to load.
     # Otherwise, it will be filled in by <%= buildTool %> when building the JAR file
     # Either way, it can be overridden by `--spring.profiles.active` value passed in the commandline or `-Dspring.profiles.active` set in `JAVA_OPTS`
-    active: #spring.profiles.active#
+    active: '@spring.profiles.active@'
   cloud:
 <%_ if (serviceDiscoveryConsul) { _%>
     consul:

package/dist/generators/server/templates/src/main/resources/static/index_microservices.html.ejs

@@ -72,9 +72,9 @@
 </head>
 <body>
 <div class="container">
-  <h1>Welcome, Java Hipster!</h1>
+  <h1>Welcome, <%- hipsterName %>!</h1>
 
-  <p>This application is a microservice, which has been generated using <a href="https://www.jhipster.tech/" rel="noopener noreferrer">JHipster</a>.</p>
+  <p>This application is a microservice, which has been generated using <a href="<%- hipsterDocumentationLink %>" rel="noopener noreferrer">JHipster</a>.</p>
 
   <ul>
 <%_ if (microfrontend) { %>
@@ -107,15 +107,15 @@
   </h2>
 
   <ul>
-    <li><a href="https://www.jhipster.tech/" target="_blank" rel="noopener noreferrer">JHipster homepage</a></li>
-    <li><a href="https://stackoverflow.com/tags/jhipster/info" target="_blank" rel="noopener noreferrer">JHipster on Stack Overflow</a></li>
-    <li><a href="https://github.com/jhipster/generator-jhipster/issues?state=open" target="_blank" rel="noopener noreferrer">JHipster bug tracker</a></li>
-    <li><a href="https://gitter.im/jhipster/generator-jhipster" target="_blank" rel="noopener noreferrer">JHipster public chat room</a></li>
-    <li><a href="https://twitter.com/jhipster" target="_blank" rel="noopener noreferrer">follow @jhipster on Twitter</a></li>
+    <li><a href="<%- hipsterDocumentationLink %>" target="_blank" rel="noopener noreferrer">JHipster homepage</a></li>
+    <li><a href="<%- hipsterStackoverflowLink %>" target="_blank" rel="noopener noreferrer">JHipster on Stack Overflow</a></li>
+    <li><a href="<%- hipsterBugTrackerLink %>" target="_blank" rel="noopener noreferrer">JHipster bug tracker</a></li>
+    <li><a href="<%- hipsterChatLink %>" target="_blank" rel="noopener noreferrer">JHipster public chat room</a></li>
+    <li><a href="<%- hipsterTwitterLink %>" target="_blank" rel="noopener noreferrer">follow @jhipster on Twitter</a></li>
   </ul>
 
   <p>
-    <span>If you like JHipster, don't forget to give us a star on</span> <a href="https://github.com/jhipster/generator-jhipster" target="_blank" rel="noopener noreferrer">GitHub</a>!
+    <span>If you like JHipster, don't forget to give us a star on</span> <a href="<%- hipsterProjectLink %>" target="_blank" rel="noopener noreferrer">GitHub</a>!
   </p>
 
 </div>

package/dist/generators/spring-boot/cleanup.js

@@ -197,4 +197,7 @@ export default asWritingTask(function cleanupTask(taskParam) {
             this.removeFile('gradle/sonar.gradle');
         }
     }
+    if (this.isJhipsterVersionLessThan('8.4.0')) {
+        this.removeFile(`${application.javaPackageSrcDir}config/LocaleConfiguration.java`);
+    }
 });

package/dist/generators/spring-boot/command.js

@@ -35,7 +35,16 @@ const command = {
                 message: 'Do you want to allow relationships with User entity?',
                 when: ({ authenticationType }) => (authenticationType ?? gen.jhipsterConfigWithDefaults.authenticationType) === 'oauth2',
             }),
-            default: false,
+        },
+        defaultPackaging: {
+            description: 'Default packaging for the application',
+            cli: {
+                type: String,
+                hide: true,
+            },
+            choices: ['jar', 'war'],
+            default: 'jar',
+            scope: 'storage',
         },
     },
     import: [GENERATOR_JAVA, GENERATOR_LIQUIBASE, GENERATOR_SPRING_DATA_RELATIONAL],

package/dist/generators/spring-boot/files.js

@@ -410,11 +410,6 @@ export const baseServerFiles = {
             renameTo: moveToJavaPackageSrcDir,
             templates: ['config/Constants.java'],
         },
-        {
-            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
-            renameTo: moveToJavaPackageSrcDir,
-            templates: [data => `config/LocaleConfiguration_${data.imperativeOrReactive}.java`],
-        },
     ],
     serverJavaDomain: [
         {

package/dist/generators/spring-boot/generator.js

@@ -30,6 +30,7 @@ import { createNeedleCallback, mutateData } from '../base/support/index.js';
 import { APPLICATION_TYPE_MICROSERVICE, applicationTypes, cacheTypes, databaseTypes, fieldTypes, messageBrokerTypes, searchEngineTypes, testFrameworkTypes, websocketTypes, } from '../../jdl/index.js';
 import { writeFiles as writeEntityFiles } from './entity-files.js';
 import { getPomVersionProperties, parseMavenPom } from '../maven/support/index.js';
+import { askForOptionalItems, askForServerSideOpts, askForServerTestOpts } from './prompts.js';
 const { CAFFEINE, EHCACHE, HAZELCAST, INFINISPAN, MEMCACHED, REDIS, NO: NO_CACHE } = cacheTypes;
 const { NO: NO_WEBSOCKET, SPRING_WEBSOCKET } = websocketTypes;
 const { CASSANDRA, COUCHBASE, MONGODB, NEO4J, SQL } = databaseTypes;
@@ -67,6 +68,9 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
                     return;
                 await this.promptCurrentJHipsterCommand();
             },
+            askForServerTestOpts,
+            askForServerSideOpts,
+            askForOptionalItems,
         });
     }
     get [BaseApplicationGenerator.PROMPTING]() {
@@ -163,6 +167,9 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
     }
     get preparing() {
         return this.asPreparingTaskGroup({
+            async loadCommand({ application }) {
+                await this.loadCurrentJHipsterCommandConfig(application);
+            },
             checksWebsocket({ application }) {
                 const { websocket } = application;
                 if (websocket && websocket !== NO_WEBSOCKET) {
@@ -284,6 +291,16 @@ public void set${javaBeanCase(propertyName)}(${propertyType} ${propertyName}) {
     }
     get preparingEachEntityRelationship() {
         return this.asPreparingEachEntityRelationshipTaskGroup({
+            checkUserRelationships({ entity, entityName, relationship }) {
+                if (!entity.dtoMapstruct && relationship.otherEntity.builtInUser) {
+                    this.log.warn(`Entity ${entityName} doesn't use DTO. You should check for User data leakage through ${relationship.relationshipName} relationship.`);
+                }
+            },
+            checkDtoRelationships({ entity, entityName, relationship }) {
+                if (entity.dto !== relationship.otherEntity.dto) {
+                    this.log.warn(`Relationship between entities with different DTO configurations can cause unexpected results. Check ${relationship.relationshipName} in the ${entityName} entity.`);
+                }
+            },
             prepareEntity({ relationship }) {
                 if (relationship.otherEntity.embedded)
                     return;