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

rnorth · web-flow · commit 9c09b431d412 · 2021-07-08T13:02:40.000+01:00
diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
@@ -30,7 +30,7 @@ jobs:
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      - uses: actions/github-script@v3
+      - uses: actions/github-script@v4.0.2
         id: fetch-branch-names
         name: Fetch branch names
         with:
@@ -121,7 +121,7 @@ jobs:
           git pull origin $sourcebranches --no-edit
           git push origin $COMBINE_BRANCH_NAME
       # Creates a PR with the new combined branch
-      - uses: actions/github-script@v3
+      - uses: actions/github-script@v4.0.2
         name: Create Combined Pull Request
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Update Gradle Wrapper
-        uses: gradle-update/update-gradle-wrapper-action@af940e8bff73d435137caae9d08cf7a1badf5497 # v1.0.13
+        uses: gradle-update/update-gradle-wrapper-action@6356f411fa7c14aab1fb2ac2fd20762a629e2fbf # v1.0.13
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           labels: dependencies
diff --git a/core/build.gradle b/core/build.gradle
@@ -136,11 +136,11 @@ dependencies {
     }
 
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
-    testImplementation 'redis.clients:jedis:3.6.0'
+    testImplementation 'redis.clients:jedis:3.6.1'
     testImplementation 'com.rabbitmq:amqp-client:5.12.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.7'
 
-    testImplementation ('org.mockito:mockito-core:3.10.0') {
+    testImplementation ('org.mockito:mockito-core:3.11.2') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly "org.projectlombok:lombok:1.18.20"
     annotationProcessor "org.projectlombok:lombok:1.18.20"
     implementation 'biz.paluch.redis:spinach:0.3'
-    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.google.code.gson:gson:2.8.7'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.mockito:mockito-all:1.10.19'
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testAnnotationProcessor "org.projectlombok:lombok:1.18.10"
     testImplementation 'org.testcontainers:kafka'
     testImplementation 'org.apache.kafka:kafka-clients:2.8.0'
-    testImplementation 'org.assertj:assertj-core:3.19.0'
+    testImplementation 'org.assertj:assertj-core:3.20.2'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'org.slf4j:slf4j-simple:1.7.30'
 }
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.30'
     implementation 'com.squareup.okhttp3:okhttp:4.9.1'
     implementation 'org.json:json:20210307'
-    testImplementation 'org.postgresql:postgresql:42.2.20'
+    testImplementation 'org.postgresql:postgresql:42.2.22'
     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
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
     implementation 'redis.clients:jedis:3.6.0'
-    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.google.code.gson:gson:2.8.7'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
     implementation 'redis.clients:jedis:3.6.0'
-    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.google.code.gson:gson:2.8.7'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.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.0'
+    id 'org.springframework.boot' version '2.5.2'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
 
     implementation 'redis.clients:jedis:3.6.0'
-    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.google.code.gson:gson:2.8.7'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
 
diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly "org.projectlombok:lombok:1.18.20"
     annotationProcessor "org.projectlombok:lombok:1.18.16"
 
-    implementation 'org.apache.solr:solr-solrj:8.8.2'
+    implementation 'org.apache.solr:solr-solrj:8.9.0'
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'
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.0"
+    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.10"
+    id("org.jetbrains.kotlin.plugin.spring") version "1.5.20"
 }
 
 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.0'
+    id 'org.springframework.boot' version '2.5.2'
 }
 apply plugin: 'io.spring.dependency-management'
 
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.1.6'
-    testImplementation 'org.awaitility:awaitility:3.0.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.1"
+    testImplementation "org.elasticsearch.client:transport:7.13.2"
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle
@@ -14,7 +14,7 @@ dependencies {
         exclude(group: "net.java.dev.jna", module: "jna")
     }
 
-    api 'org.apache.tomcat:tomcat-jdbc:10.0.6'
+    api 'org.apache.tomcat:tomcat-jdbc:10.0.7'
     api 'org.vibur:vibur-dbcp:25.0'
     api 'mysql:mysql-connector-java:8.0.25'
 }
diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
@@ -11,5 +11,5 @@ dependencies {
     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.19.0'
+    testImplementation 'org.assertj:assertj-core:3.20.2'
 }
diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
@@ -7,15 +7,15 @@ dependencies {
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
-    testImplementation 'redis.clients:jedis:3.6.0'
+    testImplementation 'redis.clients:jedis:3.6.1'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
-    testImplementation ('org.mockito:mockito-core:3.10.0') {
+    testImplementation ('org.mockito:mockito-core:3.11.2') {
         exclude(module: 'hamcrest-core')
     }
-    testImplementation 'org.assertj:assertj-core:3.19.0'
+    testImplementation 'org.assertj:assertj-core:3.20.2'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.2.20'
+    testRuntimeOnly 'org.postgresql:postgresql:42.2.22'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.25'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
 }
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:2.8.0'
-    testImplementation 'org.assertj:assertj-core:3.19.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.11.1030'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.16'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.11.1030'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.1'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.11.807'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.16'
     testImplementation 'software.amazon.awssdk:s3:2.16.80'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
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.19.0'
+    testImplementation 'org.assertj:assertj-core:3.20.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.20'
+    testImplementation 'org.postgresql:postgresql:42.2.22'
 
     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.19.0'
+    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.20.2'
     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:4.0.3'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.2.20'
+    testRuntimeOnly 'org.postgresql:postgresql:42.2.22'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.25'
 
     testCompileClasspath 'org.jetbrains:annotations:21.0.1'
diff --git a/modules/vault/build.gradle b/modules/vault/build.gradle
@@ -5,6 +5,6 @@ dependencies {
 
     testImplementation 'com.bettercloud:vault-java-driver:5.1.0'
     testImplementation 'io.rest-assured:rest-assured:4.4.0'
-    testImplementation 'org.assertj:assertj-core:3.19.0'
+    testImplementation 'org.assertj:assertj-core:3.20.2'
 
 }

Original file line number	Diff line number	Diff line change
`@@ -136,11 +136,11 @@ dependencies {`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'`
`139`		`- testImplementation 'redis.clients:jedis:3.6.0'`
	`139`	`+ testImplementation 'redis.clients:jedis:3.6.1'`
`140`	`140`	`testImplementation 'com.rabbitmq:amqp-client:5.12.0'`
`141`	`141`	`testImplementation 'org.mongodb:mongo-java-driver:3.12.7'`
`142`	`142`
`143`		`- testImplementation ('org.mockito:mockito-core:3.10.0') {`
	`143`	`+ testImplementation ('org.mockito:mockito-core:3.11.2') {`
`144`	`144`	`exclude(module: 'hamcrest-core')`
`145`	`145`	`}`
`146`	`146`	`// Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ dependencies {`
`11`	`11`	`testAnnotationProcessor "org.projectlombok:lombok:1.18.10"`
`12`	`12`	`testImplementation 'org.testcontainers:kafka'`
`13`	`13`	`testImplementation 'org.apache.kafka:kafka-clients:2.8.0'`
`14`		`- testImplementation 'org.assertj:assertj-core:3.19.0'`
	`14`	`+ testImplementation 'org.assertj:assertj-core:3.20.2'`
`15`	`15`	`testImplementation 'com.google.guava:guava:23.0'`
`16`	`16`	`testImplementation 'org.slf4j:slf4j-simple:1.7.30'`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ dependencies {`
`9`	`9`	`compileOnly 'org.slf4j:slf4j-api:1.7.30'`
`10`	`10`	`implementation 'com.squareup.okhttp3:okhttp:4.9.1'`
`11`	`11`	`implementation 'org.json:json:20210307'`
`12`		`- testImplementation 'org.postgresql:postgresql:42.2.20'`
	`12`	`+ testImplementation 'org.postgresql:postgresql:42.2.22'`
`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
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id 'java'`
`3`		`- id 'org.springframework.boot' version '2.5.0'`
	`3`	`+ id 'org.springframework.boot' version '2.5.2'`
`4`	`4`	`}`
`5`	`5`	`apply plugin: 'io.spring.dependency-management'`
`6`	`6`