Merge branch 'main' into update-servicebusemulatorcontainer-to-not-use-deprecated-mssqlservercontainer-anymore

Author: eddumelendez

.github/dependabot.yml

@@ -18,6 +18,10 @@ updates:
         update-types: [ "version-update:semver-major" ]
       - dependency-name: "com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
         update-types: [ "version-update:semver-minor", "version-update:semver-patch" ]
+      - dependency-name: "org.junit.jupiter:junit-jupiter"
+        update-types: [ "version-update:semver-major" ]
+      - dependency-name: "org.junit.platform:junit-platform-launcher"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/"
     allow:
@@ -30,6 +34,10 @@ updates:
     ignore:
       - dependency-name: "com.gradleup.shadow"
         update-types: [ "version-update:semver-major" ]
+      - dependency-name: "org.junit.jupiter:junit-jupiter"
+        update-types: [ "version-update:semver-major" ]
+      - dependency-name: "org.junit.platform:junit-platform-launcher"
+        update-types: [ "version-update:semver-major" ]
 
 # Explicit entry for each module
   - package-ecosystem: "gradle"
@@ -143,6 +151,8 @@ updates:
     ignore:
       - dependency-name: "org.apache.tomcat:tomcat-jdbc"
         update-types: [ "version-update:semver-minor" ]
+      - dependency-name: "org.junit.jupiter:junit-jupiter"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/modules/junit-jupiter"
     schedule:
@@ -151,6 +161,8 @@ updates:
     ignore:
       - dependency-name: "org.mockito:mockito-core"
         update-types: [ "version-update:semver-major" ]
+      - dependency-name: "org.junit:junit-bom"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/modules/k3s"
     schedule:
@@ -304,6 +316,8 @@ updates:
     ignore:
       - dependency-name: "io.r2dbc:r2dbc-spi"
         update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
+      - dependency-name: "org.junit.jupiter:junit-jupiter"
+        update-types: [ "version-update:semver-major" ]
   - package-ecosystem: "gradle"
     directory: "/modules/rabbitmq"
     schedule:
@@ -347,6 +361,9 @@ updates:
     directory: "/modules/spock"
     schedule:
       interval: "monthly"
+    ignore:
+      - dependency-name: "org.junit:junit-bom"
+        update-types: [ "version-update:semver-major" ]
     open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/tidb"
@@ -412,6 +429,12 @@ updates:
         update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
       - dependency-name: "com.hazelcast:hazelcast"
         update-types: [ "version-update:semver-minor" ]
+      - dependency-name: "org.junit.jupiter:junit-jupiter"
+        update-types: [ "version-update:semver-major" ]
+      - dependency-name: "org.junit.platform:junit-platform-launcher"
+        update-types: [ "version-update:semver-major" ]
+      - dependency-name: "com.gradleup.shadow"
+        update-types: [ "version-update:semver-major" ]
 
 # Smoke test
   - package-ecosystem: "gradle"
@@ -424,6 +447,12 @@ updates:
         update-types: [ "version-update:semver-minor" ]
       - dependency-name: "com.diffplug.spotless"
         update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
+      - dependency-name: "org.junit.jupiter:junit-jupiter"
+        update-types: [ "version-update:semver-major" ]
+      - dependency-name: "org.junit.platform:junit-platform-launcher"
+        update-types: [ "version-update:semver-major" ]
+      - dependency-name: "com.gradleup.shadow"
+        update-types: [ "version-update:semver-major" ]
 
 # GitHub Actions
   - package-ecosystem: "github-actions"

.github/workflows/ci.yml

@@ -98,7 +98,7 @@ jobs:
           # we should not push empty results to the cache
           READ_ONLY_REMOTE_GRADLE_CACHE: true
         run: |
-          TASKS=$(./gradlew --no-daemon --parallel -q testMatrix | jq 'del(.[] | select(. == ":testcontainers-databend:check" or . == ":testcontainers:check" or startswith(":docs:")))' --compact-output)
+          TASKS=$(./gradlew --no-daemon --parallel -q testMatrix | jq 'del(.[] | select(. == ":testcontainers:check" or startswith(":docs:")))' --compact-output)
           echo $TASKS
           echo "matrix={\"gradle_args\":$TASKS}" >> $GITHUB_OUTPUT
   check:

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() {

core/src/main/java/org/testcontainers/utility/RyukContainer.java

@@ -9,7 +9,7 @@
 class RyukContainer extends GenericContainer<RyukContainer> {
 
     RyukContainer() {
-        super("testcontainers/ryuk:0.13.0");
+        super("testcontainers/ryuk:0.14.0");
         withExposedPorts(8080);
         withCreateContainerCmdModifier(cmd -> {
             cmd.withName("testcontainers-ryuk-" + DockerClientFactory.SESSION_ID);

modules/activemq/build.gradle

@@ -3,6 +3,6 @@ description = "Testcontainers :: ActiveMQ"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation "org.apache.activemq:activemq-client:6.1.7"
-    testImplementation "org.apache.activemq:artemis-jakarta-client:2.42.0"
+    testImplementation "org.apache.activemq:activemq-client:6.2.0"
+    testImplementation "org.apache.activemq:artemis-jakarta-client:2.44.0"
 }

modules/activemq/src/main/java/org/testcontainers/activemq/ActiveMQContainer.java

@@ -21,7 +21,11 @@
  */
 public class ActiveMQContainer extends GenericContainer<ActiveMQContainer> {
 
-    private static final DockerImageName DEFAULT_IMAGE = DockerImageName.parse("apache/activemq-classic");
+    private static final DockerImageName APACHE_ACTIVEMQ_CLASSIC_IMAGE = DockerImageName.parse(
+        "apache/activemq-classic"
+    );
+
+    private static final DockerImageName DEFAULT_IMAGE = DockerImageName.parse("apache/activemq");
 
     private static final int WEB_CONSOLE_PORT = 8161;
 
@@ -45,7 +49,7 @@ public ActiveMQContainer(String image) {
 
     public ActiveMQContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE, APACHE_ACTIVEMQ_CLASSIC_IMAGE);
 
         withExposedPorts(WEB_CONSOLE_PORT, TCP_PORT, AMQP_PORT, STOMP_PORT, MQTT_PORT, WS_PORT);
         waitingFor(Wait.forLogMessage(".*Apache ActiveMQ.*started.*", 1).withStartupTimeout(Duration.ofMinutes(1)));

modules/activemq/src/test/java/org/testcontainers/activemq/ActiveMQContainerTest.java

@@ -10,6 +10,8 @@
 import lombok.SneakyThrows;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -18,7 +20,7 @@ class ActiveMQContainerTest {
     @Test
     void test() {
         try ( // container {
-            ActiveMQContainer activemq = new ActiveMQContainer("apache/activemq-classic:5.18.3")
+            ActiveMQContainer activemq = new ActiveMQContainer("apache/activemq:5.18.7")
             // }
         ) {
             activemq.start();
@@ -29,11 +31,20 @@ void test() {
         }
     }
 
+    @ParameterizedTest
+    @ValueSource(strings = { "apache/activemq-classic:5.18.7", "apache/activemq:5.18.7" })
+    void compatibility(String image) {
+        try (ActiveMQContainer activemq = new ActiveMQContainer(image)) {
+            activemq.start();
+            assertFunctionality(activemq, false);
+        }
+    }
+
     @Test
     void customCredentials() {
         try (
             // settingCredentials {
-            ActiveMQContainer activemq = new ActiveMQContainer("apache/activemq-classic:5.18.3")
+            ActiveMQContainer activemq = new ActiveMQContainer("apache/activemq:5.18.7")
                 .withUser("testcontainers")
                 .withPassword("testcontainers")
             // }

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'
@@ -13,5 +13,5 @@ dependencies {
     testImplementation 'com.azure:azure-data-tables'
     testImplementation 'com.azure:azure-messaging-eventhubs'
     testImplementation 'com.azure:azure-messaging-servicebus'
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.2.0.jre8'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.3.0.jre8-preview'
 }

modules/clickhouse/build.gradle

@@ -5,12 +5,12 @@ dependencies {
     api project(':testcontainers-jdbc')
 
     compileOnly project(':testcontainers-r2dbc')
-    compileOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.9.2', classifier: 'http')
+    compileOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.9.4', classifier: 'http')
 
     testImplementation project(':testcontainers-jdbc-test')
-    testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-jdbc', version: '0.9.2', classifier: 'all')
+    testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-jdbc', version: '0.9.4', classifier: 'all')
 
-    testImplementation 'com.clickhouse:client-v2:0.9.2'
+    testImplementation 'com.clickhouse:client-v2:0.9.4'
     testImplementation testFixtures(project(':testcontainers-r2dbc'))
-    testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.9.2', classifier: 'http')
+    testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.9.4', classifier: 'http')
 }

modules/couchbase/build.gradle

@@ -3,8 +3,8 @@ 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 'com.couchbase.client:java-client:3.10.0'
     testImplementation 'org.awaitility:awaitility:4.3.0'
 }