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

eddumelendez · web-flow · commit 074295ed5842 · 2022-08-15T23:38:14.000-05:00
Combined dependencies PR
diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle
@@ -11,6 +11,6 @@ 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.6.0'
-    testImplementation 'io.cucumber:cucumber-junit:7.5.0'
+    testImplementation 'io.cucumber:cucumber-junit:7.6.0'
     testImplementation 'org.testcontainers:selenium'
 }
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.36'
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'org.json:json:20220320'
-    testImplementation 'org.postgresql:postgresql:42.4.0'
+    testImplementation 'org.postgresql:postgresql:42.4.1'
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'
     testImplementation 'org.testcontainers:postgresql'
 }
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.11.1"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.7.2"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.0"
     }
 }
 
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:4.4.0'
+    testImplementation 'io.rest-assured:rest-assured:5.1.1'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
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.3.2'
+    testImplementation 'com.couchbase.client:java-client:3.3.3'
     testImplementation 'org.awaitility:awaitility:4.2.0'
 }
diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.273'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.253'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.281'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.281'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
@@ -3,10 +3,10 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.google.cloud:google-cloud-datastore:2.10.1'
+    testImplementation 'com.google.cloud:google-cloud-datastore:2.11.0'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.4.0'
-    testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.6'
+    testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.11'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.28.0'
-    testImplementation 'com.google.cloud:google-cloud-bigtable:2.10.1'
+    testImplementation 'com.google.cloud:google-cloud-bigtable:2.10.3'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.23'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation ('org.mockito:mockito-core:4.6.1') {
+    testImplementation ('org.mockito:mockito-core:4.7.0') {
         exclude(module: 'hamcrest-core')
     }
 }
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.281'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.273'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.273'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.282'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.281'
-    testImplementation 'software.amazon.awssdk:s3:2.17.244'
+    testImplementation 'software.amazon.awssdk:s3:2.17.253'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
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.0.6'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.0.7'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'org.mariadb:r2dbc-mariadb:1.0.2'
diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:0.9.0.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:11.1.2.jre8-preview'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:11.2.0.jre8'
 
     testImplementation project(':r2dbc')
     testImplementation 'io.r2dbc:r2dbc-mssql:0.8.7.RELEASE'
diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.12.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.4.21'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.4.22'
     testFixturesImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/settings.gradle b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.1"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.7.2"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.0"
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@ 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.6.0'`
`14`		`- testImplementation 'io.cucumber:cucumber-junit:7.5.0'`
	`14`	`+ testImplementation 'io.cucumber:cucumber-junit:7.6.0'`
`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.36'`
`10`	`10`	`implementation 'com.squareup.okhttp3:okhttp:4.10.0'`
`11`	`11`	`implementation 'org.json:json:20220320'`
`12`		`- testImplementation 'org.postgresql:postgresql:42.4.0'`
	`12`	`+ testImplementation 'org.postgresql:postgresql:42.4.1'`
`13`	`13`	`testImplementation 'ch.qos.logback:logback-classic:1.2.11'`
`14`	`14`	`testImplementation 'org.testcontainers:postgresql'`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`	`dependencies {`
`8`	`8`	`classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"`
`9`	`9`	`classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.11.1"`
`10`		`- classpath "com.gradle:common-custom-user-data-gradle-plugin:1.7.2"`
	`10`	`+ classpath "com.gradle:common-custom-user-data-gradle-plugin:1.8.0"`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`
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 'com.ecwid.consul:consul-api:1.4.5'`
`7`		`- testImplementation 'io.rest-assured:rest-assured:4.4.0'`
	`7`	`+ testImplementation 'io.rest-assured:rest-assured:5.1.1'`
`8`	`8`	`testImplementation 'org.assertj:assertj-core:3.23.1'`
`9`	`9`	`}`
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:3.14.9'`
`7`	`7`
`8`		`- testImplementation 'com.couchbase.client:java-client:3.3.2'`
	`8`	`+ testImplementation 'com.couchbase.client:java-client:3.3.3'`
`9`	`9`	`testImplementation 'org.awaitility:awaitility:4.2.0'`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite"`
`3`	`3`	`dependencies {`
`4`	`4`	`api project(':testcontainers')`
`5`	`5`
`6`		`- compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.273'`
`7`		`- testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.253'`
	`6`	`+ compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.281'`
	`7`	`+ testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.281'`
`8`	`8`	`testImplementation 'org.assertj:assertj-core:3.23.1'`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ dependencies {`
`10`	`10`	`testImplementation 'org.apache.tomcat:tomcat-jdbc:10.0.23'`
`11`	`11`	`testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'`
`12`	`12`	`testImplementation 'org.assertj:assertj-core:3.23.1'`
`13`		`- testImplementation ('org.mockito:mockito-core:4.6.1') {`
	`13`	`+ testImplementation ('org.mockito:mockito-core:4.7.0') {`
`14`	`14`	`exclude(module: 'hamcrest-core')`
`15`	`15`	`}`
`16`	`16`	`}`