From 5565a39ee00839aa59cb646d4177642d3b3af78e Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Wed, 10 Jan 2024 17:34:05 +0100 Subject: [PATCH 1/3] Revert "[#1791] Upgrade Vert.x SQL client to 4.5.0" This reverts commit 163eee7a4e9b6ee6b4ce183c735b43fbec795ae2. --- README.md | 10 +++++----- build.gradle | 2 +- gradle.properties | 6 +++--- tooling/jbang/CockroachDBReactiveTest.java.qute | 4 ++-- tooling/jbang/Db2ReactiveTest.java.qute | 4 ++-- tooling/jbang/Example.java | 6 +++--- tooling/jbang/MariaDBReactiveTest.java.qute | 4 ++-- tooling/jbang/MySQLReactiveTest.java.qute | 4 ++-- tooling/jbang/PostgreSQLReactiveTest.java.qute | 4 ++-- tooling/jbang/ReactiveTest.java | 8 ++++---- 10 files changed, 26 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 6ce76109a..c837ce9c2 100644 --- a/README.md +++ b/README.md @@ -38,11 +38,11 @@ Hibernate Reactive has been tested with: - MS SQL Server 2019 - Oracle 21.3 - [Hibernate ORM][] 6.2.13.Final -- [Vert.x Reactive PostgreSQL Client](https://vertx.io/docs/vertx-pg-client/java/) 4.5.0 -- [Vert.x Reactive MySQL Client](https://vertx.io/docs/vertx-mysql-client/java/) 4.5.0 -- [Vert.x Reactive Db2 Client](https://vertx.io/docs/vertx-db2-client/java/) 4.5.0 -- [Vert.x Reactive MS SQL Server Client](https://vertx.io/docs/vertx-mssql-client/java/) 4.5.0 -- [Vert.x Reactive Oracle Client](https://vertx.io/docs/vertx-oracle-client/java/) 4.5.0 +- [Vert.x Reactive PostgreSQL Client](https://vertx.io/docs/vertx-pg-client/java/) 4.4.6 +- [Vert.x Reactive MySQL Client](https://vertx.io/docs/vertx-mysql-client/java/) 4.4.6 +- [Vert.x Reactive Db2 Client](https://vertx.io/docs/vertx-db2-client/java/) 4.4.6 +- [Vert.x Reactive MS SQL Server Client](https://vertx.io/docs/vertx-mssql-client/java/) 4.4.6 +- [Vert.x Reactive Oracle Client](https://vertx.io/docs/vertx-oracle-client/java/) 4.4.6 - [Quarkus][Quarkus] via the Hibernate Reactive extension [PostgreSQL]: https://www.postgresql.org diff --git a/build.gradle b/build.gradle index a906b63c0..5c2cbbadd 100644 --- a/build.gradle +++ b/build.gradle @@ -83,7 +83,7 @@ ext { // Example: // ./gradlew build -PvertxSqlClientVersion=4.0.0-SNAPSHOT if ( !project.hasProperty( 'vertxSqlClientVersion' ) ) { - vertxSqlClientVersion = '4.5.0' + vertxSqlClientVersion = '4.4.6' } testcontainersVersion = '1.18.3' diff --git a/gradle.properties b/gradle.properties index b0d63e2b4..147dda4b0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -47,9 +47,9 @@ org.gradle.java.installations.auto-download=false #skipOrmVersionParsing = true # Override default Vert.x Sql client version -#vertxSqlClientVersion = 4.5.0-SNAPSHOT +#vertxSqlClientVersion = 4.4.6-SNAPSHOT # Override default Vert.x Web client and server versions. For integration tests, both default to vertxSqlClientVersion -#vertxWebVersion = 4.5.0 -#vertxWebtClientVersion = 4.5.0 +#vertxWebVersion = 4.4.6 +#vertxWebtClientVersion = 4.4.6 diff --git a/tooling/jbang/CockroachDBReactiveTest.java.qute b/tooling/jbang/CockroachDBReactiveTest.java.qute index 063fbf554..b9de00be0 100755 --- a/tooling/jbang/CockroachDBReactiveTest.java.qute +++ b/tooling/jbang/CockroachDBReactiveTest.java.qute @@ -5,8 +5,8 @@ * Copyright: Red Hat Inc. and Hibernate Authors */ -//DEPS io.vertx:vertx-pg-client:$\{vertx.version:4.5.0} -//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.0} +//DEPS io.vertx:vertx-pg-client:$\{vertx.version:4.4.6} +//DEPS io.vertx:vertx-unit:$\{vertx.version:4.4.6} //DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.0.6.Final} //DEPS org.assertj:assertj-core:3.24.2 //DEPS junit:junit:4.13.2 diff --git a/tooling/jbang/Db2ReactiveTest.java.qute b/tooling/jbang/Db2ReactiveTest.java.qute index 648537e59..b50b347fc 100755 --- a/tooling/jbang/Db2ReactiveTest.java.qute +++ b/tooling/jbang/Db2ReactiveTest.java.qute @@ -5,8 +5,8 @@ * Copyright: Red Hat Inc. and Hibernate Authors */ -//DEPS io.vertx:vertx-db2-client:$\{vertx.version:4.5.0} -//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.0} +//DEPS io.vertx:vertx-db2-client:$\{vertx.version:4.4.6} +//DEPS io.vertx:vertx-unit:$\{vertx.version:4.4.6} //DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.0.6.Final} //DEPS org.assertj:assertj-core:3.24.2 //DEPS junit:junit:4.13.2 diff --git a/tooling/jbang/Example.java b/tooling/jbang/Example.java index 745d23a26..a63ad8b36 100644 --- a/tooling/jbang/Example.java +++ b/tooling/jbang/Example.java @@ -6,9 +6,9 @@ */ //DEPS com.ongres.scram:client:2.1 -//DEPS io.vertx:vertx-pg-client:${vertx.version:4.5.0} -//DEPS io.vertx:vertx-mysql-client:${vertx.version:4.5.0} -//DEPS io.vertx:vertx-db2-client:${vertx.version:4.5.0} +//DEPS io.vertx:vertx-pg-client:${vertx.version:4.4.6} +//DEPS io.vertx:vertx-mysql-client:${vertx.version:4.4.6} +//DEPS io.vertx:vertx-db2-client:${vertx.version:4.4.6} //DEPS org.hibernate.reactive:hibernate-reactive-core:${hibernate-reactive.version:2.0.6.Final} //DEPS org.slf4j:slf4j-simple:2.0.7 //DESCRIPTION Allow authentication to PostgreSQL using SCRAM: diff --git a/tooling/jbang/MariaDBReactiveTest.java.qute b/tooling/jbang/MariaDBReactiveTest.java.qute index 38077a73b..3433ebf30 100755 --- a/tooling/jbang/MariaDBReactiveTest.java.qute +++ b/tooling/jbang/MariaDBReactiveTest.java.qute @@ -5,8 +5,8 @@ * Copyright: Red Hat Inc. and Hibernate Authors */ -//DEPS io.vertx:vertx-mysql-client:$\{vertx.version:4.5.0} -//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.0} +//DEPS io.vertx:vertx-mysql-client:$\{vertx.version:4.4.6} +//DEPS io.vertx:vertx-unit:$\{vertx.version:4.4.6} //DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.0.6.Final} //DEPS org.assertj:assertj-core:3.24.2 //DEPS junit:junit:4.13.2 diff --git a/tooling/jbang/MySQLReactiveTest.java.qute b/tooling/jbang/MySQLReactiveTest.java.qute index 0af49a7d9..e07c61ede 100755 --- a/tooling/jbang/MySQLReactiveTest.java.qute +++ b/tooling/jbang/MySQLReactiveTest.java.qute @@ -5,8 +5,8 @@ * Copyright: Red Hat Inc. and Hibernate Authors */ -//DEPS io.vertx:vertx-mysql-client:$\{vertx.version:4.5.0} -//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.0} +//DEPS io.vertx:vertx-mysql-client:$\{vertx.version:4.4.6} +//DEPS io.vertx:vertx-unit:$\{vertx.version:4.4.6} //DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.0.6.Final} //DEPS org.assertj:assertj-core:3.24.2 //DEPS junit:junit:4.13.2 diff --git a/tooling/jbang/PostgreSQLReactiveTest.java.qute b/tooling/jbang/PostgreSQLReactiveTest.java.qute index 64c6b5df0..a2967a22a 100755 --- a/tooling/jbang/PostgreSQLReactiveTest.java.qute +++ b/tooling/jbang/PostgreSQLReactiveTest.java.qute @@ -5,8 +5,8 @@ * Copyright: Red Hat Inc. and Hibernate Authors */ -//DEPS io.vertx:vertx-pg-client:$\{vertx.version:4.5.0} -//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.0} +//DEPS io.vertx:vertx-pg-client:$\{vertx.version:4.4.6} +//DEPS io.vertx:vertx-unit:$\{vertx.version:4.4.6} //DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.0.6.Final} //DEPS org.assertj:assertj-core:3.24.2 //DEPS junit:junit:4.13.2 diff --git a/tooling/jbang/ReactiveTest.java b/tooling/jbang/ReactiveTest.java index e74d14cce..7baa432b0 100755 --- a/tooling/jbang/ReactiveTest.java +++ b/tooling/jbang/ReactiveTest.java @@ -5,11 +5,11 @@ */ ///usr/bin/env jbang "$0" "$@" ; exit $? -//DEPS io.vertx:vertx-pg-client:${vertx.version:4.5.0} +//DEPS io.vertx:vertx-pg-client:${vertx.version:4.4.6} //DEPS com.ongres.scram:client:2.1 -//DEPS io.vertx:vertx-db2-client:${vertx.version:4.5.0} -//DEPS io.vertx:vertx-mysql-client:${vertx.version:4.5.0} -//DEPS io.vertx:vertx-unit:${vertx.version:4.5.0} +//DEPS io.vertx:vertx-db2-client:${vertx.version:4.4.6} +//DEPS io.vertx:vertx-mysql-client:${vertx.version:4.4.6} +//DEPS io.vertx:vertx-unit:${vertx.version:4.4.6} //DEPS org.hibernate.reactive:hibernate-reactive-core:${hibernate-reactive.version:2.0.6.Final} //DEPS org.assertj:assertj-core:3.24.2 //DEPS junit:junit:4.13.2 From f98b2f04ca9bb1d0374660a47d362086913321dd Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Fri, 12 Jan 2024 11:48:24 +0100 Subject: [PATCH 2/3] [#1791] Disable build with JDK 22 Requires Vert.x 4.5 --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0f63ccde4..9e9b3cf66 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -151,7 +151,8 @@ jobs: # and it's useful to test that. - { name: "20", java_version_numeric: 20, jvm_args: '--enable-preview' } - { name: "21-ea", java_version_numeric: 21, from: 'jdk.java.net', jvm_args: '--enable-preview' } - - { name: "22-ea", java_version_numeric: 22, from: 'jdk.java.net', jvm_args: '--enable-preview' } + # Requires Vert.x 4.5 + # - { name: "22-ea", java_version_numeric: 22, from: 'jdk.java.net', jvm_args: '--enable-preview' } steps: - uses: actions/checkout@v2 - name: Get year/month for cache key From 3678c22afd88939851b20b646c88442e2971a7ae Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Mon, 15 Jan 2024 16:24:14 +0100 Subject: [PATCH 3/3] [#1834] Disable CascadeTest#testCascade It doesn't work with Vert.x 4.4 and Hibernate ORM >= 6.2.14.Final. Everything works fine with Vert.x 4.5 Error stacktrace: `` Caused by: org.opentest4j.AssertionFailedError: expected: but was: at app//org.junit.jupiter.api.AssertionFailureBuilder.build(AssertionFailureBuilder.java:151) at app//org.junit.jupiter.api.AssertionFailureBuilder.buildAndThrow(AssertionFailureBuilder.java:132) at app//org.junit.jupiter.api.AssertEquals.failNotEqual(AssertEquals.java:197) at app//org.junit.jupiter.api.AssertEquals.assertEquals(AssertEquals.java:182) at app//org.junit.jupiter.api.AssertEquals.assertEquals(AssertEquals.java:177) at app//org.junit.jupiter.api.Assertions.assertEquals(Assertions.java:1142) at app//org.hibernate.reactive.CascadeTest.lambda$testCascade$26(CascadeTest.java:136) ``` --- .../src/test/java/org/hibernate/reactive/CascadeTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/CascadeTest.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/CascadeTest.java index ec94d6c8a..c7f6f9dfd 100644 --- a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/CascadeTest.java +++ b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/CascadeTest.java @@ -13,6 +13,7 @@ import org.hibernate.cfg.Configuration; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import io.vertx.junit5.Timeout; @@ -80,6 +81,7 @@ public void testQuery(VertxTestContext context) { ); } + @Disabled("It doesn't work with Hibernate ORM >= 6.2.14.Final and Vert.x 4.4 (Everything works fine with Vert.x 4.5)") @Test public void testCascade(VertxTestContext context) {