move to hibernate 6.2.x

mshima · Aug 9, 2023 · 32f1533 · 32f1533
1 parent 9de6d7b
commit 32f1533
Show file tree

Hide file tree

Showing 15 changed files with 213 additions and 221 deletions.
diff --git a/generators/docker-compose/__snapshots__/docker-compose.spec.mts.snap b/generators/docker-compose/__snapshots__/docker-compose.spec.mts.snap
diff --git a/generators/docker/__snapshots__/generator.spec.mts.snap b/generators/docker/__snapshots__/generator.spec.mts.snap
@@ -14,8 +14,8 @@ services:
       - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED=true
       - SPRING_CLOUD_CONSUL_HOST=consul
       - SPRING_CLOUD_CONSUL_PORT=8500
-      - SPRING_R2DBC_URL=r2dbc:mariadb://mariadb:3306/jhipster?useLegacyDatetimeCode=false&serverTimezone=UTC
-      - SPRING_LIQUIBASE_URL=jdbc:mariadb://mariadb:3306/jhipster?useLegacyDatetimeCode=false&serverTimezone=UTC
+      - SPRING_R2DBC_URL=r2dbc:mariadb://mariadb:3306/jhipster?useLegacyDatetimeCode=false
+      - SPRING_LIQUIBASE_URL=jdbc:mariadb://mariadb:3306/jhipster?useLegacyDatetimeCode=false
       - SPRING_ELASTICSEARCH_URIS=http://elasticsearch:9200
     ports:
       - 127.0.0.1:8080:8080
@@ -718,8 +718,8 @@ services:
       - _JAVA_OPTIONS=-Xmx512m -Xms256m
       - SPRING_PROFILES_ACTIVE=prod,api-docs
       - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED=true
-      - SPRING_DATASOURCE_URL=jdbc:mariadb://mariadb:3306/jhipster?useLegacyDatetimeCode=false&serverTimezone=UTC
-      - SPRING_LIQUIBASE_URL=jdbc:mariadb://mariadb:3306/jhipster?useLegacyDatetimeCode=false&serverTimezone=UTC
+      - SPRING_DATASOURCE_URL=jdbc:mariadb://mariadb:3306/jhipster?useLegacyDatetimeCode=false
+      - SPRING_LIQUIBASE_URL=jdbc:mariadb://mariadb:3306/jhipster?useLegacyDatetimeCode=false
       - SPRING_CLOUD_STREAM_KAFKA_BINDER_BROKERS=kafka:9092
     ports:
       - 127.0.0.1:8080:8080
@@ -1192,8 +1192,8 @@ services:
       - _JAVA_OPTIONS=-Xmx512m -Xms256m
       - SPRING_PROFILES_ACTIVE=prod,api-docs
       - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED=true
-      - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/jhipster?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true
-      - SPRING_LIQUIBASE_URL=jdbc:mysql://mysql:3306/jhipster?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true
+      - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/jhipster?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
+      - SPRING_LIQUIBASE_URL=jdbc:mysql://mysql:3306/jhipster?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
       - JHIPSTER_CACHE_REDIS_SERVER=redis://redis:6379
       - JHIPSTER_CACHE_REDIS_CLUSTER=false
       - SPRING_PULSAR_CLIENT_SERVICE_URL=pulsar://pulsar:6650

diff --git a/generators/generator-constants.mts b/generators/generator-constants.mts
@@ -38,7 +38,7 @@ export const javaDependencies: Record<string, string> = {
    * Required due to hibernate-jpamodelgen annotation processor.
    */
   // TODO update to spring-boot provided version. Refer to https://github.com/jhipster/generator-jhipster/issues/22579
-  hibernate: '6.1.7.Final', // Should be 6.2.5.Final
+  hibernate: '6.2.5.Final', // Should be 6.2.5.Final
   /*
    * cassandra driver version should match the one managed by https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/SPRING_BOOT_VERSION
    * Required due to java-driver-mapper-processor annotation processor.

diff --git a/generators/kubernetes-helm/__snapshots__/kubernetes.helm.spec.mts.snap b/generators/kubernetes-helm/__snapshots__/kubernetes.helm.spec.mts.snap
diff --git a/generators/kubernetes-knative/__snapshots__/knative.spec.mts.snap b/generators/kubernetes-knative/__snapshots__/knative.spec.mts.snap
diff --git a/generators/kubernetes/__snapshots__/kubernetes.spec.mts.snap b/generators/kubernetes/__snapshots__/kubernetes.spec.mts.snap
diff --git a/generators/liquibase-changelogs/__snapshots__/incremental-liquibase.spec.mts.snap b/generators/liquibase-changelogs/__snapshots__/incremental-liquibase.spec.mts.snap
@@ -153,7 +153,7 @@ ROLE_USER
     <property name="now" value="now()" dbms="h2"/>
     <property name="floatType" value="float4" dbms="h2"/>
     <property name="uuidType" value="uuid" dbms="h2"/>
-    <property name="datetimeType" value="datetime" dbms="h2"/>
+    <property name="datetimeType" value="datetime(6)" dbms="h2"/>
     <property name="clobType" value="longvarchar" dbms="h2"/>
     <property name="blobType" value="blob" dbms="h2"/>
     <property name="now" value="current_timestamp" dbms="postgresql"/>
@@ -285,7 +285,7 @@ ROLE_USER
     <property name="now" value="now()" dbms="h2"/>
     <property name="floatType" value="float4" dbms="h2"/>
     <property name="uuidType" value="uuid" dbms="h2"/>
-    <property name="datetimeType" value="datetime" dbms="h2"/>
+    <property name="datetimeType" value="datetime(6)" dbms="h2"/>
     <property name="clobType" value="longvarchar" dbms="h2"/>
     <property name="blobType" value="blob" dbms="h2"/>
     <property name="now" value="current_timestamp" dbms="postgresql"/>
@@ -449,7 +449,7 @@ ROLE_USER
     <property name="now" value="now()" dbms="h2"/>
     <property name="floatType" value="float4" dbms="h2"/>
     <property name="uuidType" value="uuid" dbms="h2"/>
-    <property name="datetimeType" value="datetime" dbms="h2"/>
+    <property name="datetimeType" value="datetime(6)" dbms="h2"/>
     <property name="clobType" value="longvarchar" dbms="h2"/>
     <property name="blobType" value="blob" dbms="h2"/>
     <property name="now" value="current_timestamp" dbms="postgresql"/>
@@ -723,7 +723,7 @@ ROLE_USER
     <property name="now" value="now()" dbms="h2"/>
     <property name="floatType" value="float4" dbms="h2"/>
     <property name="uuidType" value="uuid" dbms="h2"/>
-    <property name="datetimeType" value="datetime" dbms="h2"/>
+    <property name="datetimeType" value="datetime(6)" dbms="h2"/>
     <property name="clobType" value="longvarchar" dbms="h2"/>
     <property name="blobType" value="blob" dbms="h2"/>
     <property name="now" value="current_timestamp" dbms="postgresql"/>
@@ -902,7 +902,7 @@ ROLE_USER
     <property name="now" value="now()" dbms="h2"/>
     <property name="floatType" value="float4" dbms="h2"/>
     <property name="uuidType" value="uuid" dbms="h2"/>
-    <property name="datetimeType" value="datetime" dbms="h2"/>
+    <property name="datetimeType" value="datetime(6)" dbms="h2"/>
     <property name="clobType" value="longvarchar" dbms="h2"/>
     <property name="blobType" value="blob" dbms="h2"/>
     <property name="now" value="current_timestamp" dbms="postgresql"/>
@@ -1456,7 +1456,7 @@ ROLE_USER
     <property name="now" value="now()" dbms="h2"/>
     <property name="floatType" value="float4" dbms="h2"/>
     <property name="uuidType" value="uuid" dbms="h2"/>
-    <property name="datetimeType" value="datetime" dbms="h2"/>
+    <property name="datetimeType" value="datetime(6)" dbms="h2"/>
     <property name="clobType" value="longvarchar" dbms="h2"/>
     <property name="blobType" value="blob" dbms="h2"/>
     <property name="now" value="current_timestamp" dbms="postgresql"/>
@@ -1536,7 +1536,7 @@ ROLE_USER
     <property name="now" value="now()" dbms="h2"/>
     <property name="floatType" value="float4" dbms="h2"/>
     <property name="uuidType" value="uuid" dbms="h2"/>
-    <property name="datetimeType" value="datetime" dbms="h2"/>
+    <property name="datetimeType" value="datetime(6)" dbms="h2"/>
     <property name="clobType" value="longvarchar" dbms="h2"/>
     <property name="blobType" value="blob" dbms="h2"/>
     <property name="now" value="current_timestamp" dbms="postgresql"/>
@@ -1617,7 +1617,7 @@ ROLE_USER
     <property name="now" value="now()" dbms="h2"/>
     <property name="floatType" value="float4" dbms="h2"/>
     <property name="uuidType" value="uuid" dbms="h2"/>
-    <property name="datetimeType" value="datetime" dbms="h2"/>
+    <property name="datetimeType" value="datetime(6)" dbms="h2"/>
     <property name="clobType" value="longvarchar" dbms="h2"/>
     <property name="blobType" value="blob" dbms="h2"/>
     <property name="now" value="current_timestamp" dbms="postgresql"/>

diff --git a/generators/liquibase/templates/src/main/resources/config/liquibase/master.xml.ejs b/generators/liquibase/templates/src/main/resources/config/liquibase/master.xml.ejs
@@ -11,7 +11,7 @@
   <%_ } else { _%>
     <property name="uuidType" value="uuid" dbms="h2"/>
   <%_ } _%>
-    <property name="datetimeType" value="datetime" dbms="h2"/>
+    <property name="datetimeType" value="datetime(6)" dbms="h2"/>
   <%_ if (prodDatabaseTypePostgres) { _%>
     <property name="clobType" value="longvarchar" dbms="h2"/>
   <%_ } else { _%>

diff --git a/generators/openshift/__snapshots__/openshift.spec.mts.snap b/generators/openshift/__snapshots__/openshift.spec.mts.snap
@@ -118,7 +118,7 @@ objects:
                 - name: SPRING_CLOUD_CONSUL_PORT
                   value: 8500
                 - name: SPRING_DATASOURCE_URL
-                  value: jdbc:mysql://\${APPLICATION_NAME}-mysqldb:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true
+                  value: jdbc:mysql://\${APPLICATION_NAME}-mysqldb:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
                 - name: SPRING_DATASOURCE_USERNAME
                   valueFrom:
                     secretKeyRef:
@@ -436,7 +436,7 @@ objects:
                 - name: SPRING_CLOUD_CONSUL_PORT
                   value: 8500
                 - name: SPRING_DATASOURCE_URL
-                  value: jdbc:mysql://\${APPLICATION_NAME}-mysqldb:3306/msmysql?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true
+                  value: jdbc:mysql://\${APPLICATION_NAME}-mysqldb:3306/msmysql?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
                 - name: SPRING_DATASOURCE_USERNAME
                   valueFrom:
                     secretKeyRef:
@@ -1149,7 +1149,7 @@ objects:
                 - name: SPRING_CLOUD_CONSUL_PORT
                   value: 8500
                 - name: SPRING_DATASOURCE_URL
-                  value: jdbc:mysql://\${APPLICATION_NAME}-mysqldb:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true
+                  value: jdbc:mysql://\${APPLICATION_NAME}-mysqldb:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
                 - name: SPRING_DATASOURCE_USERNAME
                   valueFrom:
                     secretKeyRef:
@@ -1738,7 +1738,7 @@ objects:
                 - name: SPRING_CLOUD_CONSUL_PORT
                   value: 8500
                 - name: SPRING_DATASOURCE_URL
-                  value: jdbc:mariadb://\${APPLICATION_NAME}-mariadb:3306/msmariadb?useLegacyDatetimeCode=false&serverTimezone=UTC
+                  value: jdbc:mariadb://\${APPLICATION_NAME}-mariadb:3306/msmariadb?useLegacyDatetimeCode=false
                 - name: SPRING_DATASOURCE_USERNAME
                   valueFrom:
                     secretKeyRef:
@@ -2371,7 +2371,7 @@ objects:
                 - name: SPRING_CLOUD_CONSUL_PORT
                   value: 8500
                 - name: SPRING_DATASOURCE_URL
-                  value: jdbc:mysql://\${APPLICATION_NAME}-mysqldb:3306/msmysql?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true
+                  value: jdbc:mysql://\${APPLICATION_NAME}-mysqldb:3306/msmysql?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
                 - name: SPRING_DATASOURCE_USERNAME
                   valueFrom:
                     secretKeyRef:
@@ -3557,7 +3557,7 @@ objects:
                 - name: JHIPSTER_SECURITY_AUTHENTICATION_JWT_BASE64_SECRET
                   value: YlhrdGMyVmpjbVYwTFhSdmEyVnVMWFJ2TFdOb1lXNW5aUzFwYmkxd2NtOWtkV04wYVc5dUxXRnVaQzEwYnkxclpXVndMV2x1TFdFdGMyVmpkWEpsTFhCc1lXTmwK
                 - name: SPRING_DATASOURCE_URL
-                  value: jdbc:mysql://\${APPLICATION_NAME}-mysqldb:3306/samplemysql?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true
+                  value: jdbc:mysql://\${APPLICATION_NAME}-mysqldb:3306/samplemysql?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
                 - name: SPRING_DATASOURCE_USERNAME
                   valueFrom:
                     secretKeyRef:
@@ -4008,7 +4008,7 @@ objects:
                 - name: SPRING_CLOUD_CONSUL_PORT
                   value: 8500
                 - name: SPRING_DATASOURCE_URL
-                  value: jdbc:mysql://\${APPLICATION_NAME}-mysqldb:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true
+                  value: jdbc:mysql://\${APPLICATION_NAME}-mysqldb:3306/jhgate?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
                 - name: SPRING_DATASOURCE_USERNAME
                   valueFrom:
                     secretKeyRef:
@@ -4705,7 +4705,7 @@ objects:
                 - name: SPRING_CLOUD_CONSUL_PORT
                   value: 8500
                 - name: SPRING_DATASOURCE_URL
-                  value: jdbc:mysql://\${APPLICATION_NAME}-mysqldb:3306/msmysql?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true
+                  value: jdbc:mysql://\${APPLICATION_NAME}-mysqldb:3306/msmysql?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
                 - name: SPRING_DATASOURCE_USERNAME
                   valueFrom:
                     secretKeyRef:

diff --git a/generators/server/templates/src/main/resources/config/application.yml.ejs b/generators/server/templates/src/main/resources/config/application.yml.ejs
@@ -251,6 +251,7 @@ spring:
     open-in-view: false
     properties:
       hibernate.jdbc.time_zone: UTC
+      hibernate.timezone.default_storage: NORMALIZE
       hibernate.type.preferred_instant_jdbc_type: TIMESTAMP
       hibernate.id.new_generator_mappings: true
       hibernate.connection.provider_disables_autocommit: true

diff --git a/generators/spring-data-relational/support/database-data.mts b/generators/spring-data-relational/support/database-data.mts
@@ -111,7 +111,7 @@ const databaseData: Record<string, DatabaseDataSpec> = {
     jdbcDriver: 'org.mariadb.jdbc.Driver',
     hibernateDialect: 'org.hibernate.dialect.MariaDB103Dialect',
     port: ':3306/',
-    extraOptions: '?useLegacyDatetimeCode=false&serverTimezone=UTC',
+    extraOptions: '?useLegacyDatetimeCode=false',
     defaultUsername: 'root',
 
     constraintNameMaxLength: 64,
@@ -125,8 +125,7 @@ const databaseData: Record<string, DatabaseDataSpec> = {
     tableNameMaxLength: 64,
     constraintNameMaxLength: 64,
     port: ':3306/',
-    extraOptions:
-      '?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true',
+    extraOptions: '?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true',
     defaultUsername: 'root',
   },
   [ORACLE]: {

diff --git a/generators/spring-data-relational/support/database-url.spec.mts b/generators/spring-data-relational/support/database-url.spec.mts
@@ -7,9 +7,9 @@ const { H2_MEMORY, H2_DISK, MARIADB, MSSQL, MYSQL, ORACLE, POSTGRESQL } = databa
 describe('generator - sql - database-url', () => {
   describe('getJdbcUrl', () => {
     describe('when called for mysql', () => {
-      it('return jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true', () => {
+      it('return jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true', () => {
         expect(getJdbcUrl(MYSQL, { databaseName: 'test', hostname: 'localhost' })).toEqual(
-          'jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true',
+          'jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true',
         );
       });
     });
@@ -21,9 +21,9 @@ describe('generator - sql - database-url', () => {
       });
     });
     describe('when called for mariadb', () => {
-      it('return jdbc:mariadb://localhost:3306/test?useLegacyDatetimeCode=false&serverTimezone=UTC', () => {
+      it('return jdbc:mariadb://localhost:3306/test?useLegacyDatetimeCode=false', () => {
         expect(getJdbcUrl(MARIADB, { databaseName: 'test', hostname: 'localhost' })).toEqual(
-          'jdbc:mariadb://localhost:3306/test?useLegacyDatetimeCode=false&serverTimezone=UTC',
+          'jdbc:mariadb://localhost:3306/test?useLegacyDatetimeCode=false',
         );
       });
     });
@@ -131,9 +131,9 @@ describe('generator - sql - database-url', () => {
 
   describe('getR2dbcUrl', () => {
     describe('when called for mysql', () => {
-      it('return r2dbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true', () => {
+      it('return r2dbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true', () => {
         expect(getR2dbcUrl(MYSQL, { databaseName: 'test', hostname: 'localhost' })).toEqual(
-          'r2dbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true',
+          'r2dbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true',
         );
       });
     });
@@ -145,9 +145,9 @@ describe('generator - sql - database-url', () => {
       });
     });
     describe('when called for mariadb', () => {
-      it('return r2dbc:mariadb://localhost:3306/test?useLegacyDatetimeCode=false&serverTimezone=UTC', () => {
+      it('return r2dbc:mariadb://localhost:3306/test?useLegacyDatetimeCode=false', () => {
         expect(getR2dbcUrl(MARIADB, { databaseName: 'test', hostname: 'localhost' })).toEqual(
-          'r2dbc:mariadb://localhost:3306/test?useLegacyDatetimeCode=false&serverTimezone=UTC',
+          'r2dbc:mariadb://localhost:3306/test?useLegacyDatetimeCode=false',
         );
       });
     });