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

kiview · web-flow · commit be26e4c4d826 · 2021-10-08T14:20:48.000+02:00
Combined dependencies PR
diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
@@ -15,7 +15,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.3.0
+      - uses: actions/setup-java@v2.3.1
         with:
           java-version: '8.0.302'
           distribution: temurin
@@ -43,7 +43,7 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.3.0
+      - uses: actions/setup-java@v2.3.1
         with:
           java-version: '8.0.302'
           distribution: temurin
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.3.0
+      - uses: actions/setup-java@v2.3.1
         with:
           java-version: '8.0.302'
           distribution: temurin
@@ -49,7 +49,7 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.3.0
+      - uses: actions/setup-java@v2.3.1
         with:
           java-version: '8.0.302'
           distribution: temurin
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2.3.0
+      - uses: actions/setup-java@v2.3.1
         with:
           java-version: '8.0.302'
           distribution: temurin
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:3.0.0'
-    testImplementation 'org.assertj:assertj-core:3.20.2'
+    testImplementation 'org.assertj:assertj-core:3.21.0'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.2.6'
 }
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.23'
+    testImplementation 'org.postgresql:postgresql:42.2.24'
     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
@@ -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.9.0'
+    implementation 'org.apache.solr:solr-solrj:8.10.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,6 +1,6 @@
 plugins {
     id("org.springframework.boot") version "2.5.5"
-    id("org.jetbrains.kotlin.jvm") version "1.5.30"
+    id("org.jetbrains.kotlin.jvm") version "1.5.31"
     id("org.jetbrains.kotlin.plugin.spring") version "1.5.31"
 }
 
diff --git a/modules/database-commons/build.gradle b/modules/database-commons/build.gradle
@@ -3,5 +3,5 @@ description = "Testcontainers :: Database-Commons"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'org.assertj:assertj-core:3.20.2'
+    testImplementation 'org.assertj:assertj-core:3.21.0'
 }
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.14.1"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.15.0"
     testImplementation "org.elasticsearch.client:transport:7.15.0"
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: JUnit Jupiter Extension"
 
 dependencies {
     api project(':testcontainers')
-    api 'org.junit.jupiter:junit-jupiter-api:5.7.2'
+    api 'org.junit.jupiter:junit-jupiter-api:5.8.1'
 
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
@@ -13,7 +13,7 @@ dependencies {
         exclude(module: 'hamcrest-core')
     }
     testImplementation 'org.assertj:assertj-core:3.21.0'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.1'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.2.24'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.26'
diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
@@ -13,6 +13,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.apache.kafka:kafka-clients:3.0.0'
-    testImplementation 'org.assertj:assertj-core:3.20.2'
+    testImplementation 'org.assertj:assertj-core:3.21.0'
     testImplementation 'com.google.guava:guava:23.0'
 }
diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.80'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.80'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.62'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.82'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.60'
     testImplementation 'software.amazon.awssdk:s3:2.17.52'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
@@ -7,13 +7,13 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'io.r2dbc:r2dbc-mssql:0.8.6.RELEASE'
+    compileOnly 'io.r2dbc:r2dbc-mssql:0.8.7.RELEASE'
 
     testImplementation project(':jdbc-test')
     testImplementation 'com.microsoft.sqlserver:mssql-jdbc:9.4.0.jre8'
 
     testImplementation project(':r2dbc')
-    testImplementation 'io.r2dbc:r2dbc-mssql:0.8.5.RELEASE'
+    testImplementation 'io.r2dbc:r2dbc-mssql:0.8.7.RELEASE'
 
     // MSSQL's wait strategy requires the JDBC driver
     testImplementation testFixtures(project(':r2dbc'))
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.20.2'
+    testImplementation 'org.assertj:assertj-core:3.21.0'
 
 }

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:3.0.0'`
`14`		`- testImplementation 'org.assertj:assertj-core:3.20.2'`
	`14`	`+ testImplementation 'org.assertj:assertj-core:3.21.0'`
`15`	`15`	`testImplementation 'com.google.guava:guava:23.0'`
`16`	`16`	`testImplementation 'ch.qos.logback:logback-classic:1.2.6'`
`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.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.23'`
	`12`	`+ testImplementation 'org.postgresql:postgresql:42.2.24'`
`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
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id("org.springframework.boot") version "2.5.5"`
`3`		`- id("org.jetbrains.kotlin.jvm") version "1.5.30"`
	`3`	`+ id("org.jetbrains.kotlin.jvm") version "1.5.31"`
`4`	`4`	`id("org.jetbrains.kotlin.plugin.spring") version "1.5.31"`
`5`	`5`	`}`
`6`	`6`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@ description = "Testcontainers :: Database-Commons"`
`3`	`3`	`dependencies {`
`4`	`4`	`api project(':testcontainers')`
`5`	`5`
`6`		`- testImplementation 'org.assertj:assertj-core:3.20.2'`
	`6`	`+ testImplementation 'org.assertj:assertj-core:3.21.0'`
`7`	`7`	`}`
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.14.1"`
	`5`	`+ testImplementation "org.elasticsearch.client:elasticsearch-rest-client:7.15.0"`
`6`	`6`	`testImplementation "org.elasticsearch.client:transport:7.15.0"`
`7`	`7`	`testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'`
`8`	`8`	`}`