Merge branch 'main' into main

Author: rajucomp

core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java

@@ -401,21 +401,34 @@ public static DockerClient getClientForConfig(TransportConfig transportConfig) {
                 throw new IllegalArgumentException("Unknown transport type '" + transportType + "'");
         }
 
-        DefaultDockerClientConfig.Builder configBuilder = DefaultDockerClientConfig.createDefaultConfigBuilder();
+        DefaultDockerClientConfig.Builder configBuilder = DefaultDockerClientConfig
+            .createDefaultConfigBuilder()
+            .withDockerHost(transportConfig.getDockerHost().toString());
 
-        if (configBuilder.build().getApiVersion() == RemoteApiVersion.UNKNOWN_VERSION) {
-            configBuilder.withApiVersion(RemoteApiVersion.VERSION_1_44);
-        }
         Map<String, String> headers = new HashMap<>();
         headers.put("x-tc-sid", DockerClientFactory.SESSION_ID);
         headers.put("User-Agent", String.format("tc-java/%s", DockerClientFactory.TESTCONTAINERS_VERSION));
 
-        return DockerClientImpl.getInstance(
-            new AuthDelegatingDockerClientConfig(
-                configBuilder.withDockerHost(transportConfig.getDockerHost().toString()).build()
-            ),
-            new HeadersAddingDockerHttpClient(dockerHttpClient, headers)
-        );
+        try {
+            if (configBuilder.build().getApiVersion() == RemoteApiVersion.UNKNOWN_VERSION) {
+                configBuilder.withApiVersion(RemoteApiVersion.VERSION_1_44);
+            }
+            DockerClient client = DockerClientImpl.getInstance(
+                new AuthDelegatingDockerClientConfig(configBuilder.build()),
+                new HeadersAddingDockerHttpClient(dockerHttpClient, headers)
+            );
+            log.debug("Pinging Docker API version 1.44.");
+            client.pingCmd().exec();
+            return client;
+        } catch (Exception ex) {
+            log.debug("Fallback to Docker API version 1.32.");
+            return DockerClientImpl.getInstance(
+                new AuthDelegatingDockerClientConfig(
+                    configBuilder.withApiVersion(RemoteApiVersion.VERSION_1_32).build()
+                ),
+                new HeadersAddingDockerHttpClient(dockerHttpClient, headers)
+            );
+        }
     }
 
     public synchronized String getDockerHostIpAddress() {

modules/azure/build.gradle

@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
     api project(':testcontainers-mssqlserver')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
-    shaded 'com.squareup.okhttp3:okhttp:5.1.0'
+    shaded 'com.squareup.okhttp3:okhttp:5.3.2'
 
     testImplementation platform("com.azure:azure-sdk-bom:1.2.32")
     testImplementation 'com.azure:azure-cosmos'

modules/couchbase/build.gradle

@@ -3,7 +3,7 @@ description = "Testcontainers :: Couchbase"
 dependencies {
     api project(':testcontainers')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
-    shaded 'com.squareup.okhttp3:okhttp:5.1.0'
+    shaded 'com.squareup.okhttp3:okhttp:5.3.2'
 
     testImplementation 'com.couchbase.client:java-client:3.9.1'
     testImplementation 'org.awaitility:awaitility:4.3.0'

modules/jdbc-test/build.gradle

@@ -11,5 +11,5 @@ dependencies {
     api 'org.apache.tomcat:tomcat-jdbc:11.0.14'
     api 'org.vibur:vibur-dbcp:26.0'
     api 'com.mysql:mysql-connector-j:9.5.0'
-    api 'org.junit.jupiter:junit-jupiter:5.13.4'
+    api 'org.junit.jupiter:junit-jupiter:5.14.1'
 }

modules/junit-jupiter/build.gradle

@@ -2,18 +2,18 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     api project(':testcontainers')
-    implementation platform('org.junit:junit-bom:5.13.4')
+    implementation platform('org.junit:junit-bom:5.14.1')
     implementation 'org.junit.jupiter:junit-jupiter-api'
 
     testImplementation project(':testcontainers-mysql')
     testImplementation project(':testcontainers-postgresql')
     testImplementation 'com.zaxxer:HikariCP:7.0.2'
-    testImplementation 'redis.clients:jedis:6.2.0'
+    testImplementation 'redis.clients:jedis:7.1.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')
     }
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.8'
-    testRuntimeOnly 'com.mysql:mysql-connector-j:8.2.0'
+    testRuntimeOnly 'com.mysql:mysql-connector-j:9.5.0'
 }

modules/mysql/build.gradle

@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'io.asyncer:r2dbc-mysql:1.4.1'
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'com.mysql:mysql-connector-j:8.2.0'
+    testRuntimeOnly 'com.mysql:mysql-connector-j:9.5.0'
 
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
     testRuntimeOnly 'io.asyncer:r2dbc-mysql:1.4.1'

modules/oceanbase/build.gradle

@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly 'com.mysql:mysql-connector-j:8.2.0'
+    testRuntimeOnly 'com.mysql:mysql-connector-j:9.5.0'
 }

modules/orientdb/build.gradle

@@ -3,8 +3,8 @@ description = "Testcontainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.44"
+    api "com.orientechnologies:orientdb-client:3.2.46"
 
-    testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.4'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.44"
+    testImplementation 'org.apache.tinkerpop:gremlin-driver:3.8.0'
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.46"
 }

modules/questdb/src/test/java/org/testcontainers/QuestDBTestImages.java

@@ -3,5 +3,5 @@
 import org.testcontainers.utility.DockerImageName;
 
 public interface QuestDBTestImages {
-    DockerImageName QUESTDB_IMAGE = DockerImageName.parse("questdb/questdb:6.5.3");
+    DockerImageName QUESTDB_IMAGE = DockerImageName.parse("questdb/questdb:9.2.2");
 }

modules/questdb/src/test/java/org/testcontainers/junit/questdb/SimpleQuestDBTest.java

@@ -26,7 +26,7 @@ class SimpleQuestDBTest extends AbstractContainerDatabaseTest {
     @Test
     void testSimple() throws SQLException {
         try ( // container {
-            QuestDBContainer questDB = new QuestDBContainer("questdb/questdb:6.5.3")
+            QuestDBContainer questDB = new QuestDBContainer("questdb/questdb:9.2.2")
             // }
         ) {
             questDB.start();