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

eddumelendez · web-flow · commit 90de9b91c563 · 2023-02-02T14:46:11.000-05:00
Combined dependencies PR
diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle
@@ -11,7 +11,7 @@ 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.11.1'
-    testImplementation 'io.cucumber:cucumber-junit:7.10.1'
+    testImplementation 'io.cucumber:cucumber-junit:7.11.1'
     testImplementation 'org.testcontainers:selenium'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
@@ -5,6 +5,6 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.10.0'
 
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.azure:azure-cosmos:4.40.0'
 }
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.13.3'
-    testImplementation 'com.google.cloud:google-cloud-firestore:3.7.4'
+    testImplementation 'com.google.cloud:google-cloud-firestore:3.7.9'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.122.2'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.35.2'
-    testImplementation 'com.google.cloud:google-cloud-bigtable:2.17.1'
+    testImplementation 'com.google.cloud:google-cloud-bigtable:2.18.3'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("ch.qos.logback:logback-classic:1.4.5")
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.1")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.2")
 }
 
 test {
diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:24.0.0'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.4'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.5'
     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
@@ -13,11 +13,11 @@ dependencies {
         exclude(module: 'hamcrest-core')
     }
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.2'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.5.1'
+    testRuntimeOnly 'org.postgresql:postgresql:42.5.2'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.32'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
 }
 
 test {
diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.apache.kafka:kafka-clients:3.3.2'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    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
@@ -5,8 +5,8 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.398'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.398'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.376'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.398'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.398'
-    testImplementation 'software.amazon.awssdk:s3:2.19.8'
+    testImplementation 'software.amazon.awssdk:s3:2.19.29'
     testImplementation 'org.assertj:assertj-core:3.24.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:3.1.0'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.1.2'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'org.mariadb:r2dbc-mariadb:1.0.2'
diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.mock-server:mockserver-client-java:5.15.0'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: MongoDB"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation("org.mongodb:mongodb-driver-sync:4.8.1")
+    testImplementation("org.mongodb:mongodb-driver-sync:4.8.2")
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
 
diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle
@@ -2,6 +2,6 @@ description = "Testcontainers :: Nginx"
 
 dependencies {
     api project(':testcontainers')
-    compileOnly 'org.jetbrains:annotations:23.1.0'
+    compileOnly 'org.jetbrains:annotations:24.0.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     api "com.orientechnologies:orientdb-client:3.2.15"
 
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.1'
     testImplementation "com.orientechnologies:orientdb-gremlin:3.2.15"
 }
diff --git a/modules/presto/build.gradle b/modules/presto/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation 'io.prestosql:presto-jdbc:350'
-    compileOnly 'org.jetbrains:annotations:23.1.0'
+    compileOnly 'org.jetbrains:annotations:24.0.0'
 }
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.11.0'
-    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.23.1'
+    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.24.2'
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.11.0'
 }
diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
     testImplementation 'org.postgresql:postgresql:42.5.1'
     testImplementation project(':jdbc-test')
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.questdb:questdb:6.7-jdk8'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(":testcontainers")
     testImplementation 'com.rabbitmq:amqp-client:5.16.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    compileOnly 'org.jetbrains:annotations:23.1.0'
+    compileOnly 'org.jetbrains:annotations:24.0.0'
 }
diff --git a/modules/redpanda/build.gradle b/modules/redpanda/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Redpanda"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.apache.kafka:kafka-clients:3.3.1'
+    testImplementation 'org.apache.kafka:kafka-clients:3.3.2'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'io.rest-assured:rest-assured:5.3.0'
 }
diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
@@ -18,9 +18,9 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.5.2'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.31'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.9.2'
-    testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.9.1'
+    testRuntimeOnly 'org.junit.platform:junit-platform-testkit:1.9.2'
 
-    testCompileOnly 'org.jetbrains:annotations:23.1.0'
+    testCompileOnly 'org.jetbrains:annotations:24.0.0'
 }
 
 sourceJar {
diff --git a/modules/tidb/build.gradle b/modules/tidb/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'mysql:mysql-connector-java:8.0.31'
+    testImplementation 'mysql:mysql-connector-java:8.0.32'
 
-    compileOnly 'org.jetbrains:annotations:23.1.0'
+    compileOnly 'org.jetbrains:annotations:24.0.0'
 }
diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testImplementation 'io.trino:trino-jdbc:406'
-    compileOnly 'org.jetbrains:annotations:23.1.0'
+    compileOnly 'org.jetbrains:annotations:24.0.0'
 }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ 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.11.1'`
`14`		`- testImplementation 'io.cucumber:cucumber-junit:7.10.1'`
	`14`	`+ testImplementation 'io.cucumber:cucumber-junit:7.11.1'`
`15`	`15`	`testImplementation 'org.testcontainers:selenium'`
`16`	`16`	`testImplementation 'org.assertj:assertj-core:3.23.1'`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@ 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 'org.assertj:assertj-core:3.23.1'`
	`8`	`+ testImplementation 'org.assertj:assertj-core:3.24.2'`
`9`	`9`	`testImplementation 'com.azure:azure-cosmos:4.40.0'`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ dependencies {`
`18`	`18`	`testImplementation("org.apache.httpcomponents:httpclient:4.5.14")`
`19`	`19`	`testImplementation("ch.qos.logback:logback-classic:1.4.5")`
`20`	`20`	`testImplementation 'org.assertj:assertj-core:3.24.2'`
`21`		`- testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.1")`
	`21`	`+ testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.2")`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`test {`
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,11 @@ dependencies {`
`13`	`13`	`exclude(module: 'hamcrest-core')`
`14`	`14`	`}`
`15`	`15`	`testImplementation 'org.assertj:assertj-core:3.24.2'`
`16`		`- testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.1'`
	`16`	`+ testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.2'`
`17`	`17`
`18`		`- testRuntimeOnly 'org.postgresql:postgresql:42.5.1'`
	`18`	`+ testRuntimeOnly 'org.postgresql:postgresql:42.5.2'`
`19`	`19`	`testRuntimeOnly 'mysql:mysql-connector-java:8.0.32'`
`20`		`- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'`
	`20`	`+ testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`test {`
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 'org.apache.kafka:kafka-clients:3.3.2'`
`7`		`- testImplementation 'org.assertj:assertj-core:3.23.1'`
	`7`	`+ testImplementation 'org.assertj:assertj-core:3.24.2'`
`8`	`8`	`testImplementation 'com.google.guava:guava:23.0'`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@ dependencies {`
`4`	`4`	`api project(':testcontainers')`
`5`	`5`
`6`	`6`	`testImplementation 'org.mock-server:mockserver-client-java:5.15.0'`
`7`		`- testImplementation 'org.assertj:assertj-core:3.23.1'`
	`7`	`+ testImplementation 'org.assertj:assertj-core:3.24.2'`
`8`	`8`	`}`