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

eddumelendez · web-flow · commit 47837f2e2204 · 2022-09-01T22:12:25.000-05:00
Combined dependencies PR
diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
@@ -25,7 +25,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.7
+        uses: actions/cache@v3.0.8
         continue-on-error: true
         with:
           path: ~/.gradle/caches
@@ -53,7 +53,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.7
+        uses: actions/cache@v3.0.8
         continue-on-error: true
         with:
           path: ~/.gradle/caches
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.7
+        uses: actions/cache@v3.0.8
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-home-testmatrix-${{ hashFiles('**/*.gradle') }}
@@ -59,7 +59,7 @@ jobs:
           java-version: '8.0.302'
           distribution: temurin
       - name: Cache Gradle Home files
-        uses: actions/cache@v3.0.7
+        uses: actions/cache@v3.0.8
         continue-on-error: true
         with:
           path: ~/.gradle/caches
diff --git a/core/build.gradle b/core/build.gradle
@@ -61,7 +61,7 @@ configurations.all {
 
 dependencies {
     api 'junit:junit:4.13.2'
-    api 'org.slf4j:slf4j-api:1.7.36'
+    api 'org.slf4j:slf4j-api:2.0.0'
     compileOnly 'org.jetbrains:annotations:23.0.0'
     testCompileClasspath 'org.jetbrains:annotations:23.0.0'
     api 'org.apache.commons:commons-compress:1.21'
@@ -80,7 +80,7 @@ dependencies {
 
     api 'com.github.docker-java:docker-java-transport-zerodep'
 
-    shaded "org.yaml:snakeyaml:1.30"
+    shaded "org.yaml:snakeyaml:1.31"
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
 
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
@@ -6,10 +6,10 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    compileOnly 'org.slf4j:slf4j-api:1.7.36'
+    compileOnly 'org.slf4j:slf4j-api:2.0.0'
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'org.json:json:20220320'
-    testImplementation 'org.postgresql:postgresql:42.4.2'
+    testImplementation 'org.postgresql:postgresql:42.5.0'
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.assertj:assertj-core:3.23.1'
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.36'
+    compileOnly 'org.slf4j:slf4j-api:2.0.0'
     implementation 'redis.clients:jedis:4.2.3'
     implementation 'com.google.code.gson:gson:2.9.1'
     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.36'
+    compileOnly 'org.slf4j:slf4j-api:2.0.0'
     implementation 'redis.clients:jedis:4.2.3'
     implementation 'com.google.code.gson:gson:2.9.1'
     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:4.2.3'
     implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'com.google.guava:guava:23.0'
-    compileOnly 'org.slf4j:slf4j-api:1.7.36'
+    compileOnly 'org.slf4j:slf4j-api:2.0.0'
 
     testImplementation 'ch.qos.logback:logback-classic:1.2.11'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.10.0'
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'com.azure:azure-cosmos:4.34.0'
+    testImplementation 'com.azure:azure-cosmos:4.35.1'
 }
diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.postgresql:postgresql:42.4.2'
+    testImplementation 'org.postgresql:postgresql:42.5.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
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.285'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.281'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.295'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.295'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
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:8.3.3"
-    testImplementation "org.elasticsearch.client:transport:7.17.5"
+    testImplementation "org.elasticsearch.client:transport:7.17.6"
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
@@ -4,9 +4,9 @@ dependencies {
     api project(':testcontainers')
 
     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-firestore:3.4.2'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.12'
-    testImplementation 'com.google.cloud:google-cloud-spanner:6.28.0'
+    testImplementation 'com.google.cloud:google-cloud-spanner:6.29.0'
     testImplementation 'com.google.cloud:google-cloud-bigtable:2.10.3'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testImplementation("com.hivemq:hivemq-extension-sdk:4.8.3")
     testImplementation("com.hivemq:hivemq-mqtt-client:1.3.0")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.13")
-    testImplementation("ch.qos.logback:logback-classic:1.2.11")
+    testImplementation("ch.qos.logback:logback-classic:1.4.0")
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.0")
 }
diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.0'
 
-    testRuntimeOnly 'org.postgresql:postgresql:42.4.2'
+    testRuntimeOnly 'org.postgresql:postgresql:42.5.0'
     testRuntimeOnly 'mysql:mysql-connector-java:8.0.30'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'
 }
diff --git a/modules/k3s/build.gradle b/modules/k3s/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     // Any >2.8 version here is not compatible with jackson-databind 2.8.x.
     shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
 
-    testImplementation 'io.fabric8:kubernetes-client:6.0.0'
+    testImplementation 'io.fabric8:kubernetes-client:6.1.1'
     testImplementation 'io.kubernetes:client-java:16.0.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
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.285'
+    compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.295'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.285'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.285'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.285'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.295'
     testImplementation 'software.amazon.awssdk:s3:2.17.256'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle
@@ -7,14 +7,14 @@ dependencies {
     api project(':jdbc')
 
     compileOnly project(':r2dbc')
-    compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.12.RELEASE'
+    compileOnly 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
     testImplementation project(':jdbc-test')
     testImplementation project(':test-support')
-    testImplementation 'org.postgresql:postgresql:42.4.2'
+    testImplementation 'org.postgresql:postgresql:42.5.0'
 
     testImplementation testFixtures(project(':r2dbc'))
-    testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.11.RELEASE'
+    testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
 
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }
diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     api 'io.r2dbc:r2dbc-spi:0.8.1.RELEASE'
 
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.12.RELEASE'
+    testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
     testFixturesImplementation 'io.projectreactor:reactor-core:3.4.22'
diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testImplementation 'io.trino:trino-jdbc:393'
+    testImplementation 'io.trino:trino-jdbc:394'
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }

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.36'`
	`10`	`+ compileOnly 'org.slf4j:slf4j-api:2.0.0'`
`11`	`11`	`implementation 'redis.clients:jedis:4.2.3'`
`12`	`12`	`implementation 'com.google.code.gson:gson:2.9.1'`
`13`	`13`	`implementation 'com.google.guava:guava:23.0'`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ dependencies {`
`6`	`6`	`shaded 'com.squareup.okhttp3:okhttp:4.10.0'`
`7`	`7`
`8`	`8`	`testImplementation 'org.assertj:assertj-core:3.23.1'`
`9`		`- testImplementation 'com.azure:azure-cosmos:4.34.0'`
	`9`	`+ testImplementation 'com.azure:azure-cosmos:4.35.1'`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@ dependencies {`
`4`	`4`	`api project(':jdbc')`
`5`	`5`
`6`	`6`	`testImplementation project(':jdbc-test')`
`7`		`- testImplementation 'org.postgresql:postgresql:42.4.2'`
	`7`	`+ testImplementation 'org.postgresql:postgresql:42.5.0'`
`8`	`8`	`testImplementation 'org.assertj:assertj-core:3.23.1'`
`9`	`9`	`}`
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.285'`
`7`		`- testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.281'`
	`6`	`+ compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.295'`
	`7`	`+ testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.295'`
`8`	`8`	`testImplementation 'org.assertj:assertj-core:3.23.1'`
`9`	`9`	`}`