Merge branch '3.1.x' into 3.2.x

Author: ryanjbaxter

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

@@ -110,7 +110,7 @@
 		<module>spring-cloud-kubernetes-k8s-client-configuration-watcher</module>
 
 		<!-- config watcher reload, using kafka and configmap -->
-        <module>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</module>
+        <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>

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/appA/AppATestApplication.java

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<parent>
-		<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
-		<groupId>org.springframework.cloud</groupId>
-		<version>3.2.1-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<packaging>jar</packaging>
-
-	<artifactId>kafka-configmap-test-app</artifactId>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-webflux</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-kubernetes-test-support</artifactId>
-		</dependency>
-
-	</dependencies>
-
-	<build>
-		<resources>
-			<resource>
-				<directory>../../src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
-		</resources>
-		<!-- no need to build image for this module -->
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-				<executions>
-					<execution>
-						<id>build-image</id>
-						<configuration>
-							<skip>true</skip>
-						</configuration>
-					</execution>
-					<execution>
-						<id>repackage</id>
-						<configuration>
-							<skip>true</skip>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/src/main/resources/application.yaml

@@ -3,14 +3,14 @@
 		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<parent>
-		<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</artifactId>
+		<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload</artifactId>
 		<groupId>org.springframework.cloud</groupId>
 		<version>3.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
 
-	<artifactId>kafka-configmap-app-a</artifactId>
+	<artifactId>kafka-configmap-app</artifactId>
 
 	<dependencies>
 		<dependency>
@@ -25,21 +25,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
-
 	</dependencies>
 
-	<build>
-		<resources>
-			<resource>
-				<directory>../src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
-		</resources>
-	</build>
-
-
 </project>

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml

@@ -31,17 +31,17 @@
  */
 @SpringBootApplication
 @RestController
-public class AppBTestApplication implements ApplicationListener<RefreshRemoteApplicationEvent> {
+public class AppTestApplication implements ApplicationListener<RefreshRemoteApplicationEvent> {
 
 	private final Log LOG = LogFactory.getLog(getClass());
 
 	private boolean value = false;
 
 	public static void main(String[] args) {
-		SpringApplication.run(AppBTestApplication.class, args);
+		SpringApplication.run(AppTestApplication.class, args);
 	}
 
-	@GetMapping("/app-b")
+	@GetMapping("/app")
 	public boolean index() {
 		LOG.info("Current value: " + value);
 		return value;

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/src/test/resources/app-a/app-a-deployment.yaml

@@ -1,16 +1,13 @@
-#logging:
-#  level:
-#    org.springframework: DEBUG
-#
 spring:
   application:
-    name: spring-cloud-kubernetes-client-configuration-watcher-configmap-app-b
+    name: non-app
   cloud:
     bus:
       refresh:
         enabled: false
       enabled: true
-      destination: multiple-apps
+      destination: app
+      id: app
     stream:
       default-binder: kafka
 management: