generator-jhipster 7.9.0 → 7.9.3

package/generators/languages/templates/src/main/webapp/i18n/zh-tw/health.json.ejs

@@ -32,7 +32,7 @@
 <%_ if (messageBrokerKafka) { _%>
             "binders": "Message Broker",
 <%_ } _%>
-<%_ if (applicationTypeGateway || serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway || serviceDiscoveryAny) { _%>
             "discoveryComposite": "Discovery Composite",
             "refreshScope": "Microservice Refresh Scope",
             "clientConfigServer": "Microservice 設定伺服器",

package/generators/openshift/templates/deployment.yml.ejs

@@ -126,7 +126,7 @@ objects:
             env:
             - name: SPRING_PROFILES_ACTIVE
               value: prod,api-docs
-<%_ if (!serviceDiscoveryType) { _%>
+<%_ if (!serviceDiscoveryAny) { _%>
             - name: JHIPSTER_SECURITY_AUTHENTICATION_JWT_BASE64_SECRET
               value: YlhrdGMyVmpjbVYwTFhSdmEyVnVMWFJ2TFdOb1lXNW5aUzFwYmkxd2NtOWtkV04wYVc5dUxXRnVaQzEwYnkxclpXVndMV2x1TFdFdGMyVmpkWEpsTFhCc1lXTmwK
 <%_ } _%>
@@ -242,7 +242,7 @@ objects:
       type: LoadBalancer
       ports:
       - name: http
-<%_ if (!app.serviceDiscoveryType) { _%>
+<%_ if (!app.serviceDiscoveryAny) { _%>
         port: 80
         targetPort: ${{APP_PORT}}
 <%_ } else { _%>

package/generators/server/cleanup-elasticsearch.js

@@ -41,6 +41,11 @@ function cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, tes
       generator.removeFile(`${testDir}repository/search/UserSearchRepositoryMockConfiguration.java`);
     }
   }
+  if (generator.isJhipsterVersionLessThan('7.9.3')) {
+    if (generator.reactive) {
+      generator.removeFile(`${testDir}config/ElasticsearchReactiveTestConfiguration.java`);
+    }
+  }
 }
 
 module.exports = {

package/generators/server/files.js

@@ -214,11 +214,6 @@ const baseServerFiles = {
       templates: ['entrypoint.sh'],
     },
   ],
-  node: [
-    {
-      templates: ['.npmrc'],
-    },
-  ],
   packageJson: [
     {
       condition: generator => generator.skipClient,
@@ -788,6 +783,16 @@ const baseServerFiles = {
       path: SERVER_MAIN_SRC_DIR,
       templates: [{ file: 'package/Application.java', renameTo: generator => `${generator.javaDir}${generator.mainClass}.java` }],
     },
+    {
+      condition: generator => generator.serviceDiscoveryType && generator.serviceDiscoveryEureka,
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/config/EurekaWorkaroundConfiguration.java',
+          renameTo: generator => `${generator.javaDir}/config/EurekaWorkaroundConfiguration.java`,
+        },
+      ],
+    },
     {
       condition: generator => !generator.reactive,
       path: SERVER_MAIN_SRC_DIR,
@@ -842,6 +847,10 @@ const baseServerFiles = {
           file: 'package/config/AsyncConfiguration.java',
           renameTo: generator => `${generator.javaDir}config/AsyncConfiguration.java`,
         },
+        {
+          file: 'package/config/CRLFLogConverter.java',
+          renameTo: generator => `${generator.javaDir}config/CRLFLogConverter.java`,
+        },
         {
           file: 'package/config/DateTimeFormatConfiguration.java',
           renameTo: generator => `${generator.javaDir}config/DateTimeFormatConfiguration.java`,
@@ -1673,12 +1682,12 @@ const baseServerFiles = {
       ],
     },
     {
-      condition: ({ searchEngineElasticsearch, reactive }) => searchEngineElasticsearch && reactive,
+      condition: ({ searchEngineElasticsearch }) => searchEngineElasticsearch,
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
-          file: 'package/config/ElasticsearchReactiveTestConfiguration.java',
-          renameTo: generator => `${generator.testDir}config/ElasticsearchReactiveTestConfiguration.java`,
+          file: 'package/config/ElasticsearchTestConfiguration.java',
+          renameTo: generator => `${generator.testDir}config/ElasticsearchTestConfiguration.java`,
         },
       ],
     },

package/generators/server/index.js

@@ -201,8 +201,6 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
         this.JACKSON_DATABIND_NULLABLE_VERSION = constants.JACKSON_DATABIND_NULLABLE_VERSION;
         this.JACOCO_VERSION = constants.JACOCO_VERSION;
         this.JIB_VERSION = constants.JIB_VERSION;
-        this.H2_VERSION = constants.H2_VERSION;
-        this.H2_R2DBC_VERSION = constants.H2_R2DBC_VERSION;
 
         this.ANGULAR = constants.SUPPORTED_CLIENT_FRAMEWORKS.ANGULAR;
         this.VUE = constants.SUPPORTED_CLIENT_FRAMEWORKS.VUE;

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

@@ -88,7 +88,7 @@ if (project.hasProperty("gae")) {
     appengineStage.dependsOn thinResolve
 }
 
-<%_ if (serviceDiscoveryType || applicationTypeGateway || applicationTypeMicroservice) { _%>
+<%_ if (serviceDiscoveryAny || applicationTypeGateway || applicationTypeMicroservice) { _%>
 if (project.hasProperty("zipkin")) {
     apply from: "gradle/zipkin.gradle"
 }
@@ -250,12 +250,6 @@ configurations {
             // Inherited version from Spring Boot can't be used because of regressions:
             // To be removed as soon as spring-boot use the same version
             force 'org.liquibase:liquibase-core:<%= LIQUIBASE_VERSION %>'
-<%_ if (devDatabaseTypeH2Any && (prodDatabaseTypeMysql || reactive)) { _%>
-            force 'com.h2database:h2:<%= H2_VERSION %>'
-  <%_ if (reactive) { _%>
-            force 'io.r2dbc:r2dbc-h2:<%= H2_R2DBC_VERSION %>'
-  <%_ } _%>
-<%_ } _%>
         }
     }
 }
@@ -373,8 +367,10 @@ if (SPRING_BOOT_VERSION.indexOf('M') > -1 || SPRING_BOOT_VERSION.indexOf('RC') >
     implementation "org.hibernate:hibernate-jcache"
   <%_ } _%>
 <%_ } _%>
-<%_ if (cacheProviderCaffeine) { _%>
+<%_ if (cacheProviderCaffeine || (authenticationTypeOauth2 && !cacheProviderInfinispan)) { _%>
     implementation "com.github.ben-manes.caffeine:caffeine:${caffeineVersion}"
+<%_ } _%>
+<%_ if (cacheProviderCaffeine) { _%>
     implementation "com.github.ben-manes.caffeine:jcache:${caffeineVersion}"
     implementation "com.typesafe:config:${typesafeConfigVersion}"
   <%_ if (enableHibernateCache) { _%>
@@ -499,7 +495,7 @@ if (SPRING_BOOT_VERSION.indexOf('M') > -1 || SPRING_BOOT_VERSION.indexOf('RC') >
     implementation "org.springframework.retry:spring-retry"
     implementation "org.springframework.cloud:spring-cloud-starter-openfeign"
 <%_ } _%>
-<%_ if (serviceDiscoveryType) { _%>
+<%_ if (serviceDiscoveryAny) { _%>
     implementation "org.springframework.cloud:spring-cloud-starter-bootstrap"
   <%_ if (serviceDiscoveryEureka) { _%>
     implementation "org.springframework.cloud:spring-cloud-starter-netflix-eureka-client"
@@ -574,14 +570,10 @@ task webapp_test(type: NpmTask, dependsOn: "npm_install") {
 }
 
 if (project.hasProperty("nodeInstall")) {
-    // Workaround node grade plugin not working on apple silicon https://github.com/node-gradle/gradle-node-plugin/issues/154
-    OperatingSystem os = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.getCurrentOperatingSystem();
-    Architecture arch = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.getCurrentArchitecture();
-    Boolean downloadNode = !os.isMacOsX() || arch.isAmd64()
     node {
         version = "<%= NODE_VERSION %>"
         npmVersion = "<%= NPM_VERSION %>"
-        download = downloadNode
+        download = true
     }
 
     // Copy local node and npm to a fixed location for npmw

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

@@ -166,7 +166,7 @@ processResources {
         filter {
             it.replace("#project.version#", version)
         }
-<%_ if (!serviceDiscoveryType) { _%>
+<%_ if (!serviceDiscoveryAny) { _%>
         filter {
             it.replace("#spring.profiles.active#", profiles)
         }

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

@@ -107,7 +107,7 @@ processResources {
         filter {
             it.replace("#project.version#", version)
         }
-<%_ if (!serviceDiscoveryType) { _%>
+<%_ if (!serviceDiscoveryAny) { _%>
         filter {
             it.replace("#spring.profiles.active#", profiles)
         }

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

@@ -32,8 +32,10 @@ archunitJunit5Version=0.22.0
 <%_ if (enableSwaggerCodegen) { _%>
 jacksonDatabindNullableVersion=<%= JACKSON_DATABIND_NULLABLE_VERSION %>
 <%_ } _%>
-<%_ if (cacheProviderCaffeine) { _%>
+<%_ if (cacheProviderCaffeine || (authenticationTypeOauth2 && !cacheProviderInfinispan)) { _%>
 caffeineVersion=3.1.1
+<%_ } _%>
+<%_ if (cacheProviderCaffeine) { _%>
 typesafeConfigVersion=1.4.2
 <%_ } _%>
 <%_ if (databaseTypeSql && !reactive) { _%>
@@ -73,11 +75,11 @@ sonarqubePluginVersion=3.4.0.2513
 openapiPluginVersion=6.0.1
 <%_ } _%>
 noHttpCheckstyleVersion=0.0.10
-checkstyleVersion=10.3.1
+checkstyleVersion=10.3.2
 modernizerPluginVersion=1.6.2
 <%_ if (enableGradleEnterprise) { _%>
-gradleEnterprisePluginVersion=3.10.3
-gradleCommonCustomUserDataPluginVersion=1.7.2
+gradleEnterprisePluginVersion=3.11.1
+gradleCommonCustomUserDataPluginVersion=1.8
 <%_ } _%>
 <%_ if (searchEngineElasticsearch) { _%>
 awaitilityVersion=4.2.0

package/generators/server/templates/npmw.cmd

@@ -1,29 +1,31 @@
-@echo off
-
-@setlocal
-
-set NPMW_DIR=%~dp0
-
-if exist "%NPMW_DIR%\mvnw.cmd" (
-  set NODE_EXE=""
-  set NPM_EXE=%NPMW_DIR%\target\node\npm.cmd
-  set INSTALL_NPM_COMMAND=%NPMW_DIR%\mvnw.cmd -Pwebapp frontend:install-node-and-npm@install-node-and-npm
-) else (
-  set NODE_EXE=%NPMW_DIR%\build\node\bin\node.exe
-  set NPM_EXE=%NPMW_DIR%\build\node\lib\node_modules\npm\bin\npm-cli.js
-  set INSTALL_NPM_COMMAND=%NPMW_DIR%\gradlew.bat npmSetup
-)
-
-if not exist %NPM_EXE% (
-  call %INSTALL_NPM_COMMAND%
-)
-
-if exist %NODE_EXE% (
-  Rem Executing local npm with local node
-  call %NODE_EXE% %NPM_EXE% %*
-) else if exist %NPM_EXE% (
-  Rem Executing local npm
-  call %NPM_EXE% %*
-) else (
-  call npm %*
-)
+@echo off
+
+setlocal
+
+set NPMW_DIR=%~dp0
+
+if exist "%NPMW_DIR%mvnw.cmd" (
+  set NODE_EXE=^"^"
+  set NODE_PATH=%NPMW_DIR%target\node\
+  set NPM_EXE=^"%NPMW_DIR%target\node\npm.cmd^"
+  set INSTALL_NPM_COMMAND=^"%NPMW_DIR%mvnw.cmd^" -Pwebapp frontend:install-node-and-npm@install-node-and-npm
+) else (
+  set NODE_EXE=^"%NPMW_DIR%build\node\bin\node.exe^"
+  set NODE_PATH=%NPMW_DIR%build\node\bin\
+  set NPM_EXE=^"%NPMW_DIR%build\node\lib\node_modules\npm\bin\npm-cli.js^"
+  set INSTALL_NPM_COMMAND=^"%NPMW_DIR%gradlew.bat^" npmSetup
+)
+
+if not exist %NPM_EXE% (
+  call %INSTALL_NPM_COMMAND% 
+)
+
+if exist %NODE_EXE% (
+  Rem execute local npm with local node, whilst adding local node location to the PATH for this CMD session
+  endlocal & echo "%PATH%"|find /i "%NODE_PATH%;">nul || set "PATH=%NODE_PATH%;%PATH%" & call %NODE_EXE% %NPM_EXE% %*
+) else if exist %NPM_EXE% (
+  Rem execute local npm, whilst adding local npm location to the PATH for this CMD session
+  endlocal & echo "%PATH%"|find /i "%NODE_PATH%;">nul || set "PATH=%NODE_PATH%;%PATH%" & call %NPM_EXE% %*
+) else (
+  call npm %*
+)

package/generators/server/templates/package.json.ejs

@@ -43,7 +43,7 @@
     "default_environment": "prod"
   },
   "scripts": {
-    "prettier:check": "prettier --check \"{,src/**/}*.{<%= getPrettierExtensions() %>}\"",
-    "prettier:format": "prettier --write \"{,src/**/}*.{<%= getPrettierExtensions() %>}\""
+    "prettier:check": "prettier --check \"{,src/**/,.blueprint/**/}*.{<%= getPrettierExtensions() %>}\"",
+    "prettier:format": "prettier --write \"{,src/**/,.blueprint/**/}*.{<%= getPrettierExtensions() %>}\""
   }
 }

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

@@ -25,7 +25,7 @@
 
     <groupId><%= packageName %></groupId>
     <artifactId><%= dasherizedBaseName %></artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version><%= projectVersion %></version>
     <packaging>jar</packaging>
     <name><%= humanizedBaseName %></name>
     <description><%= projectDescription %></description>
@@ -102,12 +102,6 @@
         <liquibase.version><%= LIQUIBASE_VERSION %></liquibase.version>
   <%_ if (!reactive) { _%>
         <liquibase-hibernate5.version><%= LIQUIBASE_VERSION %></liquibase-hibernate5.version>
-  <%_ } _%>
-  <%_ if (devDatabaseTypeH2Any && (prodDatabaseTypeMysql || reactive)) { _%>
-        <h2.version><%= H2_VERSION %></h2.version>
-    <%_ if (reactive) { _%>
-        <h2-r2dbc.version><%= H2_R2DBC_VERSION %></h2-r2dbc.version>
-    <%_ } _%>
   <%_ } _%>
         <validation-api.version>2.0.1.Final</validation-api.version>
   <%_ if (reactive) { _%>
@@ -130,15 +124,17 @@
 <%_ if (enableSwaggerCodegen) { _%>
         <jackson-databind-nullable.version><%= JACKSON_DATABIND_NULLABLE_VERSION %></jackson-databind-nullable.version>
 <%_ } _%>
-<%_ if (cacheProviderCaffeine) { _%>
+<%_ if (cacheProviderCaffeine || (authenticationTypeOauth2 && !cacheProviderInfinispan)) { _%>
         <caffeine.version>3.1.1</caffeine.version>
+<%_ } _%>
+<%_ if (cacheProviderCaffeine) { _%>
         <typesafe.version>1.4.2</typesafe.version>
 <%_ } _%>
         <!-- Plugin versions -->
         <maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
-        <maven-site-plugin.version>3.12.0</maven-site-plugin.version>
+        <maven-site-plugin.version>3.12.1</maven-site-plugin.version>
         <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
-        <maven-javadoc-plugin.version>3.4.0</maven-javadoc-plugin.version>
+        <maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
         <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
         <maven-enforcer-plugin.version>3.1.0</maven-enforcer-plugin.version>
         <maven-failsafe-plugin.version>3.0.0-M7</maven-failsafe-plugin.version>
@@ -148,7 +144,7 @@
         <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
         <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
         <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
-        <checkstyle.version>10.3.1</checkstyle.version>
+        <checkstyle.version>10.3.2</checkstyle.version>
         <nohttp-checkstyle.version>0.0.10</nohttp-checkstyle.version>
 <%_ if (!skipClient) { _%>
         <frontend-maven-plugin.version>1.12.1</frontend-maven-plugin.version>
@@ -408,12 +404,14 @@
         </dependency>
   <%_ } _%>
 <%_ } _%>
-<%_ if (cacheProviderCaffeine) { _%>
+<%_ if (cacheProviderCaffeine || (authenticationTypeOauth2 && !cacheProviderInfinispan)) { _%>
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
             <version>${caffeine.version}</version>
         </dependency>
+<%_ } _%>
+<%_ if (cacheProviderCaffeine) { _%>
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>jcache</artifactId>
@@ -763,7 +761,7 @@
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
 <%_ } _%>
-<%_ if (serviceDiscoveryType) { _%>
+<%_ if (serviceDiscoveryAny) { _%>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-bootstrap</artifactId>
@@ -1581,17 +1579,11 @@
                 <dependency>
                     <groupId>com.h2database</groupId>
                     <artifactId>h2</artifactId>
-  <%_ if (prodDatabaseTypeMysql || reactive) { _%>
-                    <version>${h2.version}</version>
-  <%_ } _%>
                 </dependency>
   <%_ if (reactive) { _%>
                 <dependency>
                     <groupId>io.r2dbc</groupId>
                     <artifactId>r2dbc-h2</artifactId>
-    <%_ if (prodDatabaseTypeMysql) { _%>
-                    <version>${h2-r2dbc.version}</version>
-    <%_ } _%>
                 </dependency>
   <%_ } _%>
 <%_ } _%>
@@ -1780,9 +1772,6 @@
                                 <dependency>
                                     <groupId>com.h2database</groupId>
                                     <artifactId>h2</artifactId>
-    <%_ if (prodDatabaseTypeMysql || reactive) { _%>
-                                    <version>${h2.version}</version>
-    <%_ } _%>
                                 </dependency>
   <%_ } _%>
                             </dependencies>
@@ -2073,7 +2062,7 @@
                 </plugins>
             </build>
         </profile>
-<%_ if (serviceDiscoveryType || applicationTypeGateway || applicationTypeMicroservice) { _%>
+<%_ if (serviceDiscoveryAny || applicationTypeGateway || applicationTypeMicroservice) { _%>
         <profile>
             <!--
                 Profile for tracing requests with Zipkin.

package/generators/server/templates/sql/common/src/test/java/package/config/MsSqlTestContainer.java.ejs

@@ -26,9 +26,9 @@ import org.testcontainers.containers.output.Slf4jLogConsumer;
 
 import java.util.Collections;
 
-public class MsSqlServerContainer implements SqlTestContainer {
+public class MsSqlTestContainer implements SqlTestContainer {
 
-    private static final Logger log = LoggerFactory.getLogger(MsSqlServerContainer.class);
+    private static final Logger log = LoggerFactory.getLogger(MsSqlTestContainer.class);
 
     private MSSQLServerContainer<?> mSSQLServerContainer;
 
@@ -42,7 +42,6 @@ public class MsSqlServerContainer implements SqlTestContainer {
     public void afterPropertiesSet() {
         if (null == mSSQLServerContainer) {
             mSSQLServerContainer = new MSSQLServerContainer<>("<%= DOCKER_MSSQL %>")
-                .withDatabaseName("<%= baseName %>")
                 .withTmpFs(Collections.singletonMap("/testtmpfs", "rw"))
                 .withLogConsumer(new Slf4jLogConsumer(log))
                 .withReuse(true);

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

@@ -78,7 +78,13 @@ _%>
       - SPRING_DATA_CASSANDRA_CONTACTPOINTS=<%= baseName.toLowerCase() %>-cassandra
 <%_ } _%>
 <%_ if (applicationTypeGateway) { _%>
-      - JHIPSTER_SLEEP=60 # gives time for microservices to boot before the gateway, the entire stack will be ready to accept incomming requests.
+<%_ if (authenticationTypeOauth2) { _%>
+      - JHIPSTER_SLEEP=80 # gives time for microservices, dependencies to boot before the gateway, the entire stack will be ready to accept incoming requests.
+<%_ } else { _%>
+      - JHIPSTER_SLEEP=60 # gives time for microservices to boot before the gateway, the entire stack will be ready to accept incoming requests.
+<%_ } _%>
+<%_ } else if (applicationTypeMicroservice && authenticationTypeOauth2) { _%>
+      - JHIPSTER_SLEEP=60 # gives time for other services to boot before the application
 <%_ } else { _%>
       - JHIPSTER_SLEEP=30 # gives time for other services to boot before the application
 <%_ } _%>

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

@@ -1,6 +1,7 @@
 {
   "id": "jhipster",
   "realm": "jhipster",
+  "displayName": "JHipster",
   "notBefore": 0,
   "defaultSignatureAlgorithm": "RS256",
   "revokeRefreshToken": false,
@@ -496,15 +497,8 @@
       "disableableCredentialTypes": [],
       "requiredActions": [],
       "realmRoles": [
-        "offline_access",
-        "uma_authorization"
+        "default-roles-jhipster"
       ],
-      "clientRoles": {
-        "account": [
-          "view-profile",
-          "manage-account"
-        ]
-      },
       "notBefore": 0,
       "groups": []
     }
@@ -553,7 +547,9 @@
       "publicClient": false,
       "frontchannelLogout": false,
       "protocol": "openid-connect",
-      "attributes": {},
+      "attributes": {
+        "post.logout.redirect.uris": "+"
+      },
       "authenticationFlowBindingOverrides": {},
       "fullScopeAllowed": false,
       "nodeReRegistrationTimeout": 0,
@@ -596,6 +592,7 @@
       "frontchannelLogout": false,
       "protocol": "openid-connect",
       "attributes": {
+        "post.logout.redirect.uris": "+",
         "pkce.code.challenge.method": "S256"
       },
       "authenticationFlowBindingOverrides": {},
@@ -645,7 +642,9 @@
       "publicClient": true,
       "frontchannelLogout": false,
       "protocol": "openid-connect",
-      "attributes": {},
+      "attributes": {
+        "post.logout.redirect.uris": "+"
+      },
       "authenticationFlowBindingOverrides": {},
       "fullScopeAllowed": false,
       "nodeReRegistrationTimeout": 0,
@@ -683,7 +682,9 @@
       "publicClient": false,
       "frontchannelLogout": false,
       "protocol": "openid-connect",
-      "attributes": {},
+      "attributes": {
+        "post.logout.redirect.uris": "+"
+      },
       "authenticationFlowBindingOverrides": {},
       "fullScopeAllowed": false,
       "nodeReRegistrationTimeout": 0,
@@ -725,6 +726,7 @@
         "saml.force.post.binding": "false",
         "saml.multivalued.roles": "false",
         "saml.encrypt": "false",
+        "post.logout.redirect.uris": "+",
         "saml.server.signature": "false",
         "saml.server.signature.keyinfo.ext": "false",
         "exclude.session.state.from.auth.response": "false",
@@ -833,6 +835,7 @@
         "saml.force.post.binding": "false",
         "saml.multivalued.roles": "false",
         "saml.encrypt": "false",
+        "post.logout.redirect.uris": "+",
         "saml.server.signature": "false",
         "saml.server.signature.keyinfo.ext": "false",
         "exclude.session.state.from.auth.response": "false",
@@ -893,6 +896,7 @@
         "saml.force.post.binding": "false",
         "saml.multivalued.roles": "false",
         "saml.encrypt": "false",
+        "post.logout.redirect.uris": "+",
         "saml.server.signature": "false",
         "saml.server.signature.keyinfo.ext": "false",
         "exclude.session.state.from.auth.response": "false",
@@ -941,7 +945,9 @@
       "publicClient": false,
       "frontchannelLogout": false,
       "protocol": "openid-connect",
-      "attributes": {},
+      "attributes": {
+        "post.logout.redirect.uris": "+"
+      },
       "authenticationFlowBindingOverrides": {},
       "fullScopeAllowed": false,
       "nodeReRegistrationTimeout": 0,
@@ -986,6 +992,7 @@
       "frontchannelLogout": false,
       "protocol": "openid-connect",
       "attributes": {
+        "post.logout.redirect.uris": "+",
         "pkce.code.challenge.method": "S256"
       },
       "authenticationFlowBindingOverrides": {},
@@ -1057,6 +1064,7 @@
         "saml.force.post.binding": "false",
         "saml.multivalued.roles": "false",
         "saml.encrypt": "false",
+        "post.logout.redirect.uris": "+",
         "saml.server.signature": "false",
         "saml.server.signature.keyinfo.ext": "false",
         "exclude.session.state.from.auth.response": "false",
@@ -1768,6 +1776,14 @@
         "config": {}
       }
     ],
+    "org.keycloak.userprofile.UserProfileProvider": [
+      {
+        "id": "b05ccf0d-d8ac-4695-bd60-37018f8f94b4",
+        "providerId": "declarative-user-profile",
+        "subComponents": {},
+        "config": {}
+      }
+    ],
     "org.keycloak.keys.KeyProvider": [
       {
         "id": "62707fae-58f9-4fc2-89fb-0c5d212dc3dc",
@@ -2488,9 +2504,11 @@
     "clientSessionMaxLifespan": "0",
     "parRequestUriLifespan": "60",
     "clientOfflineSessionIdleTimeout": "0",
-    "cibaInterval": "5"
+    "cibaInterval": "5",
+    "frontendUrl": "",
+    "acr.loa.map": "[]"
   },
-  "keycloakVersion": "<%= DOCKER_KEYCLOAK_VERSION %>",
+  "keycloakVersion": "19.0.1",
   "userManagedAccessAllowed": false,
   "clientProfiles": {
     "profiles": []

package/generators/server/templates/src/main/docker/jhipster-control-center.yml.ejs

@@ -48,7 +48,7 @@
 # - In Eureka mode, the ports are in the jhipster-registry.yml file.
 
 
-<%_ let discoveryProfile = serviceDiscoveryType ? serviceDiscoveryType : 'static'; _%>
+<%_ let discoveryProfile = serviceDiscoveryAny ? serviceDiscoveryAny : 'static'; _%>
 version: '<%= DOCKER_COMPOSE_FORMAT_VERSION %>'
 services:
   jhipster-control-center:

package/generators/server/templates/src/main/docker/prometheus/prometheus.yml.ejs

@@ -42,7 +42,7 @@ scrape_configs:
     #basic_auth:
     # username: admin
     # password: admin
-    metrics_path: <% if (applicationTypeMicroservice && !serviceDiscoveryType) { %>/services/<%= baseName %><% } %>/management/prometheus
+    metrics_path: <% if (applicationTypeMicroservice && !serviceDiscoveryAny) { %>/services/<%= baseName %><% } %>/management/prometheus
     static_configs:
       - targets:
         # On MacOS, replace localhost by host.docker.internal

package/generators/server/templates/src/main/java/package/Application.java.ejs

@@ -19,6 +19,7 @@
 package <%= packageName %>;
 
 import <%= packageName %>.config.ApplicationProperties;
+import <%= packageName %>.config.CRLFLogConverter;
 
 import tech.jhipster.config.DefaultProfileUtil;
 import tech.jhipster.config.JHipsterConstants;
@@ -95,7 +96,9 @@ public class <%= mainClass %> {
         } catch (UnknownHostException e) {
             log.warn("The host name could not be determined, using `localhost` as fallback");
         }
-        log.info("\n----------------------------------------------------------\n\t" +
+        log.info(
+            CRLFLogConverter.CRLF_SAFE_MARKER,
+            "\n----------------------------------------------------------\n\t" +
                 "Application '{}' is running! Access URLs:\n\t" +
                 "Local: \t\t{}://localhost:{}{}\n\t" +
                 "External: \t{}://{}:{}{}\n\t" +
@@ -110,14 +113,18 @@ public class <%= mainClass %> {
             contextPath,
             env.getActiveProfiles().length == 0 ? env.getDefaultProfiles() : env.getActiveProfiles()
         );
-<%_ if (serviceDiscoveryType && (applicationTypeMicroservice || applicationTypeGateway)) { _%>
+<%_ if (serviceDiscoveryAny && (applicationTypeMicroservice || applicationTypeGateway)) { _%>
 
         String configServerStatus = env.getProperty("configserver.status");
         if (configServerStatus == null) {
             configServerStatus = "Not found or not setup for this application";
         }
-        log.info("\n----------------------------------------------------------\n\t" +
-                "Config Server: \t{}\n----------------------------------------------------------", configServerStatus);
+        log.info(
+            CRLFLogConverter.CRLF_SAFE_MARKER,
+            "\n----------------------------------------------------------\n\t" +
+            "Config Server: \t{}\n----------------------------------------------------------",
+            configServerStatus
+        );
 <%_ } _%>
     }
 }