generator-jhipster 7.9.2 → 7.9.3

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

package/generators/server/templates/src/main/java/package/config/CRLFLogConverter.java.ejs

@@ -0,0 +1,57 @@
+package <%= packageName %>.config;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.pattern.CompositeConverter;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
+import org.springframework.boot.ansi.AnsiColor;
+import org.springframework.boot.ansi.AnsiElement;
+import org.springframework.boot.ansi.AnsiOutput;
+import org.springframework.boot.ansi.AnsiStyle;
+
+public class CRLFLogConverter extends CompositeConverter<ILoggingEvent> {
+    public static final Marker CRLF_SAFE_MARKER = MarkerFactory.getMarker("CRLF_SAFE");
+
+    private static final String[] SAFE_LOGGERS = { "org.hibernate" };
+    private static final Map<String, AnsiElement> ELEMENTS;
+
+	static {
+		Map<String, AnsiElement> ansiElements = new HashMap<>();
+		ansiElements.put("faint", AnsiStyle.FAINT);
+		ansiElements.put("red", AnsiColor.RED);
+		ansiElements.put("green", AnsiColor.GREEN);
+		ansiElements.put("yellow", AnsiColor.YELLOW);
+		ansiElements.put("blue", AnsiColor.BLUE);
+		ansiElements.put("magenta", AnsiColor.MAGENTA);
+		ansiElements.put("cyan", AnsiColor.CYAN);
+		ELEMENTS = Collections.unmodifiableMap(ansiElements);
+	}
+
+    @Override
+    protected String transform(ILoggingEvent event, String in) {
+        AnsiElement element = ELEMENTS.get(getFirstOption());
+        if ((event.getMarker() != null && event.getMarker().contains(CRLF_SAFE_MARKER)) || isLoggerSafe(event)) {
+            return in;
+        }
+        String replacement = element == null ? "_" : toAnsiString("_", element);
+        return in.replaceAll("[\n\r\t]", replacement);
+    }
+
+    protected boolean isLoggerSafe(ILoggingEvent event) {
+        for (String safeLogger : SAFE_LOGGERS) {
+            if (event.getLoggerName().startsWith(safeLogger)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+	protected String toAnsiString(String in, AnsiElement element) {
+		return AnsiOutput.toString(element, in);
+	}
+}

package/generators/server/templates/src/main/java/package/config/EurekaWorkaroundConfiguration.java.ejs

@@ -0,0 +1,49 @@
+<%#
+ Copyright 2013-2022 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+// This is a workaround for
+// https://github.com/jhipster/jhipster-registry/issues/537
+// https://github.com/jhipster/generator-jhipster/issues/18533
+// The original issue will be fixed with spring cloud 2021.0.4
+// https://github.com/spring-cloud/spring-cloud-netflix/issues/3941
+package <%= packageName %>.config;
+
+import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.boot.actuate.health.Health;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+
+@Component
+public class EurekaWorkaroundConfiguration implements HealthIndicator {
+
+    private boolean applicationIsUp = false;
+
+    @EventListener(ApplicationReadyEvent.class)
+    public void onStartup() {
+        this.applicationIsUp = true;
+    }
+
+    @Override
+    public Health health() {
+        if (!applicationIsUp) {
+            return Health.down().build();
+        }
+        return Health.up().build();
+    }
+}

package/generators/server/templates/src/main/java/package/config/LoggingConfiguration.java.ejs

@@ -23,11 +23,11 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import tech.jhipster.config.JHipsterProperties;
 import org.slf4j.LoggerFactory;
-<%_ if (serviceDiscoveryConsul || (serviceDiscoveryType && applicationTypeGateway || applicationTypeMicroservice)) { _%>
+<%_ if (serviceDiscoveryConsul || (serviceDiscoveryAny && applicationTypeGateway || applicationTypeMicroservice)) { _%>
 import org.springframework.beans.factory.ObjectProvider;
 <%_ } _%>
 import org.springframework.beans.factory.annotation.Value;
-<%_ if (serviceDiscoveryType && (applicationTypeGateway || applicationTypeMicroservice)) { _%>
+<%_ if (serviceDiscoveryAny && (applicationTypeGateway || applicationTypeMicroservice)) { _%>
 import org.springframework.boot.info.BuildProperties;
 <%_ } _%>
 <%_ if (serviceDiscoveryConsul) { _%>
@@ -58,7 +58,7 @@ public class LoggingConfiguration {
 <%_ if (serviceDiscoveryConsul) { _%>
                                 ObjectProvider<ConsulRegistration> consulRegistration,
 <%_ } _%>
-<%_ if (serviceDiscoveryType && (applicationTypeMicroservice || applicationTypeGateway)) { _%>
+<%_ if (serviceDiscoveryAny && (applicationTypeMicroservice || applicationTypeGateway)) { _%>
                                 ObjectProvider<BuildProperties> buildProperties,
 <%_ } _%>
                                 ObjectMapper mapper) throws JsonProcessingException {
@@ -68,7 +68,7 @@ public class LoggingConfiguration {
         Map<String, String> map = new HashMap<>();
         map.put("app_name", appName);
         map.put("app_port", serverPort);
-<%_ if (serviceDiscoveryType && (applicationTypeMicroservice || applicationTypeGateway)) { _%>
+<%_ if (serviceDiscoveryAny && (applicationTypeMicroservice || applicationTypeGateway)) { _%>
         buildProperties.ifAvailable(it -> map.put("version", it.getVersion()));
 <%_ } _%>
 <%_ if (serviceDiscoveryConsul) { _%>

package/generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.ejs

@@ -37,13 +37,6 @@ import org.springframework.http.HttpMethod;
 <%_ } _%>
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-<%_ if (!applicationTypeMicroservice || !authenticationTypeOauth2) { _%>
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
-<%_ } else { _%>
-  <%_ if (devDatabaseTypeH2Any) { _%>
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
-  <%_ } _%>
-<%_ } _%>
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.web.SecurityFilterChain;
 <%_ if (authenticationTypeJwt || (authenticationTypeOauth2 && applicationTypeMicroservice)) { _%>
@@ -91,7 +84,9 @@ import org.springframework.security.oauth2.client.registration.ClientRegistratio
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import <%= packageName %>.security.oauth2.CustomClaimConverter;
 <%_ } _%>
+<%_ if(!skipClient) { _%>
 import org.springframework.security.web.header.writers.ReferrerPolicyHeaderWriter;
+<%_ } _%>
 <%_ if (!applicationTypeMicroservice) { _%>
 import org.springframework.web.filter.CorsFilter;
 <%_ } _%>
@@ -165,6 +160,9 @@ public class SecurityConfiguration {
         // @formatter:off
         http
             .csrf()
+<%_ if (devDatabaseTypeH2Any) { _%>
+            .ignoringAntMatchers("/h2-console/**")
+<%_ } _%>
 <%_ if ((authenticationTypeOauth2 || authenticationTypeSession) && !applicationTypeMicroservice) { _%>
             .csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())
         .and()
@@ -201,22 +199,23 @@ public class SecurityConfiguration {
             .logoutSuccessHandler(ajaxLogoutSuccessHandler())
             .permitAll()
 <%_ } _%>
+<%_ if (!skipClient) { _%>
         .and()
             .headers()
-            .contentSecurityPolicy(jHipsterProperties.getSecurity().getContentSecurityPolicy())
-        .and()
-            .referrerPolicy(ReferrerPolicyHeaderWriter.ReferrerPolicy.STRICT_ORIGIN_WHEN_CROSS_ORIGIN)
-        .and()
-            .permissionsPolicy().policy("camera=(), fullscreen=(self), geolocation=(), gyroscope=(), magnetometer=(), microphone=(), midi=(), payment=(), sync-xhr=()")
-        .and()
-            .frameOptions()
-            .sameOrigin()
-        .and()
+                .contentSecurityPolicy(jHipsterProperties.getSecurity().getContentSecurityPolicy())
+            .and()
+                .referrerPolicy(ReferrerPolicyHeaderWriter.ReferrerPolicy.STRICT_ORIGIN_WHEN_CROSS_ORIGIN)
+            .and()
+                .permissionsPolicy().policy("camera=(), fullscreen=(self), geolocation=(), gyroscope=(), magnetometer=(), microphone=(), midi=(), payment=(), sync-xhr=()")
+            .and()
+                .frameOptions().sameOrigin()
+<%_ } _%>
 <%_ if (authenticationTypeJwt || (authenticationTypeOauth2 && applicationTypeMicroservice)) { _%>
-            .sessionManagement()
-            .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
         .and()
+            .sessionManagement()
+                .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
 <%_ } _%>
+        .and()
             .authorizeRequests()
 <%_ if (!applicationTypeMicroservice) { _%>
             .antMatchers(HttpMethod.OPTIONS, "/**").permitAll()