From b8cb30fa9ea8d8b9a5ce2ec9e848fb41b243291c Mon Sep 17 00:00:00 2001
From: David Turanski <dturanski@vmware.com>
Date: Wed, 2 Mar 2022 13:32:28 -0500
Subject: [PATCH] Quiet down integration test logging

---
 applications/sink/geode-sink/pom.xml          | 12 +++--
 .../src/test/resources/logback-include.xml    | 16 ++++++
 .../mqtt-sink/src/test/resources/logback.xml  | 13 +++++
 .../src/test/resources/logback.xml            | 13 +++++
 .../src/test/resources/logback.xml            | 14 +++++
 .../src/test/resources/logback.xml            | 14 +++++
 applications/source/geode-source/pom.xml      | 12 +++--
 .../app/source/geode/GeodeSourceTests.java    |  2 +-
 .../src/test/resources/logback-include.xml    | 16 ++++++
 .../src/test/resources/logback.xml            | 13 +++++
 .../src/test/resources/logback.xml            | 13 +++++
 .../src/test/resources/logback.xml            | 13 +++++
 functions/consumer/geode-consumer/pom.xml     | 10 ++--
 .../src/test/resources/logback-include.xml    | 16 ++++++
 .../src/test/resources/logback.xml            | 14 +++++
 functions/supplier/geode-supplier/pom.xml     | 11 ++--
 .../src/test/resources/logback-include.xml    | 16 ++++++
 .../src/test/resources/logback.xml            | 13 +++++
 stream-applications-build/pom.xml             | 51 +++++++++++--------
 19 files changed, 242 insertions(+), 40 deletions(-)
 create mode 100644 applications/sink/geode-sink/src/test/resources/logback-include.xml
 create mode 100644 applications/sink/mqtt-sink/src/test/resources/logback.xml
 create mode 100644 applications/sink/rabbit-sink/src/test/resources/logback.xml
 create mode 100644 applications/sink/twitter-message-sink/src/test/resources/logback.xml
 create mode 100644 applications/sink/twitter-update-sink/src/test/resources/logback.xml
 create mode 100644 applications/source/geode-source/src/test/resources/logback-include.xml
 create mode 100644 applications/source/mqtt-source/src/test/resources/logback.xml
 create mode 100644 applications/source/rabbit-source/src/test/resources/logback.xml
 create mode 100644 functions/consumer/elasticsearch-consumer/src/test/resources/logback.xml
 create mode 100644 functions/consumer/geode-consumer/src/test/resources/logback-include.xml
 create mode 100644 functions/consumer/mqtt-consumer/src/test/resources/logback.xml
 create mode 100644 functions/supplier/geode-supplier/src/test/resources/logback-include.xml
 create mode 100644 functions/supplier/mqtt-supplier/src/test/resources/logback.xml

diff --git a/applications/sink/geode-sink/pom.xml b/applications/sink/geode-sink/pom.xml
index e14984a5..700ae031 100644
--- a/applications/sink/geode-sink/pom.xml
+++ b/applications/sink/geode-sink/pom.xml
@@ -33,14 +33,16 @@
             <artifactId>lombok</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-geode-test</artifactId>
-            <version>${spring-data-geode-test.version}</version>
+            <groupId>org.springframework.geode</groupId>
+            <artifactId>spring-geode-starter-logging</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.geode</groupId>
+            <artifactId>spring-geode-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
 
     <build>
diff --git a/applications/sink/geode-sink/src/test/resources/logback-include.xml b/applications/sink/geode-sink/src/test/resources/logback-include.xml
new file mode 100644
index 00000000..ae330ab3
--- /dev/null
+++ b/applications/sink/geode-sink/src/test/resources/logback-include.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%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:-WARN}"/>
+	<logger name="org.apache.geode" level="${spring.boot.data.gemfire.log.level:-WARN}"/>
+	<logger name="org.jgroups" level="${spring.boot.data.gemfire.jgroups.log.level:-ERROR}"/>
+
+</included>
diff --git a/applications/sink/mqtt-sink/src/test/resources/logback.xml b/applications/sink/mqtt-sink/src/test/resources/logback.xml
new file mode 100644
index 00000000..ae8b3d29
--- /dev/null
+++ b/applications/sink/mqtt-sink/src/test/resources/logback.xml
@@ -0,0 +1,13 @@
+<configuration>
+
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+	<logger name="org.testcontainers" level="INFO" />
+</configuration>
diff --git a/applications/sink/rabbit-sink/src/test/resources/logback.xml b/applications/sink/rabbit-sink/src/test/resources/logback.xml
new file mode 100644
index 00000000..ae8b3d29
--- /dev/null
+++ b/applications/sink/rabbit-sink/src/test/resources/logback.xml
@@ -0,0 +1,13 @@
+<configuration>
+
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+	<logger name="org.testcontainers" level="INFO" />
+</configuration>
diff --git a/applications/sink/twitter-message-sink/src/test/resources/logback.xml b/applications/sink/twitter-message-sink/src/test/resources/logback.xml
new file mode 100644
index 00000000..ff7a34a2
--- /dev/null
+++ b/applications/sink/twitter-message-sink/src/test/resources/logback.xml
@@ -0,0 +1,14 @@
+<configuration>
+
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+	<logger name="io.netty" level="INFO" />
+	<logger name="org.mockserver" level="WARN" />
+</configuration>
diff --git a/applications/sink/twitter-update-sink/src/test/resources/logback.xml b/applications/sink/twitter-update-sink/src/test/resources/logback.xml
new file mode 100644
index 00000000..ff7a34a2
--- /dev/null
+++ b/applications/sink/twitter-update-sink/src/test/resources/logback.xml
@@ -0,0 +1,14 @@
+<configuration>
+
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+	<logger name="io.netty" level="INFO" />
+	<logger name="org.mockserver" level="WARN" />
+</configuration>
diff --git a/applications/source/geode-source/pom.xml b/applications/source/geode-source/pom.xml
index f40e5353..32ac81ca 100644
--- a/applications/source/geode-source/pom.xml
+++ b/applications/source/geode-source/pom.xml
@@ -14,9 +14,7 @@
         <version>3.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
-
     <dependencies>
-
         <dependency>
             <groupId>org.springframework.cloud.fn</groupId>
             <artifactId>geode-supplier</artifactId>
@@ -35,9 +33,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-geode-test</artifactId>
-            <version>${spring-data-geode-test.version}</version>
+            <groupId>org.springframework.geode</groupId>
+            <artifactId>spring-geode-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.geode</groupId>
+            <artifactId>spring-geode-starter-logging</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/applications/source/geode-source/src/test/java/org/springframework/cloud/stream/app/source/geode/GeodeSourceTests.java b/applications/source/geode-source/src/test/java/org/springframework/cloud/stream/app/source/geode/GeodeSourceTests.java
index 3cc262cc..12b4d7ce 100644
--- a/applications/source/geode-source/src/test/java/org/springframework/cloud/stream/app/source/geode/GeodeSourceTests.java
+++ b/applications/source/geode-source/src/test/java/org/springframework/cloud/stream/app/source/geode/GeodeSourceTests.java
@@ -57,7 +57,7 @@ public class GeodeSourceTests {
 	@BeforeAll
 	static void setup() throws IOException {
 		ForkingClientServerIntegrationTestsSupport.startGemFireServer(
-				GeodeServerTestConfiguration.class);
+				GeodeServerTestConfiguration.class, "-Dspring.data.gemfire.logging.level=warn");
 
 		applicationContextRunner = new ApplicationContextRunner()
 				.withUserConfiguration(
diff --git a/applications/source/geode-source/src/test/resources/logback-include.xml b/applications/source/geode-source/src/test/resources/logback-include.xml
new file mode 100644
index 00000000..ae330ab3
--- /dev/null
+++ b/applications/source/geode-source/src/test/resources/logback-include.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%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:-WARN}"/>
+	<logger name="org.apache.geode" level="${spring.boot.data.gemfire.log.level:-WARN}"/>
+	<logger name="org.jgroups" level="${spring.boot.data.gemfire.jgroups.log.level:-ERROR}"/>
+
+</included>
diff --git a/applications/source/mqtt-source/src/test/resources/logback.xml b/applications/source/mqtt-source/src/test/resources/logback.xml
new file mode 100644
index 00000000..ae8b3d29
--- /dev/null
+++ b/applications/source/mqtt-source/src/test/resources/logback.xml
@@ -0,0 +1,13 @@
+<configuration>
+
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+	<logger name="org.testcontainers" level="INFO" />
+</configuration>
diff --git a/applications/source/rabbit-source/src/test/resources/logback.xml b/applications/source/rabbit-source/src/test/resources/logback.xml
new file mode 100644
index 00000000..ae8b3d29
--- /dev/null
+++ b/applications/source/rabbit-source/src/test/resources/logback.xml
@@ -0,0 +1,13 @@
+<configuration>
+
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+	<logger name="org.testcontainers" level="INFO" />
+</configuration>
diff --git a/functions/consumer/elasticsearch-consumer/src/test/resources/logback.xml b/functions/consumer/elasticsearch-consumer/src/test/resources/logback.xml
new file mode 100644
index 00000000..ae8b3d29
--- /dev/null
+++ b/functions/consumer/elasticsearch-consumer/src/test/resources/logback.xml
@@ -0,0 +1,13 @@
+<configuration>
+
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+	<logger name="org.testcontainers" level="INFO" />
+</configuration>
diff --git a/functions/consumer/geode-consumer/pom.xml b/functions/consumer/geode-consumer/pom.xml
index dd249b38..2bca879a 100644
--- a/functions/consumer/geode-consumer/pom.xml
+++ b/functions/consumer/geode-consumer/pom.xml
@@ -32,9 +32,13 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-geode-test</artifactId>
-            <version>${spring-data-geode-test.version}</version>
+            <groupId>org.springframework.geode</groupId>
+            <artifactId>spring-geode-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.geode</groupId>
+            <artifactId>spring-geode-starter-logging</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/functions/consumer/geode-consumer/src/test/resources/logback-include.xml b/functions/consumer/geode-consumer/src/test/resources/logback-include.xml
new file mode 100644
index 00000000..ae330ab3
--- /dev/null
+++ b/functions/consumer/geode-consumer/src/test/resources/logback-include.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%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:-WARN}"/>
+	<logger name="org.apache.geode" level="${spring.boot.data.gemfire.log.level:-WARN}"/>
+	<logger name="org.jgroups" level="${spring.boot.data.gemfire.jgroups.log.level:-ERROR}"/>
+
+</included>
diff --git a/functions/consumer/mqtt-consumer/src/test/resources/logback.xml b/functions/consumer/mqtt-consumer/src/test/resources/logback.xml
new file mode 100644
index 00000000..984967b8
--- /dev/null
+++ b/functions/consumer/mqtt-consumer/src/test/resources/logback.xml
@@ -0,0 +1,14 @@
+<configuration>
+
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+	<logger name="org.testcontainers" level="INFO" />
+</configuration>
+
diff --git a/functions/supplier/geode-supplier/pom.xml b/functions/supplier/geode-supplier/pom.xml
index 88b296ff..25bdae12 100644
--- a/functions/supplier/geode-supplier/pom.xml
+++ b/functions/supplier/geode-supplier/pom.xml
@@ -53,11 +53,14 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-geode-test</artifactId>
-            <version>${spring-data-geode-test.version}</version>
+            <groupId>org.springframework.geode</groupId>
+            <artifactId>spring-geode-starter-logging</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.geode</groupId>
+            <artifactId>spring-geode-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/functions/supplier/geode-supplier/src/test/resources/logback-include.xml b/functions/supplier/geode-supplier/src/test/resources/logback-include.xml
new file mode 100644
index 00000000..ae330ab3
--- /dev/null
+++ b/functions/supplier/geode-supplier/src/test/resources/logback-include.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%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:-WARN}"/>
+	<logger name="org.apache.geode" level="${spring.boot.data.gemfire.log.level:-WARN}"/>
+	<logger name="org.jgroups" level="${spring.boot.data.gemfire.jgroups.log.level:-ERROR}"/>
+
+</included>
diff --git a/functions/supplier/mqtt-supplier/src/test/resources/logback.xml b/functions/supplier/mqtt-supplier/src/test/resources/logback.xml
new file mode 100644
index 00000000..8e52ae3e
--- /dev/null
+++ b/functions/supplier/mqtt-supplier/src/test/resources/logback.xml
@@ -0,0 +1,13 @@
+<configuration>
+
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+	<logger name="org.testcontainers" level="INFO" />
+</configuration>
\ No newline at end of file
diff --git a/stream-applications-build/pom.xml b/stream-applications-build/pom.xml
index 4099632e..9e55984c 100644
--- a/stream-applications-build/pom.xml
+++ b/stream-applications-build/pom.xml
@@ -45,7 +45,7 @@
 		<spring-rabbit.version>2.4.2</spring-rabbit.version>
 		<spring-cloud-function.version>3.2.2</spring-cloud-function.version>
 		<spring-cloud-starters.version>3.1.1</spring-cloud-starters.version>
-		<spring-data-geode-test.version>0.0.28</spring-data-geode-test.version>
+		<spring-geode.version>1.6.4</spring-geode.version>
 		<test-containers.version>1.16.3</test-containers.version>
 		<maven-flatten-plugin.version>1.2.5</maven-flatten-plugin.version>
 		<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
@@ -66,27 +66,34 @@
 
 	<dependencyManagement>
 		<dependencies>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-function-dependencies</artifactId>
-				<version>${spring-cloud-function.version}</version>
-				<scope>import</scope>
-				<type>pom</type>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-dependencies</artifactId>
-				<version>${spring-boot.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.testcontainers</groupId>
-				<artifactId>testcontainers-bom</artifactId>
-				<version>${test-containers.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-function-dependencies</artifactId>
+			<version>${spring-cloud-function.version}</version>
+			<scope>import</scope>
+			<type>pom</type>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-dependencies</artifactId>
+			<version>${spring-boot.version}</version>
+			<type>pom</type>
+			<scope>import</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>testcontainers-bom</artifactId>
+			<version>${test-containers.version}</version>
+			<type>pom</type>
+			<scope>import</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.geode</groupId>
+			<artifactId>spring-geode-bom</artifactId>
+			<version>${spring-geode.version}</version>
+			<scope>import</scope>
+			<type>pom</type>
+		</dependency>
 		</dependencies>
 	</dependencyManagement>