From 877c66a731aa1de1cec704f417c6f0532a0cf65c Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Tue, 11 Nov 2025 09:39:48 +0100 Subject: [PATCH] [#2763] Ugrade Hibernate ORM to 7.2.0.CR2 Update the catalog and fix compilation errors. --- gradle/libs.versions.toml | 4 ++-- .../provider/service/NoJdbcEnvironmentInitiator.java | 2 ++ .../hibernate/reactive/testing/TestingRegistryExtension.java | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ad48ecade..134e02129 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] assertjVersion = "3.27.6" -hibernateOrmVersion = "7.2.0.CR1" -hibernateOrmGradlePluginVersion = "7.2.0.CR1" +hibernateOrmVersion = "7.2.0.CR2" +hibernateOrmGradlePluginVersion = "7.2.0.CR2" jacksonDatabindVersion = "2.20.1" jbossLoggingAnnotationVersion = "3.0.4.Final" jbossLoggingVersion = "3.6.1.Final" diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/NoJdbcEnvironmentInitiator.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/NoJdbcEnvironmentInitiator.java index 2d5209127..adf7b403c 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/NoJdbcEnvironmentInitiator.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/NoJdbcEnvironmentInitiator.java @@ -10,6 +10,7 @@ import org.hibernate.engine.jdbc.connections.spi.DatabaseConnectionInfo; import org.hibernate.engine.jdbc.dialect.spi.DialectFactory; import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; +import org.hibernate.engine.jdbc.env.JdbcMetadataOnBoot; import org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentImpl; import org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; @@ -79,6 +80,7 @@ protected JdbcEnvironmentImpl getJdbcEnvironmentWithDefaults( @Override protected JdbcEnvironmentImpl getJdbcEnvironmentUsingJdbcMetadata( + JdbcMetadataOnBoot jdbcMetadataAccess, Map configurationValues, ServiceRegistryImplementor registry, DialectFactory dialectFactory, diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/testing/TestingRegistryExtension.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/testing/TestingRegistryExtension.java index d3a0f3528..0a4e82468 100644 --- a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/testing/TestingRegistryExtension.java +++ b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/testing/TestingRegistryExtension.java @@ -135,6 +135,11 @@ public ServiceBinding locateServiceBinding(Class servi public void destroy() { } + @Override + public boolean isActive() { + return true; + } + @Override public void registerChild(ServiceRegistryImplementor child) { }