From 2e91024a5679cfaec90b448f8c49b2325669c7d9 Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Sun, 9 Jun 2019 10:54:28 +0200 Subject: [PATCH] Fix integration tests See: #1033 --- build.gradle | 2 +- spring-session-core/spring-session-core.gradle | 2 +- spring-session-data-redis/spring-session-data-redis.gradle | 2 +- spring-session-hazelcast/spring-session-hazelcast.gradle | 2 +- spring-session-jdbc/spring-session-jdbc.gradle | 2 +- .../spring-session-sample-boot-findbyusername.gradle | 2 +- .../spring-session-sample-boot-jdbc.gradle | 2 +- .../spring-session-sample-boot-redis-json.gradle | 2 +- .../spring-session-sample-boot-redis.gradle | 2 +- .../spring-session-sample-boot-webflux.gradle | 2 +- .../spring-session-sample-boot-websocket.gradle | 2 +- .../spring-session-sample-javaconfig-custom-cookie.gradle | 2 +- .../spring-session-sample-javaconfig-hazelcast.gradle | 2 +- .../spring-session-sample-javaconfig-jdbc.gradle | 2 +- .../spring-session-sample-javaconfig-redis.gradle | 2 +- .../spring-session-sample-javaconfig-rest.gradle | 2 +- .../spring-session-sample-javaconfig-security.gradle | 2 +- .../spring-session-sample-misc-hazelcast.gradle | 2 +- .../spring-session-sample-xml-jdbc.gradle | 2 +- .../spring-session-sample-xml-redis.gradle | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index 1d332691..02ded8ec 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ gradle.taskGraph.whenReady { graph -> plugins.withType(JavaPlugin) { sourceCompatibility = 1.8 - test { + tasks.withType(Test) { useJUnitPlatform() } } diff --git a/spring-session-core/spring-session-core.gradle b/spring-session-core/spring-session-core.gradle index 0b5967a2..78ad6f91 100644 --- a/spring-session-core/spring-session-core.gradle +++ b/spring-session-core/spring-session-core.gradle @@ -25,5 +25,5 @@ dependencies { testCompile "org.springframework.security:spring-security-core" testCompile "org.junit.jupiter:junit-jupiter-api" testCompile "org.junit.jupiter:junit-jupiter-params" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" + testRuntime "org.junit.jupiter:junit-jupiter-engine" } diff --git a/spring-session-data-redis/spring-session-data-redis.gradle b/spring-session-data-redis/spring-session-data-redis.gradle index e6bae874..8bf4d127 100644 --- a/spring-session-data-redis/spring-session-data-redis.gradle +++ b/spring-session-data-redis/spring-session-data-redis.gradle @@ -17,7 +17,7 @@ dependencies { testCompile "org.springframework:spring-web" testCompile "org.springframework.security:spring-security-core" testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" + testRuntime "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "io.lettuce:lettuce-core" integrationTestCompile "org.testcontainers:testcontainers" diff --git a/spring-session-hazelcast/spring-session-hazelcast.gradle b/spring-session-hazelcast/spring-session-hazelcast.gradle index 9d2d3378..b3a67502 100644 --- a/spring-session-hazelcast/spring-session-hazelcast.gradle +++ b/spring-session-hazelcast/spring-session-hazelcast.gradle @@ -10,7 +10,7 @@ dependencies { testCompile "org.springframework:spring-web" testCompile "org.springframework.security:spring-security-core" testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" + testRuntime "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "com.hazelcast:hazelcast-client" integrationTestCompile "org.testcontainers:testcontainers" diff --git a/spring-session-jdbc/spring-session-jdbc.gradle b/spring-session-jdbc/spring-session-jdbc.gradle index 3984fef5..baf111e4 100644 --- a/spring-session-jdbc/spring-session-jdbc.gradle +++ b/spring-session-jdbc/spring-session-jdbc.gradle @@ -11,7 +11,7 @@ dependencies { testCompile "org.springframework:spring-web" testCompile "org.springframework.security:spring-security-core" testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" + testRuntime "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "com.h2database:h2" integrationTestCompile "com.microsoft.sqlserver:mssql-jdbc" diff --git a/spring-session-samples/spring-session-sample-boot-findbyusername/spring-session-sample-boot-findbyusername.gradle b/spring-session-samples/spring-session-sample-boot-findbyusername/spring-session-sample-boot-findbyusername.gradle index 485447b1..cd150adc 100644 --- a/spring-session-samples/spring-session-sample-boot-findbyusername/spring-session-sample-boot-findbyusername.gradle +++ b/spring-session-samples/spring-session-sample-boot-findbyusername/spring-session-sample-boot-findbyusername.gradle @@ -17,7 +17,7 @@ dependencies { testCompile "org.springframework.boot:spring-boot-starter-test" testCompile "org.assertj:assertj-core" testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" + testRuntime "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile seleniumDependencies integrationTestCompile "org.testcontainers:testcontainers" diff --git a/spring-session-samples/spring-session-sample-boot-jdbc/spring-session-sample-boot-jdbc.gradle b/spring-session-samples/spring-session-sample-boot-jdbc/spring-session-sample-boot-jdbc.gradle index 66a02725..59ec4ef6 100644 --- a/spring-session-samples/spring-session-sample-boot-jdbc/spring-session-sample-boot-jdbc.gradle +++ b/spring-session-samples/spring-session-sample-boot-jdbc/spring-session-sample-boot-jdbc.gradle @@ -15,7 +15,7 @@ dependencies { testCompile "org.springframework.boot:spring-boot-starter-test" testCompile "org.assertj:assertj-core" testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" + testRuntime "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile seleniumDependencies } diff --git a/spring-session-samples/spring-session-sample-boot-redis-json/spring-session-sample-boot-redis-json.gradle b/spring-session-samples/spring-session-sample-boot-redis-json/spring-session-sample-boot-redis-json.gradle index b13c0d9f..2a56ebaf 100644 --- a/spring-session-samples/spring-session-sample-boot-redis-json/spring-session-sample-boot-redis-json.gradle +++ b/spring-session-samples/spring-session-sample-boot-redis-json/spring-session-sample-boot-redis-json.gradle @@ -17,7 +17,7 @@ dependencies { testCompile "org.assertj:assertj-core" testCompile "org.skyscreamer:jsonassert" testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" + testRuntime "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile seleniumDependencies integrationTestCompile "org.testcontainers:testcontainers" diff --git a/spring-session-samples/spring-session-sample-boot-redis/spring-session-sample-boot-redis.gradle b/spring-session-samples/spring-session-sample-boot-redis/spring-session-sample-boot-redis.gradle index 8fc1b067..65a8ec44 100644 --- a/spring-session-samples/spring-session-sample-boot-redis/spring-session-sample-boot-redis.gradle +++ b/spring-session-samples/spring-session-sample-boot-redis/spring-session-sample-boot-redis.gradle @@ -14,7 +14,7 @@ dependencies { testCompile "org.springframework.boot:spring-boot-starter-test" testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" + testRuntime "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile seleniumDependencies integrationTestCompile "org.testcontainers:testcontainers" diff --git a/spring-session-samples/spring-session-sample-boot-webflux/spring-session-sample-boot-webflux.gradle b/spring-session-samples/spring-session-sample-boot-webflux/spring-session-sample-boot-webflux.gradle index 28ff3280..52eda6bb 100644 --- a/spring-session-samples/spring-session-sample-boot-webflux/spring-session-sample-boot-webflux.gradle +++ b/spring-session-samples/spring-session-sample-boot-webflux/spring-session-sample-boot-webflux.gradle @@ -10,7 +10,7 @@ dependencies { testCompile "org.springframework.boot:spring-boot-starter-test" testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" + testRuntime "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile seleniumDependencies integrationTestCompile "org.testcontainers:testcontainers" diff --git a/spring-session-samples/spring-session-sample-boot-websocket/spring-session-sample-boot-websocket.gradle b/spring-session-samples/spring-session-sample-boot-websocket/spring-session-sample-boot-websocket.gradle index e396dc6e..ab8580f3 100644 --- a/spring-session-samples/spring-session-sample-boot-websocket/spring-session-sample-boot-websocket.gradle +++ b/spring-session-samples/spring-session-sample-boot-websocket/spring-session-sample-boot-websocket.gradle @@ -24,7 +24,7 @@ dependencies { testCompile "org.springframework.boot:spring-boot-starter-test" testCompile "org.springframework.security:spring-security-test" testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" + testRuntime "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "org.testcontainers:testcontainers" } diff --git a/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle b/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle index ef0eaf1c..4ef73b46 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle @@ -14,7 +14,7 @@ dependencies { testCompile "org.assertj:assertj-core" testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" + testRuntime "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile seleniumDependencies } diff --git a/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle b/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle index 829037d4..6769dfe5 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle @@ -16,7 +16,7 @@ dependencies { testCompile "org.assertj:assertj-core" testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" + testRuntime "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile seleniumDependencies } diff --git a/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle b/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle index 93e6ca0a..4ed115a9 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle @@ -13,7 +13,7 @@ dependencies { testCompile "org.assertj:assertj-core" testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" + testRuntime "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile seleniumDependencies } diff --git a/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle b/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle index ef0eaf1c..4ef73b46 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle @@ -14,7 +14,7 @@ dependencies { testCompile "org.assertj:assertj-core" testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" + testRuntime "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile seleniumDependencies } diff --git a/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle b/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle index a84907f0..007c895f 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle @@ -17,7 +17,7 @@ dependencies { testCompile "org.assertj:assertj-core" testCompile "org.springframework:spring-test" testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" + testRuntime "org.junit.jupiter:junit-jupiter-engine" } gretty { diff --git a/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle b/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle index 46c3e452..e418f640 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle @@ -18,7 +18,7 @@ dependencies { testCompile "org.assertj:assertj-core" testCompile "org.springframework:spring-test" testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" + testRuntime "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile seleniumDependencies } diff --git a/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle b/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle index 91934f63..5121e401 100644 --- a/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle +++ b/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle @@ -12,7 +12,7 @@ dependencies { testCompile "org.assertj:assertj-core" testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" + testRuntime "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile seleniumDependencies } diff --git a/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle b/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle index cd10aa7f..de6e3bcb 100644 --- a/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle +++ b/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle @@ -13,7 +13,7 @@ dependencies { testCompile "org.assertj:assertj-core" testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" + testRuntime "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile seleniumDependencies } diff --git a/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle b/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle index 8648ee5b..e094ce96 100644 --- a/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle +++ b/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle @@ -14,7 +14,7 @@ dependencies { testCompile "org.assertj:assertj-core" testCompile "org.junit.jupiter:junit-jupiter-api" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" + testRuntime "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile seleniumDependencies }