Merge branch '3.2.x' into 3.3.x

Author: ryanjbaxter

scripts/deploy.sh

@@ -2,7 +2,6 @@
 set -e
 
 ./mvnw deploy -DskipTests -B -Pfast,deploy ${@}
-./mvnw clean package -pl :spring-cloud-kubernetes-configuration-watcher,:spring-cloud-kubernetes-discoveryserver,:spring-cloud-kubernetes-configserver -Pexecutable -DskipTests
 ./mvnw dockerfile:push -pl :spring-cloud-kubernetes-configuration-watcher -Pdockerpush ${@}
 ./mvnw dockerfile:push -pl :spring-cloud-kubernetes-discoveryserver -Pdockerpush ${@}
 ./mvnw dockerfile:push -pl :spring-cloud-kubernetes-configserver -Pdockerpush ${@}

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.1</plexus-archiver.version>
+		<plexus-archiver.version>4.10.2</plexus-archiver.version>
 	</properties>
 
 	<dependencies>

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.1</plexus-archiver.version>
+		<plexus-archiver.version>4.10.2</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.1</plexus-archiver.version>
+		<plexus-archiver.version>4.10.2</plexus-archiver.version>
 	</properties>
 
 	<dependencies>