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

eddumelendez · web-flow · commit 563eae517667 · 2022-12-01T21:09:39.000-06:00
Combined dependencies PR
diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,7 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '7.1.2'
     id 'me.champeau.gradle.japicmp' version '0.4.1' apply false
     id 'com.diffplug.spotless' version '6.11.0' apply false
-    id 'org.gradle.test-retry' version '1.4.1'
+    id 'org.gradle.test-retry' version '1.5.0'
 }
 
 apply from: "$rootDir/gradle/ci-support.gradle"
@@ -125,7 +125,7 @@ subprojects {
     }
 
     dependencies {
-        testImplementation 'ch.qos.logback:logback-classic:1.3.4'
+        testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     }
 
     checkstyle {
diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     api "io.lettuce:lettuce-core:6.2.1.RELEASE"
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation project(":spock")
-    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
 }
 
 test {
diff --git a/examples/hazelcast/build.gradle b/examples/hazelcast/build.gradle
@@ -9,6 +9,6 @@ repositories {
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'com.hazelcast:hazelcast:5.2.1'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
@@ -13,5 +13,5 @@ dependencies {
     testImplementation 'org.apache.kafka:kafka-clients:3.3.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
 }
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'org.json:json:20220924'
     testImplementation 'org.postgresql:postgresql:42.5.1'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
@@ -10,6 +10,6 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'io.nats:jnats:2.16.5'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 }
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.10'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.testng:testng:7.5'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
@@ -13,6 +13,6 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
 
-    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
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.5"
     id("org.jetbrains.kotlin.jvm") version "1.7.22"
-    id("org.jetbrains.kotlin.plugin.spring") version "1.7.21"
+    id("org.jetbrains.kotlin.plugin.spring") version "1.7.22"
 }
 
 apply plugin: 'io.spring.dependency-management'
diff --git a/examples/zookeeper/build.gradle b/examples/zookeeper/build.gradle
@@ -10,5 +10,5 @@ dependencies {
     testImplementation 'org.apache.curator:curator-framework:5.4.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
 }
diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.10.0'
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'com.azure:azure-cosmos:4.38.1'
+    testImplementation 'com.azure:azure-cosmos:4.39.0'
 }
diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
@@ -4,9 +4,9 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.google.cloud:google-cloud-datastore:2.12.5'
-    testImplementation 'com.google.cloud:google-cloud-firestore:3.7.1'
+    testImplementation 'com.google.cloud:google-cloud-firestore:3.7.3'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.121.1'
-    testImplementation 'com.google.cloud:google-cloud-spanner:6.32.0'
+    testImplementation 'com.google.cloud:google-cloud-spanner:6.33.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.16.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.353'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.343'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.342'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.354'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.353'
     testImplementation 'software.amazon.awssdk:s3:2.18.18'
     testImplementation 'org.assertj:assertj-core:3.23.1'
diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
@@ -3,7 +3,7 @@ description = "TestContainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.12"
+    api "com.orientechnologies:orientdb-client:3.2.13"
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.1'
diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.5.0'
+    testRuntimeOnly 'org.postgresql:postgresql:42.5.1'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.31'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.9.1'
     testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.9.1'
diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'io.trino:trino-jdbc:402'
+    testImplementation 'io.trino:trino-jdbc:403'
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ plugins {`
`16`	`16`	`id 'com.github.johnrengelman.shadow' version '7.1.2'`
`17`	`17`	`id 'me.champeau.gradle.japicmp' version '0.4.1' apply false`
`18`	`18`	`id 'com.diffplug.spotless' version '6.11.0' apply false`
`19`		`- id 'org.gradle.test-retry' version '1.4.1'`
	`19`	`+ id 'org.gradle.test-retry' version '1.5.0'`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`apply from: "$rootDir/gradle/ci-support.gradle"`
`@@ -125,7 +125,7 @@ subprojects {`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`dependencies {`
`128`		`- testImplementation 'ch.qos.logback:logback-classic:1.3.4'`
	`128`	`+ testImplementation 'ch.qos.logback:logback-classic:1.3.5'`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`checkstyle {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ dependencies {`
`7`	`7`	`api "io.lettuce:lettuce-core:6.2.1.RELEASE"`
`8`	`8`	`testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'`
`9`	`9`	`testImplementation project(":spock")`
`10`		`- testImplementation 'ch.qos.logback:logback-classic:1.3.4'`
	`10`	`+ testImplementation 'ch.qos.logback:logback-classic:1.3.5'`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`test {`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@ repositories {`
`9`	`9`	`dependencies {`
`10`	`10`	`testImplementation 'org.testcontainers:testcontainers'`
`11`	`11`	`testImplementation 'com.hazelcast:hazelcast:5.2.1'`
`12`		`- testImplementation 'ch.qos.logback:logback-classic:1.3.4'`
	`12`	`+ testImplementation 'ch.qos.logback:logback-classic:1.3.5'`
`13`	`13`	`testImplementation 'org.assertj:assertj-core:3.23.1'`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ dependencies {`
`13`	`13`	`testImplementation 'org.apache.kafka:kafka-clients:3.3.1'`
`14`	`14`	`testImplementation 'org.assertj:assertj-core:3.23.1'`
`15`	`15`	`testImplementation 'com.google.guava:guava:23.0'`
`16`		`- testImplementation 'ch.qos.logback:logback-classic:1.3.4'`
	`16`	`+ testImplementation 'ch.qos.logback:logback-classic:1.3.5'`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ dependencies {`
`10`	`10`	`implementation 'com.squareup.okhttp3:okhttp:4.10.0'`
`11`	`11`	`implementation 'org.json:json:20220924'`
`12`	`12`	`testImplementation 'org.postgresql:postgresql:42.5.1'`
`13`		`- testImplementation 'ch.qos.logback:logback-classic:1.3.4'`
	`13`	`+ testImplementation 'ch.qos.logback:logback-classic:1.3.5'`
`14`	`14`	`testImplementation 'org.testcontainers:postgresql'`
`15`	`15`	`testImplementation 'org.assertj:assertj-core:3.23.1'`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ dependencies {`
`10`	`10`	`testImplementation 'org.assertj:assertj-core:3.23.1'`
`11`	`11`	`testImplementation 'org.testcontainers:testcontainers'`
`12`	`12`	`testImplementation 'io.nats:jnats:2.16.5'`
`13`		`- testImplementation 'ch.qos.logback:logback-classic:1.3.4'`
	`13`	`+ testImplementation 'ch.qos.logback:logback-classic:1.3.5'`
`14`	`14`	`testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ dependencies {`
`12`	`12`	`implementation 'com.google.code.gson:gson:2.10'`
`13`	`13`	`implementation 'com.google.guava:guava:23.0'`
`14`	`14`	`testImplementation 'org.testcontainers:testcontainers'`
`15`		`- testImplementation 'ch.qos.logback:logback-classic:1.3.4'`
	`15`	`+ testImplementation 'ch.qos.logback:logback-classic:1.3.5'`
`16`	`16`	`testImplementation 'org.testng:testng:7.5'`
`17`	`17`	`testImplementation 'org.assertj:assertj-core:3.23.1'`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ dependencies {`
`13`	`13`	`implementation 'com.google.guava:guava:23.0'`
`14`	`14`	`testImplementation 'org.testcontainers:testcontainers'`
`15`	`15`	`testImplementation 'junit:junit:4.13.2'`
`16`		`- testImplementation 'ch.qos.logback:logback-classic:1.3.4'`
	`16`	`+ testImplementation 'ch.qos.logback:logback-classic:1.3.5'`
`17`	`17`	`testImplementation 'org.assertj:assertj-core:3.23.1'`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ dependencies {`
`13`	`13`	`implementation 'com.google.guava:guava:23.0'`
`14`	`14`	`compileOnly 'org.slf4j:slf4j-api:1.7.36'`
`15`	`15`
`16`		`- testImplementation 'ch.qos.logback:logback-classic:1.3.4'`
	`16`	`+ testImplementation 'ch.qos.logback:logback-classic:1.3.5'`
`17`	`17`	`testImplementation 'org.testcontainers:testcontainers'`
`18`	`18`	`testImplementation 'org.assertj:assertj-core:3.23.1'`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id("org.springframework.boot") version "2.7.5"`
`3`	`3`	`id("org.jetbrains.kotlin.jvm") version "1.7.22"`
`4`		`- id("org.jetbrains.kotlin.plugin.spring") version "1.7.21"`
	`4`	`+ id("org.jetbrains.kotlin.plugin.spring") version "1.7.22"`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`apply plugin: 'io.spring.dependency-management'`