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

eddumelendez · web-flow · commit 78820f0d8f58 · 2023-02-02T17:14:10.000-05:00
Combined dependencies PR
diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
@@ -8,5 +8,5 @@ dependencies {
 
     testImplementation 'mysql:mysql-connector-java:8.0.31'
     testImplementation "org.seleniumhq.selenium:selenium-api:4.7.2"
-    testImplementation 'org.assertj:assertj-core:3.15.0'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }
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.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
@@ -4,11 +4,11 @@ dependencies {
     api "io.lettuce:lettuce-core:6.2.2.RELEASE"
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.2"
-    testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.1"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.2"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.2"
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }
 
 test {
diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle
@@ -13,5 +13,5 @@ dependencies {
     testImplementation 'io.cucumber:cucumber-java:7.11.1'
     testImplementation 'io.cucumber:cucumber-junit:7.11.1'
     testImplementation 'org.testcontainers:selenium'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
@@ -10,5 +10,5 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'com.hazelcast:hazelcast:5.2.1'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     implementation 'io.codenotary:immudb4j:1.0.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
 }
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.24"
     testImplementation 'org.testcontainers:kafka'
     testImplementation 'org.apache.kafka:kafka-clients:3.3.2'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
 }
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
@@ -12,6 +12,6 @@ dependencies {
     testImplementation 'org.postgresql:postgresql:42.5.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.testcontainers:postgresql'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }
 
diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
@@ -7,9 +7,9 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'io.nats:jnats:2.16.7'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
-    testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
+    testImplementation 'org.apache.httpcomponents:httpclient:4.5.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.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.11'
     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.5'
     testImplementation 'org.testng:testng:7.5'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }
 
 test {
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
@@ -14,5 +14,5 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
@@ -15,5 +15,5 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.testcontainers:selenium'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle
@@ -9,6 +9,6 @@ repositories {
 dependencies {
     testImplementation 'com.jcraft:jsch:0.1.55'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
 }
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
@@ -15,5 +15,5 @@ dependencies {
 
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
@@ -14,6 +14,6 @@ dependencies {
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 
 }
diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id("org.springframework.boot") version "2.7.6"
     id("org.jetbrains.kotlin.jvm") version "1.8.0"
-    id("org.jetbrains.kotlin.plugin.spring") version "1.8.0"
+    id("org.jetbrains.kotlin.plugin.spring") version "1.8.10"
 }
 
 apply plugin: 'io.spring.dependency-management'
diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
@@ -9,6 +9,6 @@ repositories {
 dependencies {
     testImplementation 'org.apache.curator:curator-framework:5.4.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'ch.qos.logback:logback-classic:1.3.5'
 }
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.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }

Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@ dependencies {`
`8`	`8`
`9`	`9`	`testImplementation 'mysql:mysql-connector-java:8.0.31'`
`10`	`10`	`testImplementation "org.seleniumhq.selenium:selenium-api:4.7.2"`
`11`		`- testImplementation 'org.assertj:assertj-core:3.15.0'`
	`11`	`+ testImplementation 'org.assertj:assertj-core:3.24.2'`
`12`	`12`	`}`
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.23.1'`
	`8`	`+ testImplementation 'org.assertj:assertj-core:3.24.2'`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ dependencies {`
`13`	`13`	`testImplementation 'io.cucumber:cucumber-java:7.11.1'`
`14`	`14`	`testImplementation 'io.cucumber:cucumber-junit:7.11.1'`
`15`	`15`	`testImplementation 'org.testcontainers:selenium'`
`16`		`- testImplementation 'org.assertj:assertj-core:3.23.1'`
	`16`	`+ testImplementation 'org.assertj:assertj-core:3.24.2'`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,5 @@ dependencies {`
`10`	`10`	`testImplementation 'org.testcontainers:testcontainers'`
`11`	`11`	`testImplementation 'com.hazelcast:hazelcast:5.2.1'`
`12`	`12`	`testImplementation 'ch.qos.logback:logback-classic:1.3.5'`
`13`		`- testImplementation 'org.assertj:assertj-core:3.23.1'`
	`13`	`+ testImplementation 'org.assertj:assertj-core:3.24.2'`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ repositories {`
`9`	`9`	`dependencies {`
`10`	`10`	`implementation 'io.codenotary:immudb4j:1.0.0'`
`11`	`11`	`testImplementation 'org.testcontainers:testcontainers'`
`12`		`- testImplementation 'org.assertj:assertj-core:3.23.1'`
	`12`	`+ testImplementation 'org.assertj:assertj-core:3.24.2'`
`13`	`13`	`testImplementation 'com.google.guava:guava:23.0'`
`14`	`14`	`testImplementation 'ch.qos.logback:logback-classic:1.3.5'`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ dependencies {`
`11`	`11`	`testAnnotationProcessor "org.projectlombok:lombok:1.18.24"`
`12`	`12`	`testImplementation 'org.testcontainers:kafka'`
`13`	`13`	`testImplementation 'org.apache.kafka:kafka-clients:3.3.2'`
`14`		`- testImplementation 'org.assertj:assertj-core:3.23.1'`
	`14`	`+ testImplementation 'org.assertj:assertj-core:3.24.2'`
`15`	`15`	`testImplementation 'com.google.guava:guava:23.0'`
`16`	`16`	`testImplementation 'ch.qos.logback:logback-classic:1.3.5'`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ dependencies {`
`12`	`12`	`testImplementation 'org.postgresql:postgresql:42.5.2'`
`13`	`13`	`testImplementation 'ch.qos.logback:logback-classic:1.3.5'`
`14`	`14`	`testImplementation 'org.testcontainers:postgresql'`
`15`		`- testImplementation 'org.assertj:assertj-core:3.23.1'`
	`15`	`+ testImplementation 'org.assertj:assertj-core:3.24.2'`
`16`	`16`	`}`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ repositories {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`dependencies {`
`10`		`- testImplementation 'org.assertj:assertj-core:3.23.1'`
	`10`	`+ testImplementation 'org.assertj:assertj-core:3.24.2'`
`11`	`11`	`testImplementation 'org.testcontainers:testcontainers'`
`12`	`12`	`testImplementation 'io.nats:jnats:2.16.7'`
`13`	`13`	`testImplementation 'ch.qos.logback:logback-classic:1.3.5'`
`14`		`- testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'`
	`14`	`+ testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'`
`15`	`15`	`}`
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.23.1'`
	`10`	`+ testImplementation 'org.assertj:assertj-core:3.24.2'`
`11`	`11`	`testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.11'`
`12`	`12`	`testImplementation 'org.testcontainers:neo4j'`
`13`	`13`	`testImplementation 'org.testcontainers:junit-jupiter'`