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

kiview · web-flow · commit d21a3df1af4a · 2021-10-07T18:25:47.000+02:00
Combined dependencies PR
diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
@@ -18,4 +18,4 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           labels: dependencies
 
-      - uses: gradle/wrapper-validation-action@e2c57acffb2c9aa5a8dc6eda2bbae0b6e495bd4c # v1.0.3
+      - uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b # v1.0.3
diff --git a/core/build.gradle b/core/build.gradle
@@ -100,7 +100,7 @@ dependencies {
     testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
-    testImplementation 'org.assertj:assertj-core:3.20.2'
+    testImplementation 'org.assertj:assertj-core:3.21.0'
     testImplementation project(':test-support')
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
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.8'
     implementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.6'
     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
@@ -10,8 +10,8 @@ dependencies {
     testCompileOnly "org.projectlombok:lombok:1.18.20"
     testAnnotationProcessor "org.projectlombok:lombok:1.18.10"
     testImplementation 'org.testcontainers:kafka'
-    testImplementation 'org.apache.kafka:kafka-clients:2.8.0'
+    testImplementation 'org.apache.kafka:kafka-clients:3.0.0'
     testImplementation 'org.assertj:assertj-core:3.20.2'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.6'
 }
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.32'
-    implementation 'com.squareup.okhttp3:okhttp:4.9.1'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.2'
     implementation 'org.json:json:20210307'
     testImplementation 'org.postgresql:postgresql:42.2.23'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.6'
     testImplementation 'org.testcontainers:postgresql'
 }
 
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.8.8'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.6'
     testImplementation 'org.testng:testng:7.4.0'
     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
@@ -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.2.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.6'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.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.5.4'
+    id 'org.springframework.boot' version '2.5.5'
 }
 apply plugin: 'io.spring.dependency-management'
 
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.32'
 
-    testImplementation 'ch.qos.logback:logback-classic:1.2.5'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.6'
     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.5.4"
+    id("org.springframework.boot") version "2.5.5"
     id("org.jetbrains.kotlin.jvm") version "1.5.30"
-    id("org.jetbrains.kotlin.plugin.spring") version "1.5.30"
+    id("org.jetbrains.kotlin.plugin.spring") version "1.5.31"
 }
 
 apply plugin: 'io.spring.dependency-management'
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.5.4'
+    id 'org.springframework.boot' version '2.5.5'
 }
 apply plugin: 'io.spring.dependency-management'
 
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.14.1"
-    testImplementation "org.elasticsearch.client:transport:7.14.1"
+    testImplementation "org.elasticsearch.client:transport:7.15.0"
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/influxdb/build.gradle b/modules/influxdb/build.gradle
@@ -3,6 +3,6 @@ description = "Testcontainers :: InfluxDB"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'org.influxdb:influxdb-java:2.21'
+    compileOnly 'org.influxdb:influxdb-java:2.22'
     testImplementation 'org.influxdb:influxdb-java:2.21'
 }
diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle
@@ -2,7 +2,7 @@ dependencies {
     api project(':jdbc')
     api project(':test-support')
 
-    api 'com.google.guava:guava:30.1.1-jre'
+    api 'com.google.guava:guava:31.0.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'
@@ -14,7 +14,7 @@ dependencies {
         exclude(group: "net.java.dev.jna", module: "jna")
     }
 
-    api 'org.apache.tomcat:tomcat-jdbc:10.0.10'
+    api 'org.apache.tomcat:tomcat-jdbc:10.0.12'
     api 'org.vibur:vibur-dbcp:25.0'
     api 'mysql:mysql-connector-java:8.0.26'
 }
diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
@@ -7,9 +7,9 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:22.0.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.10'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.12'
     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'
-    testImplementation 'org.assertj:assertj-core:3.20.2'
+    testImplementation 'org.assertj:assertj-core:3.21.0'
 }
diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
@@ -12,12 +12,12 @@ dependencies {
     testImplementation ('org.mockito:mockito-core:3.12.4') {
         exclude(module: 'hamcrest-core')
     }
-    testImplementation 'org.assertj:assertj-core:3.20.2'
+    testImplementation 'org.assertj:assertj-core:3.21.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.2.23'
+    testRuntimeOnly 'org.postgresql:postgresql:42.2.24'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.26'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
 }
 
 test {
diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
@@ -12,7 +12,7 @@ tasks.japicmp {
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.apache.kafka:kafka-clients:2.8.0'
+    testImplementation 'org.apache.kafka:kafka-clients:3.0.0'
     testImplementation 'org.assertj:assertj-core:3.20.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')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.62'
-    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.37'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.80'
+    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.80'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.62'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.60'
-    testImplementation 'software.amazon.awssdk:s3:2.17.34'
+    testImplementation 'software.amazon.awssdk:s3:2.17.52'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/mariadb/build.gradle b/modules/mariadb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'org.mariadb:r2dbc-mariadb:1.0.2'
+    compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
     testImplementation project(':jdbc-test')
     testImplementation 'org.mariadb.jdbc:mariadb-java-client:2.7.4'
diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle
@@ -34,5 +34,5 @@ dependencies {
     api project(":testcontainers")
 
     testImplementation "org.neo4j.driver:neo4j-java-driver:1.7.5"
-    testImplementation 'org.assertj:assertj-core:3.20.2'
+    testImplementation 'org.assertj:assertj-core:3.21.0'
 }
diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     testImplementation project(':jdbc-test')
     testImplementation 'com.oracle.ojdbc:ojdbc8:19.3.0.0'
 
-    compileOnly 'org.jetbrains:annotations:21.0.1'
+    compileOnly 'org.jetbrains:annotations:22.0.0'
 }
diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation project(':test-support')
-    testImplementation 'org.postgresql:postgresql:42.2.23'
+    testImplementation 'org.postgresql:postgresql:42.2.24'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.5.RELEASE'
diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.7.2'
-    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.20.2'
+    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.21.0'
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.7.2'
 }
diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:5.0.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.2.23'
+    testRuntimeOnly 'org.postgresql:postgresql:42.2.24'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.26'
 
     testCompileClasspath 'org.jetbrains:annotations:22.0.0'

Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,10 @@ repositories {`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`	`9`	`compileOnly 'org.slf4j:slf4j-api:1.7.32'`
`10`		`- implementation 'com.squareup.okhttp3:okhttp:4.9.1'`
	`10`	`+ implementation 'com.squareup.okhttp3:okhttp:4.9.2'`
`11`	`11`	`implementation 'org.json:json:20210307'`
`12`	`12`	`testImplementation 'org.postgresql:postgresql:42.2.23'`
`13`		`- testImplementation 'ch.qos.logback:logback-classic:1.2.5'`
	`13`	`+ testImplementation 'ch.qos.logback:logback-classic:1.2.6'`
`14`	`14`	`testImplementation 'org.testcontainers:postgresql'`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ dependencies {`
`12`	`12`	`implementation 'com.google.code.gson:gson:2.8.8'`
`13`	`13`	`implementation 'com.google.guava:guava:23.0'`
`14`	`14`	`testImplementation 'org.testcontainers:testcontainers'`
`15`		`- testImplementation 'ch.qos.logback:logback-classic:1.2.5'`
	`15`	`+ testImplementation 'ch.qos.logback:logback-classic:1.2.6'`
`16`	`16`	`testImplementation 'org.testng:testng:7.4.0'`
`17`	`17`	`testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ dependencies {`
`13`	`13`	`implementation 'com.google.guava:guava:23.0'`
`14`	`14`	`testImplementation 'org.testcontainers:testcontainers'`
`15`	`15`	`testImplementation 'junit:junit:4.13.2'`
`16`		`- testImplementation 'ch.qos.logback:logback-classic:1.2.5'`
	`16`	`+ testImplementation 'ch.qos.logback:logback-classic:1.2.6'`
`17`	`17`	`testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'`
`18`	`18`	`}`
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.5.4'`
	`3`	`+ id 'org.springframework.boot' version '2.5.5'`
`4`	`4`	`}`
`5`	`5`	`apply plugin: 'io.spring.dependency-management'`
`6`	`6`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ dependencies {`
`13`	`13`	`implementation 'com.google.guava:guava:23.0'`
`14`	`14`	`compileOnly 'org.slf4j:slf4j-api:1.7.32'`
`15`	`15`
`16`		`- testImplementation 'ch.qos.logback:logback-classic:1.2.5'`
	`16`	`+ testImplementation 'ch.qos.logback:logback-classic:1.2.6'`
`17`	`17`	`testImplementation 'org.testcontainers:testcontainers'`
`18`	`18`	`testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`plugins {`
`2`		`- id("org.springframework.boot") version "2.5.4"`
	`2`	`+ id("org.springframework.boot") version "2.5.5"`
`3`	`3`	`id("org.jetbrains.kotlin.jvm") version "1.5.30"`
`4`		`- id("org.jetbrains.kotlin.plugin.spring") version "1.5.30"`
	`4`	`+ id("org.jetbrains.kotlin.plugin.spring") version "1.5.31"`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`apply plugin: 'io.spring.dependency-management'`