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

eddumelendez · web-flow · commit 034134edb225 · 2022-11-02T18:47:37.000-06:00
Combined dependencies PR
diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
@@ -23,7 +23,7 @@ jobs:
           sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@671dc9c9e0c2d73f07fa45a3eb0220e1622f0c5f # v3.10.1
+        uses: peter-evans/create-pull-request@b4d51739f96fca8047ad065eccef63442d8e99f7 # v3.10.1
         with:
           title: Update docs version to ${GITHUB_REF##*/}
           body: |
diff --git a/core/build.gradle b/core/build.gradle
@@ -87,7 +87,7 @@ dependencies {
     shaded 'org.zeroturnaround:zt-exec:1.12'
 
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
-    testImplementation 'redis.clients:jedis:4.2.3'
+    testImplementation 'redis.clients:jedis:4.3.1'
     testImplementation 'com.rabbitmq:amqp-client:5.16.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.11'
 
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.4.2"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.1"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.4.2"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.1"
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")
     testImplementation 'org.assertj:assertj-core:3.23.1'
diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
@@ -5,7 +5,7 @@ plugins {
 
 dependencies {
     api "io.lettuce:lettuce-core:5.2.0.RELEASE"
-    testImplementation 'org.spockframework:spock-core:1.2-groovy-2.5'
+    testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation project(":spock")
     testImplementation 'ch.qos.logback:logback-classic:1.3.4'
 }
diff --git a/examples/settings.gradle b/examples/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
-        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.1"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.3"
         classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.1"
     }
 }
diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.10.0'
 
-    testImplementation 'com.couchbase.client:java-client:3.3.4'
+    testImplementation 'com.couchbase.client:java-client:3.4.0'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testImplementation 'com.google.cloud:google-cloud-datastore:2.12.3'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.5.0'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.24'
-    testImplementation 'com.google.cloud:google-cloud-spanner:6.31.0'
+    testImplementation 'com.google.cloud:google-cloud-spanner:6.32.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.15.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle
@@ -13,5 +13,5 @@ dependencies {
 
     api 'org.apache.tomcat:tomcat-jdbc:10.0.27'
     api 'org.vibur:vibur-dbcp:25.0'
-    api 'mysql:mysql-connector-java:8.0.30'
+    api 'mysql:mysql-connector-java:8.0.31'
 }
diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     // Any >2.8 version here is not compatible with jackson-databind 2.8.x.
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
-    testImplementation 'io.fabric8:kubernetes-client:6.1.1'
+    testImplementation 'io.fabric8:kubernetes-client:6.2.0'
     testImplementation 'io.kubernetes:client-java:16.0.1'
     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.333'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.333'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.314'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.333'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.314'
     testImplementation 'software.amazon.awssdk:s3:2.18.7'
     testImplementation 'org.assertj:assertj-core:3.23.1'
diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.10.2'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.23.1'
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.10.1'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.10.2'
 }
diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Redpanda"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.3.0'
+    testImplementation 'org.apache.kafka:kafka-clients:3.3.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'io.rest-assured:rest-assured:5.2.0'
 }
diff --git a/settings.gradle b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.3"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.1"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.2"
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ plugins {`
`5`	`5`
`6`	`6`	`dependencies {`
`7`	`7`	`api "io.lettuce:lettuce-core:5.2.0.RELEASE"`
`8`		`- testImplementation 'org.spockframework:spock-core:1.2-groovy-2.5'`
	`8`	`+ testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'`
`9`	`9`	`testImplementation project(":spock")`
`10`	`10`	`testImplementation 'ch.qos.logback:logback-classic:1.3.4'`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`	`8`	`classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"`
`9`		`- classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.1"`
	`9`	`+ classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.3"`
`10`	`10`	`classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.1"`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ dependencies {`
`5`	`5`	`// TODO use JDK's HTTP client and/or Apache HttpClient5`
`6`	`6`	`shaded 'com.squareup.okhttp3:okhttp:4.10.0'`
`7`	`7`
`8`		`- testImplementation 'com.couchbase.client:java-client:3.3.4'`
	`8`	`+ testImplementation 'com.couchbase.client:java-client:3.4.0'`
`9`	`9`	`testImplementation 'org.awaitility:awaitility:4.2.0'`
`10`	`10`	`testImplementation 'org.assertj:assertj-core:3.23.1'`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ dependencies {`
`6`	`6`	`testImplementation 'com.google.cloud:google-cloud-datastore:2.12.3'`
`7`	`7`	`testImplementation 'com.google.cloud:google-cloud-firestore:3.5.0'`
`8`	`8`	`testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.24'`
`9`		`- testImplementation 'com.google.cloud:google-cloud-spanner:6.31.0'`
	`9`	`+ testImplementation 'com.google.cloud:google-cloud-spanner:6.32.0'`
`10`	`10`	`testImplementation 'com.google.cloud:google-cloud-bigtable:2.15.0'`
`11`	`11`	`testImplementation 'org.assertj:assertj-core:3.23.1'`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ dependencies {`
`13`	`13`
`14`	`14`	`api 'org.apache.tomcat:tomcat-jdbc:10.0.27'`
`15`	`15`	`api 'org.vibur:vibur-dbcp:25.0'`
`16`		`- api 'mysql:mysql-connector-java:8.0.30'`
	`16`	`+ api 'mysql:mysql-connector-java:8.0.31'`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ dependencies {`
`8`	`8`	`// Any >2.8 version here is not compatible with jackson-databind 2.8.x.`
`9`	`9`	`shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'`
`10`	`10`
`11`		`- testImplementation 'io.fabric8:kubernetes-client:6.1.1'`
	`11`	`+ testImplementation 'io.fabric8:kubernetes-client:6.2.0'`
`12`	`12`	`testImplementation 'io.kubernetes:client-java:16.0.1'`
`13`	`13`	`testImplementation 'org.assertj:assertj-core:3.23.1'`
`14`	`14`	`}`