From f6acac11b2195415c00bba94f33a78f9a26349e9 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@pivotal.io>
Date: Thu, 21 Jan 2021 15:45:52 -0800
Subject: [PATCH] Declare @DirtiesContext to avoid conflicts in logger/logging
 cofiguration between tests in a Spring Boot (Test) context.

---
 ...FoundryClusterNotAvailableConfigurationIntegrationTests.java | 2 ++
 ...ernetesClusterNotAvailableConfigurationIntegrationTests.java | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/CloudFoundryClusterNotAvailableConfigurationIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/CloudFoundryClusterNotAvailableConfigurationIntegrationTests.java
index b24d7060..3fc785f4 100644
--- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/CloudFoundryClusterNotAvailableConfigurationIntegrationTests.java
+++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/CloudFoundryClusterNotAvailableConfigurationIntegrationTests.java
@@ -36,6 +36,7 @@ import org.springframework.data.gemfire.config.annotation.ClientCacheApplication
 import org.springframework.data.gemfire.config.annotation.EnableEntityDefinedRegions;
 import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport;
 import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
@@ -65,6 +66,7 @@ import example.app.crm.model.Customer;
  * @since 1.2.0
  */
 @ActiveProfiles("cloudfoundry-cluster-test")
+@DirtiesContext
 @RunWith(SpringRunner.class)
 @SpringBootTest(
 	properties = "spring.main.cloud-platform=CLOUD_FOUNDRY",
diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/KubernetesClusterNotAvailableConfigurationIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/KubernetesClusterNotAvailableConfigurationIntegrationTests.java
index f58b413a..1468b32f 100644
--- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/KubernetesClusterNotAvailableConfigurationIntegrationTests.java
+++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/KubernetesClusterNotAvailableConfigurationIntegrationTests.java
@@ -36,6 +36,7 @@ import org.springframework.data.gemfire.config.annotation.ClientCacheApplication
 import org.springframework.data.gemfire.config.annotation.EnableEntityDefinedRegions;
 import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport;
 import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
@@ -67,6 +68,7 @@ import example.app.crm.model.Customer;
  * @since 1.4.2
  */
 @ActiveProfiles("kubernetes-cluster-test")
+@DirtiesContext
 @RunWith(SpringRunner.class)
 @SpringBootTest(
 	properties = {