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

eddumelendez · web-flow · commit bd6ee9cdd1a8 · 2022-11-07T17:20:08.000-06:00
Combined dependencies PR
diff --git a/build.gradle b/build.gradle
@@ -13,10 +13,10 @@ buildscript {
 
 plugins {
     id 'io.franzbecker.gradle-lombok' version '5.0.0'
-    id 'com.github.johnrengelman.shadow' version '7.0.0'
+    id 'com.github.johnrengelman.shadow' version '7.1.2'
     id 'me.champeau.gradle.japicmp' version '0.2.9' apply false
     id 'com.diffplug.spotless' version '6.8.0' apply false
-    id 'org.gradle.test-retry' version '1.4.0'
+    id 'org.gradle.test-retry' version '1.4.1'
 }
 
 apply from: "$rootDir/gradle/ci-support.gradle"
diff --git a/docs/examples/junit5/redis/build.gradle b/docs/examples/junit5/redis/build.gradle
@@ -3,7 +3,7 @@ description = "Examples for docs"
 dependencies {
     api "io.lettuce:lettuce-core:5.1.1.RELEASE"
 
-    testImplementation "org.junit.jupiter:junit-jupiter-api:5.4.2"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.1"
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.1"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.1"
     testImplementation project(":testcontainers")
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.36'
     implementation 'redis.clients:jedis:4.2.3'
-    implementation 'com.google.code.gson:gson:2.9.1'
+    implementation 'com.google.code.gson:gson:2.10'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.3.4'
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.36'
     implementation 'redis.clients:jedis:4.2.3'
-    implementation 'com.google.code.gson:gson:2.9.1'
+    implementation 'com.google.code.gson:gson:2.10'
     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.7.4'
+    id 'org.springframework.boot' version '2.7.5'
 }
 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:4.2.3'
-    implementation 'com.google.code.gson:gson:2.9.1'
+    implementation 'com.google.code.gson:gson:2.10'
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.36'
 
diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("org.springframework.boot") version "2.7.4"
+    id("org.springframework.boot") version "2.7.5"
     id("org.jetbrains.kotlin.jvm") version "1.7.20"
     id("org.jetbrains.kotlin.plugin.spring") version "1.7.20"
 }
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.4'
+    id 'org.springframework.boot' version '2.7.5'
 }
 apply plugin: 'io.spring.dependency-management'
 
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.333'
-    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.314'
+    compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.336'
+    testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.336'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/gcloud/build.gradle b/modules/gcloud/build.gradle
@@ -3,7 +3,7 @@ description = "Testcontainers :: GCloud"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation 'com.google.cloud:google-cloud-datastore:2.12.3'
+    testImplementation 'com.google.cloud:google-cloud-datastore:2.12.4'
     testImplementation 'com.google.cloud:google-cloud-firestore:3.7.0'
     testImplementation 'com.google.cloud:google-cloud-pubsub:1.120.24'
     testImplementation 'com.google.cloud:google-cloud-spanner:6.32.0'
diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
@@ -5,8 +5,8 @@ dependencies {
 
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.333'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.333'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.333'
+    testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.336'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.334'
-    testImplementation 'software.amazon.awssdk:s3:2.18.7'
+    testImplementation 'software.amazon.awssdk:s3:2.18.11'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }
diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly 'io.r2dbc:r2dbc-mssql:0.9.0.RELEASE'
 
     testImplementation project(':jdbc-test')
-    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:11.2.1.jre8'
+    testImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.1.0.jre8-preview'
 
     testImplementation project(':r2dbc')
     testImplementation 'io.r2dbc:r2dbc-mssql:0.8.7.RELEASE'
diff --git a/modules/questdb/build.gradle b/modules/questdb/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation 'org.postgresql:postgresql:42.5.0'
     testImplementation project(':jdbc-test')
     testImplementation 'org.assertj:assertj-core:3.23.1'
-    testImplementation 'org.questdb:questdb:6.5.4-jdk8'
+    testImplementation 'org.questdb:questdb:6.5.5-jdk8'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 }
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:401'
+    testImplementation 'io.trino:trino-jdbc:402'
     compileOnly 'org.jetbrains:annotations:23.0.0'
 }

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.4'`
	`3`	`+ id 'org.springframework.boot' version '2.7.5'`
`4`	`4`	`}`
`5`	`5`	`apply plugin: 'io.spring.dependency-management'`
`6`	`6`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id("org.springframework.boot") version "2.7.4"`
	`2`	`+ id("org.springframework.boot") version "2.7.5"`
`3`	`3`	`id("org.jetbrains.kotlin.jvm") version "1.7.20"`
`4`	`4`	`id("org.jetbrains.kotlin.plugin.spring") version "1.7.20"`
`5`	`5`	`}`
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.333'`
`7`		`- testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.314'`
	`6`	`+ compileOnly 'com.amazonaws:aws-java-sdk-dynamodb:1.12.336'`
	`7`	`+ testImplementation 'com.amazonaws:aws-java-sdk-dynamodb:1.12.336'`
`8`	`8`	`testImplementation 'org.assertj:assertj-core:3.23.1'`
`9`	`9`	`}`