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

kiview · web-flow · commit 5370e25af86f · 2021-11-29T17:01:42.000+01:00
Combined dependencies PR
diff --git a/core/build.gradle b/core/build.gradle
@@ -66,7 +66,7 @@ dependencies {
         exclude(group: 'org.jetbrains', module: 'annotations')
     }
 
-    shaded 'org.awaitility:awaitility:4.1.0'
+    shaded 'org.awaitility:awaitility:4.1.1'
 
     api platform('com.github.docker-java:docker-java-bom:3.2.12')
     shaded platform('com.github.docker-java:docker-java-bom:3.2.12')
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:6.11.0'
+    testImplementation 'io.cucumber:cucumber-java:7.1.0'
     testImplementation 'io.cucumber:cucumber-junit:7.0.0'
     testImplementation 'org.testcontainers:selenium'
 }
diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.projectlombok:lombok:1.18.20"
+    compileOnly "org.projectlombok:lombok:1.18.22"
     annotationProcessor "org.projectlombok:lombok:1.18.20"
     implementation 'biz.paluch.redis:spinach:0.3'
     implementation 'com.google.code.gson:gson:2.8.9'
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
@@ -7,8 +7,8 @@ repositories {
 }
 
 dependencies {
-    testCompileOnly "org.projectlombok:lombok:1.18.20"
-    testAnnotationProcessor "org.projectlombok:lombok:1.18.10"
+    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.assertj:assertj-core:3.21.0'
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.2'
     implementation 'org.json:json:20210307'
-    testImplementation 'org.postgresql:postgresql:42.2.24'
+    testImplementation 'org.postgresql:postgresql:42.3.1'
     testImplementation 'ch.qos.logback:logback-classic:1.2.6'
     testImplementation 'org.testcontainers:postgresql'
 }
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
@@ -7,8 +7,8 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.projectlombok:lombok:1.18.20"
-    annotationProcessor "org.projectlombok:lombok:1.18.16"
+    compileOnly "org.projectlombok:lombok:1.18.22"
+    annotationProcessor "org.projectlombok:lombok:1.18.22"
 
     implementation 'org.apache.solr:solr-solrj:8.10.1'
 
diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'com.couchbase.client:java-client:3.2.2'
-    testImplementation 'org.awaitility:awaitility:4.1.0'
+    testImplementation 'org.awaitility:awaitility:4.1.1'
 }
diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle
@@ -2,7 +2,7 @@ description = "TestContainers :: elasticsearch"
 
 dependencies {
     api project(':testcontainers')
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.15.0"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.15.2"
     testImplementation "org.elasticsearch.client:transport:7.15.1"
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
@@ -9,14 +9,14 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'redis.clients:jedis:3.7.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
-    testImplementation ('org.mockito:mockito-core:3.12.4') {
+    testImplementation ('org.mockito:mockito-core:4.1.0') {
         exclude(module: 'hamcrest-core')
     }
     testImplementation 'org.assertj:assertj-core:3.21.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.1'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.3.1'
-    testRuntimeOnly 'mysql:mysql-connector-java:8.0.26'
+    testRuntimeOnly 'mysql:mysql-connector-java:8.0.27'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
 }
 
diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.100'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.80'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.100'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.60'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.119'
     testImplementation 'software.amazon.awssdk:s3:2.17.72'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
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.24'
+    testImplementation 'org.postgresql:postgresql:42.3.1'
 
     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
@@ -3,7 +3,7 @@ description = "Testcontainers :: Pulsar"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.7.2'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.7.3'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.21.0'
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.7.3'
 }
diff --git a/modules/spock/build.gradle b/modules/spock/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.2.24'
+    testRuntimeOnly 'org.postgresql:postgresql:42.3.1'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.27'
 
     testCompileClasspath 'org.jetbrains:annotations:22.0.0'
diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: Toxiproxy"
 
 dependencies {
     api project(':testcontainers')
-    api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.4'
+    api 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.5'
 
     testImplementation 'redis.clients:jedis:3.0.1'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ dependencies {`
`66`	`66`	`exclude(group: 'org.jetbrains', module: 'annotations')`
`67`	`67`	`}`
`68`	`68`
`69`		`- shaded 'org.awaitility:awaitility:4.1.0'`
	`69`	`+ shaded 'org.awaitility:awaitility:4.1.1'`
`70`	`70`
`71`	`71`	`api platform('com.github.docker-java:docker-java-bom:3.2.12')`
`72`	`72`	`shaded platform('com.github.docker-java:docker-java-bom:3.2.12')`
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:6.11.0'`
	`13`	`+ testImplementation 'io.cucumber:cucumber-java:7.1.0'`
`14`	`14`	`testImplementation 'io.cucumber:cucumber-junit:7.0.0'`
`15`	`15`	`testImplementation 'org.testcontainers:selenium'`
`16`	`16`	`}`
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.projectlombok:lombok:1.18.20"`
	`10`	`+ compileOnly "org.projectlombok:lombok:1.18.22"`
`11`	`11`	`annotationProcessor "org.projectlombok:lombok:1.18.20"`
`12`	`12`	`implementation 'biz.paluch.redis:spinach:0.3'`
`13`	`13`	`implementation 'com.google.code.gson:gson:2.8.9'`
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.2'`
`11`	`11`	`implementation 'org.json:json:20210307'`
`12`		`- testImplementation 'org.postgresql:postgresql:42.2.24'`
	`12`	`+ testImplementation 'org.postgresql:postgresql:42.3.1'`
`13`	`13`	`testImplementation 'ch.qos.logback:logback-classic:1.2.6'`
`14`	`14`	`testImplementation 'org.testcontainers:postgresql'`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ repositories {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`dependencies {`
`10`		`- compileOnly "org.projectlombok:lombok:1.18.20"`
`11`		`- annotationProcessor "org.projectlombok:lombok:1.18.16"`
	`10`	`+ compileOnly "org.projectlombok:lombok:1.18.22"`
	`11`	`+ annotationProcessor "org.projectlombok:lombok:1.18.22"`
`12`	`12`
`13`	`13`	`implementation 'org.apache.solr:solr-solrj:8.10.1'`
`14`	`14`
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 'com.couchbase.client:java-client:3.2.2'`
`7`		`- testImplementation 'org.awaitility:awaitility:4.1.0'`
	`7`	`+ testImplementation 'org.awaitility:awaitility:4.1.1'`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ description = "TestContainers :: elasticsearch"`
`2`	`2`
`3`	`3`	`dependencies {`
`4`	`4`	`api project(':testcontainers')`
`5`		`- testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.15.0"`
	`5`	`+ testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.15.2"`
`6`	`6`	`testImplementation "org.elasticsearch.client:transport:7.15.1"`
`7`	`7`	`testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ dependencies {`
`6`	`6`	`compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.100'`
`7`	`7`	`testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.80'`
`8`	`8`	`testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.100'`
`9`		`- testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.60'`
	`9`	`+ testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.119'`
`10`	`10`	`testImplementation 'software.amazon.awssdk:s3:2.17.72'`
`11`	`11`	`testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'`
`12`	`12`	`}`