From 4c12024914bedca1d69f7d07e96eba3414dd5645 Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Mon, 5 Feb 2024 12:51:57 +0100 Subject: [PATCH 01/12] [#1852] Gradle wrapper upgrade to 8.5 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ac72c34e8..1af9e0930 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From c7f126abad72efdc796587cc979b1fe7dd21fac7 Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Mon, 5 Feb 2024 12:50:40 +0100 Subject: [PATCH 02/12] [#1850] Upgrade Hibernate ORM to 6.4.3.Final --- README.md | 2 +- build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 60e062de6..571b6869b 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Hibernate Reactive has been tested with: - CockroachDB 22.1 - MS SQL Server 2019 - Oracle 21.3 -- [Hibernate ORM][] 6.4.2.Final +- [Hibernate ORM][] 6.4.3.Final - [Vert.x Reactive PostgreSQL Client](https://vertx.io/docs/vertx-pg-client/java/) 4.5.1 - [Vert.x Reactive MySQL Client](https://vertx.io/docs/vertx-mysql-client/java/) 4.5.1 - [Vert.x Reactive Db2 Client](https://vertx.io/docs/vertx-db2-client/java/) 4.5.1 diff --git a/build.gradle b/build.gradle index 1f9bce0be..ed885ce46 100644 --- a/build.gradle +++ b/build.gradle @@ -53,7 +53,7 @@ version = projectVersion // ./gradlew clean build -PhibernateOrmVersion=5.6.15-SNAPSHOT ext { if ( !project.hasProperty('hibernateOrmVersion') ) { - hibernateOrmVersion = '6.4.2.Final' + hibernateOrmVersion = '6.4.3.Final' } if ( !project.hasProperty( 'hibernateOrmGradlePluginVersion' ) ) { // Same as ORM as default From aa2bb3802706fbab801f01aa34ebb89fd1836cb5 Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Fri, 2 Feb 2024 15:40:23 +0100 Subject: [PATCH 03/12] [#1850] Test ORM snapshots using the latest 6.4 Test were failing because we were using the latest 6.2 instead of the latest 6.4 --- .github/workflows/tracking-orm-6.build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tracking-orm-6.build.yml b/.github/workflows/tracking-orm-6.build.yml index b4252379b..54f2d4e21 100644 --- a/.github/workflows/tracking-orm-6.build.yml +++ b/.github/workflows/tracking-orm-6.build.yml @@ -1,6 +1,6 @@ # Run the build using the latest ORM 5.x snapshots # so that we can spot integration issues early -name: Latest ORM 6.x +name: Latest ORM 6.4 on: # Trigger the workflow on push or pull request, @@ -33,7 +33,7 @@ jobs: strategy: matrix: example: [ 'session-example', 'native-sql-example' ] - orm-version: [ '[6.2,6.3)' ] + orm-version: [ '[6.2,6.5)' ] db: ['MySQL', 'PostgreSQL'] exclude: # 'native-sql-example' doesn't run on MySQL because it has native queries @@ -88,7 +88,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - orm-version: [ '[6.2,6.3)' ] + orm-version: [ '[6.2,6.5)' ] db: [ 'MariaDB', 'MySQL', 'PostgreSQL', 'DB2', 'CockroachDB', 'MSSQLServer', 'Oracle' ] steps: - uses: actions/checkout@v2 From 6e40a73a8e5d09367ba3858d583b51704339fc2a Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Mon, 5 Feb 2024 12:51:27 +0100 Subject: [PATCH 04/12] [#1851] Upgrade Vert.x SQL Client to 4.5.2 --- 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 571b6869b..38bfc1b2a 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.4.3.Final -- [Vert.x Reactive PostgreSQL Client](https://vertx.io/docs/vertx-pg-client/java/) 4.5.1 -- [Vert.x Reactive MySQL Client](https://vertx.io/docs/vertx-mysql-client/java/) 4.5.1 -- [Vert.x Reactive Db2 Client](https://vertx.io/docs/vertx-db2-client/java/) 4.5.1 -- [Vert.x Reactive MS SQL Server Client](https://vertx.io/docs/vertx-mssql-client/java/) 4.5.1 -- [Vert.x Reactive Oracle Client](https://vertx.io/docs/vertx-oracle-client/java/) 4.5.1 +- [Vert.x Reactive PostgreSQL Client](https://vertx.io/docs/vertx-pg-client/java/) 4.5.2 +- [Vert.x Reactive MySQL Client](https://vertx.io/docs/vertx-mysql-client/java/) 4.5.2 +- [Vert.x Reactive Db2 Client](https://vertx.io/docs/vertx-db2-client/java/) 4.5.2 +- [Vert.x Reactive MS SQL Server Client](https://vertx.io/docs/vertx-mssql-client/java/) 4.5.2 +- [Vert.x Reactive Oracle Client](https://vertx.io/docs/vertx-oracle-client/java/) 4.5.2 - [Quarkus][Quarkus] via the Hibernate Reactive extension [PostgreSQL]: https://www.postgresql.org diff --git a/build.gradle b/build.gradle index ed885ce46..364112496 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.1' + vertxSqlClientVersion = '4.5.2' } testcontainersVersion = '1.18.3' diff --git a/gradle.properties b/gradle.properties index e6bc9462c..a049b271e 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.1-SNAPSHOT +#vertxSqlClientVersion = 4.5.2-SNAPSHOT # Override default Vert.x Web client and server versions. For integration tests, both default to vertxSqlClientVersion -#vertxWebVersion = 4.5.1 -#vertxWebtClientVersion = 4.5.1 +#vertxWebVersion = 4.5.2 +#vertxWebtClientVersion = 4.5.2 diff --git a/tooling/jbang/CockroachDBReactiveTest.java.qute b/tooling/jbang/CockroachDBReactiveTest.java.qute index 6bd79e507..78503163f 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.1} -//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.1} +//DEPS io.vertx:vertx-pg-client:$\{vertx.version:4.5.2} +//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.2} //DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.2.0.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 9aa4723b6..d51909b57 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.1} -//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.1} +//DEPS io.vertx:vertx-db2-client:$\{vertx.version:4.5.2} +//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.2} //DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.2.0.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 680f22c01..42ff3416c 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.1} -//DEPS io.vertx:vertx-mysql-client:${vertx.version:4.5.1} -//DEPS io.vertx:vertx-db2-client:${vertx.version:4.5.1} +//DEPS io.vertx:vertx-pg-client:${vertx.version:4.5.2} +//DEPS io.vertx:vertx-mysql-client:${vertx.version:4.5.2} +//DEPS io.vertx:vertx-db2-client:${vertx.version:4.5.2} //DEPS org.hibernate.reactive:hibernate-reactive-core:${hibernate-reactive.version:2.2.0.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 23b4675ce..761b0d0f1 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.1} -//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.1} +//DEPS io.vertx:vertx-mysql-client:$\{vertx.version:4.5.2} +//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.2} //DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.2.0.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 6adf27020..2aba89773 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.1} -//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.1} +//DEPS io.vertx:vertx-mysql-client:$\{vertx.version:4.5.2} +//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.2} //DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.2.0.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 c8c4dbff8..32bd0d77d 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.1} -//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.1} +//DEPS io.vertx:vertx-pg-client:$\{vertx.version:4.5.2} +//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.2} //DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.2.0.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 2cb7177e2..3db6cd5aa 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.1} +//DEPS io.vertx:vertx-pg-client:${vertx.version:4.5.2} //DEPS com.ongres.scram:client:2.1 -//DEPS io.vertx:vertx-db2-client:${vertx.version:4.5.1} -//DEPS io.vertx:vertx-mysql-client:${vertx.version:4.5.1} -//DEPS io.vertx:vertx-unit:${vertx.version:4.5.1} +//DEPS io.vertx:vertx-db2-client:${vertx.version:4.5.2} +//DEPS io.vertx:vertx-mysql-client:${vertx.version:4.5.2} +//DEPS io.vertx:vertx-unit:${vertx.version:4.5.2} //DEPS org.hibernate.reactive:hibernate-reactive-core:${hibernate-reactive.version:2.2.0.Final} //DEPS org.assertj:assertj-core:3.24.2 //DEPS junit:junit:4.13.2 From 9fd999ac322928cc36e1b81038c4732ea5d5be5e Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Mon, 5 Feb 2024 12:51:48 +0100 Subject: [PATCH 05/12] [#1847] Upgrade Testcontainers to 1.19.4 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 364112496..2be3a084b 100644 --- a/build.gradle +++ b/build.gradle @@ -86,7 +86,7 @@ ext { vertxSqlClientVersion = '4.5.2' } - testcontainersVersion = '1.18.3' + testcontainersVersion = '1.19.4' logger.lifecycle "Hibernate ORM Version: " + project.hibernateOrmVersion logger.lifecycle "Hibernate ORM Gradle plugin Version: " + project.hibernateOrmGradlePluginVersion From a141efd1f61f015d35b7201a391e0c21053c648f Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Fri, 2 Feb 2024 10:33:11 +0100 Subject: [PATCH 06/12] [#1847] Upgrade PostgreSQL for testing to 16.1 --- .github/workflows/tracking-orm-6.build.yml | 2 +- .github/workflows/tracking-vertx-4.build.yml | 2 +- .../org/hibernate/reactive/containers/PostgreSQLDatabase.java | 2 +- .../src/test/java/org/hibernate/reactive/it/BaseReactiveIT.java | 2 +- .../java/org/hibernate/reactive/it/verticle/VertxServer.java | 2 +- podman.md | 2 +- tooling/jbang/Example.java | 2 +- tooling/jbang/PostgreSQLReactiveTest.java.qute | 2 +- tooling/jbang/ReactiveTest.java | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tracking-orm-6.build.yml b/.github/workflows/tracking-orm-6.build.yml index 54f2d4e21..526eef2c9 100644 --- a/.github/workflows/tracking-orm-6.build.yml +++ b/.github/workflows/tracking-orm-6.build.yml @@ -59,7 +59,7 @@ jobs: - 3306:3306 postgres: # Docker Hub image - image: postgres:15.2 + image: postgres:16.1 env: POSTGRES_DB: hreact POSTGRES_USER: hreact diff --git a/.github/workflows/tracking-vertx-4.build.yml b/.github/workflows/tracking-vertx-4.build.yml index d331d4411..e300ed1c8 100644 --- a/.github/workflows/tracking-vertx-4.build.yml +++ b/.github/workflows/tracking-vertx-4.build.yml @@ -59,7 +59,7 @@ jobs: - 3306:3306 postgres: # Docker Hub image - image: postgres:15.2 + image: postgres:16.1 env: POSTGRES_DB: hreact POSTGRES_USER: hreact diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/PostgreSQLDatabase.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/PostgreSQLDatabase.java index b44163b77..f6babfd86 100644 --- a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/PostgreSQLDatabase.java +++ b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/PostgreSQLDatabase.java @@ -82,7 +82,7 @@ class PostgreSQLDatabase implements TestableDatabase { * TIP: To reuse the same containers across multiple runs, set `testcontainers.reuse.enable=true` in a file located * at `$HOME/.testcontainers.properties` (create the file if it does not exist). */ - public static final PostgreSQLContainer postgresql = new PostgreSQLContainer<>( imageName( "postgres", "15.2" ) ) + public static final PostgreSQLContainer postgresql = new PostgreSQLContainer<>( imageName( "postgres", "16.1" ) ) .withUsername( DatabaseConfiguration.USERNAME ) .withPassword( DatabaseConfiguration.PASSWORD ) .withDatabaseName( DatabaseConfiguration.DB_NAME ) diff --git a/integration-tests/bytecode-enhancements-it/src/test/java/org/hibernate/reactive/it/BaseReactiveIT.java b/integration-tests/bytecode-enhancements-it/src/test/java/org/hibernate/reactive/it/BaseReactiveIT.java index c7d8edbb7..d1bbc66f0 100644 --- a/integration-tests/bytecode-enhancements-it/src/test/java/org/hibernate/reactive/it/BaseReactiveIT.java +++ b/integration-tests/bytecode-enhancements-it/src/test/java/org/hibernate/reactive/it/BaseReactiveIT.java @@ -53,7 +53,7 @@ public abstract class BaseReactiveIT { public static final boolean USE_DOCKER = Boolean.getBoolean( "docker" ); public static final DockerImageName IMAGE_NAME = DockerImageName - .parse( "docker.io/postgres:15.2" ) + .parse( "docker.io/postgres:16.1" ) .asCompatibleSubstituteFor( "postgres" ); public static final String USERNAME = "hreact"; diff --git a/integration-tests/verticle-postgres-it/src/main/java/org/hibernate/reactive/it/verticle/VertxServer.java b/integration-tests/verticle-postgres-it/src/main/java/org/hibernate/reactive/it/verticle/VertxServer.java index 283e89aee..28b65aa73 100644 --- a/integration-tests/verticle-postgres-it/src/main/java/org/hibernate/reactive/it/verticle/VertxServer.java +++ b/integration-tests/verticle-postgres-it/src/main/java/org/hibernate/reactive/it/verticle/VertxServer.java @@ -36,7 +36,7 @@ public class VertxServer { // These properties are in DatabaseConfiguration in core public static final boolean USE_DOCKER = Boolean.getBoolean( "docker" ); - public static final String IMAGE_NAME = "postgres:15.2"; + public static final String IMAGE_NAME = "postgres:16.1"; public static final String USERNAME = "hreact"; public static final String PASSWORD = "hreact"; public static final String DB_NAME = "hreact"; diff --git a/podman.md b/podman.md index b8363c437..6c3bc8b0f 100644 --- a/podman.md +++ b/podman.md @@ -38,7 +38,7 @@ required credentials and schema to run the tests: ``` podman run --rm --name HibernateTestingPGSQL \ -e POSTGRES_USER=hreact -e POSTGRES_PASSWORD=hreact -e POSTGRES_DB=hreact \ - -p 5432:5432 docker.io/postgres:15.2 + -p 5432:5432 docker.io/postgres:16.1 ``` When the database has started, you can run the tests on PostgreSQL with: diff --git a/tooling/jbang/Example.java b/tooling/jbang/Example.java index 42ff3416c..94b6cca43 100644 --- a/tooling/jbang/Example.java +++ b/tooling/jbang/Example.java @@ -59,7 +59,7 @@ * 
  *                 podman run --rm --name HibernateTestingPGSQL \
  *                      -e POSTGRES_USER=hreact -e POSTGRES_PASSWORD=hreact -e POSTGRES_DB=hreact \
- *                      -p 5432:5432 postgres:15.2
+ *                      -p 5432:5432 postgres:16.1
  *
* *
3. Run the example with JBang
diff --git a/tooling/jbang/PostgreSQLReactiveTest.java.qute b/tooling/jbang/PostgreSQLReactiveTest.java.qute index 32bd0d77d..21c8b9081 100755 --- a/tooling/jbang/PostgreSQLReactiveTest.java.qute +++ b/tooling/jbang/PostgreSQLReactiveTest.java.qute @@ -67,7 +67,7 @@ public class {baseName} { } @ClassRule - public final static PostgreSQLContainer database = new PostgreSQLContainer( imageName( "docker.io", "postgres", "15.2" ) ); + public final static PostgreSQLContainer database = new PostgreSQLContainer( imageName( "docker.io", "postgres", "16.1" ) ); private Mutiny.SessionFactory sessionFactory; diff --git a/tooling/jbang/ReactiveTest.java b/tooling/jbang/ReactiveTest.java index 3db6cd5aa..28caf8b6a 100755 --- a/tooling/jbang/ReactiveTest.java +++ b/tooling/jbang/ReactiveTest.java @@ -228,7 +228,7 @@ public String toString() { * It's a wrapper around the testcontainers classes. */ enum Database { - POSTGRESQL( () -> new PostgreSQLContainer( "postgres:15.2" ) ), + POSTGRESQL( () -> new PostgreSQLContainer( "postgres:16.1" ) ), MYSQL( () -> new MySQLContainer( "mysql:8.0.33" ) ), DB2( () -> new Db2Container( "docker.io/ibmcom/db2:11.5.8.0" ).acceptLicense() ), MARIADB( () -> new MariaDBContainer( "mariadb:10.11.3" ) ), From d5785a1eccc3ec08137e793dceb25458d3113838 Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Fri, 2 Feb 2024 10:29:58 +0100 Subject: [PATCH 07/12] [#1847] Upgrade MySQL for testing to 8.3.0 --- .github/workflows/tracking-orm-6.build.yml | 2 +- .github/workflows/tracking-vertx-4.build.yml | 2 +- .../java/org/hibernate/reactive/containers/MySQLDatabase.java | 2 +- podman.md | 2 +- tooling/jbang/MySQLReactiveTest.java.qute | 2 +- tooling/jbang/ReactiveTest.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tracking-orm-6.build.yml b/.github/workflows/tracking-orm-6.build.yml index 526eef2c9..9ed886386 100644 --- a/.github/workflows/tracking-orm-6.build.yml +++ b/.github/workflows/tracking-orm-6.build.yml @@ -43,7 +43,7 @@ jobs: # Label used to access the service container mysql: # Docker Hub image - image: mysql:8.0.33 + image: mysql:8.3.0 env: MYSQL_ROOT_PASSWORD: hreact MYSQL_DATABASE: hreact diff --git a/.github/workflows/tracking-vertx-4.build.yml b/.github/workflows/tracking-vertx-4.build.yml index e300ed1c8..edd571873 100644 --- a/.github/workflows/tracking-vertx-4.build.yml +++ b/.github/workflows/tracking-vertx-4.build.yml @@ -43,7 +43,7 @@ jobs: # Label used to access the service container mysql: # Docker Hub image - image: mysql:8.0.33 + image: mysql:8.3.0 env: MYSQL_ROOT_PASSWORD: hreact MYSQL_DATABASE: hreact diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/MySQLDatabase.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/MySQLDatabase.java index a8b3f0ed4..34aa54310 100644 --- a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/MySQLDatabase.java +++ b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/MySQLDatabase.java @@ -82,7 +82,7 @@ class MySQLDatabase implements TestableDatabase { * TIP: To reuse the same containers across multiple runs, set `testcontainers.reuse.enable=true` in a file located * at `$HOME/.testcontainers.properties` (create the file if it does not exist). */ - public static final MySQLContainer mysql = new MySQLContainer<>( imageName( "mysql", "8.0.33") ) + public static final MySQLContainer mysql = new MySQLContainer<>( imageName( "mysql", "8.3.0") ) .withUsername( DatabaseConfiguration.USERNAME ) .withPassword( DatabaseConfiguration.PASSWORD ) .withDatabaseName( DatabaseConfiguration.DB_NAME ) diff --git a/podman.md b/podman.md index 6c3bc8b0f..f5dbf2dce 100644 --- a/podman.md +++ b/podman.md @@ -93,7 +93,7 @@ and schema to run the tests: ``` podman run --rm --name HibernateTestingMySQL \ -e MYSQL_ROOT_PASSWORD=hreact -e MYSQL_DATABASE=hreact -e MYSQL_USER=hreact -e MYSQL_PASSWORD=hreact \ - -p 3306:3306 docker.io/mysql:8.0.33 + -p 3306:3306 docker.io/mysql:8.3.0 ``` When the database has started, you can run the tests on MySQL with: diff --git a/tooling/jbang/MySQLReactiveTest.java.qute b/tooling/jbang/MySQLReactiveTest.java.qute index 2aba89773..c7c5328bb 100755 --- a/tooling/jbang/MySQLReactiveTest.java.qute +++ b/tooling/jbang/MySQLReactiveTest.java.qute @@ -72,7 +72,7 @@ public class {baseName} { } @ClassRule - public final static MySQLContainer database = new MySQLContainer<>( imageName( "docker.io", "mysql", "8.0.33" ) ); + public final static MySQLContainer database = new MySQLContainer<>( imageName( "docker.io", "mysql", "8.3.0" ) ); private Mutiny.SessionFactory sessionFactory; diff --git a/tooling/jbang/ReactiveTest.java b/tooling/jbang/ReactiveTest.java index 28caf8b6a..8eaee8df6 100755 --- a/tooling/jbang/ReactiveTest.java +++ b/tooling/jbang/ReactiveTest.java @@ -229,7 +229,7 @@ public String toString() { */ enum Database { POSTGRESQL( () -> new PostgreSQLContainer( "postgres:16.1" ) ), - MYSQL( () -> new MySQLContainer( "mysql:8.0.33" ) ), + MYSQL( () -> new MySQLContainer( "mysql:8.3.0" ) ), DB2( () -> new Db2Container( "docker.io/ibmcom/db2:11.5.8.0" ).acceptLicense() ), MARIADB( () -> new MariaDBContainer( "mariadb:10.11.3" ) ), COCKROACHDB( () -> new CockroachContainer( "cockroachdb/cockroach:v22.2.10" ) ); From 8f8f791e768935d31ed42d1ecbb725402f29d4e8 Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Fri, 2 Feb 2024 10:39:04 +0100 Subject: [PATCH 08/12] [#1847] Upgrade Db2 for testing to 11.5.9.0 The repository name is now `icr.io/db2_community/db2` --- hibernate-reactive-core/build.gradle | 2 +- .../java/org/hibernate/reactive/containers/DB2Database.java | 2 +- podman.md | 2 +- tooling/jbang/Db2ReactiveTest.java.qute | 2 +- tooling/jbang/ReactiveTest.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hibernate-reactive-core/build.gradle b/hibernate-reactive-core/build.gradle index 3205129f0..0e00733ab 100644 --- a/hibernate-reactive-core/build.gradle +++ b/hibernate-reactive-core/build.gradle @@ -57,7 +57,7 @@ dependencies { testRuntimeOnly "com.mysql:mysql-connector-j:8.0.33" // JDBC driver for Db2 server, for testing - testRuntimeOnly "com.ibm.db2:jcc:11.5.8.0" + testRuntimeOnly "com.ibm.db2:jcc:11.5.9.0" // EHCache testRuntimeOnly ("org.ehcache:ehcache:3.10.0-alpha0") { diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/DB2Database.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/DB2Database.java index d40e07305..46ebdefc2 100644 --- a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/DB2Database.java +++ b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/DB2Database.java @@ -82,7 +82,7 @@ class DB2Database implements TestableDatabase { * TIP: To reuse the same containers across multiple runs, set `testcontainers.reuse.enable=true` in a file located * at `$HOME/.testcontainers.properties` (create the file if it does not exist). */ - static final Db2Container db2 = new Db2Container( imageName( "docker.io", "ibmcom/db2", "11.5.8.0" ) ) + static final Db2Container db2 = new Db2Container( imageName( "icr.io", "db2_community/db2", "11.5.9.0" ) ) .withUsername( DatabaseConfiguration.USERNAME ) .withPassword( DatabaseConfiguration.PASSWORD ) .withDatabaseName( DatabaseConfiguration.DB_NAME ) diff --git a/podman.md b/podman.md index f5dbf2dce..c0cca037e 100644 --- a/podman.md +++ b/podman.md @@ -157,7 +157,7 @@ and schema to run the tests: podman run --rm -e LICENSE=accept --privileged=true --group-add keep-groups \ --name HibernateTestingDB2 -e DBNAME=hreact -e DB2INSTANCE=hreact \ -e DB2INST1_PASSWORD=hreact -e PERSISTENT_HOME=false -e ARCHIVE_LOGS=false \ - -e AUTOCONFIG=false -p 50000:50000 docker.io/ibmcom/db2:11.5.8.0 + -e AUTOCONFIG=false -p 50000:50000 docker.io/icr.io/db2_community/db2:11.5.9.0 ``` When the database has started, you can run the tests on Db2 with: diff --git a/tooling/jbang/Db2ReactiveTest.java.qute b/tooling/jbang/Db2ReactiveTest.java.qute index d51909b57..693eb9ec0 100755 --- a/tooling/jbang/Db2ReactiveTest.java.qute +++ b/tooling/jbang/Db2ReactiveTest.java.qute @@ -65,7 +65,7 @@ public class {baseName} { } @ClassRule - public final static Db2Container database = new Db2Container( imageName( "docker.io", "ibmcom/db2", "11.5.8.0" ) ) + public final static Db2Container database = new Db2Container( imageName( "docker.io", "icr.io/db2_community/db2", "11.5.9.0" ) ) .acceptLicense(); private Mutiny.SessionFactory sessionFactory; diff --git a/tooling/jbang/ReactiveTest.java b/tooling/jbang/ReactiveTest.java index 8eaee8df6..eaa422148 100755 --- a/tooling/jbang/ReactiveTest.java +++ b/tooling/jbang/ReactiveTest.java @@ -230,7 +230,7 @@ public String toString() { enum Database { POSTGRESQL( () -> new PostgreSQLContainer( "postgres:16.1" ) ), MYSQL( () -> new MySQLContainer( "mysql:8.3.0" ) ), - DB2( () -> new Db2Container( "docker.io/ibmcom/db2:11.5.8.0" ).acceptLicense() ), + DB2( () -> new Db2Container( "docker.io/icr.io/db2_community/db2:11.5.9.0" ).acceptLicense() ), MARIADB( () -> new MariaDBContainer( "mariadb:10.11.3" ) ), COCKROACHDB( () -> new CockroachContainer( "cockroachdb/cockroach:v22.2.10" ) ); From 76dfb7884ad5cd5c625688bde11a8b4400c2d172 Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Fri, 2 Feb 2024 10:42:32 +0100 Subject: [PATCH 09/12] [#1847] Upgrade MariaDB for testing to 11.2.2 --- .../java/org/hibernate/reactive/containers/MariaDatabase.java | 2 +- podman.md | 2 +- tooling/jbang/MariaDBReactiveTest.java.qute | 2 +- tooling/jbang/ReactiveTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/MariaDatabase.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/MariaDatabase.java index 2a2c79ea7..46e2a0ad6 100644 --- a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/MariaDatabase.java +++ b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/MariaDatabase.java @@ -21,7 +21,7 @@ class MariaDatabase extends MySQLDatabase { * TIP: To reuse the same containers across multiple runs, set `testcontainers.reuse.enable=true` in a file located * at `$HOME/.testcontainers.properties` (create the file if it does not exist). */ - public static final MariaDBContainer maria = new MariaDBContainer<>( imageName( "mariadb", "10.11.3" ) ) + public static final MariaDBContainer maria = new MariaDBContainer<>( imageName( "mariadb", "11.2.2" ) ) .withUsername( DatabaseConfiguration.USERNAME ) .withPassword( DatabaseConfiguration.PASSWORD ) .withDatabaseName( DatabaseConfiguration.DB_NAME ) diff --git a/podman.md b/podman.md index c0cca037e..ae48fff35 100644 --- a/podman.md +++ b/podman.md @@ -66,7 +66,7 @@ and schema to run the tests: ``` podman run --rm --name HibernateTestingMariaDB \ -e MYSQL_ROOT_PASSWORD=hreact -e MYSQL_DATABASE=hreact -e MYSQL_USER=hreact -e MYSQL_PASSWORD=hreact \ - -p 3306:3306 docker.io/mariadb:10.11.3 + -p 3306:3306 docker.io/mariadb:11.2.2 ``` When the database has started, you can run the tests on MariaDB with: diff --git a/tooling/jbang/MariaDBReactiveTest.java.qute b/tooling/jbang/MariaDBReactiveTest.java.qute index 761b0d0f1..0f62029b9 100755 --- a/tooling/jbang/MariaDBReactiveTest.java.qute +++ b/tooling/jbang/MariaDBReactiveTest.java.qute @@ -69,7 +69,7 @@ public class {baseName} { } @ClassRule - public final static MariaDBContainer database = new MariaDBContainer<>( imageName( "docker.io", "mariadb", "10.11.3" ) ); + public final static MariaDBContainer database = new MariaDBContainer<>( imageName( "docker.io", "mariadb", "11.2.2" ) ); private Mutiny.SessionFactory sessionFactory; diff --git a/tooling/jbang/ReactiveTest.java b/tooling/jbang/ReactiveTest.java index eaa422148..ca586cc83 100755 --- a/tooling/jbang/ReactiveTest.java +++ b/tooling/jbang/ReactiveTest.java @@ -231,7 +231,7 @@ enum Database { POSTGRESQL( () -> new PostgreSQLContainer( "postgres:16.1" ) ), MYSQL( () -> new MySQLContainer( "mysql:8.3.0" ) ), DB2( () -> new Db2Container( "docker.io/icr.io/db2_community/db2:11.5.9.0" ).acceptLicense() ), - MARIADB( () -> new MariaDBContainer( "mariadb:10.11.3" ) ), + MARIADB( () -> new MariaDBContainer( "mariadb:11.2.2" ) ), COCKROACHDB( () -> new CockroachContainer( "cockroachdb/cockroach:v22.2.10" ) ); private final Supplier> containerSupplier; From f4c7326a12dfac8ed5d0ccb969cc2f05c2f595c1 Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Fri, 2 Feb 2024 10:44:18 +0100 Subject: [PATCH 10/12] [#1847] Upgrade CockroachDB for testing to v23.1.14 --- .../org/hibernate/reactive/containers/CockroachDBDatabase.java | 2 +- podman.md | 2 +- tooling/jbang/CockroachDBReactiveTest.java.qute | 2 +- tooling/jbang/ReactiveTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/CockroachDBDatabase.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/CockroachDBDatabase.java index 3f80bbf96..ef8ef06ee 100644 --- a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/CockroachDBDatabase.java +++ b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/CockroachDBDatabase.java @@ -25,7 +25,7 @@ class CockroachDBDatabase extends PostgreSQLDatabase { * TIP: To reuse the same containers across multiple runs, set `testcontainers.reuse.enable=true` in a file located * at `$HOME/.testcontainers.properties` (create the file if it does not exist). */ - public static final CockroachContainer cockroachDb = new CockroachContainer( imageName( "cockroachdb/cockroach", "v22.2.10" ) ) + public static final CockroachContainer cockroachDb = new CockroachContainer( imageName( "cockroachdb/cockroach", "v23.1.14" ) ) // Username, password and database are not supported by test container at the moment // Testcontainers will use a database named 'postgres' and the 'root' user .withReuse( true ); diff --git a/podman.md b/podman.md index ae48fff35..548f1030a 100644 --- a/podman.md +++ b/podman.md @@ -120,7 +120,7 @@ configured to run the tests: ``` podman run --rm --name=HibernateTestingCockroachDB \ --hostname=roachrr1 -p 26257:26257 -p 8080:8080 \ - docker.io/cockroachdb/cockroach:v22.2.10 start-single-node --insecure + docker.io/cockroachdb/cockroach:v23.1.14 start-single-node --insecure ``` Some of tests needs temporary tables and because this is an experimental feature in diff --git a/tooling/jbang/CockroachDBReactiveTest.java.qute b/tooling/jbang/CockroachDBReactiveTest.java.qute index 78503163f..efcceac3e 100755 --- a/tooling/jbang/CockroachDBReactiveTest.java.qute +++ b/tooling/jbang/CockroachDBReactiveTest.java.qute @@ -70,7 +70,7 @@ public class {baseName} { } @ClassRule - public final static CockroachContainer database = new CockroachContainer( imageName( "cockroachdb", "cockroach", "v22.2.10" ) ); + public final static CockroachContainer database = new CockroachContainer( imageName( "cockroachdb", "cockroach", "v23.1.14" ) ); private Mutiny.SessionFactory sessionFactory; diff --git a/tooling/jbang/ReactiveTest.java b/tooling/jbang/ReactiveTest.java index ca586cc83..705754f91 100755 --- a/tooling/jbang/ReactiveTest.java +++ b/tooling/jbang/ReactiveTest.java @@ -232,7 +232,7 @@ enum Database { MYSQL( () -> new MySQLContainer( "mysql:8.3.0" ) ), DB2( () -> new Db2Container( "docker.io/icr.io/db2_community/db2:11.5.9.0" ).acceptLicense() ), MARIADB( () -> new MariaDBContainer( "mariadb:11.2.2" ) ), - COCKROACHDB( () -> new CockroachContainer( "cockroachdb/cockroach:v22.2.10" ) ); + COCKROACHDB( () -> new CockroachContainer( "cockroachdb/cockroach:v23.1.14" ) ); private final Supplier> containerSupplier; From 7887427c0a21952b5ec0db73bbd6e3a890948b06 Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Mon, 5 Feb 2024 12:49:15 +0100 Subject: [PATCH 11/12] [#1853] Upgrade org.asciidoctor.jvm.convert to 4.0.2 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2be3a084b..3808ce4e6 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'maven-publish' id 'com.diffplug.spotless' version '6.18.0' id 'nu.studer.credentials' version '3.0' - id 'org.asciidoctor.jvm.convert' version '3.3.2' apply false + id 'org.asciidoctor.jvm.convert' version '4.0.2' apply false id 'io.github.gradle-nexus.publish-plugin' version '1.3.0' } From 90191646471214830d3773ef485420000b4d02b1 Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Mon, 5 Feb 2024 12:50:59 +0100 Subject: [PATCH 12/12] [#1854] Upgrade Gradle spotless plugin to 6.25.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3808ce4e6..04b95b110 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ import java.util.regex.Pattern plugins { id 'java-library' id 'maven-publish' - id 'com.diffplug.spotless' version '6.18.0' + id 'com.diffplug.spotless' version '6.25.0' id 'nu.studer.credentials' version '3.0' id 'org.asciidoctor.jvm.convert' version '4.0.2' apply false id 'io.github.gradle-nexus.publish-plugin' version '1.3.0'