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

Combined dependencies PR
testcontainers · Jul 2, 2023 · fd266c7 · fd266c7
2 parents 63c2370 + 0f7c236
commit fd266c7
Show file tree

Hide file tree

Showing 58 changed files with 92 additions and 92 deletions.
diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
@@ -13,6 +13,6 @@ jobs:
     steps:
       - name: combine-prs
         id: combine-prs
-        uses: github/combine-prs@v3.0.1
+        uses: github/combine-prs@v3.1.1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
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@569eb7ee3a85817ab916c8f8ff03a5bd96c9c83e # v5.19.0
+      - uses: release-drafter/release-drafter@65c5fb495d1e69aa8c08a3317bc44ff8aabe9772 # 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@38e0b6e68b4c852a5500a94740f0e535e0d7ba54 # v3.10.1
+        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v3.10.1
         with:
           title: Update docs version to ${GITHUB_REF##*/}
           body: |

diff --git a/.github/workflows/update-testcontainers-version.yml b/.github/workflows/update-testcontainers-version.yml
@@ -23,7 +23,7 @@ jobs:
           sed -i "s/^testcontainers\.version=.*/testcontainers\.version=${GITHUB_REF##*/}/g" gradle.properties
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@38e0b6e68b4c852a5500a94740f0e535e0d7ba54 # v3.10.1
+        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v3.10.1
         with:
           title: Update testcontainers version to ${GITHUB_REF##*/}
           body: |

diff --git a/build.gradle b/build.gradle
@@ -122,7 +122,7 @@ subprojects {
     }
 
     dependencies {
-        testImplementation 'ch.qos.logback:logback-classic:1.3.5'
+        testImplementation 'ch.qos.logback:logback-classic:1.3.8'
     }
 
     checkstyle {

diff --git a/core/build.gradle b/core/build.gradle
@@ -105,7 +105,7 @@ dependencies {
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
     testImplementation 'redis.clients:jedis:4.3.2'
     testImplementation 'com.rabbitmq:amqp-client:5.17.0'
-    testImplementation 'org.mongodb:mongo-java-driver:3.12.12'
+    testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
 
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')

diff --git a/docs/examples/junit4/generic/build.gradle b/docs/examples/junit4/generic/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation project(":mysql")
 
     testImplementation 'mysql:mysql-connector-java:8.0.32'
-    testImplementation "org.seleniumhq.selenium:selenium-api:4.8.1"
+    testImplementation "org.seleniumhq.selenium:selenium-api:4.10.0"
     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,7 +4,7 @@ dependencies {
     api "io.lettuce:lettuce-core:6.2.3.RELEASE"
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.2"
-    testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.2"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.3"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.2"
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")

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.3.RELEASE"
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation project(":spock")
-    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
 }
 
 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.3'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/examples/immudb/build.gradle b/examples/immudb/build.gradle
@@ -11,5 +11,5 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
 }
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
@@ -7,11 +7,11 @@ repositories {
 }
 
 dependencies {
-    testCompileOnly "org.projectlombok:lombok:1.18.26"
-    testAnnotationProcessor "org.projectlombok:lombok:1.18.26"
+    testCompileOnly "org.projectlombok:lombok:1.18.28"
+    testAnnotationProcessor "org.projectlombok:lombok:1.18.28"
     testImplementation 'org.testcontainers:kafka'
     testImplementation 'org.apache.kafka:kafka-clients:3.4.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
 }
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
@@ -7,10 +7,10 @@ repositories {
 }
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.11.0'
     implementation 'org.json:json:20230227'
     testImplementation 'org.postgresql:postgresql:42.6.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
@@ -10,6 +10,6 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'io.nats:jnats:2.16.10'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }
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.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
     testImplementation 'org.testng:testng:7.5'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

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.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
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.10'
+    id 'org.springframework.boot' version '2.7.13'
 }
 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.12.6"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.10"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11"
     }
 }
 

diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle
@@ -10,5 +10,5 @@ dependencies {
     testImplementation 'com.jcraft:jsch:0.1.55'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
 }
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.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
@@ -7,8 +7,8 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.projectlombok:lombok:1.18.26"
-    annotationProcessor "org.projectlombok:lombok:1.18.26"
+    compileOnly "org.projectlombok:lombok:1.18.28"
+    annotationProcessor "org.projectlombok:lombok:1.18.28"
 
     implementation 'org.apache.solr:solr-solrj:8.11.2'
 

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.10'
+    id 'org.springframework.boot' version '2.7.13'
 }
 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.24.2'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.3.8'
 }
diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Azure"
 dependencies {
     api project(':testcontainers')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
-    shaded 'com.squareup.okhttp3:okhttp:4.10.0'
+    shaded 'com.squareup.okhttp3:okhttp:4.11.0'
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'com.azure:azure-cosmos:4.42.0'
+    testImplementation 'com.azure:azure-cosmos:4.47.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.15.0'
+    testImplementation 'com.datastax.oss:java-driver-core:4.16.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
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.3.0'
+    testImplementation 'io.rest-assured:rest-assured:5.3.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
@@ -3,9 +3,9 @@ description = "Testcontainers :: Couchbase"
 dependencies {
     api project(':testcontainers')
     // TODO use JDK's HTTP client and/or Apache HttpClient5
-    shaded 'com.squareup.okhttp3:okhttp:4.10.0'
+    shaded 'com.squareup.okhttp3:okhttp:4.11.0'
 
-    testImplementation 'com.couchbase.client:java-client:3.4.4'
+    testImplementation 'com.couchbase.client:java-client:3.4.7'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite (deprecated)"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.441'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.441'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.500'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.500'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: elasticsearch"
 dependencies {
     api project(':testcontainers')
     testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.7.0"
-    testImplementation "org.elasticsearch.client:transport:7.17.9"
+    testImplementation "org.elasticsearch.client:transport:7.17.11"
     testImplementation 'org.assertj:assertj-core:3.24.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.17.0")
+    testImplementation platform("com.google.cloud:libraries-bom:26.18.0")
     testImplementation 'com.google.cloud:google-cloud-datastore'
     testImplementation 'com.google.cloud:google-cloud-firestore'
     testImplementation 'com.google.cloud:google-cloud-pubsub'

diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
@@ -5,20 +5,20 @@ dependencies {
     api("org.jetbrains:annotations:24.0.1")
 
     shaded("org.apache.commons:commons-lang3:3.12.0")
-    shaded("commons-io:commons-io:2.11.0")
+    shaded("commons-io:commons-io:2.13.0")
     shaded("org.javassist:javassist:3.29.2-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.5")
 
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.2")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.3")
     testImplementation(project(":junit-jupiter"))
-    testImplementation("com.hivemq:hivemq-extension-sdk:4.14.0")
+    testImplementation("com.hivemq:hivemq-extension-sdk:4.16.0")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
-    testImplementation("ch.qos.logback:logback-classic:1.4.6")
+    testImplementation("ch.qos.logback:logback-classic:1.4.8")
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.2")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.3")
 }
 
 test {

diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.influxdb:influxdb-java:2.23'
-    testImplementation "com.influxdb:influxdb-client-java:6.8.0"
+    testImplementation "com.influxdb:influxdb-client-java:6.9.0"
 }
diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
     api project(':jdbc')
 
-    api 'com.google.guava:guava:31.1-jre'
+    api 'com.google.guava:guava:32.1.1-jre'
     api 'org.apache.commons:commons-lang3:3.12.0'
     api 'com.zaxxer:HikariCP-java6:2.3.13'
     api 'commons-dbutils:commons-dbutils:1.7'

diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:24.0.1'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.7'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.10'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation ('org.mockito:mockito-core:4.11.0') {

diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
@@ -2,13 +2,13 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     api project(':testcontainers')
-    implementation platform('org.junit:junit-bom:5.9.2')
+    implementation platform('org.junit:junit-bom:5.9.3')
     implementation 'org.junit.jupiter:junit-jupiter-api'
 
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
-    testImplementation 'redis.clients:jedis:4.3.2'
+    testImplementation 'redis.clients:jedis:4.4.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')
@@ -17,7 +17,7 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
-    testRuntimeOnly 'mysql:mysql-connector-java:8.0.32'
+    testRuntimeOnly 'mysql:mysql-connector-java:8.0.33'
 }
 
 test {

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.5.1'
+    testImplementation 'io.fabric8:kubernetes-client:6.7.2'
     testImplementation 'io.kubernetes:client-java:18.0.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Kafka"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.4.0'
+    testImplementation 'org.apache.kafka:kafka-clients:3.5.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
 }
diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
@@ -3,10 +3,10 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.489")
+    testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.500")
     testImplementation 'com.amazonaws:aws-java-sdk-s3'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs'
     testImplementation 'com.amazonaws:aws-java-sdk-logs'
-    testImplementation 'software.amazon.awssdk:s3:2.20.38'
+    testImplementation 'software.amazon.awssdk:s3:2.20.97'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/modules/mariadb/build.gradle b/modules/mariadb/build.gradle
@@ -1,16 +1,16 @@
 description = "Testcontainers :: JDBC :: MariaDB"
 
 dependencies {
-    annotationProcessor 'com.google.auto.service:auto-service:1.0.1'
-    compileOnly 'com.google.auto.service:auto-service:1.0.1'
+    annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
+    compileOnly 'com.google.auto.service:auto-service:1.1.1'
 
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.1.3'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.1.4'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'org.mariadb:r2dbc-mariadb:1.0.3'