From 6adb5c8d582d692714fcb829c59ba101000a3799 Mon Sep 17 00:00:00 2001
From: Hibernate-CI <ci@hibernate.org>
Date: Sun, 13 Jul 2025 01:03:41 +0000
Subject: [PATCH 01/21] Update project version to : `3.0.5-SNAPSHOT`

---
 gradle/version.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/version.properties b/gradle/version.properties
index 88292cf88..1b8ea940d 100644
--- a/gradle/version.properties
+++ b/gradle/version.properties
@@ -1 +1 @@
-projectVersion=3.0.4.Final
\ No newline at end of file
+projectVersion=3.0.5-SNAPSHOT
\ No newline at end of file

From c4054a94602b396e7434ef418ce566c8f6714980 Mon Sep 17 00:00:00 2001
From: Davide D'Alto <davide@hibernate.org>
Date: Thu, 10 Jul 2025 14:05:15 +0200
Subject: [PATCH 02/21] [#2269] chore: Fix imports in MutinySessionTest

---
 .../java/org/hibernate/reactive/MutinySessionTest.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/MutinySessionTest.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/MutinySessionTest.java
index bf46f835a..31bcf2380 100644
--- a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/MutinySessionTest.java
+++ b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/MutinySessionTest.java
@@ -27,7 +27,13 @@
 import jakarta.persistence.metamodel.EntityType;
 
 import static java.util.concurrent.TimeUnit.MINUTES;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 @Timeout(value = 10, timeUnit = MINUTES)
 

From 54671cdb5d94eb464df4a03834c00b54d3c96be9 Mon Sep 17 00:00:00 2001
From: Davide D'Alto <davide@hibernate.org>
Date: Wed, 9 Jul 2025 15:10:08 +0200
Subject: [PATCH 03/21] [#2269] chore: Upgrade Testcontainers to 1.21.3

---
 gradle/libs.versions.toml                       |  2 +-
 tooling/jbang/CockroachDBReactiveTest.java.qute |  2 +-
 tooling/jbang/Db2ReactiveTest.java.qute         |  2 +-
 tooling/jbang/MariaDBReactiveTest.java.qute     |  2 +-
 tooling/jbang/MySQLReactiveTest.java.qute       |  2 +-
 tooling/jbang/PostgreSQLReactiveTest.java.qute  |  2 +-
 tooling/jbang/ReactiveTest.java                 | 10 +++++-----
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 816a2efb5..99a98132a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -7,7 +7,7 @@ jbossLoggingAnnotationVersion = "3.0.4.Final"
 jbossLoggingVersion = "3.6.1.Final"
 junitVersion = "5.11.3"
 log4jVersion = "2.20.0"
-testcontainersVersion = "1.21.0"
+testcontainersVersion = "1.21.3"
 vertxSqlClientVersion = "4.5.16"
 vertxWebVersion= "4.5.16"
 vertxWebClientVersion = "4.5.16"
diff --git a/tooling/jbang/CockroachDBReactiveTest.java.qute b/tooling/jbang/CockroachDBReactiveTest.java.qute
index 337916470..54996e38d 100755
--- a/tooling/jbang/CockroachDBReactiveTest.java.qute
+++ b/tooling/jbang/CockroachDBReactiveTest.java.qute
@@ -10,7 +10,7 @@
 //DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:3.0.0.Final}
 //DEPS org.assertj:assertj-core:3.27.3
 //DEPS junit:junit:4.13.2
-//DEPS org.testcontainers:cockroachdb:1.21.0
+//DEPS org.testcontainers:cockroachdb:1.21.3
 //DEPS org.slf4j:slf4j-simple:2.0.7
 
 //// Testcontainer needs the JDBC drivers to start the container
diff --git a/tooling/jbang/Db2ReactiveTest.java.qute b/tooling/jbang/Db2ReactiveTest.java.qute
index cff1b8101..ed3c993d1 100755
--- a/tooling/jbang/Db2ReactiveTest.java.qute
+++ b/tooling/jbang/Db2ReactiveTest.java.qute
@@ -10,7 +10,7 @@
 //DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:3.0.0.Final}
 //DEPS org.assertj:assertj-core:3.27.3
 //DEPS junit:junit:4.13.2
-//DEPS org.testcontainers:db2:1.21.0
+//DEPS org.testcontainers:db2:1.21.3
 //DEPS org.slf4j:slf4j-simple:2.0.7
 
 import jakarta.persistence.Entity;
diff --git a/tooling/jbang/MariaDBReactiveTest.java.qute b/tooling/jbang/MariaDBReactiveTest.java.qute
index 3a9698fa1..611f142c0 100755
--- a/tooling/jbang/MariaDBReactiveTest.java.qute
+++ b/tooling/jbang/MariaDBReactiveTest.java.qute
@@ -10,7 +10,7 @@
 //DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:3.0.0.Final}
 //DEPS org.assertj:assertj-core:3.27.3
 //DEPS junit:junit:4.13.2
-//DEPS org.testcontainers:mariadb:1.21.0
+//DEPS org.testcontainers:mariadb:1.21.3
 //DEPS org.slf4j:slf4j-simple:2.0.7
 
 //// Testcontainer needs the JDBC drivers to start the container
diff --git a/tooling/jbang/MySQLReactiveTest.java.qute b/tooling/jbang/MySQLReactiveTest.java.qute
index 1e6debefc..473fad721 100755
--- a/tooling/jbang/MySQLReactiveTest.java.qute
+++ b/tooling/jbang/MySQLReactiveTest.java.qute
@@ -10,7 +10,7 @@
 //DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:3.0.0.Final}
 //DEPS org.assertj:assertj-core:3.27.3
 //DEPS junit:junit:4.13.2
-//DEPS org.testcontainers:mysql:1.21.0
+//DEPS org.testcontainers:mysql:1.21.3
 //DEPS org.slf4j:slf4j-simple:2.0.7
 
 //// Testcontainer needs the JDBC drivers to start the container
diff --git a/tooling/jbang/PostgreSQLReactiveTest.java.qute b/tooling/jbang/PostgreSQLReactiveTest.java.qute
index ec4ecee00..1e6e094d5 100755
--- a/tooling/jbang/PostgreSQLReactiveTest.java.qute
+++ b/tooling/jbang/PostgreSQLReactiveTest.java.qute
@@ -10,7 +10,7 @@
 //DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:3.0.0.Final}
 //DEPS org.assertj:assertj-core:3.27.3
 //DEPS junit:junit:4.13.2
-//DEPS org.testcontainers:postgresql:1.21.0
+//DEPS org.testcontainers:postgresql:1.21.3
 //DEPS org.slf4j:slf4j-simple:2.0.7
 //DESCRIPTION Allow authentication to PostgreSQL using SCRAM:
 //DEPS com.ongres.scram:client:2.1
diff --git a/tooling/jbang/ReactiveTest.java b/tooling/jbang/ReactiveTest.java
index c0db48f2b..2d66ca368 100755
--- a/tooling/jbang/ReactiveTest.java
+++ b/tooling/jbang/ReactiveTest.java
@@ -13,11 +13,11 @@
 //DEPS org.hibernate.reactive:hibernate-reactive-core:${hibernate-reactive.version:3.0.0.Final}
 //DEPS org.assertj:assertj-core:3.27.3
 //DEPS junit:junit:4.13.2
-//DEPS org.testcontainers:postgresql:1.21.0
-//DEPS org.testcontainers:mysql:1.21.0
-//DEPS org.testcontainers:db2:1.21.0
-//DEPS org.testcontainers:mariadb:1.21.0
-//DEPS org.testcontainers:cockroachdb:1.21.0
+//DEPS org.testcontainers:postgresql:1.21.3
+//DEPS org.testcontainers:mysql:1.21.3
+//DEPS org.testcontainers:db2:1.21.3
+//DEPS org.testcontainers:mariadb:1.21.3
+//DEPS org.testcontainers:cockroachdb:1.21.3
 //
 //// Testcontainer needs the JDBC drivers to start the containers
 //// Hibernate Reactive doesn't use them

From 71d60d11dc447d01c8a1a77c804378890eb99c44 Mon Sep 17 00:00:00 2001
From: Davide D'Alto <davide@hibernate.org>
Date: Thu, 10 Jul 2025 17:00:11 +0200
Subject: [PATCH 04/21] [#2269] Keep containers image and version in docker
 files

We are trying to achieve two things:
* Make it possible for dependabot to upgrade the containers
  automatically
* Collect the image and version of the containers we use for testing in
  one place

Note that the test suite will still create and start the containers
programmatically, but it will read the first FROM line in each Dockerfile
to extract the image and version to use. It will ignore everything else.

My initial plan was to configure each container using the Dockerfile
directly, but I prefer to reuse the exsisting Testcontainers classes for
each database (for example, PostgreSQLContainer) because they contain
out-of-the-box configuration that I would need to copy somewhere else.

In any case, this is a good starting point and we can improve it later.
---
 build.gradle                                  |   6 +
 .../containers/CockroachDBDatabase.java       |   4 +-
 .../reactive/containers/DB2Database.java      |   4 +-
 .../reactive/containers/DockerImage.java      | 103 ++++++++++++++-
 .../containers/MSSQLServerDatabase.java       |   4 +-
 .../reactive/containers/MariaDatabase.java    |   4 +-
 .../reactive/containers/MySQLDatabase.java    |   4 +-
 .../reactive/containers/OracleDatabase.java   |   6 +-
 .../containers/PostgreSQLDatabase.java        |   8 +-
 .../hibernate/reactive/it/BaseReactiveIT.java |   4 +-
 .../hibernate/reactive/it/DockerImage.java    | 125 ++++++++++++++++++
 .../quarkus/qe/database/BaseReactiveIT.java   |   4 +-
 .../it/quarkus/qe/database/DockerImage.java   | 125 ++++++++++++++++++
 .../reactive/it/verticle/DockerImage.java     | 125 ++++++++++++++++++
 .../reactive/it/verticle/VertxServer.java     |   4 +-
 tooling/docker/README.md                      |   6 +
 tooling/docker/cockroachdb.Dockerfile         |   3 +
 tooling/docker/db2.Dockerfile                 |   3 +
 tooling/docker/maria.Dockerfile               |   3 +
 tooling/docker/mysql.Dockerfile               |   3 +
 tooling/docker/oracle.Dockerfile              |   3 +
 tooling/docker/postgresql.Dockerfile          |   3 +
 tooling/docker/sqlserver.Dockerfile           |   3 +
 23 files changed, 528 insertions(+), 29 deletions(-)
 create mode 100644 integration-tests/bytecode-enhancements-it/src/test/java/org/hibernate/reactive/it/DockerImage.java
 create mode 100644 integration-tests/hibernate-validator-postgres-it/src/test/java/org/hibernate/reactive/it/quarkus/qe/database/DockerImage.java
 create mode 100644 integration-tests/verticle-postgres-it/src/main/java/org/hibernate/reactive/it/verticle/DockerImage.java
 create mode 100644 tooling/docker/README.md
 create mode 100644 tooling/docker/cockroachdb.Dockerfile
 create mode 100644 tooling/docker/db2.Dockerfile
 create mode 100644 tooling/docker/maria.Dockerfile
 create mode 100644 tooling/docker/mysql.Dockerfile
 create mode 100644 tooling/docker/oracle.Dockerfile
 create mode 100644 tooling/docker/postgresql.Dockerfile
 create mode 100644 tooling/docker/sqlserver.Dockerfile

diff --git a/build.gradle b/build.gradle
index 532d932ef..2615b335d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -52,6 +52,12 @@ subprojects {
         options.encoding = 'UTF-8'
     }
 
+    // Configure test tasks for all subprojects
+    tasks.withType( Test ).configureEach {
+        // Set the project root for finding Docker files - available to all modules
+        systemProperty 'hibernate.reactive.project.root', rootProject.projectDir.absolutePath
+    }
+
     if ( !gradle.ext.javaToolchainEnabled ) {
         sourceCompatibility = JavaVersion.toVersion( gradle.ext.baselineJavaVersion )
         targetCompatibility = JavaVersion.toVersion( gradle.ext.baselineJavaVersion )
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 e1a0928d1..172ace2bc 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
@@ -12,7 +12,7 @@
 import org.testcontainers.containers.CockroachContainer;
 import org.testcontainers.containers.Container;
 
-import static org.hibernate.reactive.containers.DockerImage.imageName;
+import static org.hibernate.reactive.containers.DockerImage.fromDockerfile;
 
 class CockroachDBDatabase extends PostgreSQLDatabase {
 
@@ -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", "v24.3.13" ) )
+	public static final CockroachContainer cockroachDb = new CockroachContainer( fromDockerfile( "cockroachdb" ) )
 			// 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/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 dfeeaf15c..c2b60e3d6 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
@@ -28,7 +28,7 @@
 
 import org.testcontainers.containers.Db2Container;
 
-import static org.hibernate.reactive.containers.DockerImage.imageName;
+import static org.hibernate.reactive.containers.DockerImage.fromDockerfile;
 
 class DB2Database implements TestableDatabase {
 
@@ -87,7 +87,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( "icr.io", "db2_community/db2", "12.1.0.0" ) )
+	static final Db2Container db2 = new Db2Container( fromDockerfile( "db2" ) )
 			.withUsername( DatabaseConfiguration.USERNAME )
 			.withPassword( DatabaseConfiguration.PASSWORD )
 			.withDatabaseName( DatabaseConfiguration.DB_NAME )
diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/DockerImage.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/DockerImage.java
index 1b2f3f6a7..e8f40f34d 100644
--- a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/DockerImage.java
+++ b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/DockerImage.java
@@ -5,10 +5,17 @@
  */
 package org.hibernate.reactive.containers;
 
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
 import org.testcontainers.utility.DockerImageName;
 
+
 /**
- * A utility class with methods to generate {@link DockerImageName} for testcontainers.
+ * A utility class with methods to generate a {@link DockerImageName} for Testcontainers.
  * <p>
  * Testcontainers might not work if the image required is available in multiple different registries (for example when
  * using podman instead of docker).
@@ -17,10 +24,28 @@
  */
 public final class DockerImage {
 
-	public static final String DEFAULT_REGISTRY = "docker.io";
+	/**
+	 * The absolute path of the project root that we have set in Gradle.
+	 */
+	private static final String PROJECT_ROOT = System.getProperty( "hibernate.reactive.project.root" );
+
+	/**
+	 * The path to the directory containing all the Dockerfile files
+	 */
+	private static final Path DOCKERFILE_DIR_PATH = Path.of( PROJECT_ROOT ).resolve( "tooling" ).resolve( "docker" );
 
-	public static DockerImageName imageName(String image, String version) {
-		return imageName( DEFAULT_REGISTRY, image, version );
+	/**
+	 * Extract the image name and version from the first FROM instruction in the Dockerfile.
+	 * Note that everything else is ignored.
+	 */
+	public static DockerImageName fromDockerfile(String databaseName) {
+		try {
+			final ImageInformation imageInformation = readFromInstruction( databaseName.toLowerCase() );
+			return imageName( imageInformation.getRegistry(), imageInformation.getImage(), imageInformation.getVersion() );
+		}
+		catch (IOException e) {
+			throw new RuntimeException( e );
+		}
 	}
 
 	public static DockerImageName imageName(String registry, String image, String version) {
@@ -28,4 +53,74 @@ public static DockerImageName imageName(String registry, String image, String ve
 				.parse( registry + "/" + image + ":" + version )
 				.asCompatibleSubstituteFor( image );
 	}
+
+	private static class ImageInformation {
+		private final String registry;
+		private final String image;
+		private final String version;
+
+		public ImageInformation(String fullImageInfo) {
+			// FullImageInfo pattern: <registry>/<image>:<version>
+			// For example: "docker.io/cockroachdb/cockroach:v24.3.13" becomes registry = "docker.io", image = "cockroachdb/cockroach", version = "v24.3.13"
+			final int registryEndPos = fullImageInfo.indexOf( '/' );
+			final int imageEndPos = fullImageInfo.lastIndexOf( ':' );
+			this.registry = fullImageInfo.substring( 0, registryEndPos );
+			this.image = fullImageInfo.substring( registryEndPos + 1, imageEndPos );
+			this.version = fullImageInfo.substring( imageEndPos + 1 );
+		}
+
+		public String getRegistry() {
+			return registry;
+		}
+
+		public String getImage() {
+			return image;
+		}
+
+		public String getVersion() {
+			return version;
+		}
+
+		@Override
+		public String toString() {
+			return registry + "/" + image + ":" + version;
+		}
+	}
+
+	private static Path dockerFilePath(String database) {
+		// Get project root from system property set by Gradle, with fallback
+		return DOCKERFILE_DIR_PATH.resolve( database.toLowerCase() + ".Dockerfile" );
+	}
+
+	private static ImageInformation readFromInstruction(String database) throws IOException {
+		return readFromInstruction( dockerFilePath( database ) );
+	}
+
+	/**
+	 * Read a Dockerfile and extract the first FROM instruction.
+	 *
+	 * @param dockerfilePath path to the Dockerfile
+	 * @return the first FROM instruction found, or empty if none found
+	 * @throws IOException if the file cannot be read
+	 */
+	private static ImageInformation readFromInstruction(Path dockerfilePath) throws IOException {
+		if ( !Files.exists( dockerfilePath ) ) {
+			throw new FileNotFoundException( "Dockerfile not found: " + dockerfilePath );
+		}
+
+		List<String> lines = Files.readAllLines( dockerfilePath );
+		for ( String line : lines ) {
+			// Skip comments and empty lines
+			String trimmedLine = line.trim();
+			if ( trimmedLine.isEmpty() || trimmedLine.startsWith( "#" ) ) {
+				continue;
+			}
+
+			if ( trimmedLine.startsWith( "FROM " ) ) {
+				return new ImageInformation( trimmedLine.substring( "FROM ".length() ) );
+			}
+		}
+
+		throw new IOException( " Missing FROM instruction in " + dockerfilePath );
+	}
 }
diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/MSSQLServerDatabase.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/MSSQLServerDatabase.java
index aeb1b8fb0..eaab2e8fb 100644
--- a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/MSSQLServerDatabase.java
+++ b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/MSSQLServerDatabase.java
@@ -28,7 +28,7 @@
 
 import org.testcontainers.containers.MSSQLServerContainer;
 
-import static org.hibernate.reactive.containers.DockerImage.imageName;
+import static org.hibernate.reactive.containers.DockerImage.fromDockerfile;
 
 /**
  * The JDBC driver syntax is:
@@ -96,7 +96,7 @@ class MSSQLServerDatabase 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 MSSQLServerContainer<?> mssqlserver = new MSSQLServerContainer<>( imageName( "mcr.microsoft.com", "mssql/server", "2022-latest" ) )
+	public static final MSSQLServerContainer<?> mssqlserver = new MSSQLServerContainer<>( fromDockerfile( "sqlserver" ) )
 			.acceptLicense()
 			.withPassword( PASSWORD )
 			.withReuse( true );
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 16a5f97ff..14d60c264 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
@@ -13,7 +13,7 @@
 
 import org.testcontainers.containers.MariaDBContainer;
 
-import static org.hibernate.reactive.containers.DockerImage.imageName;
+import static org.hibernate.reactive.containers.DockerImage.fromDockerfile;
 
 class MariaDatabase extends MySQLDatabase {
 
@@ -36,7 +36,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.7.2" ) )
+	public static final MariaDBContainer<?> maria = new MariaDBContainer<>( fromDockerfile( "maria" ) )
 			.withUsername( DatabaseConfiguration.USERNAME )
 			.withPassword( DatabaseConfiguration.PASSWORD )
 			.withDatabaseName( DatabaseConfiguration.DB_NAME )
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 e0aa9ef3a..f5cd8f7c7 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
@@ -5,7 +5,7 @@
  */
 package org.hibernate.reactive.containers;
 
-import static org.hibernate.reactive.containers.DockerImage.imageName;
+import static org.hibernate.reactive.containers.DockerImage.fromDockerfile;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -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", "9.2.0") )
+	public static final MySQLContainer<?> mysql = new MySQLContainer<>( fromDockerfile( "mysql" ) )
 			.withUsername( DatabaseConfiguration.USERNAME )
 			.withPassword( DatabaseConfiguration.PASSWORD )
 			.withDatabaseName( DatabaseConfiguration.DB_NAME )
diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/OracleDatabase.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/OracleDatabase.java
index d57f9103a..bbde95e6c 100644
--- a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/OracleDatabase.java
+++ b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/OracleDatabase.java
@@ -29,7 +29,7 @@
 
 import org.testcontainers.containers.OracleContainer;
 
-import static org.hibernate.reactive.containers.DockerImage.imageName;
+import static org.hibernate.reactive.containers.DockerImage.fromDockerfile;
 
 /**
  * Connection string for Oracle thin should be something like:
@@ -88,9 +88,7 @@ class OracleDatabase implements TestableDatabase {
 		}
 	}
 
-	public static final OracleContainer oracle = new OracleContainer(
-				imageName( "gvenzl/oracle-free", "23-slim-faststart" )
-					.asCompatibleSubstituteFor( "gvenzl/oracle-xe" ) )
+	public static final OracleContainer oracle = new OracleContainer( fromDockerfile( "oracle" ).asCompatibleSubstituteFor( "gvenzl/oracle-xe" ) )
 			.withUsername( DatabaseConfiguration.USERNAME )
 			.withPassword( DatabaseConfiguration.PASSWORD )
 			.withDatabaseName( DatabaseConfiguration.DB_NAME )
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 56ef4f878..f6a974ba2 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
@@ -5,8 +5,6 @@
  */
 package org.hibernate.reactive.containers;
 
-import static org.hibernate.reactive.containers.DockerImage.imageName;
-
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -30,9 +28,11 @@
 
 import org.testcontainers.containers.PostgreSQLContainer;
 
+import static org.hibernate.reactive.containers.DockerImage.fromDockerfile;
+
 class PostgreSQLDatabase implements TestableDatabase {
 
-	public static PostgreSQLDatabase INSTANCE = new PostgreSQLDatabase();
+	public static final PostgreSQLDatabase INSTANCE = new PostgreSQLDatabase();
 
 	private static Map<Class<?>, String> expectedDBTypeForClass = new HashMap<>();
 
@@ -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", "17.5" ) )
+	public static final PostgreSQLContainer<?> postgresql = new PostgreSQLContainer<>( fromDockerfile( "postgresql" ) )
 			.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 2388cb421..8f6081a8a 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
@@ -52,9 +52,7 @@ public abstract class BaseReactiveIT {
 	// These properties are in DatabaseConfiguration in core
 	public static final boolean USE_DOCKER = Boolean.getBoolean( "docker" );
 
-	public static final DockerImageName IMAGE_NAME = DockerImageName
-			.parse( "docker.io/postgres:17.5" )
-			.asCompatibleSubstituteFor( "postgres" );
+	public static final DockerImageName IMAGE_NAME = DockerImage.fromDockerfile( "postgresql" );
 
 	public static final String USERNAME = "hreact";
 	public static final String PASSWORD = "hreact";
diff --git a/integration-tests/bytecode-enhancements-it/src/test/java/org/hibernate/reactive/it/DockerImage.java b/integration-tests/bytecode-enhancements-it/src/test/java/org/hibernate/reactive/it/DockerImage.java
new file mode 100644
index 000000000..b5621249d
--- /dev/null
+++ b/integration-tests/bytecode-enhancements-it/src/test/java/org/hibernate/reactive/it/DockerImage.java
@@ -0,0 +1,125 @@
+/* Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.reactive.it;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * A utility class with methods to generate a {@link DockerImageName} for Testcontainers.
+ * <p>
+ * Testcontainers might not work if the image required is available in multiple different registries (for example when
+ * using podman instead of docker).
+ * These methods make sure to pick a registry as default.
+ * </p>
+ */
+public final class DockerImage {
+
+	/**
+	 * The absolute path of the project root that we have set in Gradle.
+	 */
+	private static final String PROJECT_ROOT = System.getProperty( "hibernate.reactive.project.root" );
+
+	/**
+	 * The path to the directory containing all the Dockerfile files
+	 */
+	private static final Path DOCKERFILE_DIR_PATH = Path.of( PROJECT_ROOT ).resolve( "tooling" ).resolve( "docker" );
+
+	/**
+	 * Extract the image name and version from the first FROM instruction in the Dockerfile.
+	 * Note that everything else is ignored.
+	 */
+	public static DockerImageName fromDockerfile(String databaseName) {
+		try {
+			final ImageInformation imageInformation = readFromInstruction( databaseName.toLowerCase() );
+			return imageName( imageInformation.getRegistry(), imageInformation.getImage(), imageInformation.getVersion() );
+		}
+		catch (IOException e) {
+			throw new RuntimeException( e );
+		}
+	}
+
+	public static DockerImageName imageName(String registry, String image, String version) {
+		return DockerImageName
+				.parse( registry + "/" + image + ":" + version )
+				.asCompatibleSubstituteFor( image );
+	}
+
+	private static class ImageInformation {
+		private final String registry;
+		private final String image;
+		private final String version;
+
+		public ImageInformation(String fullImageInfo) {
+			// FullImageInfo pattern: <registry>/<image>:<version>
+			// For example: "docker.io/cockroachdb/cockroach:v24.3.13" becomes registry = "docker.io", image = "cockroachdb/cockroach", version = "v24.3.13"
+			final int registryEndPos = fullImageInfo.indexOf( '/' );
+			final int imageEndPos = fullImageInfo.lastIndexOf( ':' );
+			this.registry = fullImageInfo.substring( 0, registryEndPos );
+			this.image = fullImageInfo.substring( registryEndPos + 1, imageEndPos );
+			this.version = fullImageInfo.substring( imageEndPos + 1 );
+		}
+
+		public String getRegistry() {
+			return registry;
+		}
+
+		public String getImage() {
+			return image;
+		}
+
+		public String getVersion() {
+			return version;
+		}
+
+		@Override
+		public String toString() {
+			return registry + "/" + image + ":" + version;
+		}
+	}
+
+	private static Path dockerFilePath(String database) {
+		// Get project root from system property set by Gradle, with fallback
+		return DOCKERFILE_DIR_PATH.resolve( database.toLowerCase() + ".Dockerfile" );
+	}
+
+	private static ImageInformation readFromInstruction(String database) throws IOException {
+		return readFromInstruction( dockerFilePath( database ) );
+	}
+
+	/**
+	 * Read a Dockerfile and extract the first FROM instruction.
+	 *
+	 * @param dockerfilePath path to the Dockerfile
+	 * @return the first FROM instruction found, or empty if none found
+	 * @throws IOException if the file cannot be read
+	 */
+	private static ImageInformation readFromInstruction(Path dockerfilePath) throws IOException {
+		if ( !Files.exists( dockerfilePath ) ) {
+			throw new FileNotFoundException( "Dockerfile not found: " + dockerfilePath );
+		}
+
+		List<String> lines = Files.readAllLines( dockerfilePath );
+		for ( String line : lines ) {
+			// Skip comments and empty lines
+			String trimmedLine = line.trim();
+			if ( trimmedLine.isEmpty() || trimmedLine.startsWith( "#" ) ) {
+				continue;
+			}
+
+			if ( trimmedLine.startsWith( "FROM " ) ) {
+				return new ImageInformation( trimmedLine.substring( "FROM ".length() ) );
+			}
+		}
+
+		throw new IOException( " Missing FROM instruction in " + dockerfilePath );
+	}
+}
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 7debdbb2c..fcefdaa84 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
@@ -52,9 +52,7 @@ public abstract class BaseReactiveIT {
 	// These properties are in DatabaseConfiguration in core
 	public static final boolean USE_DOCKER = Boolean.getBoolean( "docker" );
 
-	public static final DockerImageName IMAGE_NAME = DockerImageName
-			.parse( "docker.io/postgres:17.5" )
-			.asCompatibleSubstituteFor( "postgres" );
+	public static final DockerImageName IMAGE_NAME = DockerImage.fromDockerfile( "postgresql" );
 
 	public static final String USERNAME = "hreact";
 	public static final String PASSWORD = "hreact";
diff --git a/integration-tests/hibernate-validator-postgres-it/src/test/java/org/hibernate/reactive/it/quarkus/qe/database/DockerImage.java b/integration-tests/hibernate-validator-postgres-it/src/test/java/org/hibernate/reactive/it/quarkus/qe/database/DockerImage.java
new file mode 100644
index 000000000..7770da76c
--- /dev/null
+++ b/integration-tests/hibernate-validator-postgres-it/src/test/java/org/hibernate/reactive/it/quarkus/qe/database/DockerImage.java
@@ -0,0 +1,125 @@
+/* Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.reactive.it.quarkus.qe.database;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * A utility class with methods to generate a {@link DockerImageName} for Testcontainers.
+ * <p>
+ * Testcontainers might not work if the image required is available in multiple different registries (for example when
+ * using podman instead of docker).
+ * These methods make sure to pick a registry as default.
+ * </p>
+ */
+public final class DockerImage {
+
+	/**
+	 * The absolute path of the project root that we have set in Gradle.
+	 */
+	private static final String PROJECT_ROOT = System.getProperty( "hibernate.reactive.project.root" );
+
+	/**
+	 * The path to the directory containing all the Dockerfile files
+	 */
+	private static final Path DOCKERFILE_DIR_PATH = Path.of( PROJECT_ROOT ).resolve( "tooling" ).resolve( "docker" );
+
+	/**
+	 * Extract the image name and version from the first FROM instruction in the Dockerfile.
+	 * Note that everything else is ignored.
+	 */
+	public static DockerImageName fromDockerfile(String databaseName) {
+		try {
+			final ImageInformation imageInformation = readFromInstruction( databaseName.toLowerCase() );
+			return imageName( imageInformation.getRegistry(), imageInformation.getImage(), imageInformation.getVersion() );
+		}
+		catch (IOException e) {
+			throw new RuntimeException( e );
+		}
+	}
+
+	public static DockerImageName imageName(String registry, String image, String version) {
+		return DockerImageName
+				.parse( registry + "/" + image + ":" + version )
+				.asCompatibleSubstituteFor( image );
+	}
+
+	private static class ImageInformation {
+		private final String registry;
+		private final String image;
+		private final String version;
+
+		public ImageInformation(String fullImageInfo) {
+			// FullImageInfo pattern: <registry>/<image>:<version>
+			// For example: "docker.io/cockroachdb/cockroach:v24.3.13" becomes registry = "docker.io", image = "cockroachdb/cockroach", version = "v24.3.13"
+			final int registryEndPos = fullImageInfo.indexOf( '/' );
+			final int imageEndPos = fullImageInfo.lastIndexOf( ':' );
+			this.registry = fullImageInfo.substring( 0, registryEndPos );
+			this.image = fullImageInfo.substring( registryEndPos + 1, imageEndPos );
+			this.version = fullImageInfo.substring( imageEndPos + 1 );
+		}
+
+		public String getRegistry() {
+			return registry;
+		}
+
+		public String getImage() {
+			return image;
+		}
+
+		public String getVersion() {
+			return version;
+		}
+
+		@Override
+		public String toString() {
+			return registry + "/" + image + ":" + version;
+		}
+	}
+
+	private static Path dockerFilePath(String database) {
+		// Get project root from system property set by Gradle, with fallback
+		return DOCKERFILE_DIR_PATH.resolve( database.toLowerCase() + ".Dockerfile" );
+	}
+
+	private static ImageInformation readFromInstruction(String database) throws IOException {
+		return readFromInstruction( dockerFilePath( database ) );
+	}
+
+	/**
+	 * Read a Dockerfile and extract the first FROM instruction.
+	 *
+	 * @param dockerfilePath path to the Dockerfile
+	 * @return the first FROM instruction found, or empty if none found
+	 * @throws IOException if the file cannot be read
+	 */
+	private static ImageInformation readFromInstruction(Path dockerfilePath) throws IOException {
+		if ( !Files.exists( dockerfilePath ) ) {
+			throw new FileNotFoundException( "Dockerfile not found: " + dockerfilePath );
+		}
+
+		List<String> lines = Files.readAllLines( dockerfilePath );
+		for ( String line : lines ) {
+			// Skip comments and empty lines
+			String trimmedLine = line.trim();
+			if ( trimmedLine.isEmpty() || trimmedLine.startsWith( "#" ) ) {
+				continue;
+			}
+
+			if ( trimmedLine.startsWith( "FROM " ) ) {
+				return new ImageInformation( trimmedLine.substring( "FROM ".length() ) );
+			}
+		}
+
+		throw new IOException( " Missing FROM instruction in " + dockerfilePath );
+	}
+}
diff --git a/integration-tests/verticle-postgres-it/src/main/java/org/hibernate/reactive/it/verticle/DockerImage.java b/integration-tests/verticle-postgres-it/src/main/java/org/hibernate/reactive/it/verticle/DockerImage.java
new file mode 100644
index 000000000..10026d020
--- /dev/null
+++ b/integration-tests/verticle-postgres-it/src/main/java/org/hibernate/reactive/it/verticle/DockerImage.java
@@ -0,0 +1,125 @@
+/* Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.reactive.it.verticle;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * A utility class with methods to generate a {@link DockerImageName} for Testcontainers.
+ * <p>
+ * Testcontainers might not work if the image required is available in multiple different registries (for example when
+ * using podman instead of docker).
+ * These methods make sure to pick a registry as default.
+ * </p>
+ */
+public final class DockerImage {
+
+	/**
+	 * The absolute path of the project root that we have set in Gradle.
+	 */
+	private static final String PROJECT_ROOT = System.getProperty( "hibernate.reactive.project.root" );
+
+	/**
+	 * The path to the directory containing all the Dockerfile files
+	 */
+	private static final Path DOCKERFILE_DIR_PATH = Path.of( PROJECT_ROOT ).resolve( "tooling" ).resolve( "docker" );
+
+	/**
+	 * Extract the image name and version from the first FROM instruction in the Dockerfile.
+	 * Note that everything else is ignored.
+	 */
+	public static DockerImageName fromDockerfile(String databaseName) {
+		try {
+			final ImageInformation imageInformation = readFromInstruction( databaseName.toLowerCase() );
+			return imageName( imageInformation.getRegistry(), imageInformation.getImage(), imageInformation.getVersion() );
+		}
+		catch (IOException e) {
+			throw new RuntimeException( e );
+		}
+	}
+
+	public static DockerImageName imageName(String registry, String image, String version) {
+		return DockerImageName
+				.parse( registry + "/" + image + ":" + version )
+				.asCompatibleSubstituteFor( image );
+	}
+
+	private static class ImageInformation {
+		private final String registry;
+		private final String image;
+		private final String version;
+
+		public ImageInformation(String fullImageInfo) {
+			// FullImageInfo pattern: <registry>/<image>:<version>
+			// For example: "docker.io/cockroachdb/cockroach:v24.3.13" becomes registry = "docker.io", image = "cockroachdb/cockroach", version = "v24.3.13"
+			final int registryEndPos = fullImageInfo.indexOf( '/' );
+			final int imageEndPos = fullImageInfo.lastIndexOf( ':' );
+			this.registry = fullImageInfo.substring( 0, registryEndPos );
+			this.image = fullImageInfo.substring( registryEndPos + 1, imageEndPos );
+			this.version = fullImageInfo.substring( imageEndPos + 1 );
+		}
+
+		public String getRegistry() {
+			return registry;
+		}
+
+		public String getImage() {
+			return image;
+		}
+
+		public String getVersion() {
+			return version;
+		}
+
+		@Override
+		public String toString() {
+			return registry + "/" + image + ":" + version;
+		}
+	}
+
+	private static Path dockerFilePath(String database) {
+		// Get project root from system property set by Gradle, with fallback
+		return DOCKERFILE_DIR_PATH.resolve( database.toLowerCase() + ".Dockerfile" );
+	}
+
+	private static ImageInformation readFromInstruction(String database) throws IOException {
+		return readFromInstruction( dockerFilePath( database ) );
+	}
+
+	/**
+	 * Read a Dockerfile and extract the first FROM instruction.
+	 *
+	 * @param dockerfilePath path to the Dockerfile
+	 * @return the first FROM instruction found, or empty if none found
+	 * @throws IOException if the file cannot be read
+	 */
+	private static ImageInformation readFromInstruction(Path dockerfilePath) throws IOException {
+		if ( !Files.exists( dockerfilePath ) ) {
+			throw new FileNotFoundException( "Dockerfile not found: " + dockerfilePath );
+		}
+
+		List<String> lines = Files.readAllLines( dockerfilePath );
+		for ( String line : lines ) {
+			// Skip comments and empty lines
+			String trimmedLine = line.trim();
+			if ( trimmedLine.isEmpty() || trimmedLine.startsWith( "#" ) ) {
+				continue;
+			}
+
+			if ( trimmedLine.startsWith( "FROM " ) ) {
+				return new ImageInformation( trimmedLine.substring( "FROM ".length() ) );
+			}
+		}
+
+		throw new IOException( " Missing FROM instruction in " + dockerfilePath );
+	}
+}
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 990fef754..f11254c6d 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
@@ -21,6 +21,7 @@
 import io.vertx.core.Vertx;
 import io.vertx.core.VertxOptions;
 import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import static java.lang.invoke.MethodHandles.lookup;
 import static org.hibernate.reactive.logging.impl.LoggerFactory.make;
@@ -36,7 +37,8 @@ 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:17.5";
+	public static final DockerImageName IMAGE_NAME = DockerImage.fromDockerfile( "postgresql" );
+
 	public static final String USERNAME = "hreact";
 	public static final String PASSWORD = "hreact";
 	public static final String DB_NAME = "hreact";
diff --git a/tooling/docker/README.md b/tooling/docker/README.md
new file mode 100644
index 000000000..4de2451e0
--- /dev/null
+++ b/tooling/docker/README.md
@@ -0,0 +1,6 @@
+Our test suite will only read the first FROM instruction from each Dockerfile to extract the base image and the version
+of the container to run. It will ignore everything else.
+
+The reason we have these files is that we want to automate the upgrade of the containers using dependabot.
+
+See the class `DockerImage`.
diff --git a/tooling/docker/cockroachdb.Dockerfile b/tooling/docker/cockroachdb.Dockerfile
new file mode 100644
index 000000000..a4710ad5b
--- /dev/null
+++ b/tooling/docker/cockroachdb.Dockerfile
@@ -0,0 +1,3 @@
+# CockroachDB
+# See https://hub.docker.com/r/cockroachdb/cockroach
+FROM docker.io/cockroachdb/cockroach:v24.3.13
diff --git a/tooling/docker/db2.Dockerfile b/tooling/docker/db2.Dockerfile
new file mode 100644
index 000000000..1ccb34906
--- /dev/null
+++ b/tooling/docker/db2.Dockerfile
@@ -0,0 +1,3 @@
+# IBM DB2
+# See https://hub.docker.com/r/ibmcom/db2
+FROM icr.io/db2_community/db2:12.1.0.0
diff --git a/tooling/docker/maria.Dockerfile b/tooling/docker/maria.Dockerfile
new file mode 100644
index 000000000..4ccb397c8
--- /dev/null
+++ b/tooling/docker/maria.Dockerfile
@@ -0,0 +1,3 @@
+# MariaDB
+# See https://hub.docker.com/_/mariadb
+FROM docker.io/mariadb:11.7.2
diff --git a/tooling/docker/mysql.Dockerfile b/tooling/docker/mysql.Dockerfile
new file mode 100644
index 000000000..966350a87
--- /dev/null
+++ b/tooling/docker/mysql.Dockerfile
@@ -0,0 +1,3 @@
+# MySQL
+# See https://hub.docker.com/_/mysql
+FROM docker.io/mysql:9.2.0
diff --git a/tooling/docker/oracle.Dockerfile b/tooling/docker/oracle.Dockerfile
new file mode 100644
index 000000000..7dfc6447d
--- /dev/null
+++ b/tooling/docker/oracle.Dockerfile
@@ -0,0 +1,3 @@
+# Oracle Database Free
+# See https://hub.docker.com/r/gvenzl/oracle-free
+FROM docker.io/gvenzl/oracle-free:23-slim-faststart
diff --git a/tooling/docker/postgresql.Dockerfile b/tooling/docker/postgresql.Dockerfile
new file mode 100644
index 000000000..fb36f48e8
--- /dev/null
+++ b/tooling/docker/postgresql.Dockerfile
@@ -0,0 +1,3 @@
+# PostgreSQL
+# See https://hub.docker.com/_/postgres
+FROM docker.io/postgres:17.5
diff --git a/tooling/docker/sqlserver.Dockerfile b/tooling/docker/sqlserver.Dockerfile
new file mode 100644
index 000000000..b4fb34f2f
--- /dev/null
+++ b/tooling/docker/sqlserver.Dockerfile
@@ -0,0 +1,3 @@
+# Microsoft SQL Server
+# See https://hub.docker.com/_/microsoft-mssql-server
+FROM mcr.microsoft.com/mssql/server:2022-latest

From a1d6e7e2f298822c5ffd5d62f31ae167ddf15d91 Mon Sep 17 00:00:00 2001
From: Davide D'Alto <davide@hibernate.org>
Date: Fri, 11 Jul 2025 16:29:19 +0200
Subject: [PATCH 05/21] [#1136] Update dependabot configuration

Includes:
* Update project dependencies
* Update images in Dockerfile files under tooling/docker/
* Update images we use as services in the GitHub workflow (mysql and
  postgres to test the examples)
---
 .github/dependabot.yml | 43 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 4d1c7e327..0d4bc0776 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -16,3 +16,46 @@ updates:
     allow:
       - dependency-name: "actions/*"
       - dependency-name: "redhat-actions/*"
+
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "tuesday"
+    open-pull-requests-limit: 20
+    groups:
+      hibernate:
+        patterns:
+          - "org.hibernate*"
+      vertx:
+        patterns:
+          - "io.vertx*"
+      mutiny:
+        patterns:
+          - "io.smallrye.reactive*"
+      # Testcontainers plus the JDBC driver we need for testing
+      testcontainers:
+        patterns:
+          - "org.testcontainers*"
+          - "com.ibm.db2*"
+          - "com.microsoft.sqlserver*"
+          - "org.postgresql*"
+          - "con.ongres.scram*"
+          - "com.fasterxml.jackson.core*"
+          - "com.mysql*"
+          - "org.mariadb.jdbc*"
+
+    ignore:
+      # Only patches for Hibernate ORM and Vert.x
+      - dependency-name: "org.hibernate*"
+        update-types: ["version-update:semver-major", "version-update:semver-minor"]
+      - dependency-name: "io.vertx*"
+        update-types: ["version-update:semver-major", "version-update:semver-minor"]
+
+  # Dockerfiles in tooling/docker/, and database services we use for examples (MySQL and PostgreSQL)
+  - package-ecosystem: "docker"
+    directory: "/tooling/docker"
+    schedule:
+      interval: "weekly"
+    allow:
+      - dependency-type: "all"

From d9aab01a5dfe57bb8aaf09871df7dc68d400fca0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 12:59:23 +0000
Subject: [PATCH 06/21] Bump org.asciidoctor.jvm.convert from 4.0.2 to 4.0.4

Bumps org.asciidoctor.jvm.convert from 4.0.2 to 4.0.4.

---
updated-dependencies:
- dependency-name: org.asciidoctor.jvm.convert
  dependency-version: 4.0.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 99a98132a..deae4abc6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -55,5 +55,5 @@ org-testcontainers-postgresql = { group = "org.testcontainers", name = "postgres
 [plugins]
 com-diffplug-spotless = { id = "com.diffplug.spotless", version = "6.25.0" }
 io-github-gradle-nexus-publish-plugin = { id = "io.github.gradle-nexus.publish-plugin", version = "1.3.0" }
-org-asciidoctor-jvm-convert = { id = "org.asciidoctor.jvm.convert", version = "4.0.2" }
+org-asciidoctor-jvm-convert = { id = "org.asciidoctor.jvm.convert", version = "4.0.4" }
 org-hibernate-orm = { id = "org.hibernate.orm", version.ref = "hibernateOrmGradlePluginVersion" }

From 8749a0088e1b0e9a14dff6cad57c811eb62b4724 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 13:08:18 +0000
Subject: [PATCH 07/21] Bump the testcontainers group with 5 updates

Bumps the testcontainers group with 5 updates:

| Package | From | To |
| --- | --- | --- |
| [com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson) | `2.15.2` | `2.19.1` |
| com.ibm.db2:jcc | `12.1.0.0` | `12.1.2.0` |
| [com.microsoft.sqlserver:mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) | `12.10.0.jre11` | `13.1.0.jre11-preview` |
| [org.mariadb.jdbc:mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) | `3.5.3` | `3.5.4` |
| [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) | `42.7.5` | `42.7.7` |


Updates `com.fasterxml.jackson.core:jackson-databind` from 2.15.2 to 2.19.1
- [Commits](https://github.com/FasterXML/jackson/commits)

Updates `com.ibm.db2:jcc` from 12.1.0.0 to 12.1.2.0

Updates `com.microsoft.sqlserver:mssql-jdbc` from 12.10.0.jre11 to 13.1.0.jre11-preview
- [Release notes](https://github.com/Microsoft/mssql-jdbc/releases)
- [Changelog](https://github.com/microsoft/mssql-jdbc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/mssql-jdbc/commits)

Updates `org.mariadb.jdbc:mariadb-java-client` from 3.5.3 to 3.5.4
- [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases)
- [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mariadb-corporation/mariadb-connector-j/compare/3.5.3...3.5.4)

Updates `org.postgresql:postgresql` from 42.7.5 to 42.7.7
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.5...REL42.7.7)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-version: 2.19.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: testcontainers
- dependency-name: com.ibm.db2:jcc
  dependency-version: 12.1.2.0
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: testcontainers
- dependency-name: com.microsoft.sqlserver:mssql-jdbc
  dependency-version: 13.1.0.jre11-preview
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: testcontainers
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-version: 3.5.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: testcontainers
- dependency-name: org.postgresql:postgresql
  dependency-version: 42.7.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: testcontainers
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index deae4abc6..c8b9b78a7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 assertjVersion = "3.27.3"
 hibernateOrmVersion = "7.0.2.Final"
 hibernateOrmGradlePluginVersion = "7.0.2.Final"
-jacksonDatabindVersion = "2.15.2"
+jacksonDatabindVersion = "2.19.1"
 jbossLoggingAnnotationVersion = "3.0.4.Final"
 jbossLoggingVersion = "3.6.1.Final"
 junitVersion = "5.11.3"
@@ -14,8 +14,8 @@ vertxWebClientVersion = "4.5.16"
 
 [libraries]
 com-fasterxml-jackson-core-jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jacksonDatabindVersion" }
-com-ibm-db2-jcc = { group = "com.ibm.db2", name = "jcc", version = "12.1.0.0" }
-com-microsoft-sqlserver-mssql-jdbc = { group = "com.microsoft.sqlserver", name = "mssql-jdbc", version = "12.10.0.jre11" }
+com-ibm-db2-jcc = { group = "com.ibm.db2", name = "jcc", version = "12.1.2.0" }
+com-microsoft-sqlserver-mssql-jdbc = { group = "com.microsoft.sqlserver", name = "mssql-jdbc", version = "13.1.0.jre11-preview" }
 com-mysql-mysql-connector-j = { group = "com.mysql", name = "mysql-connector-j", version = "9.3.0" }
 com-ongres-scram-client = { group = "com.ongres.scram", name = "client", version = "2.1" }
 io-smallrye-reactive-mutiny = { group = "io.smallrye.reactive", name = "mutiny", version = "2.9.0" }
@@ -42,8 +42,8 @@ org-jboss-logging-jboss-logging-annotations = { group = "org.jboss.logging", nam
 org-jboss-logging-jboss-logging-processor = { group = "org.jboss.logging", name = "jboss-logging-processor", version.ref = "jbossLoggingAnnotationVersion" }
 org-junit-jupiter-junit-jupiter-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junitVersion" }
 org-junit-jupiter-junit-jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junitVersion" }
-org-mariadb-jdbc-mariadb-java-client = { group = "org.mariadb.jdbc", name = "mariadb-java-client", version = "3.5.3" }
-org-postgresql-postgresql = { group = "org.postgresql", name = "postgresql", version = "42.7.5" }
+org-mariadb-jdbc-mariadb-java-client = { group = "org.mariadb.jdbc", name = "mariadb-java-client", version = "3.5.4" }
+org-postgresql-postgresql = { group = "org.postgresql", name = "postgresql", version = "42.7.7" }
 org-testcontainers-cockroachdb = { group = "org.testcontainers", name = "cockroachdb", version.ref = "testcontainersVersion" }
 org-testcontainers-db2 = { group = "org.testcontainers", name = "db2", version.ref = "testcontainersVersion" }
 org-testcontainers-mariadb = { group = "org.testcontainers", name = "mariadb", version.ref = "testcontainersVersion" }

From 6e5b7ad43119e547afd59b4fec299a9e94b42d9f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 12:59:32 +0000
Subject: [PATCH 08/21] Bump org.apache.logging.log4j:log4j-core from 2.20.0 to
 2.25.1

Bumps org.apache.logging.log4j:log4j-core from 2.20.0 to 2.25.1.

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-core
  dependency-version: 2.25.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c8b9b78a7..e40e21405 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ jacksonDatabindVersion = "2.19.1"
 jbossLoggingAnnotationVersion = "3.0.4.Final"
 jbossLoggingVersion = "3.6.1.Final"
 junitVersion = "5.11.3"
-log4jVersion = "2.20.0"
+log4jVersion = "2.25.1"
 testcontainersVersion = "1.21.3"
 vertxSqlClientVersion = "4.5.16"
 vertxWebVersion= "4.5.16"

From 5964143cbe7b677485817a215ac42cd61b35604b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 13:17:47 +0000
Subject: [PATCH 09/21] Bump cockroachdb/cockroach from v24.3.13 to v25.2.2 in
 /tooling/docker

Bumps cockroachdb/cockroach from v24.3.13 to v25.2.2.

---
updated-dependencies:
- dependency-name: cockroachdb/cockroach
  dependency-version: v25.2.2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tooling/docker/cockroachdb.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tooling/docker/cockroachdb.Dockerfile b/tooling/docker/cockroachdb.Dockerfile
index a4710ad5b..5f92dd720 100644
--- a/tooling/docker/cockroachdb.Dockerfile
+++ b/tooling/docker/cockroachdb.Dockerfile
@@ -1,3 +1,3 @@
 # CockroachDB
 # See https://hub.docker.com/r/cockroachdb/cockroach
-FROM docker.io/cockroachdb/cockroach:v24.3.13
+FROM docker.io/cockroachdb/cockroach:v25.2.2

From 7ebf15f4cdd0a6ba72a1410fffb3ea42f985f534 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 13:18:48 +0000
Subject: [PATCH 10/21] Bump db2_community/db2 from 12.1.0.0 to 12.1.2.0 in
 /tooling/docker

Bumps db2_community/db2 from 12.1.0.0 to 12.1.2.0.

---
updated-dependencies:
- dependency-name: db2_community/db2
  dependency-version: 12.1.2.0
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tooling/docker/db2.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tooling/docker/db2.Dockerfile b/tooling/docker/db2.Dockerfile
index 1ccb34906..b70ff8a80 100644
--- a/tooling/docker/db2.Dockerfile
+++ b/tooling/docker/db2.Dockerfile
@@ -1,3 +1,3 @@
 # IBM DB2
 # See https://hub.docker.com/r/ibmcom/db2
-FROM icr.io/db2_community/db2:12.1.0.0
+FROM icr.io/db2_community/db2:12.1.2.0

From 3a6507fbc68d2cb241be828d3a12ac9818006d0b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 13:34:30 +0000
Subject: [PATCH 11/21] Bump com.diffplug.spotless from 6.25.0 to 7.1.0

Bumps com.diffplug.spotless from 6.25.0 to 7.1.0.

---
updated-dependencies:
- dependency-name: com.diffplug.spotless
  dependency-version: 7.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e40e21405..f5e37470f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -53,7 +53,7 @@ org-testcontainers-oracle-xe = { group = "org.testcontainers", name = "oracle-xe
 org-testcontainers-postgresql = { group = "org.testcontainers", name = "postgresql", version.ref = "testcontainersVersion" }
 
 [plugins]
-com-diffplug-spotless = { id = "com.diffplug.spotless", version = "6.25.0" }
+com-diffplug-spotless = { id = "com.diffplug.spotless", version = "7.1.0" }
 io-github-gradle-nexus-publish-plugin = { id = "io.github.gradle-nexus.publish-plugin", version = "1.3.0" }
 org-asciidoctor-jvm-convert = { id = "org.asciidoctor.jvm.convert", version = "4.0.4" }
 org-hibernate-orm = { id = "org.hibernate.orm", version.ref = "hibernateOrmGradlePluginVersion" }

From ec8d8a1f9ab88906acfac3d23f55542185a741bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 15:34:42 +0000
Subject: [PATCH 12/21] Bump junitVersion from 5.11.3 to 5.13.3

Requires extra dependency org.junit.platform:junit-platform-launcher:1.13.3

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-version: 5.13.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-version: 5.13.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml            | 4 +++-
 hibernate-reactive-core/build.gradle | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f5e37470f..46e8d0b14 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,8 @@ hibernateOrmGradlePluginVersion = "7.0.2.Final"
 jacksonDatabindVersion = "2.19.1"
 jbossLoggingAnnotationVersion = "3.0.4.Final"
 jbossLoggingVersion = "3.6.1.Final"
-junitVersion = "5.11.3"
+junitVersion = "5.13.3"
+junitPlatformVersion = "1.13.3"
 log4jVersion = "2.25.1"
 testcontainersVersion = "1.21.3"
 vertxSqlClientVersion = "4.5.16"
@@ -42,6 +43,7 @@ org-jboss-logging-jboss-logging-annotations = { group = "org.jboss.logging", nam
 org-jboss-logging-jboss-logging-processor = { group = "org.jboss.logging", name = "jboss-logging-processor", version.ref = "jbossLoggingAnnotationVersion" }
 org-junit-jupiter-junit-jupiter-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junitVersion" }
 org-junit-jupiter-junit-jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junitVersion" }
+org-junit-platform-junit-platform-launcher = { group = "org.junit.platform", name = "junit-platform-launcher", version = "junitPlatformVersion" }
 org-mariadb-jdbc-mariadb-java-client = { group = "org.mariadb.jdbc", name = "mariadb-java-client", version = "3.5.4" }
 org-postgresql-postgresql = { group = "org.postgresql", name = "postgresql", version = "42.7.7" }
 org-testcontainers-cockroachdb = { group = "org.testcontainers", name = "cockroachdb", version.ref = "testcontainersVersion" }
diff --git a/hibernate-reactive-core/build.gradle b/hibernate-reactive-core/build.gradle
index 04f35e985..1a6ad9efe 100644
--- a/hibernate-reactive-core/build.gradle
+++ b/hibernate-reactive-core/build.gradle
@@ -44,6 +44,7 @@ dependencies {
     // JUnit Jupiter
     testImplementation(libs.org.junit.jupiter.junit.jupiter.api)
     testRuntimeOnly(libs.org.junit.jupiter.junit.jupiter.engine)
+    testRuntimeOnly(libs.org.junit.platform.junit.platform.launcher)
 
     // JDBC driver to test with ORM and PostgreSQL
     testRuntimeOnly(libs.org.postgresql.postgresql)

From 68b1d5ed57045a31d880f25ab1d635d31764c0f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 15:36:28 +0000
Subject: [PATCH 13/21] Bump the hibernate group with 4 updates

Bumps the hibernate group with 4 updates: [org.hibernate.orm:hibernate-core](https://github.com/hibernate/hibernate-orm), [org.hibernate.orm:hibernate-jcache](https://github.com/hibernate/hibernate-orm), [org.hibernate.orm:hibernate-jpamodelgen](https://github.com/hibernate/hibernate-orm) and org.hibernate.orm.


Updates `org.hibernate.orm:hibernate-core` from 7.0.2.Final to 7.0.6.Final
- [Release notes](https://github.com/hibernate/hibernate-orm/releases)
- [Changelog](https://github.com/hibernate/hibernate-orm/blob/7.0.6/changelog.txt)
- [Commits](https://github.com/hibernate/hibernate-orm/compare/7.0.2...7.0.6)

Updates `org.hibernate.orm:hibernate-jcache` from 7.0.2.Final to 7.0.6.Final
- [Release notes](https://github.com/hibernate/hibernate-orm/releases)
- [Changelog](https://github.com/hibernate/hibernate-orm/blob/7.0.6/changelog.txt)
- [Commits](https://github.com/hibernate/hibernate-orm/compare/7.0.2...7.0.6)

Updates `org.hibernate.orm:hibernate-jpamodelgen` from 7.0.2.Final to 7.0.6.Final
- [Release notes](https://github.com/hibernate/hibernate-orm/releases)
- [Changelog](https://github.com/hibernate/hibernate-orm/blob/7.0.6/changelog.txt)
- [Commits](https://github.com/hibernate/hibernate-orm/compare/7.0.2...7.0.6)

Updates `org.hibernate.orm:hibernate-jcache` from 7.0.2.Final to 7.0.6.Final
- [Release notes](https://github.com/hibernate/hibernate-orm/releases)
- [Changelog](https://github.com/hibernate/hibernate-orm/blob/7.0.6/changelog.txt)
- [Commits](https://github.com/hibernate/hibernate-orm/compare/7.0.2...7.0.6)

Updates `org.hibernate.orm:hibernate-jpamodelgen` from 7.0.2.Final to 7.0.6.Final
- [Release notes](https://github.com/hibernate/hibernate-orm/releases)
- [Changelog](https://github.com/hibernate/hibernate-orm/blob/7.0.6/changelog.txt)
- [Commits](https://github.com/hibernate/hibernate-orm/compare/7.0.2...7.0.6)

Updates `org.hibernate.orm` from 7.0.2.Final to 7.0.6.Final

---
updated-dependencies:
- dependency-name: org.hibernate.orm:hibernate-core
  dependency-version: 7.0.6.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: hibernate
- dependency-name: org.hibernate.orm:hibernate-jcache
  dependency-version: 7.0.6.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: hibernate
- dependency-name: org.hibernate.orm:hibernate-jpamodelgen
  dependency-version: 7.0.6.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: hibernate
- dependency-name: org.hibernate.orm:hibernate-jcache
  dependency-version: 7.0.6.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: hibernate
- dependency-name: org.hibernate.orm:hibernate-jpamodelgen
  dependency-version: 7.0.6.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: hibernate
- dependency-name: org.hibernate.orm
  dependency-version: 7.0.6.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: hibernate
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 46e8d0b14..20154ce5e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 assertjVersion = "3.27.3"
-hibernateOrmVersion = "7.0.2.Final"
-hibernateOrmGradlePluginVersion = "7.0.2.Final"
+hibernateOrmVersion = "7.0.6.Final"
+hibernateOrmGradlePluginVersion = "7.0.6.Final"
 jacksonDatabindVersion = "2.19.1"
 jbossLoggingAnnotationVersion = "3.0.4.Final"
 jbossLoggingVersion = "3.6.1.Final"

From e67da11e4d5f407d3e602ff4899a242bf9002a07 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 03:37:48 +0000
Subject: [PATCH 14/21] Bump io.smallrye.reactive:mutiny from 2.9.0 to 2.9.3 in
 the mutiny group

Bumps the mutiny group with 1 update: [io.smallrye.reactive:mutiny](https://github.com/smallrye/smallrye-mutiny).

Updates `io.smallrye.reactive:mutiny` from 2.9.0 to 2.9.3
- [Release notes](https://github.com/smallrye/smallrye-mutiny/releases)
- [Commits](https://github.com/smallrye/smallrye-mutiny/compare/2.9.0...2.9.3)

---
updated-dependencies:
- dependency-name: io.smallrye.reactive:mutiny
  dependency-version: 2.9.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: mutiny
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 20154ce5e..beb2bb6b7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -19,7 +19,7 @@ com-ibm-db2-jcc = { group = "com.ibm.db2", name = "jcc", version = "12.1.2.0" }
 com-microsoft-sqlserver-mssql-jdbc = { group = "com.microsoft.sqlserver", name = "mssql-jdbc", version = "13.1.0.jre11-preview" }
 com-mysql-mysql-connector-j = { group = "com.mysql", name = "mysql-connector-j", version = "9.3.0" }
 com-ongres-scram-client = { group = "com.ongres.scram", name = "client", version = "2.1" }
-io-smallrye-reactive-mutiny = { group = "io.smallrye.reactive", name = "mutiny", version = "2.9.0" }
+io-smallrye-reactive-mutiny = { group = "io.smallrye.reactive", name = "mutiny", version = "2.9.3" }
 io-vertx-vertx-db2-client = { group = "io.vertx", name = "vertx-db2-client", version.ref = "vertxSqlClientVersion" }
 io-vertx-vertx-junit5 = { group = "io.vertx", name = "vertx-junit5", version.ref = "vertxSqlClientVersion" }
 io-vertx-vertx-micrometer-metrics = { group = "io.vertx", name = "vertx-micrometer-metrics", version.ref = "vertxSqlClientVersion" }

From 752b36a0885ab003dcf1e7f03b01087c4e6a6ef8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 06:18:18 +0000
Subject: [PATCH 15/21] Bump mariadb from 11.7.2 to 11.8.2 in /tooling/docker

Bumps mariadb from 11.7.2 to 11.8.2.

---
updated-dependencies:
- dependency-name: mariadb
  dependency-version: 11.8.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tooling/docker/maria.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tooling/docker/maria.Dockerfile b/tooling/docker/maria.Dockerfile
index 4ccb397c8..fc954df6e 100644
--- a/tooling/docker/maria.Dockerfile
+++ b/tooling/docker/maria.Dockerfile
@@ -1,3 +1,3 @@
 # MariaDB
 # See https://hub.docker.com/_/mariadb
-FROM docker.io/mariadb:11.7.2
+FROM docker.io/mariadb:11.8.2

From 77bbb4fcbf93cd7111922b70f4ebb3601e410c25 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 13:38:54 +0000
Subject: [PATCH 16/21] Bump mssql/server from 2022-latest to 2025-latest in
 /tooling/docker

Bumps mssql/server from 2022-latest to 2025-latest.

---
updated-dependencies:
- dependency-name: mssql/server
  dependency-version: 2025-latest
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tooling/docker/sqlserver.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tooling/docker/sqlserver.Dockerfile b/tooling/docker/sqlserver.Dockerfile
index b4fb34f2f..94fae1429 100644
--- a/tooling/docker/sqlserver.Dockerfile
+++ b/tooling/docker/sqlserver.Dockerfile
@@ -1,3 +1,3 @@
 # Microsoft SQL Server
 # See https://hub.docker.com/_/microsoft-mssql-server
-FROM mcr.microsoft.com/mssql/server:2022-latest
+FROM mcr.microsoft.com/mssql/server:2025-latest

From 0e97b9b372310efbfca9a992033134d1f0a158b6 Mon Sep 17 00:00:00 2001
From: Davide D'Alto <davide@hibernate.org>
Date: Tue, 15 Jul 2025 11:17:04 +0200
Subject: [PATCH 17/21] [#1136] Keep Hibernate Validator and expressively
 consistent

Expressly 5 for Hibernate Validator 8
Expressly 6 for Hibernate Validator 9

I've decided to keep it simple and just ignore the upgrades for majors.
I will update manually as needed for now, and think of something else if
it becomes too much of a chore.

We could remove the dependency to expressly by adding an extra
configuration file for Hibernate Validator, but then I would have
to explain why we need the extra configuraiton file somewhere
in the examples.
---
 .github/dependabot.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 0d4bc0776..fbc73fcb5 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -24,6 +24,10 @@ updates:
       day: "tuesday"
     open-pull-requests-limit: 20
     groups:
+      hibernate-validator:
+        patterns:
+          - "org.hibernate.validator*"
+          - "org.glassfish.expressly*"
       hibernate:
         patterns:
           - "org.hibernate*"
@@ -46,6 +50,9 @@ updates:
           - "org.mariadb.jdbc*"
 
     ignore:
+      # For Hibernate Validator, we will need to update major version manually as needed (but we only use it in tests)
+      - dependency-name: "org.glassfish.expressly*"
+        update-types: ["version-update-:semver-major"]
       # Only patches for Hibernate ORM and Vert.x
       - dependency-name: "org.hibernate*"
         update-types: ["version-update:semver-major", "version-update:semver-minor"]

From 1489d7ab556d772ae45291f9c4b27cd639cd1211 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 13:45:45 +0000
Subject: [PATCH 18/21] [#2270] Change docker image to
 container-registry.oracle.com/mysql/community-server:9.3.0

from `docker.io/mysql:9.2.0`
to `container-registry.oracle.com/mysql/community-server:9.3.0`

I found the registry in the official MySQL documentation:
https://dev.mysql.com/doc/refman/9.3/en/docker-mysql-getting-started.html#docker-download-image

The one from docker.io doesn't seem to work with testcontainers.
---
 .github/workflows/build.yml                                    | 3 +--
 .../java/org/hibernate/reactive/containers/MySQLDatabase.java  | 2 +-
 tooling/docker/mysql.Dockerfile                                | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index af832654c..e81eae258 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,8 +49,7 @@ jobs:
     services:
       # Label used to access the service container
       mysql:
-        # Docker Hub image
-        image: mysql:9.2.0
+        image: container-registry.oracle.com/mysql/community-server:9.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 f5cd8f7c7..5b5ad5d2c 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<>( fromDockerfile( "mysql" ) )
+	public static final MySQLContainer<?> mysql = new MySQLContainer<>( fromDockerfile( "mysql" ).asCompatibleSubstituteFor( "mysql" ) )
 			.withUsername( DatabaseConfiguration.USERNAME )
 			.withPassword( DatabaseConfiguration.PASSWORD )
 			.withDatabaseName( DatabaseConfiguration.DB_NAME )
diff --git a/tooling/docker/mysql.Dockerfile b/tooling/docker/mysql.Dockerfile
index 966350a87..69b12ca62 100644
--- a/tooling/docker/mysql.Dockerfile
+++ b/tooling/docker/mysql.Dockerfile
@@ -1,3 +1,3 @@
 # MySQL
 # See https://hub.docker.com/_/mysql
-FROM docker.io/mysql:9.2.0
+FROM container-registry.oracle.com/mysql/community-server:9.3.0

From 31ab28697501e3a065c6e6a28a9b8550c0d4734f Mon Sep 17 00:00:00 2001
From: Davide D'Alto <davide@hibernate.org>
Date: Tue, 15 Jul 2025 10:14:05 +0200
Subject: [PATCH 19/21] [#2270] Update JBang templates MySQL docker image

to `container-registry.oracle.com/mysql/community-server:9.3.0`
---
 tooling/jbang/MySQLReactiveTest.java.qute | 2 +-
 tooling/jbang/ReactiveTest.java           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tooling/jbang/MySQLReactiveTest.java.qute b/tooling/jbang/MySQLReactiveTest.java.qute
index 473fad721..c258612ae 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", "9.2.0" ) );
+    public final static MySQLContainer<?> database = new MySQLContainer<>( imageName( "container-registry.oracle.com", "mysql/community-server", "9.3.0" ).asCompatibleSubstituteFor( "mysql" ) );
 
 	private Mutiny.SessionFactory sessionFactory;
 
diff --git a/tooling/jbang/ReactiveTest.java b/tooling/jbang/ReactiveTest.java
index 2d66ca368..ed6011433 100755
--- a/tooling/jbang/ReactiveTest.java
+++ b/tooling/jbang/ReactiveTest.java
@@ -229,7 +229,7 @@ public String toString() {
 	 */
 	enum Database {
 		POSTGRESQL( () -> new PostgreSQLContainer( "postgres:17.5" ) ),
-		MYSQL( () -> new MySQLContainer( "mysql:9.2.0" ) ),
+		MYSQL( () -> new MySQLContainer( "container-registry.oracle.com/mysql/community-server:9.3.0" ) ),
 		DB2( () -> new Db2Container( "docker.io/icr.io/db2_community/db2:12.1.0.0" ).acceptLicense() ),
 		MARIADB( () -> new MariaDBContainer( "mariadb:11.7.2" ) ),
 		COCKROACHDB( () -> new CockroachContainer( "cockroachdb/cockroach:v24.3.13" ) );

From 256bc5e658cdede5164928a6bbdf3da3268034e0 Mon Sep 17 00:00:00 2001
From: Davide D'Alto <davide@hibernate.org>
Date: Wed, 16 Jul 2025 09:46:50 +0200
Subject: [PATCH 20/21] [#2368] Remove gradle-nexus:publish-plugin from the
 catalog

We don't use it anymore since the switch to JRelease.
This was just a left over.
---
 build.gradle                    | 1 -
 ci/snapshot-publish.Jenkinsfile | 1 -
 gradle/libs.versions.toml       | 1 -
 3 files changed, 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2615b335d..d6a172b6f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,6 @@ plugins {
     id 'maven-publish'
     alias(libs.plugins.com.diffplug.spotless)
     alias(libs.plugins.org.asciidoctor.jvm.convert) apply false
-    alias(libs.plugins.io.github.gradle.nexus.publish.plugin)
 }
 
 group = "org.hibernate.reactive"
diff --git a/ci/snapshot-publish.Jenkinsfile b/ci/snapshot-publish.Jenkinsfile
index e50eb4cac..7fb8f9444 100644
--- a/ci/snapshot-publish.Jenkinsfile
+++ b/ci/snapshot-publish.Jenkinsfile
@@ -40,7 +40,6 @@ pipeline {
 			steps {
 				script {
 					withCredentials([
-							// https://github.com/gradle-nexus/publish-plugin#publishing-to-maven-central-via-sonatype-ossrh
 							// TODO: Once we switch to maven-central publishing (from nexus2) we need to update credentialsId:
 							//  https://docs.gradle.org/current/samples/sample_publishing_credentials.html#:~:text=via%20environment%20variables
 							usernamePassword(credentialsId: 'central.sonatype.com', passwordVariable: 'ORG_GRADLE_PROJECT_snapshotsPassword', usernameVariable: 'ORG_GRADLE_PROJECT_snapshotsUsername'),
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index beb2bb6b7..9967083b5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -56,6 +56,5 @@ org-testcontainers-postgresql = { group = "org.testcontainers", name = "postgres
 
 [plugins]
 com-diffplug-spotless = { id = "com.diffplug.spotless", version = "7.1.0" }
-io-github-gradle-nexus-publish-plugin = { id = "io.github.gradle-nexus.publish-plugin", version = "1.3.0" }
 org-asciidoctor-jvm-convert = { id = "org.asciidoctor.jvm.convert", version = "4.0.4" }
 org-hibernate-orm = { id = "org.hibernate.orm", version.ref = "hibernateOrmGradlePluginVersion" }

From f320bbcee4dd46e0030fa33018746df4ceea9c8b Mon Sep 17 00:00:00 2001
From: Hibernate-CI <ci@hibernate.org>
Date: Sun, 20 Jul 2025 01:02:43 +0000
Subject: [PATCH 21/21] Update project version to : `3.0.5.Final`

---
 gradle/version.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/version.properties b/gradle/version.properties
index 1b8ea940d..8145f2a96 100644
--- a/gradle/version.properties
+++ b/gradle/version.properties
@@ -1 +1 @@
-projectVersion=3.0.5-SNAPSHOT
\ No newline at end of file
+projectVersion=3.0.5.Final
\ No newline at end of file