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

rnorth · web-flow · commit 8fe1c3ccc040 · 2021-08-02T09:47:34.000+01:00
diff --git a/core/build.gradle b/core/build.gradle
@@ -95,12 +95,12 @@ configurations.all {
 }
 
 dependencies {
-    baseline 'org.testcontainers:testcontainers:1.15.3', {
+    baseline 'org.testcontainers:testcontainers:1.16.0', {
         exclude group: "*", module: "*"
     }
 
     api 'junit:junit:4.12'
-    api 'org.slf4j:slf4j-api:1.7.30'
+    api 'org.slf4j:slf4j-api:1.7.32'
     compileOnly 'org.jetbrains:annotations:21.0.1'
     testCompileClasspath 'org.jetbrains:annotations:21.0.1'
     api 'org.apache.commons:commons-compress:1.20'
@@ -138,9 +138,9 @@ dependencies {
     }
 
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
-    testImplementation 'redis.clients:jedis:3.6.1'
+    testImplementation 'redis.clients:jedis:3.6.3'
     testImplementation 'com.rabbitmq:amqp-client:5.12.0'
-    testImplementation 'org.mongodb:mongo-java-driver:3.12.7'
+    testImplementation 'org.mongodb:mongo-java-driver:3.12.9'
 
     testImplementation ('org.mockito:mockito-core:3.11.2') {
         exclude(module: 'hamcrest-core')
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
@@ -6,10 +6,10 @@ repositories {
     jcenter()
 }
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:1.7.30'
+    compileOnly 'org.slf4j:slf4j-api:1.7.32'
     implementation 'com.squareup.okhttp3:okhttp:4.9.1'
     implementation 'org.json:json:20210307'
-    testImplementation 'org.postgresql:postgresql:42.2.22'
+    testImplementation 'org.postgresql:postgresql:42.2.23'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testcontainers:postgresql'
 }
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:1.7.30'
+    compileOnly 'org.slf4j:slf4j-api:1.7.32'
     implementation 'redis.clients:jedis:3.6.1'
     implementation 'com.google.code.gson:gson:2.8.7'
     implementation 'com.google.guava:guava:23.0'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:1.7.30'
+    compileOnly 'org.slf4j:slf4j-api:1.7.32'
     implementation 'redis.clients:jedis:3.6.1'
     implementation 'com.google.code.gson:gson:2.8.7'
     implementation 'com.google.guava:guava:23.0'
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     implementation 'redis.clients:jedis:3.6.1'
     implementation 'com.google.code.gson:gson:2.8.7'
     implementation 'com.google.guava:guava:23.0'
-    compileOnly 'org.slf4j:slf4j-api:1.7.30'
+    compileOnly 'org.slf4j:slf4j-api:1.7.32'
 
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testcontainers:testcontainers'
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.2"
     id("org.jetbrains.kotlin.jvm") version "1.5.10"
-    id("org.jetbrains.kotlin.plugin.spring") version "1.5.20"
+    id("org.jetbrains.kotlin.plugin.spring") version "1.5.21"
 }
 
 apply plugin: 'io.spring.dependency-management'
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.1.6'
+    testImplementation 'com.couchbase.client:java-client:3.2.0'
     testImplementation 'org.awaitility:awaitility:4.1.0'
 }
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.13.0"
-    testImplementation "org.elasticsearch.client:transport:7.13.2"
+    testImplementation "org.elasticsearch.client:transport:7.13.4"
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle
@@ -16,5 +16,5 @@ dependencies {
 
     api 'org.apache.tomcat:tomcat-jdbc:10.0.7'
     api 'org.vibur:vibur-dbcp:25.0'
-    api 'mysql:mysql-connector-java:8.0.25'
+    api 'mysql:mysql-connector-java:8.0.26'
 }
diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
-    testImplementation 'redis.clients:jedis:3.6.1'
+    testImplementation 'redis.clients:jedis:3.6.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
     testImplementation ('org.mockito:mockito-core:3.11.2') {
         exclude(module: 'hamcrest-core')
@@ -16,7 +16,7 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.2.22'
-    testRuntimeOnly 'mysql:mysql-connector-java:8.0.25'
+    testRuntimeOnly 'mysql:mysql-connector-java:8.0.26'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
 }
 
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.16'
-    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.11.1030'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.37'
+    testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.37'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.19'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.16'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.37'
     testImplementation 'software.amazon.awssdk:s3:2.16.97'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'mysql:mysql-connector-java:8.0.25'
+    testImplementation 'mysql:mysql-connector-java:8.0.26'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'
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.22'
+    testImplementation 'org.postgresql:postgresql:42.2.23'
 
     testImplementation testFixtures(project(':r2dbc'))
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.5.RELEASE'
diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
@@ -12,10 +12,10 @@ dependencies {
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
 
-    testImplementation 'com.zaxxer:HikariCP:4.0.3'
+    testImplementation 'com.zaxxer:HikariCP:5.0.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.2.22'
+    testRuntimeOnly 'org.postgresql:postgresql:42.2.23'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.25'
 
     testCompileClasspath 'org.jetbrains:annotations:21.0.1'

Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,10 @@ repositories {`
`6`	`6`	`jcenter()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- compileOnly 'org.slf4j:slf4j-api:1.7.30'`
	`9`	`+ compileOnly 'org.slf4j:slf4j-api:1.7.32'`
`10`	`10`	`implementation 'com.squareup.okhttp3:okhttp:4.9.1'`
`11`	`11`	`implementation 'org.json:json:20210307'`
`12`		`- testImplementation 'org.postgresql:postgresql:42.2.22'`
	`12`	`+ testImplementation 'org.postgresql:postgresql:42.2.23'`
`13`	`13`	`testImplementation 'ch.qos.logback:logback-classic:1.2.3'`
`14`	`14`	`testImplementation 'org.testcontainers:postgresql'`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ repositories {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`dependencies {`
`10`		`- compileOnly 'org.slf4j:slf4j-api:1.7.30'`
	`10`	`+ compileOnly 'org.slf4j:slf4j-api:1.7.32'`
`11`	`11`	`implementation 'redis.clients:jedis:3.6.1'`
`12`	`12`	`implementation 'com.google.code.gson:gson:2.8.7'`
`13`	`13`	`implementation 'com.google.guava:guava:23.0'`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id("org.springframework.boot") version "2.5.2"`
`3`	`3`	`id("org.jetbrains.kotlin.jvm") version "1.5.10"`
`4`		`- id("org.jetbrains.kotlin.plugin.spring") version "1.5.20"`
	`4`	`+ id("org.jetbrains.kotlin.plugin.spring") version "1.5.21"`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`apply plugin: 'io.spring.dependency-management'`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@ description = "Testcontainers :: Couchbase"`
`3`	`3`	`dependencies {`
`4`	`4`	`api project(':testcontainers')`
`5`	`5`
`6`		`- testImplementation 'com.couchbase.client:java-client:3.1.6'`
	`6`	`+ testImplementation 'com.couchbase.client:java-client:3.2.0'`
`7`	`7`	`testImplementation 'org.awaitility:awaitility:4.1.0'`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,5 @@ dependencies {`
`16`	`16`
`17`	`17`	`api 'org.apache.tomcat:tomcat-jdbc:10.0.7'`
`18`	`18`	`api 'org.vibur:vibur-dbcp:25.0'`
`19`		`- api 'mysql:mysql-connector-java:8.0.25'`
	`19`	`+ api 'mysql:mysql-connector-java:8.0.26'`
`20`	`20`	`}`