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

kiview · web-flow · commit 1c9ab86b4cb0 · 2022-02-03T15:13:48.000+01:00
Combined dependencies PR
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
@@ -12,6 +12,6 @@ jobs:
     if: github.repository == 'testcontainers/testcontainers-java'
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@fe52e97d262833ae07d05efaf1a239df3f1b5cd4 # v5.15.0
+      - uses: release-drafter/release-drafter@436492609a0c75979acf131d57f61b5321571950 # v5.15.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/update-docs-version.yml b/.github/workflows/update-docs-version.yml
@@ -17,7 +17,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@dcd5fd746d53dd8de555c0f10bca6c35628be47a # v3.10.1
+        uses: peter-evans/create-pull-request@f22a7da129c901513876a2380e2dae9f8e145330 # 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
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Update Gradle Wrapper
-        uses: gradle-update/update-gradle-wrapper-action@f31ab392a9d75029f9fd0883d8d6745c0139a006 # v1.0.13
+        uses: gradle-update/update-gradle-wrapper-action@5b865a8b4d09fdf6afaaa20397ba68455bb48f0d # v1.0.13
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           labels: dependencies
diff --git a/core/build.gradle b/core/build.gradle
@@ -53,12 +53,12 @@ configurations.all {
 }
 
 dependencies {
-    baseline 'org.testcontainers:testcontainers:1.16.2', {
+    baseline 'org.testcontainers:testcontainers:1.16.3', {
         exclude group: "*", module: "*"
     }
 
     api 'junit:junit:4.13.2'
-    api 'org.slf4j:slf4j-api:1.7.32'
+    api 'org.slf4j:slf4j-api:1.7.35'
     compileOnly 'org.jetbrains:annotations:23.0.0'
     testCompileClasspath 'org.jetbrains:annotations:23.0.0'
     api 'org.apache.commons:commons-compress:1.21'
@@ -90,10 +90,10 @@ dependencies {
 
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
     testImplementation 'redis.clients:jedis:4.0.1'
-    testImplementation 'com.rabbitmq:amqp-client:5.14.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.14.1'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.10'
 
-    testImplementation ('org.mockito:mockito-core:4.2.0') {
+    testImplementation ('org.mockito:mockito-core:4.3.1') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-remote-driver:3.141.59'
     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.2.2'
+    testImplementation 'io.cucumber:cucumber-java:7.2.3'
     testImplementation 'io.cucumber:cucumber-junit:7.2.2'
     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.22"
     testAnnotationProcessor "org.projectlombok:lombok:1.18.22"
     testImplementation 'org.testcontainers:kafka'
-    testImplementation 'org.apache.kafka:kafka-clients:3.0.0'
+    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'
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
     implementation 'org.json:json:20211205'
-    testImplementation 'org.postgresql:postgresql:42.3.1'
+    testImplementation 'org.postgresql:postgresql:42.3.2'
     testImplementation 'ch.qos.logback:logback-classic:1.2.10'
     testImplementation 'org.testcontainers:postgresql'
 }
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
-    implementation 'redis.clients:jedis:4.0.1'
+    implementation 'redis.clients:jedis:4.1.1'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
-    implementation 'redis.clients:jedis:4.0.1'
+    implementation 'redis.clients:jedis:4.1.1'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
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.6.2'
+    id 'org.springframework.boot' version '2.6.3'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:4.0.1'
+    implementation 'redis.clients:jedis:4.1.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'
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.6.2"
+    id("org.springframework.boot") version "2.6.3"
     id("org.jetbrains.kotlin.jvm") version "1.6.10"
     id("org.jetbrains.kotlin.plugin.spring") version "1.6.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.6.2'
+    id 'org.springframework.boot' version '2.6.3'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.postgresql:postgresql:42.3.1'
+    testImplementation 'org.postgresql:postgresql:42.3.2'
 }
diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: Couchbase"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.couchbase.client:java-client:3.2.4'
+    testImplementation 'com.couchbase.client:java-client:3.2.5'
     testImplementation 'org.awaitility:awaitility:4.1.1'
 }
diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
@@ -3,8 +3,8 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.137'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.131'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.150'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.150'
 
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.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:7.16.2"
-    testImplementation "org.elasticsearch.client:transport:7.16.2"
+    testImplementation "org.elasticsearch.client:transport:7.17.0"
     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.10'
+    testImplementation 'com.google.cloud:google-cloud-firestore:3.0.11'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.115.1'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.17.4'
-    testImplementation 'com.google.cloud:google-cloud-bigtable:2.5.1'
+    testImplementation 'com.google.cloud:google-cloud-bigtable:2.5.2'
     testImplementation 'org.assertj:assertj-core:3.22.0'
 }
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.14'
+    api 'org.apache.tomcat:tomcat-jdbc:10.0.16'
     api 'org.vibur:vibur-dbcp:25.0'
     api 'mysql:mysql-connector-java:8.0.27'
 }
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.14'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.16'
     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
@@ -7,15 +7,15 @@ dependencies {
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
-    testImplementation 'redis.clients:jedis:4.0.1'
+    testImplementation 'redis.clients:jedis:4.1.1'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
-    testImplementation ('org.mockito:mockito-core:4.2.0') {
+    testImplementation ('org.mockito:mockito-core:4.3.1') {
         exclude(module: 'hamcrest-core')
     }
     testImplementation 'org.assertj:assertj-core:3.22.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.3.1'
+    testRuntimeOnly 'org.postgresql:postgresql:42.3.2'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.27'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
 }
diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
@@ -3,9 +3,9 @@ description = "Testcontainers :: K3S"
 dependencies {
     api project(":testcontainers")
 
-    shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
+    shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.1'
 
     testImplementation 'io.fabric8:kubernetes-client:5.11.0'
     testImplementation 'io.kubernetes:client-java:14.0.0'
-    testImplementation 'org.assertj:assertj-core:3.21.0'
+    testImplementation 'org.assertj:assertj-core:3.22.0'
 }
diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
@@ -3,9 +3,9 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.137'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.150'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.137'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.139'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.150'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.139'
     testImplementation 'software.amazon.awssdk:s3:2.17.108'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
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:2.7.4'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.0.3'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'org.mariadb:r2dbc-mariadb:1.0.2'
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.2'
+    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.3'
     testImplementation 'org.assertj:assertj-core:3.22.0'
 }
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.14.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.14.1'
     testImplementation 'org.assertj:assertj-core:3.22.0'
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }
diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.3.1'
-    testRuntimeOnly 'mysql:mysql-connector-java:8.0.27'
+    testRuntimeOnly 'mysql:mysql-connector-java:8.0.28'
 
     testCompileClasspath 'org.jetbrains:annotations:23.0.0'
 }
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:367'
+    testImplementation 'io.trino:trino-jdbc:369'
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ dependencies {`
`10`	`10`	`implementation 'org.seleniumhq.selenium:selenium-remote-driver:3.141.59'`
`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`		`- testImplementation 'io.cucumber:cucumber-java:7.2.2'`
	`13`	`+ testImplementation 'io.cucumber:cucumber-java:7.2.3'`
`14`	`14`	`testImplementation 'io.cucumber:cucumber-junit:7.2.2'`
`15`	`15`	`testImplementation 'org.testcontainers:selenium'`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ dependencies {`
`9`	`9`	`compileOnly 'org.slf4j:slf4j-api:1.7.32'`
`10`	`10`	`implementation 'com.squareup.okhttp3:okhttp:4.9.3'`
`11`	`11`	`implementation 'org.json:json:20211205'`
`12`		`- testImplementation 'org.postgresql:postgresql:42.3.1'`
	`12`	`+ testImplementation 'org.postgresql:postgresql:42.3.2'`
`13`	`13`	`testImplementation 'ch.qos.logback:logback-classic:1.2.10'`
`14`	`14`	`testImplementation 'org.testcontainers:postgresql'`
`15`	`15`	`}`
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.6.2'`
	`3`	`+ id 'org.springframework.boot' version '2.6.3'`
`4`	`4`	`}`
`5`	`5`	`apply plugin: 'io.spring.dependency-management'`
`6`	`6`