diff --git a/apache-geode-extensions/apache-geode-extensions.gradle b/apache-geode-extensions/apache-geode-extensions.gradle index 5189cdc4..87c175ad 100644 --- a/apache-geode-extensions/apache-geode-extensions.gradle +++ b/apache-geode-extensions/apache-geode-extensions.gradle @@ -4,10 +4,21 @@ description = "Apache Geode Extensions" dependencies { - compile "org.apache.geode:geode-core:$apacheGeodeVersion" - compile "org.apache.geode:geode-cq:$apacheGeodeVersion" - compile "org.apache.geode:geode-lucene:$apacheGeodeVersion" - compile "org.apache.geode:geode-wan:$apacheGeodeVersion" + compile("org.apache.geode:geode-core:$apacheGeodeVersion") { + exclude group: "org.apache.logging.log4j", module: "log4j-core" + } + + compile("org.apache.geode:geode-cq:$apacheGeodeVersion") { + exclude group: "org.apache.logging.log4j", module: "log4j-core" + } + + compile("org.apache.geode:geode-lucene:$apacheGeodeVersion") { + exclude group: "org.apache.logging.log4j", module: "log4j-core" + } + + compile("org.apache.geode:geode-wan:$apacheGeodeVersion") { + exclude group: "org.apache.logging.log4j", module: "log4j-core" + } testCompile "org.assertj:assertj-core" testCompile "junit:junit" diff --git a/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle b/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle index d8222396..b82e8fdd 100644 --- a/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle +++ b/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle @@ -8,16 +8,15 @@ 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 "org.springframework.boot:spring-boot-starter-test" testCompile "edu.umd.cs.mtc:multithreadedtc" - 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") { + exclude group: "org.apache.logging.log4j", module: "log4j-core" } - testCompile "org.springframework.data:spring-data-geode-test" - } diff --git a/spring-geode-actuator/spring-geode-actuator.gradle b/spring-geode-actuator/spring-geode-actuator.gradle index a424ffd9..ca75740f 100644 --- a/spring-geode-actuator/spring-geode-actuator.gradle +++ b/spring-geode-actuator/spring-geode-actuator.gradle @@ -7,20 +7,17 @@ dependencies { compile project(":spring-geode") - compile ("org.springframework.boot:spring-boot-starter-actuator") { - exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" - } + compile "org.springframework.boot:spring-boot-starter-actuator" - testCompile "org.assertj:assertj-core" testCompile "junit:junit" + testCompile "org.assertj:assertj-core" testCompile "org.mockito:mockito-core" testCompile "org.projectlombok:lombok" + testCompile "org.springframework.boot:spring-boot-starter-test" testCompile "edu.umd.cs.mtc:multithreadedtc" - 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") { + exclude group: "org.apache.logging.log4j", module: "log4j-core" } - testCompile "org.springframework.data:spring-data-geode-test" - } diff --git a/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle b/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle index aa9b2512..66e6268f 100644 --- a/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle +++ b/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle @@ -13,34 +13,29 @@ dependencies { optional "org.springframework.boot:spring-boot-autoconfigure-processor" optional "org.springframework.boot:spring-boot-configuration-processor" - optional "org.springframework.session:spring-session-data-geode" + + optional("org.springframework.session:spring-session-data-geode") { + exclude group: "org.apache.logging.log4j", module: "log4j-core" + } provided "javax.servlet:javax.servlet-api" testCompile project(":apache-geode-extensions") - testCompile "org.assertj:assertj-core" testCompile "junit:junit" + testCompile "org.assertj:assertj-core" testCompile "org.mockito:mockito-core" testCompile "org.projectlombok:lombok" + testCompile "org.springframework.boot:spring-boot-starter-test" testCompile "edu.umd.cs.mtc:multithreadedtc" - 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") { + exclude group: "org.apache.logging.log4j", module: "log4j-core" } - testCompile "org.springframework.data:spring-data-geode-test" - testRuntime "javax.cache:cache-api" - - testRuntime("org.springframework.boot:spring-boot-starter-web") { - exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" - } - - testRuntime("org.springframework.boot:spring-boot-starter-jetty") { - exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" - } - + testRuntime "org.springframework.boot:spring-boot-starter-web" + testRuntime "org.springframework.boot:spring-boot-starter-jetty" testRuntime "org.springframework.shell:spring-shell:$springShellVersion" // Runtime Test dependency on Spring Cloud Services (SCS) to verify workaround to SCS problem! diff --git a/spring-geode-docs/spring-geode-docs.gradle b/spring-geode-docs/spring-geode-docs.gradle index c3c8f24b..a1541149 100644 --- a/spring-geode-docs/spring-geode-docs.gradle +++ b/spring-geode-docs/spring-geode-docs.gradle @@ -11,8 +11,8 @@ dependencies { testCompile "org.assertj:assertj-core" testCompile "org.mockito:mockito-core" testCompile "org.projectlombok:lombok" - testCompile "edu.umd.cs.mtc:multithreadedtc" testCompile "org.springframework:spring-test" + testCompile "edu.umd.cs.mtc:multithreadedtc" } 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..a4b14256 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 @@ -10,15 +10,14 @@ dependencies { compile project(":spring-geode-starter-actuator") - compile ("org.springframework.boot:spring-boot-starter-web") { - exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" + compile "org.springframework.boot:spring-boot-starter-web" + + compile("org.springframework.data:spring-data-geode-test") { + exclude group: "org.apache.logging.log4j", module: "log4j-core" } - 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" - } + runtime "org.springframework.boot:spring-boot-starter-jetty" + runtime "org.springframework.shell:spring-shell" } 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..fb0861f2 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 @@ -12,6 +12,10 @@ dependencies { compile project(":spring-geode-starter") + compile("org.springframework.data:spring-data-geode-test") { + exclude group: "org.apache.logging.log4j", module: "log4j-core" + } + compile "org.assertj:assertj-core" compile "org.projectlombok:lombok" compile "org.springframework.data:spring-data-geode-test" 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..2281bb32 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 @@ -10,29 +10,21 @@ dependencies { compile project(":spring-geode-starter") - compile ("org.springframework.boot:spring-boot-starter-data-jpa") { - exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" - } - - compile ("org.springframework.boot:spring-boot-starter-web") { - exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" - } - compile "org.projectlombok:lombok" + compile "org.springframework.boot:spring-boot-starter-data-jpa" + compile "org.springframework.boot:spring-boot-starter-web" runtime "javax.cache:cache-api" runtime "org.hsqldb:hsqldb" + runtime "org.springframework.boot:spring-boot-starter-jetty" + runtime "org.springframework.shell:spring-shell" - runtime ("org.springframework.boot:spring-boot-starter-jetty") { - exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" + testCompile "org.springframework.boot:spring-boot-starter-test" + + testCompile("org.springframework.data:spring-data-geode-test") { + exclude group: "org.apache.logging.log4j", module: "log4j-core" } - 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..cb1ef485 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 @@ -6,22 +6,18 @@ dependencies { compile project(":spring-geode-starter") - compile ("org.springframework.boot:spring-boot-starter-web") { - exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" - } + compile "org.springframework.boot:spring-boot-starter-web" runtime "javax.cache:cache-api" + runtime "org.springframework.boot:spring-boot-starter-jetty" + runtime "org.springframework.shell:spring-shell" - runtime ("org.springframework.boot:spring-boot-starter-jetty") { - exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" + testCompile "org.springframework.boot:spring-boot-starter-test" + + testCompile("org.springframework.data:spring-data-geode-test") { + exclude group: "org.apache.logging.log4j", module: "log4j-core" } - 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/spring-geode.gradle b/spring-geode/spring-geode.gradle index edbfcfbf..d0cbb10f 100644 --- a/spring-geode/spring-geode.gradle +++ b/spring-geode/spring-geode.gradle @@ -11,34 +11,30 @@ dependencies { compile "org.springframework:spring-context-support" compile "org.springframework:spring-jcl" - compile "org.springframework.data:spring-data-geode" + compile "org.springframework.boot:spring-boot-starter" - compile("org.springframework.boot:spring-boot-starter") { - exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" + compile("org.springframework.data:spring-data-geode") { + exclude group: "org.apache.logging.log4j", module: "log4j-core" } - testCompile "org.assertj:assertj-core" testCompile "junit:junit" + testCompile "org.assertj:assertj-core" testCompile "org.mockito:mockito-core" testCompile "org.projectlombok:lombok" testCompile "org.testcontainers:testcontainers" testCompile "edu.umd.cs.mtc:multithreadedtc" testCompile("org.springframework.boot:spring-boot-starter-test") { - exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" exclude group: "org.skyscreamer", module: "jsonassert" } - testCompile("org.springframework.boot:spring-boot-starter-data-jpa") { - exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" - } + testCompile "org.springframework.boot:spring-boot-starter-data-jpa" + testCompile "org.springframework.boot:spring-boot-starter-data-cassandra" - testCompile("org.springframework.boot:spring-boot-starter-data-cassandra") { - exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" + testCompile("org.springframework.data:spring-data-geode-test") { + exclude group: "org.apache.logging.log4j", module: "log4j-core" } - testCompile "org.springframework.data:spring-data-geode-test" - testRuntime "org.hsqldb:hsqldb" }