generator-jhipster 7.9.2 → 7.9.3

package/generators/languages/templates/src/main/webapp/i18n/el/user-management.json

@@ -1,26 +1,26 @@
 {
     "userManagement": {
         "home": {
-            "title": "Χρηστες",
+            "title": "Χρήστες",
             "refreshListLabel": "Refresh list",
-            "createLabel": "Δημιουργήστε έναν κανούργιο χρηστη",
-            "createOrEditLabel": "Δημιουργήστε η επεξεργαστειτε έναν χρηστη"
+            "createLabel": "Δημιουργήστε έναν κανούργιο χρήστη",
+            "createOrEditLabel": "Δημιουργήστε η επεξεργαστειτε έναν χρήστη"
         },
         "created": "Ένας κανούργιος χρηστης δημιουγήθηκε με αναγνωριστικό {{ param }}",
-        "updated": "Ένας χρηστης ανανεώθηκε με αναγνωριστικό {{ param }}",
-        "deleted": "Ένας χρηστης διαγράφτηκε με αναγνωριστικό {{ param }}",
+        "updated": "Ένας χρήστης ανανεώθηκε με αναγνωριστικό {{ param }}",
+        "deleted": "Ένας χρήστης διαγράφτηκε με αναγνωριστικό {{ param }}",
         "delete": {
-            "question": "Είστε σίγουροι όταν θέλετε να διαγράψτε τον χρηστη {{ login }}?"
+            "question": "Είστε σίγουροι όταν θέλετε να διαγράψτε τον χρήστη {{ login }}?"
         },
         "detail": {
-            "title": "Χρηστης"
+            "title": "Χρήστης"
         },
         "login": "Όνομα σύνδεσης",
         "firstName": "Μικρό Όνομα",
         "lastName": "Επίθετο",
         "email": "Email",
-        "activated": "Ένεργοποιημένo",
-        "deactivated": "Άπενεργοποιημένo",
+        "activated": "Ενεργοποιημένo",
+        "deactivated": "Απενεργοποιημένo",
         "profiles": "Προφίλ",
         "langKey": "Γλώσσα",
         "createdBy": "Δημιουργός",

package/generators/languages/templates/src/main/webapp/i18n/en/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 Config Server",

package/generators/languages/templates/src/main/webapp/i18n/es/health.json.ejs

@@ -32,7 +32,7 @@
 <%_ if (messageBrokerKafka) { _%>
             "binders": "Agente de mensajes",
 <%_ } _%>
-<%_ if (applicationTypeGateway || serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway || serviceDiscoveryAny) { _%>
             "discoveryComposite": "Descubrimiento compuesto",
             "refreshScope": "Alcance de actualización de microservicios",
             "clientConfigServer": "Servidor de configuración de microservicio",

package/generators/languages/templates/src/main/webapp/i18n/et/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 Config Server",

package/generators/languages/templates/src/main/webapp/i18n/fa/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 Config Server",

package/generators/languages/templates/src/main/webapp/i18n/fi/health.json.ejs

@@ -32,7 +32,7 @@
 <%_ if (messageBrokerKafka) { _%>
             "binders": "Sanomajono",
 <%_ } _%>
-<%_ if (applicationTypeGateway || serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway || serviceDiscoveryAny) { _%>
             "discoveryComposite": "Discovery Composite",
             "refreshScope": "Microservice Refresh Scope",
             "clientConfigServer": "Microservice Config Server",

package/generators/languages/templates/src/main/webapp/i18n/fr/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 Config Server",

package/generators/languages/templates/src/main/webapp/i18n/gl/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 Config Server",

package/generators/languages/templates/src/main/webapp/i18n/hi/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 Config Server",

package/generators/languages/templates/src/main/webapp/i18n/hr/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",
             "configServer": "Mikroservisni konfiguracijski server",

package/generators/languages/templates/src/main/webapp/i18n/hu/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 Config Server",

package/generators/languages/templates/src/main/webapp/i18n/hy/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 Config Server",

package/generators/languages/templates/src/main/webapp/i18n/in/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 Config Server",

package/generators/languages/templates/src/main/webapp/i18n/it/health.json.ejs

@@ -32,7 +32,7 @@
 <%_ if (messageBrokerKafka) { _%>
             "binders": "Message broker",
 <%_ } _%>
-<%_ if (applicationTypeGateway || serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway || serviceDiscoveryAny) { _%>
             "discoveryComposite": "Discovery Composite",
             "refreshScope": "Scopo di Aggiornamento Microservice",
             "clientConfigServer": "Server di Configurazioni Microservice",

package/generators/languages/templates/src/main/webapp/i18n/ja/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 Config Server",

package/generators/languages/templates/src/main/webapp/i18n/ko/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 Config Server",

package/generators/languages/templates/src/main/webapp/i18n/mr/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 Config Server",

package/generators/languages/templates/src/main/webapp/i18n/my/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 Config Server",

package/generators/languages/templates/src/main/webapp/i18n/nl/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 Config Server",

package/generators/languages/templates/src/main/webapp/i18n/pa/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 Config Server",

package/generators/languages/templates/src/main/webapp/i18n/pl/health.json.ejs

@@ -32,7 +32,7 @@
 <%_ if (messageBrokerKafka) { _%>
             "binders": "Broker wiadomości",
 <%_ } _%>
-<%_ if (applicationTypeGateway || serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway || serviceDiscoveryAny) { _%>
             "discoveryComposite": "Discovery Composite",
             "refreshScope": "Obszar aktualizacji mikroserwisów",
             "clientConfigServer": "Serwer konfiguracyjny mikroserwisów",

package/generators/languages/templates/src/main/webapp/i18n/pt-br/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 Config Server",

package/generators/languages/templates/src/main/webapp/i18n/pt-pt/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 Config Server",

package/generators/languages/templates/src/main/webapp/i18n/ro/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 Config Server",

package/generators/languages/templates/src/main/webapp/i18n/ru/health.json.ejs

@@ -32,7 +32,7 @@
 <%_ if (messageBrokerKafka) { _%>
             "binders": "Брокер сообщений",
 <%_ } _%>
-<%_ if (applicationTypeGateway || serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway || serviceDiscoveryAny) { _%>
             "discoveryComposite": "Discovery Composite",
             "refreshScope": "Область обновления микросервиса",
             "clientConfigServer": "Сервер конфигурации микросервиса",

package/generators/languages/templates/src/main/webapp/i18n/si/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 Config Server",

package/generators/languages/templates/src/main/webapp/i18n/sk/health.json.ejs

@@ -32,7 +32,7 @@
 <%_ if (messageBrokerKafka) { _%>
             "binders": "Message broker",
 <%_ } _%>
-<%_ if (applicationTypeGateway || serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway || serviceDiscoveryAny) { _%>
             "discoveryComposite": "Discovery Composite",
             "refreshScope": "Microservice obnovovací rozsah",
             "clientConfigServer": "Microservice konfiguračný server",

package/generators/languages/templates/src/main/webapp/i18n/sr/health.json.ejs

@@ -32,7 +32,7 @@
 <%_ if (messageBrokerKafka) { _%>
             "binders": "Broker za poruke",
 <%_ } _%>
-<%_ if (applicationTypeGateway || serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway || serviceDiscoveryAny) { _%>
             "discoveryComposite": "Discovery Composite",
             "refreshScope": "Mikroservis Refresh Scope",
             "clientConfigServer": "Mikroservis Konfiguracioni Server",

package/generators/languages/templates/src/main/webapp/i18n/sv/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 Config Server",

package/generators/languages/templates/src/main/webapp/i18n/ta/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 Config Server",

package/generators/languages/templates/src/main/webapp/i18n/te/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 Config Server",

package/generators/languages/templates/src/main/webapp/i18n/th/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 Config Server",

package/generators/languages/templates/src/main/webapp/i18n/tr/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 Config Server",

package/generators/languages/templates/src/main/webapp/i18n/ua/health.json.ejs

@@ -32,7 +32,7 @@
 <%_ if (messageBrokerKafka) { _%>
             "binders": "Message broker",
 <%_ } _%>
-<%_ if (applicationTypeGateway || serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway || serviceDiscoveryAny) { _%>
             "discoveryComposite": "Discovery Composite",
             "refreshScope": "Межі оновлення мікросервіса",
             "clientConfigServer": "Конфігураційний сервер мікросервіса",

package/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/health.json.ejs

@@ -32,7 +32,7 @@
 <%_ if (messageBrokerKafka) { _%>
             "binders": "Xabar brokeri",
 <%_ } _%>
-<%_ if (applicationTypeGateway || serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway || serviceDiscoveryAny) { _%>
             "discoveryComposite": "Discovery Composite",
             "refreshScope": "Qayta yuklash doirasi",
             "clientConfigServer": "Microservice Config Server",

package/generators/languages/templates/src/main/webapp/i18n/vi/health.json.ejs

@@ -32,7 +32,7 @@
 <%_ if (messageBrokerKafka) { _%>
             "binders": "Truyền tải tin nhắn",
 <%_ } _%>
-<%_ if (applicationTypeGateway || serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway || serviceDiscoveryAny) { _%>
             "discoveryComposite": "Thành phần tìm kiếm dịch vụ",
             "refreshScope": "Phạm vị làm mới Microservice",
             "clientConfigServer": "Trung tâm cấu hình Microservice",

package/generators/languages/templates/src/main/webapp/i18n/zh-cn/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 Config Server",

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