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

rnorth · web-flow · commit ab0091ae093e · 2021-06-14T10:25:48.000+01:00
diff --git a/core/build.gradle b/core/build.gradle
@@ -147,7 +147,7 @@ dependencies {
     testImplementation files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
     testImplementation 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
-    testImplementation 'org.assertj:assertj-core:3.18.1'
+    testImplementation 'org.assertj:assertj-core:3.19.0'
     testImplementation project(':test-support')
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testAnnotationProcessor "org.projectlombok:lombok:1.18.10"
     testImplementation 'org.testcontainers:kafka'
     testImplementation 'org.apache.kafka:kafka-clients:2.8.0'
-    testImplementation 'org.assertj:assertj-core:3.14.0'
+    testImplementation 'org.assertj:assertj-core:3.19.0'
     testImplementation 'com.google.guava:guava:23.0'
     testImplementation 'org.slf4j:slf4j-simple:1.7.30'
 }
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.4.1'
+    id 'org.springframework.boot' version '2.5.0'
 }
 apply plugin: 'io.spring.dependency-management'
 
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.4.1"
+    id("org.springframework.boot") version "2.5.0"
     id("org.jetbrains.kotlin.jvm") version "1.5.10"
     id("org.jetbrains.kotlin.plugin.spring") version "1.5.10"
 }
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.4.1'
+    id 'org.springframework.boot' version '2.5.0'
 }
 apply plugin: 'io.spring.dependency-management'
 
diff --git a/modules/junit-jupiter/build.gradle b/modules/junit-jupiter/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testImplementation ('org.mockito:mockito-core:3.10.0') {
         exclude(module: 'hamcrest-core')
     }
-    testImplementation 'org.assertj:assertj-core:3.18.1'
+    testImplementation 'org.assertj:assertj-core:3.19.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2'
 
     testRuntimeOnly 'org.postgresql:postgresql:42.2.20'
diff --git a/modules/kafka/build.gradle b/modules/kafka/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation 'org.apache.kafka:kafka-clients:2.8.0'
-    testImplementation 'org.assertj:assertj-core:3.18.1'
+    testImplementation 'org.assertj:assertj-core:3.19.0'
     testImplementation 'com.google.guava:guava:23.0'
 }
diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':testcontainers')
 
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.7.2'
-    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.18.1'
+    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.19.0'
     testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.7.2'
 }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ dependencies {`
`11`	`11`	`testAnnotationProcessor "org.projectlombok:lombok:1.18.10"`
`12`	`12`	`testImplementation 'org.testcontainers:kafka'`
`13`	`13`	`testImplementation 'org.apache.kafka:kafka-clients:2.8.0'`
`14`		`- testImplementation 'org.assertj:assertj-core:3.14.0'`
	`14`	`+ testImplementation 'org.assertj:assertj-core:3.19.0'`
`15`	`15`	`testImplementation 'com.google.guava:guava:23.0'`
`16`	`16`	`testImplementation 'org.slf4j:slf4j-simple:1.7.30'`
`17`	`17`	`}`
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.4.1'`
	`3`	`+ id 'org.springframework.boot' version '2.5.0'`
`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.4.1"`
	`2`	`+ id("org.springframework.boot") version "2.5.0"`
`3`	`3`	`id("org.jetbrains.kotlin.jvm") version "1.5.10"`
`4`	`4`	`id("org.jetbrains.kotlin.plugin.spring") version "1.5.10"`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ dependencies {`
`12`	`12`	`testImplementation ('org.mockito:mockito-core:3.10.0') {`
`13`	`13`	`exclude(module: 'hamcrest-core')`
`14`	`14`	`}`
`15`		`- testImplementation 'org.assertj:assertj-core:3.18.1'`
	`15`	`+ testImplementation 'org.assertj:assertj-core:3.19.0'`
`16`	`16`	`testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2'`
`17`	`17`
`18`	`18`	`testRuntimeOnly 'org.postgresql:postgresql:42.2.20'`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@ dependencies {`
`4`	`4`	`api project(':testcontainers')`
`5`	`5`
`6`	`6`	`testImplementation 'org.apache.kafka:kafka-clients:2.8.0'`
`7`		`- testImplementation 'org.assertj:assertj-core:3.18.1'`
	`7`	`+ testImplementation 'org.assertj:assertj-core:3.19.0'`
`8`	`8`	`testImplementation 'com.google.guava:guava:23.0'`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@ dependencies {`
`4`	`4`	`api project(':testcontainers')`
`5`	`5`
`6`	`6`	`testImplementation group: 'org.apache.pulsar', name: 'pulsar-client', version: '2.7.2'`
`7`		`- testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.18.1'`
	`7`	`+ testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.19.0'`
`8`	`8`	`testImplementation group: 'org.apache.pulsar', name: 'pulsar-client-admin', version: '2.7.2'`
`9`	`9`	`}`