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

eddumelendez · web-flow · commit 5cd754f84ec9 · 2023-09-02T11:33:05.000-06:00
Combined dependencies PR
diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
@@ -13,6 +13,6 @@ jobs:
     steps:
       - name: combine-prs
         id: combine-prs
-        uses: github/combine-prs@v3.1.1
+        uses: github/combine-prs@v3.1.2
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/docs/examples/junit4/redis/build.gradle b/docs/examples/junit4/redis/build.gradle
@@ -1,7 +1,7 @@
 description = "Examples for docs"
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.2.3.RELEASE"
+    api "io.lettuce:lettuce-core:6.2.6.RELEASE"
 
     testImplementation "junit:junit:4.13.2"
     testImplementation project(":testcontainers")
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
@@ -1,10 +1,10 @@
 description = "Examples for docs"
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.2.3.RELEASE"
+    api "io.lettuce:lettuce-core:6.2.6.RELEASE"
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.0"
-    testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.3"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.0"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.0"
     testImplementation project(":testcontainers")
     testImplementation project(":junit-jupiter")
diff --git a/docs/examples/spock/redis/build.gradle b/docs/examples/spock/redis/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    api "io.lettuce:lettuce-core:6.2.3.RELEASE"
+    api "io.lettuce:lettuce-core:6.2.6.RELEASE"
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation project(":spock")
     testImplementation 'ch.qos.logback:logback-classic:1.3.8'
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testCompileOnly "org.projectlombok:lombok:1.18.28"
     testAnnotationProcessor "org.projectlombok:lombok:1.18.28"
     testImplementation 'org.testcontainers:kafka'
-    testImplementation 'org.apache.kafka:kafka-clients:3.4.0'
+    testImplementation 'org.apache.kafka:kafka-clients:3.5.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'ch.qos.logback:logback-classic:1.3.8'
diff --git a/examples/nats/build.gradle b/examples/nats/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'io.nats:jnats:2.16.13'
+    testImplementation 'io.nats:jnats:2.16.14'
     testImplementation 'ch.qos.logback:logback-classic:1.3.8'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
diff --git a/examples/neo4j-container/build.gradle b/examples/neo4j-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.11'
+    testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.12'
     testImplementation 'org.testcontainers:neo4j'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:4.3.2'
+    implementation 'redis.clients:jedis:4.4.3'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
-    implementation 'redis.clients:jedis:4.3.2'
+    implementation 'redis.clients:jedis:4.4.3'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
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.7.13'
+    id 'org.springframework.boot' version '2.7.15'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:4.3.2'
+    implementation 'redis.clients:jedis:4.4.3'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
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.7.13'
+    id 'org.springframework.boot' version '2.7.15'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle
@@ -6,5 +6,5 @@ dependencies {
     shaded 'com.squareup.okhttp3:okhttp:4.11.0'
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'com.azure:azure-cosmos:4.48.0'
+    testImplementation 'com.azure:azure-cosmos:4.49.0'
 }
diff --git a/modules/couchbase/build.gradle b/modules/couchbase/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     // TODO use JDK's HTTP client and/or Apache HttpClient5
     shaded 'com.squareup.okhttp3:okhttp:4.11.0'
 
-    testImplementation 'com.couchbase.client:java-client:3.4.8'
+    testImplementation 'com.couchbase.client:java-client:3.4.9'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/modules/dynalite/build.gradle b/modules/dynalite/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite (deprecated)"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.520'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.520'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.543'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.543'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
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:8.9.0"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:8.9.1"
     testImplementation "org.elasticsearch.client:transport:7.17.12"
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.google.cloud:libraries-bom:26.21.0")
+    testImplementation platform("com.google.cloud:libraries-bom:26.22.0")
     testImplementation 'com.google.cloud:google-cloud-bigquery'
     testImplementation 'com.google.cloud:google-cloud-datastore'
     testImplementation 'com.google.cloud:google-cloud-firestore'
diff --git a/modules/hivemq/build.gradle b/modules/hivemq/build.gradle
@@ -14,9 +14,9 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
     testImplementation(project(":junit-jupiter"))
     testImplementation("com.hivemq:hivemq-extension-sdk:4.18.0")
-    testImplementation("com.hivemq:hivemq-mqtt-client:1.3.1")
+    testImplementation("com.hivemq:hivemq-mqtt-client:1.3.2")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
-    testImplementation("ch.qos.logback:logback-classic:1.4.8")
+    testImplementation("ch.qos.logback:logback-classic:1.4.11")
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
 }
diff --git a/modules/jdbc-test/build.gradle b/modules/jdbc-test/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api 'com.google.guava:guava:32.1.2-jre'
     api 'org.apache.commons:commons-lang3:3.13.0'
     api 'com.zaxxer:HikariCP-java6:2.3.13'
-    api 'commons-dbutils:commons-dbutils:1.7'
+    api 'commons-dbutils:commons-dbutils:1.8.0'
 
     api 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
 
diff --git a/modules/jdbc/build.gradle b/modules/jdbc/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:24.0.1'
     testImplementation 'commons-dbutils:commons-dbutils:1.7'
     testImplementation 'org.vibur:vibur-dbcp:25.0'
-    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.11'
+    testImplementation 'org.apache.tomcat:tomcat-jdbc:10.1.13'
     testImplementation 'com.zaxxer:HikariCP-java6:2.3.13'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation ('org.mockito:mockito-core:4.11.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.8.0'
+    testImplementation 'io.fabric8:kubernetes-client:6.8.1'
     testImplementation 'io.kubernetes:client-java:18.0.1'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
@@ -3,10 +3,10 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.520")
+    testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.543")
     testImplementation 'com.amazonaws:aws-java-sdk-s3'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs'
     testImplementation 'com.amazonaws:aws-java-sdk-logs'
-    testImplementation 'software.amazon.awssdk:s3:2.20.117'
+    testImplementation 'software.amazon.awssdk:s3:2.20.139'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/modules/mariadb/build.gradle b/modules/mariadb/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.1.4'
+    testImplementation 'org.mariadb.jdbc:mariadb-java-client:3.2.0'
 
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.4.0.jre8-preview'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.4.1.jre8'
 
     testImplementation project(':r2dbc')
     testRuntimeOnly 'io.r2dbc:r2dbc-mssql:1.0.2.RELEASE'
diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle
@@ -3,9 +3,9 @@ description = "Testcontainers :: Orientdb"
 dependencies {
     api project(":testcontainers")
 
-    api "com.orientechnologies:orientdb-client:3.2.21"
+    api "com.orientechnologies:orientdb-client:3.2.22"
 
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.apache.tinkerpop:gremlin-driver:3.6.4'
-    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.21"
+    testImplementation "com.orientechnologies:orientdb-gremlin:3.2.22"
 }
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: '3.0.0'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '3.1.0'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.24.2'
-    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.0.0'
+    testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '3.1.0'
 }
diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testRuntimeOnly 'org.postgresql:postgresql:42.6.0'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.24.2'
-    testImplementation 'org.questdb:questdb:7.2.1'
+    testImplementation 'org.questdb:questdb:7.3.1'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }
diff --git a/modules/r2dbc/build.gradle b/modules/r2dbc/build.gradle
@@ -15,6 +15,6 @@ dependencies {
     testImplementation 'io.r2dbc:r2dbc-postgresql:0.8.13.RELEASE'
     testImplementation project(':postgresql')
 
-    testFixturesImplementation 'io.projectreactor:reactor-core:3.5.8'
+    testFixturesImplementation 'io.projectreactor:reactor-core:3.5.9'
     testFixturesImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/modules/trino/build.gradle b/modules/trino/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'io.trino:trino-jdbc:422'
+    testRuntimeOnly 'io.trino:trino-jdbc:425'
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }

-Original file line number
+Diff line change
     steps:
       - name: combine-prs
         id: combine-prs
 -        uses: github/[email protected].1
 +        uses: github/[email protected].2
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ plugins {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`dependencies {`
`7`		`- api "io.lettuce:lettuce-core:6.2.3.RELEASE"`
	`7`	`+ api "io.lettuce:lettuce-core:6.2.6.RELEASE"`
`8`	`8`	`testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'`
`9`	`9`	`testImplementation project(":spock")`
`10`	`10`	`testImplementation 'ch.qos.logback:logback-classic:1.3.8'`
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.7.13'`
	`3`	`+ id 'org.springframework.boot' version '2.7.15'`
`4`	`4`	`}`
`5`	`5`	`apply plugin: 'io.spring.dependency-management'`
`6`	`6`