From bb853792e09c8c0e50b130bc07d98563a56f9ecd Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Fri, 7 Jun 2024 10:12:52 +0200 Subject: [PATCH 1/6] [#1935] Upgrade PostgreSQL to 16.3 --- .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 +- .../reactive/it/quarkus/qe/database/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tracking-orm-6.build.yml b/.github/workflows/tracking-orm-6.build.yml index a3bac1c0b..25dc928bf 100644 --- a/.github/workflows/tracking-orm-6.build.yml +++ b/.github/workflows/tracking-orm-6.build.yml @@ -61,7 +61,7 @@ jobs: - 3306:3306 postgres: # Docker Hub image - image: postgres:16.1 + image: postgres:16.3 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 edd571873..40c1de584 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:16.1 + image: postgres:16.3 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 f7e6509e8..038733e7e 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 @@ -87,7 +87,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", "16.2" ) ) + public static final PostgreSQLContainer postgresql = new PostgreSQLContainer<>( imageName( "postgres", "16.3" ) ) .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 64e0c7078..72ad3273d 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:16.2" ) + .parse( "docker.io/postgres:16.3" ) .asCompatibleSubstituteFor( "postgres" ); public static final String USERNAME = "hreact"; diff --git a/integration-tests/hibernate-validator-postgres-it/src/test/java/org/hibernate/reactive/it/quarkus/qe/database/BaseReactiveIT.java b/integration-tests/hibernate-validator-postgres-it/src/test/java/org/hibernate/reactive/it/quarkus/qe/database/BaseReactiveIT.java index f7a2c96ed..7272f13f2 100644 --- a/integration-tests/hibernate-validator-postgres-it/src/test/java/org/hibernate/reactive/it/quarkus/qe/database/BaseReactiveIT.java +++ b/integration-tests/hibernate-validator-postgres-it/src/test/java/org/hibernate/reactive/it/quarkus/qe/database/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:16.2" ) + .parse( "docker.io/postgres:16.3" ) .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 149ca09d6..eab23a6ff 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:16.2"; + public static final String IMAGE_NAME = "postgres:16.3"; 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 54bfa9a35..c3e222193 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:16.2 + -p 5432:5432 docker.io/postgres:16.3 ``` 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 45c125fa4..5c00d9b4d 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:16.2
+ *                      -p 5432:5432 postgres:16.3
  *
* *
3. Run the example with JBang
diff --git a/tooling/jbang/PostgreSQLReactiveTest.java.qute b/tooling/jbang/PostgreSQLReactiveTest.java.qute index 472ae77b7..3ef5b423f 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", "16.2" ) ); + public final static PostgreSQLContainer database = new PostgreSQLContainer( imageName( "docker.io", "postgres", "16.3" ) ); private Mutiny.SessionFactory sessionFactory; diff --git a/tooling/jbang/ReactiveTest.java b/tooling/jbang/ReactiveTest.java index acf778777..0e1e27d14 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:16.2" ) ), + POSTGRESQL( () -> new PostgreSQLContainer( "postgres:16.3" ) ), 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.3.2" ) ), From 7d362e9213ec41ad5151107b0a6fd4a7f465b6e9 Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Fri, 7 Jun 2024 10:16:06 +0200 Subject: [PATCH 2/6] [#1935] Upgrade MySQL to 8.4.0 --- .github/workflows/tracking-orm-6.build.yml | 2 +- .github/workflows/tracking-vertx-4.build.yml | 2 +- README.md | 2 +- .../java/org/hibernate/reactive/containers/MySQLDatabase.java | 2 +- podman.md | 2 +- tooling/jbang/MySQLReactiveTest.java.qute | 2 +- tooling/jbang/ReactiveTest.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/tracking-orm-6.build.yml b/.github/workflows/tracking-orm-6.build.yml index 25dc928bf..b4894869d 100644 --- a/.github/workflows/tracking-orm-6.build.yml +++ b/.github/workflows/tracking-orm-6.build.yml @@ -45,7 +45,7 @@ jobs: # Label used to access the service container mysql: # Docker Hub image - image: mysql:8.3.0 + image: mysql:8.4.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 40c1de584..263301e63 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.3.0 + image: mysql:8.4.0 env: MYSQL_ROOT_PASSWORD: hreact MYSQL_DATABASE: hreact diff --git a/README.md b/README.md index 6ac7b9d3f..5e4fb3402 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Hibernate Reactive has been tested with: - Java 11, 17, 20, 21 - PostgreSQL 16 -- MySQL 8.3 +- MySQL 8 - MariaDB 11 - Db2 11.5 - CockroachDB v23.1 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 01006b567..9b94cf8ed 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 @@ -87,7 +87,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.3.0") ) + public static final MySQLContainer mysql = new MySQLContainer<>( imageName( "mysql", "8.4.0") ) .withUsername( DatabaseConfiguration.USERNAME ) .withPassword( DatabaseConfiguration.PASSWORD ) .withDatabaseName( DatabaseConfiguration.DB_NAME ) diff --git a/podman.md b/podman.md index c3e222193..255569878 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.3.0 + -p 3306:3306 docker.io/mysql:8.4.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 6f0a3a97c..0aabf284d 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.3.0" ) ); + public final static MySQLContainer database = new MySQLContainer<>( imageName( "docker.io", "mysql", "8.4.0" ) ); private Mutiny.SessionFactory sessionFactory; diff --git a/tooling/jbang/ReactiveTest.java b/tooling/jbang/ReactiveTest.java index 0e1e27d14..10e97d3c8 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.3" ) ), - MYSQL( () -> new MySQLContainer( "mysql:8.3.0" ) ), + MYSQL( () -> new MySQLContainer( "mysql:8.4.0" ) ), DB2( () -> new Db2Container( "docker.io/icr.io/db2_community/db2:11.5.9.0" ).acceptLicense() ), MARIADB( () -> new MariaDBContainer( "mariadb:11.3.2" ) ), COCKROACHDB( () -> new CockroachContainer( "cockroachdb/cockroach:v23.1.17" ) ); From 161d7d55336e409b3dc7e499729231a87de86003 Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Fri, 7 Jun 2024 10:17:51 +0200 Subject: [PATCH 3/6] [#1935] Upgrade MariaDB to 11.5.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 997e6dc7d..575c5290d 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", "11.3.2" ) ) + public static final MariaDBContainer maria = new MariaDBContainer<>( imageName( "mariadb", "11.4.2" ) ) .withUsername( DatabaseConfiguration.USERNAME ) .withPassword( DatabaseConfiguration.PASSWORD ) .withDatabaseName( DatabaseConfiguration.DB_NAME ) diff --git a/podman.md b/podman.md index 255569878..01a3da9a4 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:11.3.2 + -p 3306:3306 docker.io/mariadb:11.4.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 d91dd6b78..4b1271fee 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", "11.3.2" ) ); + public final static MariaDBContainer database = new MariaDBContainer<>( imageName( "docker.io", "mariadb", "11.4.2" ) ); private Mutiny.SessionFactory sessionFactory; diff --git a/tooling/jbang/ReactiveTest.java b/tooling/jbang/ReactiveTest.java index 10e97d3c8..b43623009 100755 --- a/tooling/jbang/ReactiveTest.java +++ b/tooling/jbang/ReactiveTest.java @@ -231,7 +231,7 @@ enum Database { POSTGRESQL( () -> new PostgreSQLContainer( "postgres:16.3" ) ), MYSQL( () -> new MySQLContainer( "mysql:8.4.0" ) ), DB2( () -> new Db2Container( "docker.io/icr.io/db2_community/db2:11.5.9.0" ).acceptLicense() ), - MARIADB( () -> new MariaDBContainer( "mariadb:11.3.2" ) ), + MARIADB( () -> new MariaDBContainer( "mariadb:11.4.2" ) ), COCKROACHDB( () -> new CockroachContainer( "cockroachdb/cockroach:v23.1.17" ) ); private final Supplier> containerSupplier; From a52288f87ae011d701f3a3e3f25d71faa3d4a948 Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Fri, 7 Jun 2024 10:20:04 +0200 Subject: [PATCH 4/6] [#1935] Update Db2 version in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5e4fb3402..c8e80cc55 100644 --- a/README.md +++ b/README.md @@ -33,8 +33,8 @@ Hibernate Reactive has been tested with: - PostgreSQL 16 - MySQL 8 - MariaDB 11 -- Db2 11.5 - CockroachDB v23.1 +- Db2 11 - MS SQL Server 2022 - Oracle 23 - [Hibernate ORM][] 6.5.2.Final From 27b24d98b9577ad739cbbc050ee469b947c502f2 Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Fri, 7 Jun 2024 10:21:45 +0200 Subject: [PATCH 5/6] [#1935] Upgrade CockroachDB to v24.1.0 --- README.md | 2 +- .../org/hibernate/reactive/containers/CockroachDBDatabase.java | 2 +- podman.md | 2 +- tooling/jbang/CockroachDBReactiveTest.java.qute | 2 +- tooling/jbang/ReactiveTest.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index c8e80cc55..751bd21e2 100644 --- a/README.md +++ b/README.md @@ -33,8 +33,8 @@ Hibernate Reactive has been tested with: - PostgreSQL 16 - MySQL 8 - MariaDB 11 -- CockroachDB v23.1 - Db2 11 +- CockroachDB v24 - MS SQL Server 2022 - Oracle 23 - [Hibernate ORM][] 6.5.2.Final 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 b6ae58294..103723127 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", "v23.1.17" ) ) + public static final CockroachContainer cockroachDb = new CockroachContainer( imageName( "cockroachdb/cockroach", "v24.1.0" ) ) // 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 01a3da9a4..48c8cd9b7 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:v23.1.17 start-single-node --insecure + docker.io/cockroachdb/cockroach:v24.1.0 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 1cdacf0de..ee9c0085b 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", "v23.1.17" ) ); + public final static CockroachContainer database = new CockroachContainer( imageName( "cockroachdb", "cockroach", "v24.1.0" ) ); private Mutiny.SessionFactory sessionFactory; diff --git a/tooling/jbang/ReactiveTest.java b/tooling/jbang/ReactiveTest.java index b43623009..7a572813a 100755 --- a/tooling/jbang/ReactiveTest.java +++ b/tooling/jbang/ReactiveTest.java @@ -232,7 +232,7 @@ enum Database { MYSQL( () -> new MySQLContainer( "mysql:8.4.0" ) ), DB2( () -> new Db2Container( "docker.io/icr.io/db2_community/db2:11.5.9.0" ).acceptLicense() ), MARIADB( () -> new MariaDBContainer( "mariadb:11.4.2" ) ), - COCKROACHDB( () -> new CockroachContainer( "cockroachdb/cockroach:v23.1.17" ) ); + COCKROACHDB( () -> new CockroachContainer( "cockroachdb/cockroach:v24.1.0" ) ); private final Supplier> containerSupplier; From b91fc3a76eedf886109513252d1a7f42c37afb85 Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Fri, 7 Jun 2024 11:28:24 +0200 Subject: [PATCH 6/6] [#1935] Add extra parameter to PostgreSQL podman instructions --- podman.md | 1 + 1 file changed, 1 insertion(+) diff --git a/podman.md b/podman.md index 48c8cd9b7..1787c0982 100644 --- a/podman.md +++ b/podman.md @@ -38,6 +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 \ + -e POSTGRES_INITDB_ARGS="-A password" \ -p 5432:5432 docker.io/postgres:16.3 ```