dirty

Signed-off-by: wind57 <[email protected]>

Author: wind57

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

@@ -3,14 +3,15 @@
 		 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.1.6-SNAPSHOT</version>
+		<relativePath>../../spring-cloud-kubernetes-k8s-client-kafka-configmap-reload</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
-	<packaging>jar</packaging>
+	<packaging>pom</packaging>
 
-	<artifactId>kafka-configmap-app-a</artifactId>
+	<artifactId>kafka-configmap-app</artifactId>
 
 	<dependencies>
 		<dependency>
@@ -25,21 +26,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-app-a/src/main/resources/application.yaml

@@ -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/pom.xml

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