Merge branch 'main' into clickhouse-httpUrl

eddumelendez · web-flow · commit 2243cd7bbddb · 2025-07-29T12:28:53.000-06:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -161,9 +161,6 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
-    ignore:
-      - dependency-name: "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
-        update-types: [ "version-update:semver-minor", "version-update:semver-patch" ]
   - package-ecosystem: "gradle"
     directory: "/modules/kafka"
     schedule:
diff --git a/core/build.gradle b/core/build.gradle
@@ -110,7 +110,7 @@ dependencies {
     }
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation 'redis.clients:jedis:6.0.0'
-    testImplementation 'com.rabbitmq:amqp-client:5.25.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.26.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
 
     testImplementation ('org.mockito:mockito-core:4.11.0') {
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
@@ -3,9 +3,9 @@ description = "Examples for docs"
 dependencies {
     api "io.lettuce:lettuce-core:6.7.1.RELEASE"
 
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.13.3'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.3'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.13.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.13.4'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.4'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.13.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")
diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver'
 
-    testImplementation platform('org.junit:junit-bom:5.13.3')
+    testImplementation platform('org.junit:junit-bom:5.13.4')
     testImplementation 'org.junit.platform:junit-platform-suite'
     testImplementation platform('io.cucumber:cucumber-bom:7.23.0')
     testImplementation 'io.cucumber:cucumber-java'
diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'com.hazelcast:hazelcast:5.3.8'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     testImplementation 'org.apache.kafka:kafka-clients:4.0.0'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testImplementation 'org.awaitility:awaitility:4.2.2'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'io.nats:jnats:2.21.4'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
diff --git a/examples/ollama-hugging-face/build.gradle b/examples/ollama-hugging-face/build.gradle
@@ -9,9 +9,9 @@ repositories {
 dependencies {
     testImplementation 'org.testcontainers:ollama'
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
-    testImplementation 'io.rest-assured:rest-assured:5.5.0'
+    testImplementation 'io.rest-assured:rest-assured:5.5.5'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
 
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
@@ -9,10 +9,10 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'redis.clients:jedis:6.0.0'
-    implementation 'com.google.code.gson:gson:2.11.0'
+    implementation 'com.google.code.gson:gson:2.13.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.testng:testng:7.5.1'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
@@ -9,12 +9,12 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
     implementation 'redis.clients:jedis:6.0.0'
-    implementation 'com.google.code.gson:gson:2.11.0'
+    implementation 'com.google.code.gson:gson:2.13.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle
@@ -7,10 +7,10 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'com.jcraft:jsch:0.1.55'
+    testImplementation 'com.github.mwiede:jsch:2.27.2'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
@@ -9,11 +9,11 @@ repositories {
 dependencies {
 
     implementation 'redis.clients:jedis:6.0.0'
-    implementation 'com.google.code.gson:gson:2.11.0'
+    implementation 'com.google.code.gson:gson:2.13.1'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
 
-    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'org.apache.curator:curator-framework:5.8.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.26.3'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.14'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.15'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
 }
diff --git a/modules/activemq/build.gradle b/modules/activemq/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
     testImplementation "org.apache.activemq:activemq-client:6.1.7"
-    testImplementation "org.apache.activemq:artemis-jakarta-client:2.41.0"
+    testImplementation "org.apache.activemq:artemis-jakarta-client:2.42.0"
 }
diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
@@ -14,5 +14,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.1.0.jre8-preview'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.1.1.jre8-preview'
 }
diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:9.0.3"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:9.0.4"
     testImplementation "org.elasticsearch.client:transport:7.17.29"
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }
diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.google.cloud:libraries-bom:26.63.0")
+    testImplementation platform("com.google.cloud:libraries-bom:26.64.0")
     testImplementation 'com.google.cloud:google-cloud-bigquery'
     testImplementation 'com.google.cloud:google-cloud-datastore'
     testImplementation 'com.google.cloud:google-cloud-firestore'
diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
@@ -5,14 +5,14 @@ dependencies {
     api("org.jetbrains:annotations:26.0.2")
 
     shaded("org.apache.commons:commons-lang3:3.18.0")
-    shaded("commons-io:commons-io:2.19.0")
+    shaded("commons-io:commons-io:2.20.0")
     shaded("org.javassist:javassist:3.30.2-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
     shaded("net.lingala.zip4j:zip4j:2.11.5")
 
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.3'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.4'
     testImplementation(project(":junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.41.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.7")
diff --git a/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java b/modules/junit-jupiter/src/main/java/org/testcontainers/junit/jupiter/TestcontainersExtension.java
@@ -260,7 +260,7 @@ private static StoreAdapter getContainerInstance(final Object testInstance, fina
      * thereby letting the JUnit automatically stop containers once the current
      * {@link ExtensionContext} is closed.
      */
-    private static class StoreAdapter implements CloseableResource {
+    private static class StoreAdapter implements CloseableResource, AutoCloseable {
 
         @Getter
         private String key;
diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle
@@ -5,6 +5,7 @@ dependencies {
 
     testImplementation 'org.mock-server:mockserver-client-java:5.15.0'
     testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'io.rest-assured:rest-assured:5.5.5'
 }
 
 tasks.japicmp {
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
@@ -5,6 +5,7 @@
 import org.mockserver.client.MockServerClient;
 import org.testcontainers.utility.DockerImageName;
 
+import static io.restassured.RestAssured.given;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockserver.model.HttpRequest.request;
 import static org.mockserver.model.HttpResponse.response;
@@ -33,7 +34,9 @@ public void shouldReturnExpectation() throws Exception {
 
             // ...a GET request to '/person?name=peter' returns "Peter the person!"
 
-            assertThat(SimpleHttpClient.responseFromMockserver(mockServer, "/person?name=peter"))
+            assertThat(
+                given().baseUri(mockServer.getEndpoint()).get("/person?name=peter").then().extract().body().asString()
+            )
                 .as("Expectation returns expected response body")
                 .contains("Peter the person");
         }
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
@@ -1,9 +1,16 @@
 package org.testcontainers.containers;
 
+import io.restassured.config.RestAssuredConfig;
+import io.restassured.config.SSLConfig;
+import org.apache.http.conn.ssl.SSLSocketFactory;
 import org.junit.Test;
 import org.mockserver.client.MockServerClient;
+import org.mockserver.configuration.Configuration;
+import org.mockserver.logging.MockServerLogger;
+import org.mockserver.socket.tls.KeyStoreFactory;
 import org.testcontainers.utility.DockerImageName;
 
+import static io.restassured.RestAssured.given;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockserver.model.HttpRequest.request;
 import static org.mockserver.model.HttpResponse.response;
@@ -26,7 +33,7 @@ public void shouldCallActualMockserverVersion() throws Exception {
 
                 client.when(request().withPath("/hello")).respond(response().withBody(expectedBody));
 
-                assertThat(SimpleHttpClient.responseFromMockserver(mockServer, "/hello"))
+                assertThat(given().when().get(mockServer.getEndpoint() + "/hello").then().extract().body().asString())
                     .as("MockServer returns correct result")
                     .isEqualTo(expectedBody);
             }
@@ -48,7 +55,7 @@ public void shouldCallMockserverUsingTlsProtocol() throws Exception {
 
                 client.when(request().withPath("/hello")).respond(response().withBody(expectedBody));
 
-                assertThat(SimpleHttpClient.secureResponseFromMockserver(mockServer, "/hello"))
+                assertThat(secureResponseFromMockserver(mockServer))
                     .as("MockServer returns correct result")
                     .isEqualTo(expectedBody);
             }
@@ -73,7 +80,7 @@ public void shouldCallMockserverUsingMutualTlsProtocol() throws Exception {
 
                 client.when(request().withPath("/hello")).respond(response().withBody(expectedBody));
 
-                assertThat(SimpleHttpClient.secureResponseFromMockserver(mockServer, "/hello"))
+                assertThat(secureResponseFromMockserver(mockServer))
                     .as("MockServer returns correct result")
                     .isEqualTo(expectedBody);
             }
@@ -86,4 +93,26 @@ public void newVersionStartsWithDefaultWaitStrategy() {
             mockServer.start();
         }
     }
+
+    private static String secureResponseFromMockserver(MockServerContainer mockServer) {
+        return given()
+            .config(
+                RestAssuredConfig
+                    .config()
+                    .sslConfig(
+                        SSLConfig
+                            .sslConfig()
+                            .sslSocketFactory(
+                                new SSLSocketFactory(
+                                    new KeyStoreFactory(Configuration.configuration(), new MockServerLogger())
+                                        .sslContext()
+                                )
+                            )
+                    )
+            )
+            .baseUri(mockServer.getSecureEndpoint())
+            .get("/hello")
+            .body()
+            .asString();
+    }
 }
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/SimpleHttpClient.java b/modules/mockserver/src/test/java/org/testcontainers/containers/SimpleHttpClient.java
diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.1.0.jre8-preview'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.1.1.jre8-preview'
 
     testImplementation project(':r2dbc')
     testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'
diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: RabbitMQ"
 
 dependencies {
     api project(":testcontainers")
-    testImplementation 'com.rabbitmq:amqp-client:5.25.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.26.0'
     testImplementation 'org.assertj:assertj-core:3.27.3'
     compileOnly 'org.jetbrains:annotations:26.0.2'
 }
diff --git a/modules/scylladb/build.gradle b/modules/scylladb/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation 'com.scylladb:java-driver-core:4.19.0.1'
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'software.amazon.awssdk:dynamodb:2.32.0'
+    testImplementation 'software.amazon.awssdk:dynamodb:2.32.9'
 }
diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     shaded 'org.awaitility:awaitility:4.3.0'
 
     testImplementation 'org.assertj:assertj-core:3.27.3'
-    testImplementation 'com.solacesystems:sol-jcsmp:10.27.2'
+    testImplementation 'com.solacesystems:sol-jcsmp:10.27.3'
     testImplementation 'org.apache.qpid:qpid-jms-client:0.61.0'
     testImplementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
     testImplementation 'org.apache.httpcomponents:fluent-hc:4.5.14'
diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ dependencies {`
`110`	`110`	`}`
`111`	`111`	`testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'`
`112`	`112`	`testImplementation 'redis.clients:jedis:6.0.0'`
`113`		`- testImplementation 'com.rabbitmq:amqp-client:5.25.0'`
	`113`	`+ testImplementation 'com.rabbitmq:amqp-client:5.26.0'`
`114`	`114`	`testImplementation 'org.mongodb:mongo-java-driver:3.12.14'`
`115`	`115`
`116`	`116`	`testImplementation ('org.mockito:mockito-core:4.11.0') {`