test: update mariadb-java-client and enable efm2 test (#1532)

Author: aaron-congo

benchmarks/build.gradle.kts

@@ -22,7 +22,7 @@ dependencies {
     jmhImplementation(project(":aws-advanced-jdbc-wrapper"))
     implementation("org.postgresql:postgresql:42.7.7")
     implementation("com.mysql:mysql-connector-j:9.3.0")
-    implementation("org.mariadb.jdbc:mariadb-java-client:3.5.3")
+    implementation("org.mariadb.jdbc:mariadb-java-client:3.5.6")
     implementation("com.zaxxer:HikariCP:4.0.3")
     implementation("org.checkerframework:checker-qual:3.49.5")
 

wrapper/build.gradle.kts

@@ -53,7 +53,7 @@ dependencies {
     compileOnly("org.checkerframework:checker-qual:3.49.5")
     compileOnly("com.mysql:mysql-connector-j:9.3.0")
     compileOnly("org.postgresql:postgresql:42.7.7")
-    compileOnly("org.mariadb.jdbc:mariadb-java-client:3.5.3")
+    compileOnly("org.mariadb.jdbc:mariadb-java-client:3.5.6")
     compileOnly("org.osgi:org.osgi.core:6.0.0")
     compileOnly("org.jetbrains.kotlin:kotlin-stdlib:2.1.21")
 
@@ -75,7 +75,7 @@ dependencies {
     testImplementation("org.apache.commons:commons-dbcp2:2.13.0")
     testImplementation("org.postgresql:postgresql:42.7.7")
     testImplementation("com.mysql:mysql-connector-j:9.3.0")
-    testImplementation("org.mariadb.jdbc:mariadb-java-client:3.5.3")
+    testImplementation("org.mariadb.jdbc:mariadb-java-client:3.5.6")
     testImplementation("com.zaxxer:HikariCP:4.0.3") // Version 4.+ is compatible with Java 8
     testImplementation("com.mchange:c3p0:0.11.0")
     testImplementation("org.springframework.boot:spring-boot-starter-jdbc:2.7.13") // 2.7.13 is the last version compatible with Java 8

wrapper/src/test/build.gradle.kts

@@ -37,7 +37,7 @@ dependencies {
     testImplementation("org.apache.commons:commons-dbcp2:2.12.0")
     testImplementation("org.postgresql:postgresql:42.7.4")
     testImplementation("com.mysql:mysql-connector-j:9.1.0")
-    testImplementation("org.mariadb.jdbc:mariadb-java-client:3.4.1")
+    testImplementation("org.mariadb.jdbc:mariadb-java-client:3.5.6")
     testImplementation("com.zaxxer:HikariCP:4.0.3") // Version 4.+ is compatible with Java 8
     testImplementation("org.springframework.boot:spring-boot-starter-jdbc:2.7.13") // 2.7.13 is the last version compatible with Java 8
     testImplementation("org.mockito:mockito-inline:4.11.0") // 4.11.0 is the last version compatible with Java 8

wrapper/src/test/java/integration/container/tests/EFM2Test.java

@@ -23,10 +23,8 @@
 import integration.DatabaseEngineDeployment;
 import integration.TestEnvironmentFeatures;
 import integration.container.ConnectionStringHelper;
-import integration.container.TestDriver;
 import integration.container.TestDriverProvider;
 import integration.container.TestEnvironment;
-import integration.container.condition.DisableOnTestDriver;
 import integration.container.condition.DisableOnTestFeature;
 import integration.container.condition.EnableOnDatabaseEngineDeployment;
 import integration.container.condition.EnableOnTestFeature;
@@ -90,8 +88,6 @@ public void afterEach() {
 
   @TestTemplate
   @ExtendWith(TestDriverProvider.class)
-  // TODO: test fails because EFM monitor's isValid call is freezing for MARIADB, investigate why
-  @DisableOnTestDriver(TestDriver.MARIADB)
   @EnableOnTestFeature(TestEnvironmentFeatures.NETWORK_OUTAGES_ENABLED)
   public void test_efmNetworkFailureDetection() throws SQLException {
     int failureDelayMs = 10000;