From 625a95af6a81c1b083168ffd41fdec092f144377 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@vmware.com>
Date: Wed, 6 Jul 2022 14:35:30 -0700
Subject: [PATCH] Remove logback-include.xml from Spring Geode Starter Logging.

Resolves #117.
---
 .../src/main/resources/logback-include.xml      | 17 -----------------
 .../src/main/resources/logback.xml              |  1 -
 .../src/test/resources/logback-test.xml         |  4 +++-
 3 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 spring-geode-project/spring-geode-starters/spring-geode-starter-logging/src/main/resources/logback-include.xml

diff --git a/spring-geode-project/spring-geode-starters/spring-geode-starter-logging/src/main/resources/logback-include.xml b/spring-geode-project/spring-geode-starters/spring-geode-starter-logging/src/main/resources/logback-include.xml
deleted file mode 100644
index a19b2f27..00000000
--- a/spring-geode-project/spring-geode-starters/spring-geode-starter-logging/src/main/resources/logback-include.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- DEPRECATED -->
-<included>
-
-	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>%d %5p %40.40c:%4L - %m%n</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="delegate" class="org.springframework.geode.logging.slf4j.logback.DelegatingAppender"/>
-
-	<logger name="com.gemstone.gemfire" level="${spring.boot.data.gemfire.log.level:-INFO}"/>
-	<logger name="org.apache.geode" level="${spring.boot.data.gemfire.log.level:-INFO}"/>
-	<logger name="org.jgroups" level="${spring.boot.data.gemfire.jgroups.log.level:-ERROR}"/>
-
-</included>
diff --git a/spring-geode-project/spring-geode-starters/spring-geode-starter-logging/src/main/resources/logback.xml b/spring-geode-project/spring-geode-starters/spring-geode-starter-logging/src/main/resources/logback.xml
index 2c5d6a5d..0d5dff6b 100644
--- a/spring-geode-project/spring-geode-starters/spring-geode-starter-logging/src/main/resources/logback.xml
+++ b/spring-geode-project/spring-geode-starters/spring-geode-starter-logging/src/main/resources/logback.xml
@@ -23,7 +23,6 @@
 
 	<include resource="org/springframework/geode/logging/slf4j/logback/appender-include.xml"/>
 	<include resource="org/springframework/geode/logging/slf4j/logback/logger-include.xml"/>
-	<include resource="org/springframework/geode/logging/slf4j/logback/logback-include.xml"/>
 
 	<root level="${logback.root.log.level:-INFO}">
 		<appender-ref ref="CONSOLE"/>
diff --git a/spring-geode-project/spring-geode-starters/spring-geode-starter-logging/src/test/resources/logback-test.xml b/spring-geode-project/spring-geode-starters/spring-geode-starter-logging/src/test/resources/logback-test.xml
index ab9acc27..79ba3294 100644
--- a/spring-geode-project/spring-geode-starters/spring-geode-starter-logging/src/test/resources/logback-test.xml
+++ b/spring-geode-project/spring-geode-starters/spring-geode-starter-logging/src/test/resources/logback-test.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false">
 
-	<include resource="logback-include.xml"/>
+	<include resource="org/springframework/geode/logging/slf4j/logback/properties-include.xml"/>
+	<include resource="org/springframework/geode/logging/slf4j/logback/appender-include.xml"/>
+	<include resource="org/springframework/geode/logging/slf4j/logback/logger-include.xml"/>
 
 	<root level="${logback.root.log.level:-ERROR}">
 		<appender-ref ref="delegate"/>