Upgrade Testcontainers to 1.9.0-rc1

vpavic · vpavic · commit 603a25817243 · 2018-09-11T23:06:10.000+02:00
diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle
@@ -5,7 +5,7 @@ dependencyManagement {
 		mavenBom 'org.springframework:spring-framework-bom:5.1.0.RC3'
 		mavenBom 'org.springframework.data:spring-data-releasetrain:Lovelace-RC2'
 		mavenBom 'org.springframework.security:spring-security-bom:5.1.0.RC2'
-		mavenBom 'org.testcontainers:testcontainers-bom:1.8.3'
+		mavenBom 'org.testcontainers:testcontainers-bom:1.9.0-rc1'
 	}
 
 	dependencies {
diff --git a/samples/boot/findbyusername/src/integration-test/resources/testcontainers.properties b/samples/boot/findbyusername/src/integration-test/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.timeout=120
diff --git a/samples/boot/redis-json/src/integration-test/resources/testcontainers.properties b/samples/boot/redis-json/src/integration-test/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.timeout=120
diff --git a/samples/boot/redis/src/integration-test/resources/testcontainers.properties b/samples/boot/redis/src/integration-test/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.timeout=120
diff --git a/samples/boot/webflux/src/integration-test/resources/testcontainers.properties b/samples/boot/webflux/src/integration-test/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.timeout=120
diff --git a/samples/boot/websocket/spring-session-sample-boot-websocket.gradle b/samples/boot/websocket/spring-session-sample-boot-websocket.gradle
@@ -23,5 +23,6 @@ dependencies {
 
 	testCompile "org.springframework.boot:spring-boot-starter-test"
 	testCompile "org.springframework.security:spring-security-test"
-	testCompile "org.testcontainers:testcontainers"
+
+	integrationTestCompile "org.testcontainers:testcontainers"
 }
diff --git a/samples/boot/websocket/src/integration-test/java/sample/ApplicationTests.java b/samples/boot/websocket/src/integration-test/java/sample/ApplicationTests.java
diff --git a/samples/boot/websocket/src/integration-test/resources/testcontainers.properties b/samples/boot/websocket/src/integration-test/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.timeout=120
diff --git a/samples/javaconfig/custom-cookie/src/main/resources/testcontainers.properties b/samples/javaconfig/custom-cookie/src/main/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.timeout=120
diff --git a/samples/javaconfig/redis/src/main/resources/testcontainers.properties b/samples/javaconfig/redis/src/main/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.timeout=120
diff --git a/samples/javaconfig/rest/spring-session-sample-javaconfig-rest.gradle b/samples/javaconfig/rest/spring-session-sample-javaconfig-rest.gradle
@@ -17,8 +17,6 @@ dependencies {
 	testCompile "org.springframework.security:spring-security-test"
 	testCompile "org.assertj:assertj-core"
 	testCompile "org.springframework:spring-test"
-
-	integrationTestCompile "org.testcontainers:testcontainers"
 }
 
 gretty {
diff --git a/samples/javaconfig/rest/src/main/resources/testcontainers.properties b/samples/javaconfig/rest/src/main/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.timeout=120
diff --git a/samples/javaconfig/security/src/main/resources/testcontainers.properties b/samples/javaconfig/security/src/main/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.timeout=120
diff --git a/samples/xml/redis/src/main/resources/testcontainers.properties b/samples/xml/redis/src/main/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.timeout=120
diff --git a/spring-session-data-redis/src/integration-test/resources/testcontainers.properties b/spring-session-data-redis/src/integration-test/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.timeout=120
diff --git a/spring-session-hazelcast/src/integration-test/resources/testcontainers.properties b/spring-session-hazelcast/src/integration-test/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.timeout=120
diff --git a/spring-session-jdbc/src/integration-test/resources/testcontainers.properties b/spring-session-jdbc/src/integration-test/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.timeout=120

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ dependencyManagement {`
`5`	`5`	`mavenBom 'org.springframework:spring-framework-bom:5.1.0.RC3'`
`6`	`6`	`mavenBom 'org.springframework.data:spring-data-releasetrain:Lovelace-RC2'`
`7`	`7`	`mavenBom 'org.springframework.security:spring-security-bom:5.1.0.RC2'`
`8`		`- mavenBom 'org.testcontainers:testcontainers-bom:1.8.3'`
	`8`	`+ mavenBom 'org.testcontainers:testcontainers-bom:1.9.0-rc1'`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,6 @@ dependencies {`
`23`	`23`
`24`	`24`	`testCompile "org.springframework.boot:spring-boot-starter-test"`
`25`	`25`	`testCompile "org.springframework.security:spring-security-test"`
`26`		`- testCompile "org.testcontainers:testcontainers"`
	`26`	`+`
	`27`	`+ integrationTestCompile "org.testcontainers:testcontainers"`
`27`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@ dependencies {`
`17`	`17`	`testCompile "org.springframework.security:spring-security-test"`
`18`	`18`	`testCompile "org.assertj:assertj-core"`
`19`	`19`	`testCompile "org.springframework:spring-test"`
`20`		`-`
`21`		`- integrationTestCompile "org.testcontainers:testcontainers"`
`22`	`20`	`}`
`23`	`21`
`24`	`22`	`gretty {`