[#1334] replaced custom testcontainers for MariaDB & MySQL with class paths to jdbc drivers

Author: blafond

hibernate-reactive-core/build.gradle

@@ -46,6 +46,13 @@ dependencies {
 
     // JDBC driver for Testcontainers with MS SQL Server
     testRuntimeOnly "com.microsoft.sqlserver:mssql-jdbc:10.2.1.jre11"
+
+    // JDBC driver for Testcontainers with MariaDB Server
+    testRuntimeOnly "org.mariadb.jdbc:mariadb-java-client:3.0.5";
+
+    // JDBC driver for Testcontainers with MYSQL Server
+    testRuntimeOnly "mysql:mysql-connector-java:8.0.28";
+
     // EHCache
     testRuntimeOnly "org.ehcache:ehcache:3.10.0"
     testRuntimeOnly ("org.hibernate:hibernate-jcache:${hibernateOrmVersion}") {

hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/MariaDatabase.java

@@ -8,6 +8,8 @@
 
 import static org.hibernate.reactive.containers.DockerImage.imageName;
 
+import org.testcontainers.containers.MariaDBContainer;
+
 class MariaDatabase extends MySQLDatabase {
 
 	static MariaDatabase INSTANCE = new MariaDatabase();
@@ -19,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 VertxMariaContainer maria = new VertxMariaContainer( imageName( "mariadb", "10.7.3" ) )
+	public static final MariaDBContainer<?> maria = new MariaDBContainer<>( imageName( "mariadb", "10.7.3" ) )
 			.withUsername( DatabaseConfiguration.USERNAME )
 			.withPassword( DatabaseConfiguration.PASSWORD )
 			.withDatabaseName( DatabaseConfiguration.DB_NAME )

hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/MySQLDatabase.java

@@ -30,6 +30,8 @@
 
 import static org.hibernate.reactive.containers.DockerImage.imageName;
 
+import org.testcontainers.containers.MySQLContainer;
+
 class MySQLDatabase implements TestableDatabase {
 
 	static MySQLDatabase INSTANCE = new MySQLDatabase();
@@ -80,7 +82,7 @@ class MySQLDatabase implements TestableDatabase {
 	 * TIP: To reuse the same containers across multiple runs, set `testcontainers.reuse.enable=true` in a file located
 	 * at `$HOME/.testcontainers.properties` (create the file if it does not exist).
 	 */
-	public static final VertxMySqlContainer mysql = new VertxMySqlContainer( imageName( "mysql", "8.0.28") )
+	public static final MySQLContainer<?> mysql = new MySQLContainer<>( imageName( "mysql", "8.0.28") )
 			.withUsername( DatabaseConfiguration.USERNAME )
 			.withPassword( DatabaseConfiguration.PASSWORD )
 			.withDatabaseName( DatabaseConfiguration.DB_NAME )