Merge branch '3.1.x' into 3.2.x

Author: ryanjbaxter

spring-cloud-kubernetes-integration-tests/pom.xml

@@ -106,7 +106,7 @@
         <module>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload</module>
 
 		<!-- config watcher reload, using rabbitmq and secret -->
-        <module>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</module>
+        <module>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload</module>
 
 	</modules>
 </project>

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherBuKafkaIT.java renamed to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherBusKafkaIT.java

@@ -47,7 +47,7 @@
 /**
  * @author wind57
  */
-class ConfigurationWatcherBuKafkaIT {
+class ConfigurationWatcherBusKafkaIT {
 
 	private static final String CONFIG_WATCHER_APP_IMAGE = "kafka-configmap-app";
 

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/appB/AppBTestApplication.java

@@ -9,12 +9,11 @@
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps</artifactId>
+	<artifactId>spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload</artifactId>
 	<packaging>pom</packaging>
 
 	<modules>
-		<module>rabbitmq-secret-app-a</module>
-		<module>rabbitmq-secret-app-b</module>
+		<module>rabbitmq-secret-app</module>
 		<module>rabbitmq-secret-test-app</module>
 	</modules>