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

eddumelendez · web-flow · commit df427164a6f4 · 2022-12-01T22:03:34.000-06:00
Combined dependencies PR
diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@ plugins {
     id 'io.franzbecker.gradle-lombok' version '5.0.0'
     id 'com.github.johnrengelman.shadow' version '7.1.2'
     id 'me.champeau.gradle.japicmp' version '0.4.1' apply false
-    id 'com.diffplug.spotless' version '6.11.0' apply false
+    id 'com.diffplug.spotless' version '6.12.0' apply false
     id 'org.gradle.test-retry' version '1.5.0'
 }
 
diff --git a/examples/build.gradle b/examples/build.gradle
@@ -1,6 +1,6 @@
 // empty build.gradle for dependabot
 plugins {
-    id 'com.diffplug.spotless' version '6.11.0' apply false
+    id 'com.diffplug.spotless' version '6.12.0' apply false
 }
 
 apply from: "$rootDir/../gradle/ci-support.gradle"
diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
@@ -7,6 +7,6 @@ dependencies {
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.343'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.354'
     testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.353'
-    testImplementation 'software.amazon.awssdk:s3:2.18.18'
+    testImplementation 'software.amazon.awssdk:s3:2.18.29'
     testImplementation 'org.assertj:assertj-core:3.23.1'
 }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ plugins {`
`15`	`15`	`id 'io.franzbecker.gradle-lombok' version '5.0.0'`
`16`	`16`	`id 'com.github.johnrengelman.shadow' version '7.1.2'`
`17`	`17`	`id 'me.champeau.gradle.japicmp' version '0.4.1' apply false`
`18`		`- id 'com.diffplug.spotless' version '6.11.0' apply false`
	`18`	`+ id 'com.diffplug.spotless' version '6.12.0' apply false`
`19`	`19`	`id 'org.gradle.test-retry' version '1.5.0'`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`// empty build.gradle for dependabot`
`2`	`2`	`plugins {`
`3`		`- id 'com.diffplug.spotless' version '6.11.0' apply false`
	`3`	`+ id 'com.diffplug.spotless' version '6.12.0' apply false`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`apply from: "$rootDir/../gradle/ci-support.gradle"`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@ dependencies {`
`7`	`7`	`testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.343'`
`8`	`8`	`testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.354'`
`9`	`9`	`testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.353'`
`10`		`- testImplementation 'software.amazon.awssdk:s3:2.18.18'`
	`10`	`+ testImplementation 'software.amazon.awssdk:s3:2.18.29'`
`11`	`11`	`testImplementation 'org.assertj:assertj-core:3.23.1'`
`12`	`12`	`}`