generator-jhipster 8.0.0-beta.1 → 8.0.0-beta.2

package/dist/generators/react/resources/package.json

@@ -11,76 +11,76 @@
     "path-browserify": "1.0.1",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-hook-form": "7.44.3",
+    "react-hook-form": "7.45.1",
     "react-jhipster": "0.25.2",
     "react-loadable": "5.5.0",
-    "react-redux": "8.0.7",
+    "react-redux": "8.1.1",
     "react-redux-loading-bar": "5.0.4",
-    "react-router-dom": "6.12.0",
+    "react-router-dom": "6.14.1",
     "react-toastify": "9.1.3",
     "react-transition-group": "4.4.5",
-    "reactstrap": "9.1.10",
+    "reactstrap": "9.2.0",
     "redux": "4.2.1",
     "redux-thunk": "2.4.2",
     "sonar-scanner": "3.1.0",
-    "tslib": "2.5.3",
+    "tslib": "2.6.0",
     "uuid": "9.0.0"
   },
   "devDependencies": {
     "@testing-library/react": "14.0.0",
-    "@types/jest": "29.5.2",
+    "@types/jest": "29.5.3",
     "@types/lodash": "4.14.195",
-    "@types/node": "16.18.34",
-    "@types/react": "18.2.9",
-    "@types/react-dom": "18.2.4",
+    "@types/node": "18.16.19",
+    "@types/react": "18.2.14",
+    "@types/react-dom": "18.2.6",
     "@types/react-redux": "7.1.25",
     "@types/redux": "3.6.31",
     "@types/webpack-env": "1.18.1",
-    "@typescript-eslint/eslint-plugin": "5.59.9",
-    "@typescript-eslint/parser": "5.59.9",
+    "@typescript-eslint/eslint-plugin": "5.61.0",
+    "@typescript-eslint/parser": "5.62.0",
     "autoprefixer": "10.4.14",
     "browser-sync": "2.29.3",
     "browser-sync-webpack-plugin": "2.3.0",
     "copy-webpack-plugin": "11.0.0",
-    "core-js": "3.30.2",
+    "core-js": "3.31.1",
     "cross-env": "7.0.3",
     "css-loader": "6.8.1",
-    "css-minimizer-webpack-plugin": "5.0.0",
-    "eslint": "8.42.0",
+    "css-minimizer-webpack-plugin": "5.0.1",
+    "eslint": "8.44.0",
     "eslint-config-prettier": "8.8.0",
     "eslint-plugin-react": "7.32.2",
     "eslint-webpack-plugin": "4.0.1",
     "folder-hash": "4.0.4",
     "fork-ts-checker-webpack-plugin": "8.0.0",
-    "html-webpack-plugin": "5.5.1",
+    "html-webpack-plugin": "5.5.3",
     "identity-obj-proxy": "3.0.0",
-    "jest": "29.5.0",
-    "jest-environment-jsdom": "29.5.0",
+    "jest": "29.6.1",
+    "jest-environment-jsdom": "29.6.1",
     "jest-junit": "16.0.0",
     "jest-sonar": "0.2.16",
     "json-loader": "0.5.7",
     "merge-jsons-webpack-plugin": "2.0.1",
     "mini-css-extract-plugin": "2.7.6",
-    "postcss-loader": "7.3.2",
+    "postcss-loader": "7.3.3",
     "postcss-rtlcss": "4.0.6",
     "react-infinite-scroll-component": "6.1.0",
     "redux-mock-store": "1.5.4",
     "rimraf": "5.0.1",
-    "sass": "1.63.2",
-    "sass-loader": "13.3.1",
+    "sass": "1.63.6",
+    "sass-loader": "13.3.2",
     "simple-progress-webpack-plugin": "2.0.0",
-    "sinon": "15.1.0",
+    "sinon": "15.1.2",
     "source-map-loader": "4.0.1",
     "sourcemap-istanbul-instrumenter-loader": "0.2.0",
     "style-loader": "3.3.3",
     "terser-webpack-plugin": "5.3.9",
     "thread-loader": "4.0.2",
-    "ts-jest": "29.1.0",
-    "ts-loader": "9.4.3",
-    "typescript": "5.1.3",
-    "webpack": "5.86.0",
+    "ts-jest": "29.1.1",
+    "ts-loader": "9.4.4",
+    "typescript": "5.1.6",
+    "webpack": "5.88.1",
     "webpack-cli": "5.1.4",
-    "webpack-dev-server": "4.15.0",
+    "webpack-dev-server": "4.15.1",
     "webpack-merge": "5.9.0",
     "webpack-notifier": "1.15.0",
     "workbox-webpack-plugin": "7.0.0"

package/dist/generators/react/templates/src/main/webapp/app/entities/_entityFolder/_entityFile.tsx.ejs

@@ -522,6 +522,7 @@ _%>
               page={paginationState.activePage}
               total={totalItems}
               itemsPerPage={paginationState.itemsPerPage}
+              <% { if (enableTranslation) { %>i18nEnabled<% }} %>
             />
           </div>
           <div className="justify-content-center d-flex">

package/dist/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs

@@ -221,7 +221,7 @@ export const UserManagement = () => {
 <%_ if (!databaseTypeCassandra) { _%>
         { totalItems ? (<div className={ users?.length > 0 ? '' : 'd-none' }>
           <div className="justify-content-center d-flex">
-            <JhiItemCount page={pagination.activePage} total={totalItems} itemsPerPage={pagination.itemsPerPage} />
+            <JhiItemCount page={pagination.activePage} total={totalItems} itemsPerPage={pagination.itemsPerPage} <% { if (enableTranslation) { %>i18nEnabled<% }} %> />
           </div>
           <div className="justify-content-center d-flex">
             <JhiPagination

package/dist/generators/server/command.mjs

@@ -21,7 +21,7 @@ const command = {
             hide: true,
         },
         messageBroker: {
-            description: 'message brooker',
+            description: 'message broker',
             type: String,
             scope: 'storage',
         },

package/dist/generators/server/generator.mjs

@@ -280,15 +280,9 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
                 application.srcTestDir = TEST_DIR;
             },
             registerSpringFactory({ source, application }) {
-                // We need a flag so we can recreate the file.
-                let testSpringFactoryCreated = false;
                 source.addTestSpringFactory = ({ key, value }) => {
                     const springFactoriesFile = `${application.srcTestResources}META-INF/spring.factories`;
-                    if (!testSpringFactoryCreated) {
-                        testSpringFactoryCreated = true;
-                        this.writeDestination(springFactoriesFile, '');
-                    }
-                    this.editFile(springFactoriesFile, addSpringFactory({ key, value }));
+                    this.editFile(springFactoriesFile, { create: true }, addSpringFactory({ key, value }));
                 };
             },
             addLogNeedles({ source, application }) {

package/dist/generators/server/resources/Dockerfile

@@ -13,14 +13,14 @@ LABEL ALIAS=consul-config-loader
 FROM postgres:15.3
 LABEL ALIAS=postgresql
 
-FROM quay.io/keycloak/keycloak:21.1.1
+FROM quay.io/keycloak/keycloak:21.1.2
 LABEL ALIAS=keycloak
 
 FROM mysql:8.0.33
 
-FROM mariadb:10.11.3
+FROM mariadb:11.0.2
 
-FROM mongo:6.0.6
+FROM mongo:6.0.7
 LABEL ALIAS=mongodb
 
 FROM couchbase/server:7.2.0
@@ -31,14 +31,14 @@ FROM cassandra:3.11.14
 FROM mcr.microsoft.com/mssql/server:2019-CU16-GDR1-ubuntu-20.04
 LABEL ALIAS=mssql
 
-FROM neo4j:5.8.0
+FROM neo4j:5.9.0
 
-FROM hazelcast/management-center:5.3.0
+FROM hazelcast/management-center:5.3.1
 LABEL ALIAS=hazelcast
 
-FROM memcached:1.6.20-alpine
+FROM memcached:1.6.21-alpine
 
-FROM redis:7.0.11
+FROM redis:7.0.12
 
 FROM confluentinc/cp-kafka:7.4.0
 LABEL ALIAS=kafka
@@ -49,13 +49,13 @@ LABEL ALIAS=zookeeper
 FROM apachepulsar/pulsar:3.0.0
 LABEL ALIAS=pulsar
 
-FROM sonarqube:10.0.0-community
+FROM sonarqube:10.1.0-community
 LABEL ALIAS=sonar
 
-FROM docker.io/bitnami/consul:1.15.3
+FROM docker.io/bitnami/consul:1.16.0
 LABEL ALIAS=consul
 
-FROM prom/prometheus:v2.44.0
+FROM prom/prometheus:v2.45.0
 LABEL ALIAS=prometheus
 
 FROM prom/alertmanager:v0.25.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:9.5.3
+FROM grafana/grafana:10.0.2
 LABEL ALIAS=grafana
 
 FROM quay.io/coreos/grafana-watcher:v0.0.8

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

@@ -5,12 +5,14 @@ node-gradle = { id = 'com.github.node-gradle.node', version = '5.0.0' }
 
 gradle-liquibase = { id = 'org.liquibase.gradle', version = '2.2.0' }
 
-gradle-sonarqube = { id = 'org.sonarqube', version = '4.2.0.3129' }
+gradle-sonarqube = { id = 'org.sonarqube', version = '4.2.1.3168' }
+
+spotless-gradle-plugin = { id = 'com.diffplug.spotless', version = '6.19.0' }
 
 gradle-modernizer-plugin = { id = 'com.github.andygoossens.gradle-modernizer-plugin', version = '1.8.0' }
 
-gradle-enterprise = { id = 'com.gradle.enterprise', version = '3.13.3' }
+gradle-enterprise = { id = 'com.gradle.enterprise', version = '3.13.4' }
 
 common-custom-user-data-gradle-plugin = { id = 'com.gradle.common-custom-user-data-gradle-plugin', version = '1.11' }
 
-gatling-gradle = { id = 'io.gatling.gradle', version = '3.9.5' }
+gatling-gradle = { id = 'io.gatling.gradle', version = '3.9.5.1' }

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

@@ -13,30 +13,32 @@
         <blockhound-junit-platform.version>1.0.8.RELEASE</blockhound-junit-platform.version>
         <commons-beanutils.version>1.9.4</commons-beanutils.version>
         <gatling.version>3.9.5</gatling.version>
-        <hazelcast-hibernate53.version>5.0.0</hazelcast-hibernate53.version>
-        <hazelcast-spring.version>5.3.0</hazelcast-spring.version>
+        <h2.version>2.2.220</h2.version>
+        <hazelcast-hibernate53.version>5.1.0</hazelcast-hibernate53.version>
+        <hazelcast-spring.version>5.3.1</hazelcast-spring.version>
         <jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
-        <jaxb-runtime.version>4.0.2</jaxb-runtime.version>
+        <jaxb-runtime.version>4.0.3</jaxb-runtime.version>
         <junit-platform-launcher.version>1.9.3</junit-platform-launcher.version>
         <liquibase.version>4.20.0</liquibase.version>
         <mapstruct.version>1.5.5.Final</mapstruct.version>
-        <r2dbc-mysql.version>1.0.2</r2dbc-mysql.version>
+        <micrometer-context-propagation.version>1.0.4</micrometer-context-propagation.version>
+        <picocli.version>4.7.4</picocli.version>
         <spring-pulsar.version>0.2.0</spring-pulsar.version>
         <typesafe.version>1.4.2</typesafe.version>
-        <validation-api.version>3.0.2.Final</validation-api.version>
+        <validation-api.version>3.0.2</validation-api.version>
 
         <!-- Plugin versions -->
-        <checkstyle.version>10.12.0</checkstyle.version>
+        <checkstyle.version>10.12.1</checkstyle.version>
         <checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
-        <frontend-maven-plugin.version>1.12.1</frontend-maven-plugin.version>
+        <frontend-maven-plugin.version>1.13.4</frontend-maven-plugin.version>
         <gatling-maven-plugin.version>4.3.7</gatling-maven-plugin.version>
-        <git-commit-id-plugin.version>6.0.0</git-commit-id-plugin.version>
+        <git-commit-id-maven-plugin.version>6.0.0</git-commit-id-maven-plugin.version>
         <jib-maven-plugin.version>3.3.2</jib-maven-plugin.version>
         <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
         <jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
         <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
         <maven-checkstyle-plugin.version>3.3.0</maven-checkstyle-plugin.version>
-        <maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
+        <maven-clean-plugin.version>3.3.1</maven-clean-plugin.version>
         <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
         <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
         <maven-enforcer-plugin.version>3.3.0</maven-enforcer-plugin.version>
@@ -47,12 +49,13 @@
         <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
         <maven-site-plugin.version>3.12.1</maven-site-plugin.version>
         <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
-        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
-        <modernizer-maven-plugin.version>2.5.0</modernizer-maven-plugin.version>
+        <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
+        <modernizer-maven-plugin.version>2.6.0</modernizer-maven-plugin.version>
         <nohttp-checkstyle.version>0.0.11</nohttp-checkstyle.version>
         <openapi-generator-maven-plugin.version>6.6.0</openapi-generator-maven-plugin.version>
         <properties-maven-plugin.version>1.1.0</properties-maven-plugin.version>
         <sonar-maven-plugin.version>3.9.1.2184</sonar-maven-plugin.version>
+        <spotless-maven-plugin.version>2.37.0</spotless-maven-plugin.version>
     </properties>
 
     <dependencyManagement>
@@ -82,16 +85,16 @@
               <artifactId>config</artifactId>
               <version>${typesafe.version}</version>
             </dependency>
-            <dependency>
-              <groupId>io.asyncer</groupId>
-              <artifactId>r2dbc-mysql</artifactId>
-              <version>${r2dbc-mysql.version}</version>
-            </dependency>
             <dependency>
               <groupId>io.gatling.highcharts</groupId>
               <artifactId>gatling-charts-highcharts</artifactId>
               <version>${gatling.version}</version>
             </dependency>
+            <dependency>
+              <groupId>com.h2database</groupId>
+              <artifactId>h2</artifactId>
+              <version>${h2.version}</version>
+            </dependency>
             <dependency>
               <groupId>io.projectreactor.tools</groupId>
               <artifactId>blockhound-junit-platform</artifactId>
@@ -102,6 +105,11 @@
               <artifactId>jakarta.validation-api</artifactId>
               <version>${validation-api.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.micrometer</groupId>
+                <artifactId>context-propagation</artifactId>
+                <version>${micrometer-context-propagation.version}</version>
+            </dependency>
             <dependency>
               <groupId>org.awaitility</groupId>
               <artifactId>awaitility</artifactId>
@@ -127,6 +135,11 @@
               <artifactId>mapstruct</artifactId>
               <version>${mapstruct.version}</version>
             </dependency>
+            <dependency>
+              <groupId>info.picocli</groupId>
+              <artifactId>picocli</artifactId>
+              <version>${picocli.version}</version>
+            </dependency>
             <dependency>
               <groupId>org.springframework.pulsar</groupId>
               <artifactId>spring-pulsar-spring-cloud-stream-binder</artifactId>
@@ -165,7 +178,7 @@
                 <plugin>
                   <groupId>io.github.git-commit-id</groupId>
                   <artifactId>git-commit-id-maven-plugin</artifactId>
-                  <version>${git-commit-id-plugin.version}</version>
+                  <version>${git-commit-id-maven-plugin.version}</version>
                 </plugin>
                 <plugin>
                   <groupId>io.spring.nohttp</groupId>
@@ -277,6 +290,11 @@
                   <artifactId>sonar-maven-plugin</artifactId>
                   <version>${sonar-maven-plugin.version}</version>
                 </plugin>
+                <plugin>
+                    <groupId>com.diffplug.spotless</groupId>
+                    <artifactId>spotless-maven-plugin</artifactId>
+                    <version>${spotless-maven-plugin.version}</version>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>

package/dist/generators/server/support/spring-factories.mjs

@@ -1,17 +1,12 @@
-import _ from 'lodash';
-const { escapeRegExp } = _;
+import properties from 'dot-properties';
 // eslint-disable-next-line import/prefer-default-export
 export const addSpringFactory = ({ key, value }) => content => {
-    const match = content?.match(`${escapeRegExp(key)}(\\w*)=`);
-    if (match) {
-        const matchEnd = match.index + match[0].length;
-        content = `${content.slice(0, matchEnd)}\\
-${value},${content.slice(matchEnd)}`;
+    const obj = properties.parse(content ?? '');
+    const oldContent = obj[key];
+    const factories = (oldContent?.split(',') ?? []).map(val => val.trim());
+    if (factories.includes(value)) {
+        return content;
     }
-    else {
-        content = `${content ? `${content.trimEnd()}\n\n` : ''}${key}=\\
-${value}
-`;
-    }
-    return content;
+    obj[key] = [...factories, value].join(',');
+    return properties.stringify(obj);
 };

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

@@ -8,34 +8,39 @@
       // Update the VARIANT arg to pick a Java version: 17, 19
       // Append -bullseye or -buster to pin to an OS version.
       // Use the -bullseye variants on local arm64/Apple Silicon.
-      "VARIANT": "17",
+      "VARIANT": "<%= JAVA_VERSION %>-bullseye",
       // Options
-      "INSTALL_MAVEN": "<%= buildToolMaven %>",
-      "INSTALL_GRADLE": "<%= buildToolGradle %>",
-      "NODE_VERSION": "lts/*"
+      // maven and gradle wrappers are used by default, we don't need them installed globally
+      // "INSTALL_MAVEN": "<%= buildToolMaven %>",
+      // "INSTALL_GRADLE": "<%= buildToolGradle %>",
+      "NODE_VERSION": "<%= nodeVersion %>"
     }
   },
 
-  // Set *default* container specific settings.json values on container create.
-  "settings": {
-    "java.home": "/docker-java-home"
-  },
+  "customizations": {
+    "vscode": {
+      // Set *default* container specific settings.json values on container create.
+      "settings": {
+        "java.jdt.ls.java.home": "/docker-java-home"
+      },
 
-  // Add the IDs of extensions you want installed when the container is created.
-  "extensions": [
+      // Add the IDs of extensions you want installed when the container is created.
+      "extensions": [
 <%_ if(clientFrameworkAngular) { _%>
-    "angular.ng-template",
+        "angular.ng-template",
 <%_ } _%>
 <%_ if(!skipClient) { _%>
-    "christian-kohler.npm-intellisense",
-    "firsttris.vscode-jest-runner",
-    "ms-vscode.vscode-typescript-tslint-plugin",
-    "dbaeumer.vscode-eslint",
+        "christian-kohler.npm-intellisense",
+        "firsttris.vscode-jest-runner",
+        "ms-vscode.vscode-typescript-tslint-plugin",
+        "dbaeumer.vscode-eslint",
 <%_ } _%>
-    "vscjava.vscode-java-pack",
-    "pivotal.vscode-boot-dev-pack",
-    "esbenp.prettier-vscode"
-	],
+        "vscjava.vscode-java-pack",
+        "pivotal.vscode-boot-dev-pack",
+        "esbenp.prettier-vscode"
+	    ],
+    },
+  },
 
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
   "forwardPorts": [

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

@@ -32,6 +32,7 @@ plugins {
     id "com.github.node-gradle.node"
 <%_ } _%>
     id "org.sonarqube"
+    id "com.diffplug.spotless"
     id "io.spring.nohttp"
     id "com.github.andygoossens.gradle-modernizer-plugin"
 <%_ if (gatlingTests) { _%>
@@ -61,6 +62,14 @@ ext {
 
 apply from: "gradle/docker.gradle"
 apply from: "gradle/sonar.gradle"
+
+spotless {
+    java {
+        target 'src/*/java/**/*.java'
+        removeUnusedImports()
+    }
+}
+
 <%_ if (enableSwaggerCodegen) { _%>
 apply from: "gradle/swagger.gradle"
 <%_ } _%>
@@ -266,7 +275,7 @@ if (addSpringMilestoneRepository) { _%>
   <%_ if (reactive) { _%>
     implementation "commons-beanutils:commons-beanutils:${commonsBeanutilsVersion}"
   <%_ } else { _%>
-    implementation "com.fasterxml.jackson.datatype:jackson-datatype-hibernate5-jakarta"
+    implementation "com.fasterxml.jackson.datatype:jackson-datatype-hibernate6"
   <%_ } _%>
 <%_ } _%>
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-hppc"

package/dist/generators/server/templates/entity/src/test/java/package/web/rest/_EntityClass_ResourceIT.java.ejs

@@ -757,7 +757,7 @@ _%>
     <%_ break; } _%>
 
         // Load the <%= entityInstance %>
-        <%= persistClass %> updated<%= persistClass %> = <%= entityInstance %>Repository.findById(<%= persistInstance %>.get<%= primaryKey.nameCapitalized %>())<%= reactive ? '.block()' : '.get()' %>;
+        <%= persistClass %> updated<%= persistClass %> = <%= entityInstance %>Repository.findById(<%= persistInstance %>.get<%= primaryKey.nameCapitalized %>())<%= reactive ? '.block()' : '.orElseThrow()' %>;
         assertThat(updated<%= persistClass %>).isNotNull();
     <%_ if (databaseTypeSql && !reactive) { _%>
         // Disconnect from session so that the updates on updated<%= persistClass %> are not directly saved in db
@@ -1391,7 +1391,7 @@ _%>
   <%_ } _%>
 
         // Update the <%= entityInstance %>
-        <%= persistClass %> updated<%= persistClass %> = <%= entityInstance %>Repository.findById(<%= persistInstance %>.get<%= primaryKey.nameCapitalized %>())<%= reactive ? '.block()' : '.get()' %>;
+        <%= persistClass %> updated<%= persistClass %> = <%= entityInstance %>Repository.findById(<%= persistInstance %>.get<%= primaryKey.nameCapitalized %>())<%= reactive ? '.block()' : '.orElseThrow()' %>;
   <%_ if (databaseTypeSql && !reactive) { _%>
         // Disconnect from session so that the updates on updated<%= persistClass %> are not directly saved in db
         em.detach(updated<%= persistClass %>);

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

@@ -26,6 +26,20 @@ sourceSets {
 }
 <%_ } _%>
 <%_ if (databaseTypeSql) { _%>
+
+configurations {
+  all {
+    resolutionStrategy {
+      // TODO drop forced version. Refer to https://github.com/jhipster/generator-jhipster/issues/22579
+      force "org.hibernate.orm:hibernate-core:${hibernateVersion}"
+<%_ if (enableHibernateCache && (cacheProviderEhcache || cacheProviderCaffeine || cacheProviderRedis)) { _%>
+      // TODO drop forced version. Refer to https://github.com/jhipster/generator-jhipster/issues/22579
+      force "org.hibernate.orm:hibernate-jcache:${hibernateVersion}"
+<%_ } _%>
+    }
+  }
+}
+
 dependencies {
     developmentOnly "org.springframework.boot:spring-boot-devtools:${springBootVersion}"
   <%_ if (devDatabaseTypeH2Any) { _%>
@@ -37,7 +51,7 @@ dependencies {
   <%_ } _%>
   <%_ if (devDatabaseTypeMysql) { _%>
     <%_ if (reactive) { _%>
-    implementation ("io.asyncer:r2dbc-mysql:<%- javaDependencies['r2dbc-mysql'] %>")
+    implementation ("io.asyncer:r2dbc-mysql")
     <%_ } _%>
     implementation "com.mysql:mysql-connector-j"
   <%_ } _%>
@@ -49,9 +63,7 @@ dependencies {
   <%_ } _%>
   <%_ if (devDatabaseTypeMariadb) { _%>
     <%_ if (reactive) { _%>
-    // TODO drop version once spring-boot 3.1.0 is released https://github.com/spring-projects/spring-boot/issues/34625
-    // implementation "org.mariadb:r2dbc-mariadb:<%- javaDependencies['r2dbc-mariadb'] %>"
-    implementation "io.asyncer:r2dbc-mysql:<%- javaDependencies['r2dbc-mysql'] %>"
+    implementation "org.mariadb:r2dbc-mariadb"
     <%_ } _%>
     implementation "org.mariadb.jdbc:mariadb-java-client"
   <%_ } _%>

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

@@ -26,10 +26,24 @@ sourceSets {
 }
 <%_ } _%>
 <%_ if (databaseTypeSql) { _%>
+
+configurations {
+  all {
+    resolutionStrategy {
+      // TODO drop forced version. Refer to https://github.com/jhipster/generator-jhipster/issues/22579
+      force "org.hibernate.orm:hibernate-core:${hibernateVersion}"
+<%_ if (enableHibernateCache && (cacheProviderEhcache || cacheProviderCaffeine || cacheProviderRedis)) { _%>
+      // TODO drop forced version. Refer to https://github.com/jhipster/generator-jhipster/issues/22579
+      force "org.hibernate.orm:hibernate-jcache:${hibernateVersion}"
+<%_ } _%>
+    }
+  }
+}
+
 dependencies {
   <%_ if (prodDatabaseTypeMysql) { _%>
     <%_ if (reactive) { _%>
-    implementation "io.asyncer:r2dbc-mysql:<%- javaDependencies['r2dbc-mysql'] %>"
+    implementation "io.asyncer:r2dbc-mysql"
     <%_ } _%>
     implementation "com.mysql:mysql-connector-j"
     testImplementation "org.testcontainers:mysql"
@@ -43,9 +57,7 @@ dependencies {
   <%_ } _%>
   <%_ if (prodDatabaseTypeMariadb) { _%>
     <%_ if (reactive) { _%>
-    // TODO drop version once spring-boot 3.1.0 is released https://github.com/spring-projects/spring-boot/issues/34625
-    // implementation "org.mariadb:r2dbc-mariadb:<%- javaDependencies['r2dbc-mariadb'] %>"
-    implementation "io.asyncer:r2dbc-mysql:<%- javaDependencies['r2dbc-mysql'] %>"
+    implementation "org.mariadb:r2dbc-mariadb"
     <%_ } _%>
     implementation "org.mariadb.jdbc:mariadb-java-client"
     testImplementation "org.testcontainers:mariadb"

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

@@ -70,6 +70,7 @@ gitPropertiesPluginVersion=<%- javaDependencies['gradle-git-properties'] %>
 gradleNodePluginVersion=<%- javaDependencies['node-gradle'] %>
 <%_ } _%>
 sonarqubePluginVersion=<%- javaDependencies['gradle-sonarqube'] %>
+spotlessPluginVersion=<%- javaDependencies['spotless-gradle-plugin'] %>
 <%_ if (enableSwaggerCodegen) { _%>
 openapiPluginVersion=<%- javaDependencies['openapi-generator-maven-plugin'] %>
 <%_ } _%>