Merge branch 'main' into fabric8-native-leader-election

Author: wind57

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml

@@ -14,7 +14,7 @@
 
 	<properties>
 		<docker.registry.organization>springcloud</docker.registry.organization>
-		<plexus-archiver.version>4.10.3</plexus-archiver.version>
+		<plexus-archiver.version>4.10.4</plexus-archiver.version>
 	</properties>
 
 	<dependencies>

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/KubernetesEnvironmentRepositoryTests.java

@@ -118,6 +118,7 @@ class KubernetesEnvironmentRepositoryTests {
 
 	@BeforeAll
 	static void before() {
+		KUBERNETES_PROPERTY_SOURCE_SUPPLIER.clear();
 		KUBERNETES_PROPERTY_SOURCE_SUPPLIER.add((coreApi, applicationName, namespace, springEnv) -> {
 			List<MapPropertySource> propertySources = new ArrayList<>();
 

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml

@@ -14,7 +14,7 @@
 
 	<properties>
 		<docker.registry.organization>springcloud</docker.registry.organization>
-		<plexus-archiver.version>4.10.3</plexus-archiver.version>
+		<plexus-archiver.version>4.10.4</plexus-archiver.version>
 	</properties>
 
 	<dependencies>

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml

@@ -14,7 +14,7 @@
 
 	<properties>
 		<docker.registry.organization>springcloud</docker.registry.organization>
-		<plexus-archiver.version>4.10.3</plexus-archiver.version>
+		<plexus-archiver.version>4.10.4</plexus-archiver.version>
 	</properties>
 
 	<dependencies>