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

kiview · web-flow · commit 9706364e6682 · 2022-01-04T18:09:48.000+01:00
Combined dependencies PR
diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'biz.paluch.redis:spinach:0.3'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.7'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.10'
     testImplementation 'org.mockito:mockito-all:1.10.19'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
@@ -13,5 +13,5 @@ dependencies {
     testImplementation 'org.apache.kafka:kafka-clients:3.0.0'
     testImplementation 'org.assertj:assertj-core:3.21.0'
     testImplementation 'com.google.guava:guava:23.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.7'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.10'
 }
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
     implementation 'org.json:json:20211205'
     testImplementation 'org.postgresql:postgresql:42.3.1'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.7'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.10'
     testImplementation 'org.testcontainers:postgresql'
 }
 
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.7'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.10'
     testImplementation 'org.testng:testng:7.4.0'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
@@ -13,6 +13,6 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.7'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.10'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.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.6.1'
+    id 'org.springframework.boot' version '2.6.2'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/examples/settings.gradle b/examples/settings.gradle
@@ -6,7 +6,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.7.2"
+        classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.8"
     }
 }
 
diff --git a/examples/singleton-container/build.gradle b/examples/singleton-container/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     compileOnly 'org.slf4j:slf4j-api:1.7.32'
 
-    testImplementation 'ch.qos.logback:logback-classic:1.2.7'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.10'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/examples/spring-boot-kotlin-redis/build.gradle b/examples/spring-boot-kotlin-redis/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id("org.springframework.boot") version "2.6.1"
+    id("org.springframework.boot") version "2.6.2"
     id("org.jetbrains.kotlin.jvm") version "1.6.10"
-    id("org.jetbrains.kotlin.plugin.spring") version "1.6.0"
+    id("org.jetbrains.kotlin.plugin.spring") version "1.6.10"
 }
 
 apply plugin: 'io.spring.dependency-management'
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.6.1'
+    id 'org.springframework.boot' version '2.6.2'
 }
 apply plugin: 'io.spring.dependency-management'
 
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:7.16.2"
-    testImplementation "org.elasticsearch.client:transport:7.15.2"
+    testImplementation "org.elasticsearch.client:transport:7.16.2"
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }
diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.12.131'
     testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.122'
     testImplementation 'com.amazonaws:aws-java-sdk-sqs:1.12.131'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.122'
+    testImplementation 'com.amazonaws:aws-java-sdk-logs:1.12.132'
     testImplementation 'software.amazon.awssdk:s3:2.17.102'
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 }

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ dependencies {`
`13`	`13`	`testImplementation 'org.apache.kafka:kafka-clients:3.0.0'`
`14`	`14`	`testImplementation 'org.assertj:assertj-core:3.21.0'`
`15`	`15`	`testImplementation 'com.google.guava:guava:23.0'`
`16`		`- testImplementation 'ch.qos.logback:logback-classic:1.2.7'`
	`16`	`+ testImplementation 'ch.qos.logback:logback-classic:1.2.10'`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ dependencies {`
`10`	`10`	`implementation 'com.squareup.okhttp3:okhttp:4.9.3'`
`11`	`11`	`implementation 'org.json:json:20211205'`
`12`	`12`	`testImplementation 'org.postgresql:postgresql:42.3.1'`
`13`		`- testImplementation 'ch.qos.logback:logback-classic:1.2.7'`
	`13`	`+ testImplementation 'ch.qos.logback:logback-classic:1.2.10'`
`14`	`14`	`testImplementation 'org.testcontainers:postgresql'`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ dependencies {`
`12`	`12`	`implementation 'com.google.code.gson:gson:2.8.9'`
`13`	`13`	`implementation 'com.google.guava:guava:23.0'`
`14`	`14`	`testImplementation 'org.testcontainers:testcontainers'`
`15`		`- testImplementation 'ch.qos.logback:logback-classic:1.2.7'`
	`15`	`+ testImplementation 'ch.qos.logback:logback-classic:1.2.10'`
`16`	`16`	`testImplementation 'org.testng:testng:7.4.0'`
`17`	`17`	`testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ dependencies {`
`13`	`13`	`implementation 'com.google.guava:guava:23.0'`
`14`	`14`	`testImplementation 'org.testcontainers:testcontainers'`
`15`	`15`	`testImplementation 'junit:junit:4.13.2'`
`16`		`- testImplementation 'ch.qos.logback:logback-classic:1.2.7'`
	`16`	`+ testImplementation 'ch.qos.logback:logback-classic:1.2.10'`
`17`	`17`	`testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'`
`18`	`18`	`}`
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.6.1'`
	`3`	`+ id 'org.springframework.boot' version '2.6.2'`
`4`	`4`	`}`
`5`	`5`	`apply plugin: 'io.spring.dependency-management'`
`6`	`6`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`	`8`	`classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"`
`9`		`- classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.7.2"`
	`9`	`+ classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.8"`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ dependencies {`
`13`	`13`	`implementation 'com.google.guava:guava:23.0'`
`14`	`14`	`compileOnly 'org.slf4j:slf4j-api:1.7.32'`
`15`	`15`
`16`		`- testImplementation 'ch.qos.logback:logback-classic:1.2.7'`
	`16`	`+ testImplementation 'ch.qos.logback:logback-classic:1.2.10'`
`17`	`17`	`testImplementation 'org.testcontainers:testcontainers'`
`18`	`18`	`testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`plugins {`
`2`		`- id("org.springframework.boot") version "2.6.1"`
	`2`	`+ id("org.springframework.boot") version "2.6.2"`
`3`	`3`	`id("org.jetbrains.kotlin.jvm") version "1.6.10"`
`4`		`- id("org.jetbrains.kotlin.plugin.spring") version "1.6.0"`
	`4`	`+ id("org.jetbrains.kotlin.plugin.spring") version "1.6.10"`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`apply plugin: 'io.spring.dependency-management'`