From f0e8b7964c046fa413454b1f9ac8652be48e3d19 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@pivotal.io>
Date: Mon, 29 Apr 2019 19:49:36 -0700
Subject: [PATCH] Remove exclusions on
 'org.springframework.boot:spring-boot-starter-logging'.

Add exclusion on 'org.apache.logging.log4j:log4j-to-slf4j'.
---
 spring-gemfire-starter/spring-gemfire-starter.gradle      | 2 +-
 .../spring-geode-actuator-autoconfigure.gradle            | 2 +-
 spring-geode-actuator/spring-geode-actuator.gradle        | 4 ++--
 .../spring-geode-autoconfigure.gradle                     | 8 ++++----
 .../actuator/spring-geode-samples-boot-actuator.gradle    | 4 ++--
 spring-geode-starter/spring-geode-starter.gradle          | 2 +-
 spring-geode/spring-geode.gradle                          | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/spring-gemfire-starter/spring-gemfire-starter.gradle b/spring-gemfire-starter/spring-gemfire-starter.gradle
index 403ab840..4d26fb2f 100644
--- a/spring-gemfire-starter/spring-gemfire-starter.gradle
+++ b/spring-gemfire-starter/spring-gemfire-starter.gradle
@@ -5,7 +5,7 @@ description = "Spring Boot Starter for Pivotal GemFire"
 dependencies {
 
 	compile("org.springframework.boot:spring-boot-starter") {
-		exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
+		exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
 	}
 
 	compile(project(':spring-geode')) {
diff --git a/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle b/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle
index 94662643..df35743a 100644
--- a/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle
+++ b/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle
@@ -14,7 +14,7 @@ dependencies {
     testCompile "edu.umd.cs.mtc:multithreadedtc"
 
     testCompile("org.springframework.boot:spring-boot-starter-test") {
-        exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
+        exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
     }
 
     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 58f24daa..304a7535 100644
--- a/spring-geode-actuator/spring-geode-actuator.gradle
+++ b/spring-geode-actuator/spring-geode-actuator.gradle
@@ -7,7 +7,7 @@ dependencies {
     compile project(":spring-geode")
 
     compile ("org.springframework.boot:spring-boot-starter-actuator") {
-        exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
+        exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
     }
 
     testCompile "org.assertj:assertj-core"
@@ -17,7 +17,7 @@ dependencies {
     testCompile "edu.umd.cs.mtc:multithreadedtc"
 
     testCompile("org.springframework.boot:spring-boot-starter-test") {
-        exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
+        exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
     }
 
     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 747f1f03..26f35b37 100644
--- a/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle
+++ b/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle
@@ -24,7 +24,7 @@ dependencies {
 	testCompile "edu.umd.cs.mtc:multithreadedtc"
 
 	testCompile("org.springframework.boot:spring-boot-starter-test") {
-		exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
+		exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
 	}
 
 	testCompile "org.springframework.data:spring-data-geode-test"
@@ -32,17 +32,17 @@ dependencies {
 	testRuntime "javax.cache:cache-api"
 
 	testRuntime("org.springframework.boot:spring-boot-starter-web") {
-		exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
+		exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
 	}
 
 	testRuntime("org.springframework.boot:spring-boot-starter-jetty") {
-		exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
+		exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
 	}
 
 	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") {
-	//	exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
+	//	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 b58c1f04..f09f0d44 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
@@ -11,7 +11,7 @@ dependencies {
 	compile project(":spring-geode-starter-actuator")
 
 	compile ("org.springframework.boot:spring-boot-starter-web") {
-		exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
+		exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
 	}
 
 	compile "org.springframework.data:spring-data-geode-test"
@@ -19,7 +19,7 @@ dependencies {
 	runtime "org.springframework.shell:spring-shell"
 
 	runtime ("org.springframework.boot:spring-boot-starter-jetty") {
-		exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
+		exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
 	}
 
 }
diff --git a/spring-geode-starter/spring-geode-starter.gradle b/spring-geode-starter/spring-geode-starter.gradle
index 2eb9f644..b4d03994 100644
--- a/spring-geode-starter/spring-geode-starter.gradle
+++ b/spring-geode-starter/spring-geode-starter.gradle
@@ -5,7 +5,7 @@ description = "Spring Boot Starter for Apache Geode"
 dependencies {
 
 	compile("org.springframework.boot:spring-boot-starter") {
-		exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
+		exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
 	}
 
 	compile(project(':spring-geode'))
diff --git a/spring-geode/spring-geode.gradle b/spring-geode/spring-geode.gradle
index 9e08a71a..2f30f9a6 100644
--- a/spring-geode/spring-geode.gradle
+++ b/spring-geode/spring-geode.gradle
@@ -9,7 +9,7 @@ dependencies {
 	compile "org.springframework.data:spring-data-geode"
 
 	compile("org.springframework.boot:spring-boot-starter") {
-		exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
+		exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
 	}
 
 	testCompile "org.assertj:assertj-core"
@@ -19,7 +19,7 @@ dependencies {
 	testCompile "edu.umd.cs.mtc:multithreadedtc"
 
 	testCompile("org.springframework.boot:spring-boot-starter-test") {
-		exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
+		exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
 	}
 
 	testCompile "org.springframework.data:spring-data-geode-test"