diff --git a/apache-geode-extensions/apache-geode-extensions.gradle b/apache-geode-extensions/apache-geode-extensions.gradle index 5189cdc4..c0512336 100644 --- a/apache-geode-extensions/apache-geode-extensions.gradle +++ b/apache-geode-extensions/apache-geode-extensions.gradle @@ -9,8 +9,8 @@ dependencies { compile "org.apache.geode:geode-lucene:$apacheGeodeVersion" compile "org.apache.geode:geode-wan:$apacheGeodeVersion" - testCompile "org.assertj:assertj-core" testCompile "junit:junit" + testCompile "org.assertj:assertj-core" testCompile "org.mockito:mockito-core" testCompile "org.projectlombok:lombok" testCompile "edu.umd.cs.mtc:multithreadedtc" diff --git a/spring-gemfire-starter-session/spring-gemfire-starter-session.gradle b/spring-gemfire-starter-session/spring-gemfire-starter-session.gradle index 06de2fb1..ea61acf1 100644 --- a/spring-gemfire-starter-session/spring-gemfire-starter-session.gradle +++ b/spring-gemfire-starter-session/spring-gemfire-starter-session.gradle @@ -5,7 +5,7 @@ description = "Spring Boot Starter for Spring Session using Pivotal GemFire" dependencies { - compile(project(':spring-gemfire-starter')) + compile project(':spring-gemfire-starter') compile 'org.springframework.session:spring-session-data-gemfire' diff --git a/spring-gemfire-starter-test/spring-gemfire-starter-test.gradle b/spring-gemfire-starter-test/spring-gemfire-starter-test.gradle index 179d10f4..3c3ecd8f 100644 --- a/spring-gemfire-starter-test/spring-gemfire-starter-test.gradle +++ b/spring-gemfire-starter-test/spring-gemfire-starter-test.gradle @@ -5,11 +5,9 @@ description = "Spring Boot Test Starter for Pivotal GemFire" dependencies { - compile("org.springframework.boot:spring-boot-starter-test") { - exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" - } + compile project(':spring-gemfire-starter') - compile(project(':spring-gemfire-starter')); + compile "org.springframework.boot:spring-boot-starter-test" testCompile "org.springframework.data:spring-data-gemfire-test:$springDataGeodeTestVersion" diff --git a/spring-gemfire-starter/spring-gemfire-starter.gradle b/spring-gemfire-starter/spring-gemfire-starter.gradle index f11cbc15..91351e34 100644 --- a/spring-gemfire-starter/spring-gemfire-starter.gradle +++ b/spring-gemfire-starter/spring-gemfire-starter.gradle @@ -20,7 +20,6 @@ dependencies { compile "org.springframework.data:spring-data-gemfire" runtime 'javax.cache:cache-api' - runtime 'org.springframework.shell:spring-shell' } diff --git a/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle b/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle index d8222396..52fa4909 100644 --- a/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle +++ b/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle @@ -8,8 +8,8 @@ dependencies { compile project(":spring-geode-actuator") compile project(":spring-geode-autoconfigure") - testCompile "org.assertj:assertj-core" testCompile "junit:junit" + testCompile "org.assertj:assertj-core" testCompile "org.mockito:mockito-core" testCompile "org.projectlombok:lombok" testCompile "edu.umd.cs.mtc:multithreadedtc" diff --git a/spring-geode-actuator/spring-geode-actuator.gradle b/spring-geode-actuator/spring-geode-actuator.gradle index a424ffd9..74b9f960 100644 --- a/spring-geode-actuator/spring-geode-actuator.gradle +++ b/spring-geode-actuator/spring-geode-actuator.gradle @@ -11,8 +11,8 @@ dependencies { exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } - testCompile "org.assertj:assertj-core" testCompile "junit:junit" + testCompile "org.assertj:assertj-core" testCompile "org.mockito:mockito-core" testCompile "org.projectlombok:lombok" testCompile "edu.umd.cs.mtc:multithreadedtc" diff --git a/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle b/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle index aa9b2512..fe64fd17 100644 --- a/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle +++ b/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle @@ -15,7 +15,7 @@ dependencies { optional "org.springframework.boot:spring-boot-configuration-processor" optional "org.springframework.session:spring-session-data-geode" - provided "javax.servlet:javax.servlet-api" + //provided "javax.servlet:javax.servlet-api" testCompile project(":apache-geode-extensions") @@ -44,7 +44,7 @@ dependencies { testRuntime "org.springframework.shell:spring-shell:$springShellVersion" // Runtime Test dependency on Spring Cloud Services (SCS) to verify workaround to SCS problem! - // testRuntime("io.pivotal.spring.cloud:spring-cloud-services-starter-service-registry:2.0.3.RELEASE") { + //testRuntime("io.pivotal.spring.cloud:spring-cloud-services-starter-service-registry:2.0.3.RELEASE") { // exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" - // } + //} } diff --git a/spring-geode-samples/boot/actuator/spring-geode-samples-boot-actuator.gradle b/spring-geode-samples/boot/actuator/spring-geode-samples-boot-actuator.gradle index d3a7ba2a..a3217af5 100644 --- a/spring-geode-samples/boot/actuator/spring-geode-samples-boot-actuator.gradle +++ b/spring-geode-samples/boot/actuator/spring-geode-samples-boot-actuator.gradle @@ -9,17 +9,12 @@ description = "Spring Geode Sample demonstrating the use of Spring Boot Actuator dependencies { compile project(":spring-geode-starter-actuator") + compile project(":spring-geode-starter-test") compile ("org.springframework.boot:spring-boot-starter-web") { exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } - compile "org.springframework.data:spring-data-geode-test" - - runtime ("org.springframework.boot:spring-boot-starter-jetty") { - exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" - } - } bootJar { 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 243c011e..70b26986 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,10 +11,10 @@ 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" testCompile("org.springframework.boot:spring-boot-starter-test") { exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" 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 e45715f9..9f67c4b3 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 @@ -16,18 +16,13 @@ dependencies { exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } - runtime ("org.springframework.boot:spring-boot-starter-tomcat") { - exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" - } + testCompile project(":spring-geode-starter-session") + testCompile project(":spring-geode-starter-test") testCompile("org.springframework.boot:spring-boot-starter-test") { exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } - testCompile project(":spring-geode-starter-session") - - testCompile "org.springframework.data:spring-data-geode-test" - } 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 7e0653da..7f96d6f0 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 @@ -4,12 +4,14 @@ plugins { apply plugin: 'io.spring.convention.spring-sample-boot' -description = "Spring Geode Sample demonstrating Spring's Cache Abstraction using Apache Geode as the caching provider with Inline Caching." +description = "Spring Geode Sample demonstrating Spring's Cache Abstraction using Apache Geode as the caching provider for Inline Caching." dependencies { compile project(":spring-geode-starter") + compile "org.projectlombok:lombok" + compile ("org.springframework.boot:spring-boot-starter-data-jpa") { exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } @@ -18,21 +20,14 @@ dependencies { exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } - compile "org.projectlombok:lombok" - - runtime "javax.cache:cache-api" runtime "org.hsqldb:hsqldb" - runtime ("org.springframework.boot:spring-boot-starter-jetty") { - exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" - } + testCompile project(":spring-geode-starter-test") testCompile("org.springframework.boot:spring-boot-starter-test") { exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } - testCompile "org.springframework.data:spring-data-geode-test" - } bootJar { 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 e165ac4a..66f35948 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 @@ -1,6 +1,6 @@ apply plugin: 'io.spring.convention.spring-sample-boot' -description = "Spring Geode Sample demonstrating Spring's Cache Abstraction using Apache Geode as the caching provider with Look-Aside Caching." +description = "Spring Geode Sample demonstrating Spring's Cache Abstraction using Apache Geode as the caching provider for Look-Aside Caching." dependencies { @@ -10,18 +10,11 @@ dependencies { exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } - runtime "javax.cache:cache-api" - - runtime ("org.springframework.boot:spring-boot-starter-jetty") { - exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" - } + testCompile project(":spring-geode-starter-test") testCompile("org.springframework.boot:spring-boot-starter-test") { exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } - - testCompile "org.springframework.data:spring-data-geode-test" - } 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 ea742c92..098ed918 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 @@ -4,7 +4,7 @@ plugins { apply plugin: 'io.spring.convention.spring-sample-boot' -description = "Spring Geode Sample demonstrating Spring's Cache Abstraction using Apache Geode as the caching provider with Near Caching." +description = "Spring Geode Sample demonstrating Spring's Cache Abstraction using Apache Geode as the caching provider for Near Caching." dependencies { @@ -18,18 +18,16 @@ dependencies { exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } - runtime "javax.cache:cache-api" - runtime("org.springframework.boot:spring-boot-starter-jetty") { exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } + testCompile project (":spring-geode-starter-test") + testCompile("org.springframework.boot:spring-boot-starter-test") { exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } - testCompile "org.springframework.data:spring-data-geode-test" - } bootJar { diff --git a/spring-geode-starter-session/spring-geode-starter-session.gradle b/spring-geode-starter-session/spring-geode-starter-session.gradle index d7d17463..58c76c8e 100644 --- a/spring-geode-starter-session/spring-geode-starter-session.gradle +++ b/spring-geode-starter-session/spring-geode-starter-session.gradle @@ -5,7 +5,7 @@ description = "Spring Boot Starter for Spring Session using Apache Geode" dependencies { - compile(project(':spring-geode-starter')) + compile project(':spring-geode-starter') compile 'org.springframework.session:spring-session-data-geode' diff --git a/spring-geode-starter-test/spring-geode-starter-test.gradle b/spring-geode-starter-test/spring-geode-starter-test.gradle index 075b9466..ffa04979 100644 --- a/spring-geode-starter-test/spring-geode-starter-test.gradle +++ b/spring-geode-starter-test/spring-geode-starter-test.gradle @@ -5,12 +5,12 @@ description = "Spring Boot Test Starter for Apache Geode" dependencies { + compile project(':spring-geode-starter') + compile("org.springframework.boot:spring-boot-starter-test") { exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } - compile(project(':spring-geode-starter')) - testCompile 'org.springframework.data:spring-data-geode-test' } diff --git a/spring-geode-starter/spring-geode-starter.gradle b/spring-geode-starter/spring-geode-starter.gradle index ba102989..2cd05344 100644 --- a/spring-geode-starter/spring-geode-starter.gradle +++ b/spring-geode-starter/spring-geode-starter.gradle @@ -9,12 +9,10 @@ dependencies { exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" } - compile(project(':spring-geode')) - - compile(project(':spring-geode-autoconfigure')) + compile project(':spring-geode') + compile project(':spring-geode-autoconfigure') runtime 'javax.cache:cache-api' - runtime 'org.springframework.shell:spring-shell' }