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

eddumelendez · web-flow · commit 3e5e013c6585 · 2022-09-30T20:02:21.000-05:00
Combined dependencies PR
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
@@ -18,6 +18,6 @@ jobs:
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@06a49bf28488e030d35ca2ac6dbf7f408a481779 # v5.19.0
+      - uses: release-drafter/release-drafter@df69d584deac33d8569990cb6413f82447181076 # v5.19.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
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@18f90432bedd2afd6a825469ffd38aa24712a91d # v3.10.1
+        uses: peter-evans/create-pull-request@671dc9c9e0c2d73f07fa45a3eb0220e1622f0c5f # v3.10.1
         with:
           title: Update docs version to ${GITHUB_REF##*/}
           body: |
diff --git a/core/build.gradle b/core/build.gradle
@@ -61,7 +61,7 @@ configurations.all {
 
 dependencies {
     api 'junit:junit:4.13.2'
-    api 'org.slf4j:slf4j-api:2.0.0'
+    api 'org.slf4j:slf4j-api:2.0.3'
     compileOnly 'org.jetbrains:annotations:23.0.0'
     testCompileOnly 'org.jetbrains:annotations:23.0.0'
     api 'org.apache.commons:commons-compress:1.21'
@@ -80,18 +80,18 @@ dependencies {
 
     api 'com.github.docker-java:docker-java-transport-zerodep'
 
-    shaded "org.yaml:snakeyaml:1.31"
+    shaded "org.yaml:snakeyaml:1.33"
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
 
     shaded 'org.zeroturnaround:zt-exec:1.12'
 
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
     testImplementation 'redis.clients:jedis:4.2.3'
-    testImplementation 'com.rabbitmq:amqp-client:5.15.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.16.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.11'
 
-    testImplementation ('org.mockito:mockito-core:4.7.0') {
+    testImplementation ('org.mockito:mockito-core:4.8.0') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle
@@ -11,6 +11,6 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.141.59'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.141.59'
     testImplementation 'io.cucumber:cucumber-java:7.6.0'
-    testImplementation 'io.cucumber:cucumber-junit:7.6.0'
+    testImplementation 'io.cucumber:cucumber-junit:7.8.0'
     testImplementation 'org.testcontainers:selenium'
 }
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testCompileOnly "org.projectlombok:lombok:1.18.24"
     testAnnotationProcessor "org.projectlombok:lombok:1.18.24"
     testImplementation 'org.testcontainers:kafka'
-    testImplementation 'org.apache.kafka:kafka-clients:3.2.1'
+    testImplementation 'org.apache.kafka:kafka-clients:3.3.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:2.0.0'
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
-    implementation 'org.json:json:20220320'
+    implementation 'org.json:json:20220924'
     testImplementation 'org.postgresql:postgresql:42.5.0'
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'
     testImplementation 'org.testcontainers:postgresql'
diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '2.7.3'
+    id 'org.springframework.boot' version '2.7.4'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/settings.gradle b/examples/settings.gradle
@@ -7,7 +7,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:common-custom-user-data-gradle-plugin:1.8"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.1"
     }
 }
 
diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("org.springframework.boot") version "2.7.3"
+    id("org.springframework.boot") version "2.7.4"
     id("org.jetbrains.kotlin.jvm") version "1.7.10"
     id("org.jetbrains.kotlin.plugin.spring") version "1.7.10"
 }
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '2.7.3'
+    id 'org.springframework.boot' version '2.7.4'
 }
 apply plugin: 'io.spring.dependency-management'
 
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.35.1'
+    testImplementation 'com.azure:azure-cosmos:4.36.0'
 }
diff --git a/modules/cassandra/build.gradle b/modules/cassandra/build.gradle
@@ -10,6 +10,6 @@ dependencies {
     api project(":database-commons")
     api "com.datastax.cassandra:cassandra-driver-core:3.10.0"
 
-    testImplementation 'com.datastax.oss:java-driver-core:4.14.1'
+    testImplementation 'com.datastax.oss:java-driver-core:4.15.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/consul/build.gradle b/modules/consul/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.ecwid.consul:consul-api:1.4.5'
-    testImplementation 'io.rest-assured:rest-assured:5.1.1'
+    testImplementation 'io.rest-assured:rest-assured:5.2.0'
     testImplementation 'org.assertj:assertj-core:3.23.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.3'
+    testImplementation 'com.couchbase.client:java-client:3.3.4'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.295'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.313'
     testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.295'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
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.4.1"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.4.2"
     testImplementation "org.elasticsearch.client:transport:7.17.6"
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
@@ -3,9 +3,9 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.google.cloud:google-cloud-datastore:2.11.0'
+    testImplementation 'com.google.cloud:google-cloud-datastore:2.11.4'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.4.2'
-    testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.13'
+    testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.18'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.29.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.11.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'
diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
@@ -9,16 +9,16 @@ dependencies {
     shaded("org.javassist:javassist:3.29.0-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.1")
+    shaded("net.lingala.zip4j:zip4j:2.11.2")
 
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.0")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.1")
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.8.3")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.9.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.13")
-    testImplementation("ch.qos.logback:logback-classic:1.4.0")
+    testImplementation("ch.qos.logback:logback-classic:1.4.1")
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.0")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.1")
 }
 
 test {
diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
@@ -7,10 +7,10 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:23.0.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.23'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.0'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation ('org.mockito:mockito-core:4.7.0') {
+    testImplementation ('org.mockito:mockito-core:4.8.0') {
         exclude(module: 'hamcrest-core')
     }
 }
diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
@@ -2,22 +2,22 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     api project(':testcontainers')
-    api 'org.junit.jupiter:junit-jupiter-api:5.9.0'
+    api 'org.junit.jupiter:junit-jupiter-api:5.9.1'
 
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'redis.clients:jedis:4.2.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
-    testImplementation ('org.mockito:mockito-core:4.7.0') {
+    testImplementation ('org.mockito:mockito-core:4.8.0') {
         exclude(module: 'hamcrest-core')
     }
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.1'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.5.0'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.30'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 test {
diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
@@ -3,10 +3,10 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.295'
-    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.285'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.313'
+    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.313'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.295'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.295'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.313'
     testImplementation 'software.amazon.awssdk:s3:2.17.266'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/mariadb/build.gradle b/modules/mariadb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.0.7'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.0.8'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'org.mariadb:r2dbc-mariadb:1.0.2'
diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:0.9.0.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:11.2.0.jre8'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:11.2.1.jre8'
 
     testImplementation project(':r2dbc')
     testImplementation 'io.r2dbc:r2dbc-mssql:0.8.7.RELEASE'
diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.4.22'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.4.23'
     testFixturesImplementation 'org.assertj:assertj-core:3.23.1'
 }
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.15.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.16.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }
diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Redpanda"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.2.1'
+    testImplementation 'org.apache.kafka:kafka-clients:3.3.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
-    testImplementation 'io.rest-assured:rest-assured:5.1.1'
+    testImplementation 'io.rest-assured:rest-assured:5.2.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 
 }
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.1"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.1"
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@ dependencies {`
`11`	`11`	`implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.141.59'`
`12`	`12`	`implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.141.59'`
`13`	`13`	`testImplementation 'io.cucumber:cucumber-java:7.6.0'`
`14`		`- testImplementation 'io.cucumber:cucumber-junit:7.6.0'`
	`14`	`+ testImplementation 'io.cucumber:cucumber-junit:7.8.0'`
`15`	`15`	`testImplementation 'org.testcontainers:selenium'`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id 'java'`
`3`		`- id 'org.springframework.boot' version '2.7.3'`
	`3`	`+ id 'org.springframework.boot' version '2.7.4'`
`4`	`4`	`}`
`5`	`5`	`apply plugin: 'io.spring.dependency-management'`
`6`	`6`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`	`dependencies {`
`8`	`8`	`classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"`
`9`	`9`	`classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.1"`
`10`		`- classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8"`
	`10`	`+ classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.1"`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id("org.springframework.boot") version "2.7.3"`
	`2`	`+ id("org.springframework.boot") version "2.7.4"`
`3`	`3`	`id("org.jetbrains.kotlin.jvm") version "1.7.10"`
`4`	`4`	`id("org.jetbrains.kotlin.plugin.spring") version "1.7.10"`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ dependencies {`
`6`	`6`	`shaded 'com.squareup.okhttp3:okhttp:4.10.0'`
`7`	`7`
`8`	`8`	`testImplementation 'org.assertj:assertj-core:3.23.1'`
`9`		`- testImplementation 'com.azure:azure-cosmos:4.35.1'`
	`9`	`+ testImplementation 'com.azure:azure-cosmos:4.36.0'`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ dependencies {`
`10`	`10`	`api project(":database-commons")`
`11`	`11`	`api "com.datastax.cassandra:cassandra-driver-core:3.10.0"`
`12`	`12`
`13`		`- testImplementation 'com.datastax.oss:java-driver-core:4.14.1'`
	`13`	`+ testImplementation 'com.datastax.oss:java-driver-core:4.15.0'`
`14`	`14`	`testImplementation 'org.assertj:assertj-core:3.23.1'`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@ dependencies {`
`4`	`4`	`api project(':testcontainers')`
`5`	`5`
`6`	`6`	`testImplementation 'com.ecwid.consul:consul-api:1.4.5'`
`7`		`- testImplementation 'io.rest-assured:rest-assured:5.1.1'`
	`7`	`+ testImplementation 'io.rest-assured:rest-assured:5.2.0'`
`8`	`8`	`testImplementation 'org.assertj:assertj-core:3.23.1'`
`9`	`9`	`}`
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.3'`
	`8`	`+ testImplementation 'com.couchbase.client:java-client:3.3.4'`
`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
`@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"`
`3`	`3`	`dependencies {`
`4`	`4`	`api project(':testcontainers')`
`5`	`5`
`6`		`- compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.295'`
	`6`	`+ compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.313'`
`7`	`7`	`testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.295'`
`8`	`8`	`testImplementation 'org.assertj:assertj-core:3.23.1'`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ description = "TestContainers :: elasticsearch"`
`2`	`2`
`3`	`3`	`dependencies {`
`4`	`4`	`api project(':testcontainers')`
`5`		`- testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.4.1"`
	`5`	`+ testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.4.2"`
`6`	`6`	`testImplementation "org.elasticsearch.client:transport:7.17.6"`
`7`	`7`	`testImplementation 'org.assertj:assertj-core:3.23.1'`
`8`	`8`	`}`