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

eddumelendez · web-flow · commit e5916f1b7006 · 2023-10-03T01:00:38.000-05:00
Combined dependencies PR
diff --git a/core/build.gradle b/core/build.gradle
@@ -111,7 +111,7 @@ dependencies {
     }
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'
     testImplementation 'redis.clients:jedis:5.0.0'
-    testImplementation 'com.rabbitmq:amqp-client:5.18.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.19.0'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
 
     testImplementation ('org.mockito:mockito-core:4.11.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:5.0.0'
+    implementation 'redis.clients:jedis:5.0.1'
     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:5.0.0'
+    implementation 'redis.clients:jedis:5.0.1'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
diff --git a/examples/settings.gradle b/examples/settings.gradle
@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.15"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.2"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.3"
     }
 }
 
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
 
-    implementation 'redis.clients:jedis:5.0.0'
+    implementation 'redis.clients:jedis:5.0.1'
     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/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.49.0'
+    testImplementation 'com.azure:azure-cosmos:4.51.0'
 }
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.557'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.557'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.560'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.560'
     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.23.0")
+    testImplementation platform("com.google.cloud:libraries-bom:26.24.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
@@ -5,7 +5,7 @@ dependencies {
     api("org.jetbrains:annotations:24.0.1")
 
     shaded("org.apache.commons:commons-lang3:3.13.0")
-    shaded("commons-io:commons-io:2.13.0")
+    shaded("commons-io:commons-io:2.14.0")
     shaded("org.javassist:javassist:3.29.2-GA")
     shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
     shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testImplementation project(':mysql')
     testImplementation project(':postgresql')
     testImplementation 'com.zaxxer:HikariCP:4.0.3'
-    testImplementation 'redis.clients:jedis:5.0.0'
+    testImplementation 'redis.clients:jedis:5.0.1'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     testImplementation ('org.mockito:mockito-core:4.11.0') {
         exclude(module: 'hamcrest-core')
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.557")
+    testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.560")
     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.154'
+    testImplementation 'software.amazon.awssdk:s3:2.20.157'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }
diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.1.1'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.2.0.0'
+    testImplementation 'com.oracle.database.jdbc:ojdbc11:23.3.0.23.09'
 
     compileOnly 'org.jetbrains:annotations:24.0.1'
 
diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle
@@ -2,7 +2,7 @@ description = "Testcontainers :: RabbitMQ"
 
 dependencies {
     api project(":testcontainers")
-    testImplementation 'com.rabbitmq:amqp-client:5.18.0'
+    testImplementation 'com.rabbitmq:amqp-client:5.19.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }
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:426'
+    testRuntimeOnly 'io.trino:trino-jdbc:427'
     compileOnly 'org.jetbrains:annotations:24.0.1'
 }
diff --git a/settings.gradle b/settings.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.15"
-        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.2"
+        classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.3"
         classpath "org.gradle.toolchains:foojay-resolver:0.7.0"
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ dependencies {`
`111`	`111`	`}`
`112`	`112`	`testImplementation 'org.apache.httpcomponents:httpclient:4.5.9'`
`113`	`113`	`testImplementation 'redis.clients:jedis:5.0.0'`
`114`		`- testImplementation 'com.rabbitmq:amqp-client:5.18.0'`
	`114`	`+ testImplementation 'com.rabbitmq:amqp-client:5.19.0'`
`115`	`115`	`testImplementation 'org.mongodb:mongo-java-driver:3.12.14'`
`116`	`116`
`117`	`117`	`testImplementation ('org.mockito:mockito-core:4.11.0') {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`	`dependencies {`
`8`	`8`	`classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"`
`9`	`9`	`classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.15"`
`10`		`- classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.2"`
	`10`	`+ classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.3"`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ dependencies {`
`6`	`6`	`shaded 'com.squareup.okhttp3:okhttp:4.11.0'`
`7`	`7`
`8`	`8`	`testImplementation 'org.assertj:assertj-core:3.24.2'`
`9`		`- testImplementation 'com.azure:azure-cosmos:4.49.0'`
	`9`	`+ testImplementation 'com.azure:azure-cosmos:4.51.0'`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ description = "Testcontainers :: Dynalite (deprecated)"`
`3`	`3`	`dependencies {`
`4`	`4`	`api project(':testcontainers')`
`5`	`5`
`6`		`- compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.557'`
`7`		`- testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.557'`
	`6`	`+ compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.560'`
	`7`	`+ testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.560'`
`8`	`8`	`testImplementation 'org.assertj:assertj-core:3.24.2'`
`9`	`9`	`}`