Merge pull request #8161 from testcontainers/combined-pr-branch

eddumelendez · web-flow · commit 489ac7dea096 · 2024-01-24T16:45:38.000-05:00
Combined dependencies PR
diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
@@ -8,7 +8,7 @@ dependencies {
 
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
     testImplementation "org.seleniumhq.selenium:selenium-api:4.17.0"
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
 }
 
 test {
diff --git a/docs/examples/junit4/redis/build.gradle b/docs/examples/junit4/redis/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation "junit:junit:4.13.2"
     testImplementation project(":testcontainers")
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
 }
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.1"
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
 }
 
 test {
diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'io.cucumber:cucumber-java'
     testImplementation 'io.cucumber:cucumber-junit'
     testImplementation 'org.testcontainers:selenium'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
 }
 
 test {
diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'com.hazelcast:hazelcast:5.3.6'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 
diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'io.codenotary:immudb4j:1.0.1'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:junit-jupiter'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testAnnotationProcessor "org.projectlombok:lombok:1.18.30"
     testImplementation 'org.testcontainers:kafka'
     testImplementation 'org.apache.kafka:kafka-clients:3.6.1'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
@@ -12,6 +12,6 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.testcontainers:postgresql'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
 }
 
diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'io.nats:jnats:2.17.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.13'
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.testng:testng:7.5.1'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
 }
 
 test {
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
 }
 
 test {
diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.testcontainers:selenium'
     testImplementation 'org.testcontainers:junit-jupiter'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 
diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'com.jcraft:jsch:0.1.55'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
@@ -15,7 +15,7 @@ dependencies {
 
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
@@ -14,7 +14,7 @@ dependencies {
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
 
diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
@@ -7,9 +7,9 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.apache.curator:curator-framework:5.5.0'
+    testImplementation 'org.apache.curator:curator-framework:5.6.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 }
diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.12.0'
 
     testImplementation 'org.assertj:assertj-core:3.25.1'
-    testImplementation 'com.azure:azure-cosmos:4.53.1'
+    testImplementation 'com.azure:azure-cosmos:4.54.0'
 }
diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
 }
diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.643'
     testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.643'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
 }
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:8.11.2"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.12.0"
     testImplementation "org.elasticsearch.client:transport:7.17.17"
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
 }
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.28.0")
+    testImplementation platform("com.google.cloud:libraries-bom:26.30.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/k3s/build.gradle b/modules/k3s/build.gradle
@@ -10,5 +10,5 @@ dependencies {
 
     testImplementation 'io.fabric8:kubernetes-client:6.10.0'
     testImplementation 'io.kubernetes:client-java:19.0.0'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
 }
diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.apache.kafka:kafka-clients:3.6.1'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
     testImplementation 'com.google.guava:guava:23.0'
 }
diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
@@ -8,5 +8,5 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-sqs'
     testImplementation 'com.amazonaws:aws-java-sdk-logs'
     testImplementation 'software.amazon.awssdk:s3:2.23.9'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
 }
diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation("org.mongodb:mongodb-driver-sync:4.11.1")
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
 }
 
 tasks.japicmp {
diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
@@ -34,5 +34,5 @@ dependencies {
     api project(":testcontainers")
 
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.13'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
 }
diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '3.1.1'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '3.1.2'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.25.1'
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.1.1'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.1.2'
 }
diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
     testRuntimeOnly 'org.postgresql:postgresql:42.7.1'
     testImplementation project(':jdbc-test')
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'org.questdb:questdb:7.3.9'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
@@ -11,10 +11,10 @@ dependencies {
     api project(':testcontainers')
     api 'io.r2dbc:r2dbc-spi:0.9.0.RELEASE'
 
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
     testFixturesImplementation 'io.projectreactor:reactor-core:3.6.2'
-    testFixturesImplementation 'org.assertj:assertj-core:3.24.2'
+    testFixturesImplementation 'org.assertj:assertj-core:3.25.2'
 }
diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: RabbitMQ"
 dependencies {
     api project(":testcontainers")
     testImplementation 'com.rabbitmq:amqp-client:5.20.0'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.1'
     compileOnly 'org.jetbrains:annotations:24.1.0'
 }
diff --git a/test-support/build.gradle b/test-support/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
     implementation 'junit:junit:4.13.2'
     implementation 'org.slf4j:slf4j-api:1.7.36'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.2'
 }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ dependencies {`
`8`	`8`
`9`	`9`	`testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'`
`10`	`10`	`testImplementation "org.seleniumhq.selenium:selenium-api:4.17.0"`
`11`		`- testImplementation 'org.assertj:assertj-core:3.24.2'`
	`11`	`+ testImplementation 'org.assertj:assertj-core:3.25.2'`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`test {`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@ dependencies {`
`5`	`5`
`6`	`6`	`testImplementation "junit:junit:4.13.2"`
`7`	`7`	`testImplementation project(":testcontainers")`
`8`		`- testImplementation 'org.assertj:assertj-core:3.24.2'`
	`8`	`+ testImplementation 'org.assertj:assertj-core:3.25.2'`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ dependencies {`
`8`	`8`	`testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.1"`
`9`	`9`	`testImplementation project(":testcontainers")`
`10`	`10`	`testImplementation project(":junit-jupiter")`
`11`		`- testImplementation 'org.assertj:assertj-core:3.24.2'`
	`11`	`+ testImplementation 'org.assertj:assertj-core:3.25.2'`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`test {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ dependencies {`
`16`	`16`	`testImplementation 'io.cucumber:cucumber-java'`
`17`	`17`	`testImplementation 'io.cucumber:cucumber-junit'`
`18`	`18`	`testImplementation 'org.testcontainers:selenium'`
`19`		`- testImplementation 'org.assertj:assertj-core:3.24.2'`
	`19`	`+ testImplementation 'org.assertj:assertj-core:3.25.2'`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`test {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ dependencies {`
`10`	`10`	`testImplementation 'org.testcontainers:testcontainers'`
`11`	`11`	`testImplementation 'com.hazelcast:hazelcast:5.3.6'`
`12`	`12`	`testImplementation 'ch.qos.logback:logback-classic:1.3.14'`
`13`		`- testImplementation 'org.assertj:assertj-core:3.24.2'`
	`13`	`+ testImplementation 'org.assertj:assertj-core:3.25.2'`
`14`	`14`	`testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ dependencies {`
`12`	`12`	`testRuntimeOnly 'org.postgresql:postgresql:42.7.1'`
`13`	`13`	`testImplementation 'ch.qos.logback:logback-classic:1.3.14'`
`14`	`14`	`testImplementation 'org.testcontainers:postgresql'`
`15`		`- testImplementation 'org.assertj:assertj-core:3.24.2'`
	`15`	`+ testImplementation 'org.assertj:assertj-core:3.25.2'`
`16`	`16`	`}`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ repositories {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`dependencies {`
`10`		`- testImplementation 'org.assertj:assertj-core:3.24.2'`
	`10`	`+ testImplementation 'org.assertj:assertj-core:3.25.2'`
`11`	`11`	`testImplementation 'org.testcontainers:testcontainers'`
`12`	`12`	`testImplementation 'io.nats:jnats:2.17.2'`
`13`	`13`	`testImplementation 'ch.qos.logback:logback-classic:1.3.14'`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ dependencies {`
`14`	`14`	`testImplementation 'org.testcontainers:testcontainers'`
`15`	`15`	`testImplementation 'ch.qos.logback:logback-classic:1.3.14'`
`16`	`16`	`testImplementation 'org.testng:testng:7.5.1'`
`17`		`- testImplementation 'org.assertj:assertj-core:3.24.2'`
	`17`	`+ testImplementation 'org.assertj:assertj-core:3.25.2'`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`test {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ dependencies {`
`15`	`15`	`testImplementation 'org.testcontainers:junit-jupiter'`
`16`	`16`	`testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'`
`17`	`17`	`testImplementation 'ch.qos.logback:logback-classic:1.3.14'`
`18`		`- testImplementation 'org.assertj:assertj-core:3.24.2'`
	`18`	`+ testImplementation 'org.assertj:assertj-core:3.25.2'`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`test {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ repositories {`
`9`	`9`	`dependencies {`
`10`	`10`	`testImplementation 'com.jcraft:jsch:0.1.55'`
`11`	`11`	`testImplementation 'org.testcontainers:testcontainers'`
`12`		`- testImplementation 'org.assertj:assertj-core:3.24.2'`
	`12`	`+ testImplementation 'org.assertj:assertj-core:3.25.2'`
`13`	`13`	`testImplementation 'ch.qos.logback:logback-classic:1.3.14'`
`14`	`14`	`testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'`
`15`	`15`	`}`