From be9d82934cbf28006d9de6078b93e68ea270bbde Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Fri, 13 Dec 2024 07:46:51 +0100 Subject: [PATCH 1/3] Change properties to test ORM 7.2 snapshots --- gradle.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7a33aa914..2d873a973 100644 --- a/gradle.properties +++ b/gradle.properties @@ -40,7 +40,7 @@ org.gradle.java.installations.auto-download=false #db = MSSQL # Enable the maven Central Snapshot repository, when set to any value (the value is ignored) -#enableCentralSonatypeSnapshotsRep = true +enableCentralSonatypeSnapshotsRep = true # Enable the maven local repository (for local development when needed) when present (value ignored) #enableMavenLocalRepo = true @@ -48,14 +48,14 @@ org.gradle.java.installations.auto-download=false ### Settings the following properties will override the version defined in gradle/libs.versions.toml # The default Hibernate ORM version (override using `-PhibernateOrmVersion=the.version.you.want`) -#hibernateOrmVersion = 7.1.1.Final +hibernateOrmVersion = 7.2.+ # Override default Hibernate ORM Gradle plugin version -#hibernateOrmGradlePluginVersion = 7.1.1.Final +hibernateOrmGradlePluginVersion = 7.2.+ # If set to true, skip Hibernate ORM version parsing (default is true, if set to null) # this is required when using intervals or weird versions or the build will fail -#skipOrmVersionParsing = true +skipOrmVersionParsing = true # Override default Vert.x Sql client version #vertxSqlClientVersion = 5.0.2-SNAPSHOT From 78af556dd6bbd568a2caaf8de01b4b2f7ca42d33 Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Wed, 29 Oct 2025 11:23:40 +0100 Subject: [PATCH 2/3] Fix compilation errors --- .../provider/service/NoJdbcEnvironmentInitiator.java | 2 ++ .../hibernate/reactive/testing/TestingRegistryExtension.java | 5 +++++ 2 files changed, 7 insertions(+) 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) { } From b19b0e55d6d1b7138f700a358e3061f25e3aa7ad Mon Sep 17 00:00:00 2001 From: Andrea Boriero Date: Wed, 29 Oct 2025 15:52:34 +0100 Subject: [PATCH 3/3] [#2650] FetchModeSubselectEagerTest#testEagerFetchQuery throws NullPointerException --- .../org/hibernate/reactive/FetchModeSubselectEagerTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/FetchModeSubselectEagerTest.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/FetchModeSubselectEagerTest.java index fd05f3942..490e06d0c 100644 --- a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/FetchModeSubselectEagerTest.java +++ b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/FetchModeSubselectEagerTest.java @@ -17,7 +17,6 @@ import org.hibernate.cfg.Configuration; import org.hibernate.reactive.util.impl.CompletionStages; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import io.vertx.junit5.Timeout; @@ -120,7 +119,6 @@ public void testEagerParentFetch(VertxTestContext context) { } @Test - @Disabled("NullPointerException: see https://hibernate.atlassian.net/browse/HHH-19874") public void testEagerFetchQuery(VertxTestContext context) { Node basik = new Node( "Child" ); basik.parent = new Node( "Parent" );