From 2ce660c4211c04de7e5c3442e180f07325d11d7c Mon Sep 17 00:00:00 2001
From: John Blum <jblum@pivotal.io>
Date: Wed, 19 Sep 2018 10:28:33 -0700
Subject: [PATCH] Refactor dependencies and ensure the log4j-to-slf4j
 dependency gets excluded.

Remove testCompile slf4j dependencies.
---
 .../spring-geode-actuator-autoconfigure.gradle               | 4 ++--
 spring-geode-actuator/spring-geode-actuator.gradle           | 5 +++--
 spring-geode-autoconfigure/spring-geode-autoconfigure.gradle | 1 -
 spring-geode/spring-geode.gradle                             | 1 -
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle b/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle
index 65031e0a..94662643 100644
--- a/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle
+++ b/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle
@@ -4,8 +4,8 @@ description = "Spring Boot for Apache Geode Actuator Auto-Configuration"
 
 dependencies {
 
-    compile project(":spring-geode-autoconfigure")
     compile project(":spring-geode-actuator")
+    compile project(":spring-geode-autoconfigure")
 
     testCompile "org.assertj:assertj-core"
     testCompile "junit:junit"
@@ -18,5 +18,5 @@ dependencies {
     }
 
     testCompile "org.springframework.data:spring-data-geode-test"
-    testCompile slf4jDependencies
+
 }
diff --git a/spring-geode-actuator/spring-geode-actuator.gradle b/spring-geode-actuator/spring-geode-actuator.gradle
index 4f9510b7..58f24daa 100644
--- a/spring-geode-actuator/spring-geode-actuator.gradle
+++ b/spring-geode-actuator/spring-geode-actuator.gradle
@@ -6,7 +6,9 @@ dependencies {
 
     compile project(":spring-geode")
 
-    compile 'org.springframework.boot:spring-boot-starter-actuator'
+    compile ("org.springframework.boot:spring-boot-starter-actuator") {
+        exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
+    }
 
     testCompile "org.assertj:assertj-core"
     testCompile "junit:junit"
@@ -19,6 +21,5 @@ dependencies {
     }
 
     testCompile "org.springframework.data:spring-data-geode-test"
-    testCompile slf4jDependencies
 
 }
diff --git a/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle b/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle
index 3282a546..4c026adb 100644
--- a/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle
+++ b/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle
@@ -21,7 +21,6 @@ dependencies {
 	}
 
 	testCompile "org.springframework.data:spring-data-geode-test"
-	testCompile slf4jDependencies
 
 	testRuntime "javax.cache:cache-api"
 
diff --git a/spring-geode/spring-geode.gradle b/spring-geode/spring-geode.gradle
index cc5b49ac..9e08a71a 100644
--- a/spring-geode/spring-geode.gradle
+++ b/spring-geode/spring-geode.gradle
@@ -23,6 +23,5 @@ dependencies {
 	}
 
 	testCompile "org.springframework.data:spring-data-geode-test"
-	testCompile slf4jDependencies
 
 }