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

Combined dependencies PR
testcontainers · Apr 6, 2022 · aed4476 · aed4476
2 parents 06fc95f + ae6bc93
commit aed4476
Show file tree

Hide file tree

Showing 31 changed files with 46 additions and 46 deletions.
diff --git a/.github/workflows/ci-docker-wormhole.yml b/.github/workflows/ci-docker-wormhole.yml
@@ -8,7 +8,7 @@ jobs:
  in-docker_test:
  runs-on: ubuntu-18.04
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - name: Build with Gradle
  run: |
  docker run -i --rm \

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
@@ -16,13 +16,13 @@ jobs:
  outputs:
  matrix: ${{ steps.set-matrix.outputs.matrix }}
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - uses: actions/setup-java@v3
  with:
  java-version: '8.0.302'
  distribution: temurin
  - name: Cache Gradle Home files
- uses: actions/cache@v2.1.7
+ uses: actions/cache@v3.0.1
  continue-on-error: true
  with:
  path: ~/.gradle/caches
@@ -44,13 +44,13 @@ jobs:
  matrix: ${{ fromJson(needs.find_gradle_jobs.outputs.matrix) }}
  runs-on: ubuntu-18.04
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - uses: actions/setup-java@v3
  with:
  java-version: '8.0.302'
  distribution: temurin
  - name: Cache Gradle Home files
- uses: actions/cache@v2.1.7
+ uses: actions/cache@v3.0.1
  continue-on-error: true
  with:
  path: ~/.gradle/caches

diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml
@@ -16,7 +16,7 @@ jobs:
  env:
  XDG_RUNTIME_DIR: ${{ matrix.XDG_RUNTIME_DIR }}
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - name: debug
  run: id -u; whoami
  - name: uninstall rootful Docker

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,21 +16,21 @@ jobs:
  outputs:
  thundra_agent_testrun_id: ${{ steps.thundra_test_initializer.outputs.thundra_agent_testrun_id }}
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - id: thundra_test_initializer
  uses: thundra-io/thundra-test-init-action@v1
  find_gradle_jobs:
  runs-on: ubuntu-18.04
  outputs:
  matrix: ${{ steps.set-matrix.outputs.matrix }}
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - uses: actions/setup-java@v3
  with:
  java-version: '8.0.302'
  distribution: temurin
  - name: Cache Gradle Home files
- uses: actions/cache@v2.1.7
+ uses: actions/cache@v3.0.1
  with:
  path: ~/.gradle/caches
  key: ${{ runner.os }}-gradle-home-testmatrix-${{ hashFiles('**/*.gradle') }}
@@ -50,13 +50,13 @@ jobs:
  matrix: ${{ fromJson(needs.find_gradle_jobs.outputs.matrix) }}
  runs-on: ubuntu-18.04
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - uses: actions/setup-java@v3
  with:
  java-version: '8.0.302'
  distribution: temurin
  - name: Cache Gradle Home files
- uses: actions/cache@v2.1.7
+ uses: actions/cache@v3.0.1
  continue-on-error: true
  with:
  path: ~/.gradle/caches

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
  release:
  runs-on: ubuntu-18.04
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - uses: actions/setup-java@v3
  with:
  java-version: '8.0.302'

diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
@@ -9,15 +9,15 @@ jobs:
  if: github.repository == 'testcontainers/testcontainers-java'
  runs-on: ubuntu-18.04
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  with:
  ref: master
  - name: Update latest_version property in mkdocs.yml
  run: |
  sed -i "s/latest_version: .*/latest_version: ${GITHUB_REF##*/}/g" mkdocs.yml
  git diff
  - name: Create Pull Request
- uses: peter-evans/create-pull-request@f22a7da129c901513876a2380e2dae9f8e145330 # v3.10.1
+ uses: peter-evans/create-pull-request@f1a7646cead32c950d90344a4fb5d4e926972a8f # v3.10.1
  with:
  title: Update docs version to ${GITHUB_REF##*/}
  body: |

diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
@@ -10,7 +10,7 @@ jobs:
  runs-on: ubuntu-latest
 
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
 
  - name: Update Gradle Wrapper
  uses: gradle-update/update-gradle-wrapper-action@5b865a8b4d09fdf6afaaa20397ba68455bb48f0d # v1.0.13

diff --git a/core/build.gradle b/core/build.gradle
@@ -71,7 +71,7 @@ dependencies {
  exclude(group: 'org.jetbrains', module: 'annotations')
  }
 
- shaded 'org.awaitility:awaitility:4.1.1'
+ shaded 'org.awaitility:awaitility:4.2.0'
 
  api platform('com.github.docker-java:docker-java-bom:3.2.13')
  shaded platform('com.github.docker-java:docker-java-bom:3.2.13')

diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
@@ -12,7 +12,7 @@ dependencies {
  implementation 'biz.paluch.redis:spinach:0.3'
  implementation 'com.google.code.gson:gson:2.8.9'
  implementation 'com.google.guava:guava:23.0'
- testImplementation 'ch.qos.logback:logback-classic:1.2.10'
+ testImplementation 'ch.qos.logback:logback-classic:1.2.11'
  testImplementation 'org.mockito:mockito-all:1.10.19'
  testImplementation 'org.testcontainers:testcontainers'
  testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

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.1.0'
  testImplementation 'org.assertj:assertj-core:3.22.0'
  testImplementation 'com.google.guava:guava:23.0'
- testImplementation 'ch.qos.logback:logback-classic:1.2.10'
+ testImplementation 'ch.qos.logback:logback-classic:1.2.11'
 }
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.9.3'
  implementation 'org.json:json:20211205'
  testImplementation 'org.postgresql:postgresql:42.3.3'
- testImplementation 'ch.qos.logback:logback-classic:1.2.10'
+ testImplementation 'ch.qos.logback:logback-classic:1.2.11'
  testImplementation 'org.testcontainers:postgresql'
 }
 
diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
  testImplementation 'org.assertj:assertj-core:3.22.0'
- testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.3'
+ testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.5'
  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
@@ -8,11 +8,11 @@ repositories {
 
 dependencies {
  compileOnly 'org.slf4j:slf4j-api:1.7.32'
- implementation 'redis.clients:jedis:4.1.1'
+ implementation 'redis.clients:jedis:4.2.1'
  implementation 'com.google.code.gson:gson:2.8.9'
  implementation 'com.google.guava:guava:23.0'
  testImplementation 'org.testcontainers:testcontainers'
- testImplementation 'ch.qos.logback:logback-classic:1.2.10'
+ testImplementation 'ch.qos.logback:logback-classic:1.2.11'
  testImplementation 'org.testng:testng:7.5'
  testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
@@ -8,11 +8,11 @@ repositories {
 
 dependencies {
  compileOnly 'org.slf4j:slf4j-api:1.7.32'
- implementation 'redis.clients:jedis:4.1.1'
+ implementation 'redis.clients:jedis:4.2.1'
  implementation 'com.google.code.gson:gson:2.8.9'
  implementation 'com.google.guava:guava:23.0'
  testImplementation 'org.testcontainers:testcontainers'
  testImplementation 'junit:junit:4.13.2'
- testImplementation 'ch.qos.logback:logback-classic:1.2.10'
+ testImplementation 'ch.qos.logback:logback-classic:1.2.11'
  testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
@@ -8,12 +8,12 @@ repositories {
 
 dependencies {
 
- implementation 'redis.clients:jedis:4.1.1'
+ implementation 'redis.clients:jedis:4.2.1'
  implementation 'com.google.code.gson:gson:2.8.9'
  implementation 'com.google.guava:guava:23.0'
  compileOnly 'org.slf4j:slf4j-api:1.7.32'
 
- testImplementation 'ch.qos.logback:logback-classic:1.2.10'
+ testImplementation 'ch.qos.logback:logback-classic:1.2.11'
  testImplementation 'org.testcontainers:testcontainers'
  testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.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.6.4"
  id("org.jetbrains.kotlin.jvm") version "1.6.10"
- id("org.jetbrains.kotlin.plugin.spring") version "1.6.10"
+ id("org.jetbrains.kotlin.plugin.spring") version "1.6.20"
 }
 
 apply plugin: 'io.spring.dependency-management'

diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
@@ -5,6 +5,6 @@ dependencies {
  // TODO use JDK's HTTP client and/or Apache HttpClient5
  shaded 'com.squareup.okhttp3:okhttp:3.14.9'
 
- testImplementation 'com.couchbase.client:java-client:3.2.5'
+ testImplementation 'com.couchbase.client:java-client:3.2.6'
  testImplementation 'org.awaitility:awaitility:4.1.1'
 }
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:7.16.2"
- testImplementation "org.elasticsearch.client:transport:7.17.1"
+ testImplementation "org.elasticsearch.client:transport:7.17.2"
  testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
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.2.2'
- testImplementation 'com.google.cloud:google-cloud-firestore:3.0.14'
+ testImplementation 'com.google.cloud:google-cloud-firestore:3.0.21'
  testImplementation 'com.google.cloud:google-cloud-pubsub:1.115.1'
  testImplementation 'com.google.cloud:google-cloud-spanner:6.20.0'
- testImplementation 'com.google.cloud:google-cloud-bigtable:2.5.2'
+ testImplementation 'com.google.cloud:google-cloud-bigtable:2.6.1'
  testImplementation 'org.assertj:assertj-core:3.22.0'
 }
diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
@@ -9,11 +9,11 @@ dependencies {
  shaded("org.javassist:javassist:3.28.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.9.1")
+ shaded("net.lingala.zip4j:zip4j:2.10.0")
 
  testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
  testImplementation(project(":junit-jupiter"))
- testImplementation("com.hivemq:hivemq-extension-sdk:4.7.4")
+ testImplementation("com.hivemq:hivemq-extension-sdk:4.7.5")
  testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
  testImplementation("org.apache.httpcomponents:httpclient:4.5.13")
  testImplementation("ch.qos.logback:logback-classic:1.2.10")

diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle
@@ -14,7 +14,7 @@ dependencies {
  exclude(group: "net.java.dev.jna", module: "jna")
  }
 
- api 'org.apache.tomcat:tomcat-jdbc:10.0.16'
+ api 'org.apache.tomcat:tomcat-jdbc:10.0.20'
  api 'org.vibur:vibur-dbcp:25.0'
  api 'mysql:mysql-connector-java:8.0.28'
 }
diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
@@ -7,7 +7,7 @@ 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.16'
+ testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.20'
  testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
  testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
  testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
@@ -9,7 +9,7 @@ dependencies {
  testImplementation 'com.zaxxer:HikariCP:4.0.3'
  testImplementation 'redis.clients:jedis:4.1.1'
  testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
- testImplementation ('org.mockito:mockito-core:4.3.1') {
+ testImplementation ('org.mockito:mockito-core:4.4.0') {
  exclude(module: 'hamcrest-core')
  }
  testImplementation 'org.assertj:assertj-core:3.22.0'

diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
@@ -9,6 +9,6 @@ dependencies {
  shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
  testImplementation 'io.fabric8:kubernetes-client:5.12.1'
- testImplementation 'io.kubernetes:client-java:14.0.0'
+ testImplementation 'io.kubernetes:client-java:15.0.0'
  testImplementation 'org.assertj:assertj-core:3.22.0'
 }
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.169'
+ compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.191'
  testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.169'
  testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.150'
  testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.169'
- testImplementation 'software.amazon.awssdk:s3:2.17.108'
+ testImplementation 'software.amazon.awssdk:s3:2.17.162'
  testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: MongoDB"
 dependencies {
  api project(':testcontainers')
 
- testImplementation("org.mongodb:mongodb-driver-sync:4.5.0")
+ testImplementation("org.mongodb:mongodb-driver-sync:4.5.1")
 }
diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
@@ -33,6 +33,6 @@ dependencies {
 
  api project(":testcontainers")
 
- testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.3'
+ testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.5'
  testImplementation 'org.assertj:assertj-core:3.22.0'
 }
diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
@@ -12,9 +12,9 @@ dependencies {
  api 'io.r2dbc:r2dbc-spi:0.8.1.RELEASE'
 
  testImplementation 'org.assertj:assertj-core:3.22.0'
- testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.11.RELEASE'
+ testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.12.RELEASE'
  testImplementation project(':postgresql')
 
- testFixturesImplementation 'io.projectreactor:reactor-core:3.4.15'
+ testFixturesImplementation 'io.projectreactor:reactor-core:3.4.16'
  testFixturesImplementation 'org.assertj:assertj-core:3.14.0'
 }
diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Solr"
 dependencies {
  api project(':testcontainers')
  // TODO use JDK's HTTP client and/or Apache HttpClient5
- shaded 'com.squareup.okhttp3:okhttp:3.14.9'
+ shaded 'com.squareup.okhttp3:okhttp:4.9.3'
 
  testImplementation 'org.apache.solr:solr-solrj:8.11.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:369'
+ testImplementation 'io.trino:trino-jdbc:375'
  compileOnly 'org.jetbrains:annotations:23.0.0'
 }
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:4.5.1'
+ testImplementation 'io.rest-assured:rest-assured:5.0.0'
  testImplementation 'org.assertj:assertj-core:3.22.0'
 
 }