Upgrade to Hibernate ORM 6.2.1.Final

quarkusio · Apr 18, 2023 · bdf1bc0 · bdf1bc0
1 parent 0dec6f9
commit bdf1bc0
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 2 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -97,7 +97,7 @@
         <commons-lang3.version>3.12.0</commons-lang3.version>
         <commons-codec.version>1.15</commons-codec.version>
         <classmate.version>1.5.1</classmate.version>
-        <hibernate-orm.version>6.2.0.Final</hibernate-orm.version> <!-- When updating, align bytebuddy.version to Hibernate needs as well (just below): -->
+        <hibernate-orm.version>6.2.1.Final</hibernate-orm.version> <!-- When updating, align bytebuddy.version to Hibernate needs as well (just below): -->
         <bytebuddy.version>1.12.18</bytebuddy.version> <!-- Version controlled by Hibernate ORM's needs -->
         <hibernate-commons-annotations.version>6.0.6.Final</hibernate-commons-annotations.version> <!-- version controlled by Hibernate ORM -->
         <hibernate-reactive.version>2.0.0.Beta2</hibernate-reactive.version>

diff --git a/...a/io/quarkus/hibernate/orm/runtime/boot/registry/PreconfiguredServiceRegistryBuilder.java b/...a/io/quarkus/hibernate/orm/runtime/boot/registry/PreconfiguredServiceRegistryBuilder.java
@@ -17,6 +17,7 @@
 import org.hibernate.engine.jdbc.cursor.internal.RefCursorSupportInitiator;
 import org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator;
 import org.hibernate.engine.jdbc.internal.JdbcServicesInitiator;
+import org.hibernate.engine.jdbc.internal.SqlStatementLoggerInitiator;
 import org.hibernate.event.internal.EntityCopyObserverFactoryInitiator;
 import org.hibernate.integrator.spi.Integrator;
 import org.hibernate.persister.internal.PersisterClassResolverInitiator;
@@ -234,6 +235,9 @@ private static List<StandardServiceInitiator<?>> buildQuarkusServiceInitiatorLis
         // Default implementation
         serviceInitiators.add(ParameterMarkerStrategyInitiator.INSTANCE);
 
+        // Default implementation
+        serviceInitiators.add(SqlStatementLoggerInitiator.INSTANCE);
+
         serviceInitiators.trimToSize();
         return serviceInitiators;
     }

diff --git a/...a/io/quarkus/hibernate/orm/runtime/service/StandardHibernateORMInitiatorListProvider.java b/...a/io/quarkus/hibernate/orm/runtime/service/StandardHibernateORMInitiatorListProvider.java
@@ -12,6 +12,7 @@
 import org.hibernate.engine.jdbc.dialect.internal.DialectResolverInitiator;
 import org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator;
 import org.hibernate.engine.jdbc.internal.JdbcServicesInitiator;
+import org.hibernate.engine.jdbc.internal.SqlStatementLoggerInitiator;
 import org.hibernate.event.internal.EntityCopyObserverFactoryInitiator;
 import org.hibernate.persister.internal.PersisterClassResolverInitiator;
 import org.hibernate.persister.internal.PersisterFactoryInitiator;
@@ -34,7 +35,8 @@
  * Hibernate ORM when running on Quarkus.
  * WARNING: this is a customized list: we started from a copy of ORM's standard
  * list, then changes have evolved.
- * Also: Hibernate Reactive uses a different list.
+ * Also: Hibernate Reactive uses a different list, and there's an additional definition of
+ * services in PreconfiguredServiceRegistryBuilder.
  */
 public final class StandardHibernateORMInitiatorListProvider implements InitialInitiatorListProvider {
 
@@ -104,6 +106,9 @@ public List<StandardServiceInitiator<?>> initialInitiatorList() {
         // Default implementation
         serviceInitiators.add(ParameterMarkerStrategyInitiator.INSTANCE);
 
+        // Default implementation
+        serviceInitiators.add(SqlStatementLoggerInitiator.INSTANCE);
+
         serviceInitiators.trimToSize();
 
         return serviceInitiators;

diff --git a/...hibernate/reactive/runtime/boot/registry/PreconfiguredReactiveServiceRegistryBuilder.java b/...hibernate/reactive/runtime/boot/registry/PreconfiguredReactiveServiceRegistryBuilder.java
@@ -16,6 +16,7 @@
 import org.hibernate.engine.jdbc.connections.internal.MultiTenantConnectionProviderInitiator;
 import org.hibernate.engine.jdbc.cursor.internal.RefCursorSupportInitiator;
 import org.hibernate.engine.jdbc.internal.JdbcServicesInitiator;
+import org.hibernate.engine.jdbc.internal.SqlStatementLoggerInitiator;
 import org.hibernate.event.internal.EntityCopyObserverFactoryInitiator;
 import org.hibernate.integrator.spi.Integrator;
 import org.hibernate.persister.internal.PersisterFactoryInitiator;
@@ -241,6 +242,9 @@ private static List<StandardServiceInitiator<?>> buildQuarkusServiceInitiatorLis
         // Custom for Hibernate Reactive: ParameterMarkerStrategy
         serviceInitiators.add(NativeParametersHandling.INSTANCE);
 
+        // Default implementation
+        serviceInitiators.add(SqlStatementLoggerInitiator.INSTANCE);
+
         serviceInitiators.trimToSize();
         return serviceInitiators;
     }

diff --git a/...rkus/hibernate/reactive/runtime/boot/registry/ReactiveHibernateInitiatorListProvider.java b/...rkus/hibernate/reactive/runtime/boot/registry/ReactiveHibernateInitiatorListProvider.java
@@ -12,6 +12,7 @@
 import org.hibernate.engine.jdbc.dialect.internal.DialectResolverInitiator;
 import org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator;
 import org.hibernate.engine.jdbc.internal.JdbcServicesInitiator;
+import org.hibernate.engine.jdbc.internal.SqlStatementLoggerInitiator;
 import org.hibernate.event.internal.EntityCopyObserverFactoryInitiator;
 import org.hibernate.persister.internal.PersisterFactoryInitiator;
 import org.hibernate.property.access.internal.PropertyAccessStrategyResolverInitiator;
@@ -123,6 +124,9 @@ public List<StandardServiceInitiator<?>> initialInitiatorList() {
         // Custom for Hibernate Reactive: ParameterMarkerStrategy
         serviceInitiators.add(NativeParametersHandling.INSTANCE);
 
+        // Default implementation
+        serviceInitiators.add(SqlStatementLoggerInitiator.INSTANCE);
+
         serviceInitiators.trimToSize();
         return serviceInitiators;
     }