From 82881e2f73a4c3477963d29a04eb4042055eea5a Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 22 Aug 2019 23:14:21 -0700 Subject: [PATCH] Switch direct [test] compile dependency on 'org.springframework.data:spring-data-geode-test' to 'spring-geode-starter-test'. --- .../spring-geode-samples-boot-configuration.gradle | 6 +----- .../spring-geode-samples-caching-httpsession.gradle | 6 +----- .../inline/spring-geode-samples-caching-inline.gradle | 7 ++----- .../spring-geode-samples-caching-lookaside.gradle | 6 +----- .../caching/near/spring-geode-samples-caching-near.gradle | 7 ++----- 5 files changed, 7 insertions(+), 25 deletions(-) diff --git a/spring-geode-samples/boot/configuration/spring-geode-samples-boot-configuration.gradle b/spring-geode-samples/boot/configuration/spring-geode-samples-boot-configuration.gradle index de4a7ad8..7f88e445 100644 --- a/spring-geode-samples/boot/configuration/spring-geode-samples-boot-configuration.gradle +++ b/spring-geode-samples/boot/configuration/spring-geode-samples-boot-configuration.gradle @@ -11,15 +11,11 @@ description = "Spring Geode Sample demonstrating the use of Spring Boot Auto-Con dependencies { compile project(":spring-geode-starter") + compile project(":spring-geode-starter-test") compile "org.assertj:assertj-core" compile "org.projectlombok:lombok" - compile("org.springframework.data:spring-data-geode-test") { - exclude group: "javax.servlet", module: "javax.servlet-api" - exclude group: "org.apache.logging.log4j", module: "log4j-core" - } - testCompile "org.springframework.boot:spring-boot-starter-test" } diff --git a/spring-geode-samples/caching/http-session/spring-geode-samples-caching-httpsession.gradle b/spring-geode-samples/caching/http-session/spring-geode-samples-caching-httpsession.gradle index cc97c49f..3a254db3 100644 --- a/spring-geode-samples/caching/http-session/spring-geode-samples-caching-httpsession.gradle +++ b/spring-geode-samples/caching/http-session/spring-geode-samples-caching-httpsession.gradle @@ -13,14 +13,10 @@ dependencies { runtime "org.springframework.boot:spring-boot-starter-thymeleaf" testCompile project(":spring-geode-starter-session") + testCompile project(":spring-geode-starter-test") testCompile "org.springframework.boot:spring-boot-starter-test" - testCompile("org.springframework.data:spring-data-geode-test") { - exclude group: "javax.servlet", module: "javax.servlet-api" - exclude group: "org.apache.logging.log4j", module: "log4j-core" - } - } bootJar { diff --git a/spring-geode-samples/caching/inline/spring-geode-samples-caching-inline.gradle b/spring-geode-samples/caching/inline/spring-geode-samples-caching-inline.gradle index ff7df82e..0b53f270 100644 --- a/spring-geode-samples/caching/inline/spring-geode-samples-caching-inline.gradle +++ b/spring-geode-samples/caching/inline/spring-geode-samples-caching-inline.gradle @@ -17,12 +17,9 @@ dependencies { runtime "org.hsqldb:hsqldb" runtime "org.springframework.boot:spring-boot-starter-jetty" - testCompile "org.springframework.boot:spring-boot-starter-test" + testCompile project(":spring-geode-starter-test") - testCompile("org.springframework.data:spring-data-geode-test") { - exclude group: "javax.servlet", module: "javax.servlet-api" - exclude group: "org.apache.logging.log4j", module: "log4j-core" - } + testCompile "org.springframework.boot:spring-boot-starter-test" } diff --git a/spring-geode-samples/caching/look-aside/spring-geode-samples-caching-lookaside.gradle b/spring-geode-samples/caching/look-aside/spring-geode-samples-caching-lookaside.gradle index 2ba61170..30bf1a00 100644 --- a/spring-geode-samples/caching/look-aside/spring-geode-samples-caching-lookaside.gradle +++ b/spring-geode-samples/caching/look-aside/spring-geode-samples-caching-lookaside.gradle @@ -10,13 +10,9 @@ dependencies { runtime "org.springframework.boot:spring-boot-starter-jetty" + testCompile project(":spring-geode-starter-test") testCompile "org.springframework.boot:spring-boot-starter-test" - testCompile("org.springframework.data:spring-data-geode-test") { - exclude group: "javax.servlet", module: "javax.servlet-api" - exclude group: "org.apache.logging.log4j", module: "log4j-core" - } - } bootJar { diff --git a/spring-geode-samples/caching/near/spring-geode-samples-caching-near.gradle b/spring-geode-samples/caching/near/spring-geode-samples-caching-near.gradle index badd4fbf..4460820e 100644 --- a/spring-geode-samples/caching/near/spring-geode-samples-caching-near.gradle +++ b/spring-geode-samples/caching/near/spring-geode-samples-caching-near.gradle @@ -17,12 +17,9 @@ dependencies { runtime "org.springframework.boot:spring-boot-starter-jetty" - testCompile "org.springframework.boot:spring-boot-starter-test" + testCompile project (":spring-geode-starter-test") - testCompile("org.springframework.data:spring-data-geode-test") { - exclude group: "javax.servlet", module: "javax.servlet-api" - exclude group: "org.apache.logging.log4j", module: "log4j-core" - } + testCompile "org.springframework.boot:spring-boot-starter-test" }