From 41a09bbf23c7bf1a7677dfc69bd51faf42df68a0 Mon Sep 17 00:00:00 2001
From: sampadawagde <sampada.wagde@gmail.com>
Date: Tue, 2 Jun 2020 15:46:57 +0530
Subject: [PATCH 1/2] JAVA-937: Migrate spring-cloud-bus to parent-boot-2

---
 spring-cloud-bus/pom.xml                             |  6 +++---
 spring-cloud-bus/spring-cloud-config-client/pom.xml  |  5 +++++
 .../src/main/resources/application.yml               | 12 +++++++++++-
 .../src/main/resources/application.properties        |  9 +++------
 .../src/main/resources/bootstrap.properties          |  4 ++++
 5 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 spring-cloud-bus/spring-cloud-config-server/src/main/resources/bootstrap.properties

diff --git a/spring-cloud-bus/pom.xml b/spring-cloud-bus/pom.xml
index 513c8bade6..ec56e23ac7 100644
--- a/spring-cloud-bus/pom.xml
+++ b/spring-cloud-bus/pom.xml
@@ -11,9 +11,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-1</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-1</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <modules>
@@ -34,7 +34,7 @@
     </dependencyManagement>
 
     <properties>
-        <spring-cloud-dependencies.version>Brixton.SR7</spring-cloud-dependencies.version>
+        <spring-cloud-dependencies.version>Hoxton.SR4</spring-cloud-dependencies.version>
     </properties>
 
 </project>
diff --git a/spring-cloud-bus/spring-cloud-config-client/pom.xml b/spring-cloud-bus/spring-cloud-config-client/pom.xml
index 7e1185415b..cc1c237646 100644
--- a/spring-cloud-bus/spring-cloud-config-client/pom.xml
+++ b/spring-cloud-bus/spring-cloud-config-client/pom.xml
@@ -33,6 +33,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-actuator</artifactId>
         </dependency>
+        
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-actuator-autoconfigure</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>
diff --git a/spring-cloud-bus/spring-cloud-config-client/src/main/resources/application.yml b/spring-cloud-bus/spring-cloud-config-client/src/main/resources/application.yml
index 547e0284f3..fbbc6d138f 100644
--- a/spring-cloud-bus/spring-cloud-config-client/src/main/resources/application.yml
+++ b/spring-cloud-bus/spring-cloud-config-client/src/main/resources/application.yml
@@ -4,4 +4,14 @@ spring:
     host: localhost
     port: 5672
     username: guest
-    password: guest
\ No newline at end of file
+    password: guest
+  cloud:
+    bus:
+      enabled: true
+      refresh:
+        enabled: true
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"
\ No newline at end of file
diff --git a/spring-cloud-bus/spring-cloud-config-server/src/main/resources/application.properties b/spring-cloud-bus/spring-cloud-config-server/src/main/resources/application.properties
index 4c18c192c0..6d7a945612 100644
--- a/spring-cloud-bus/spring-cloud-config-server/src/main/resources/application.properties
+++ b/spring-cloud-bus/spring-cloud-config-server/src/main/resources/application.properties
@@ -1,11 +1,8 @@
 server.port=8888
 spring.cloud.config.server.git.uri=
-security.user.name=root
-security.user.password=s3cr3t
-encrypt.key-store.location=classpath:/config-server.jks
-encrypt.key-store.password=my-s70r3-s3cr3t
-encrypt.key-store.alias=config-server-key
-encrypt.key-store.secret=my-k34-s3cr3t
+spring.cloud.bus.enabled=true
+spring.security.user.name=root
+spring.security.user.password=s3cr3t
 spring.rabbitmq.host=localhost
 spring.rabbitmq.port=5672
 spring.rabbitmq.username=guest
diff --git a/spring-cloud-bus/spring-cloud-config-server/src/main/resources/bootstrap.properties b/spring-cloud-bus/spring-cloud-config-server/src/main/resources/bootstrap.properties
new file mode 100644
index 0000000000..b0c35c72a6
--- /dev/null
+++ b/spring-cloud-bus/spring-cloud-config-server/src/main/resources/bootstrap.properties
@@ -0,0 +1,4 @@
+encrypt.key-store.location=classpath:/config-server.jks
+encrypt.key-store.password=my-s70r3-s3cr3t
+encrypt.key-store.alias=config-server-key
+encrypt.key-store.secret=my-k34-s3cr3t
\ No newline at end of file

From 6dbd0c1d6cd61d81bf10413a09af83270eca69f2 Mon Sep 17 00:00:00 2001
From: sampadawagde <sampada.wagde@gmail.com>
Date: Tue, 2 Jun 2020 22:41:01 +0530
Subject: [PATCH 2/2] JAVA-932: Migrate spring-cloud-kubernetes to
 parent-boot-2

---
 .../kubernetes-selfhealing/liveness-example/pom.xml      | 9 ++++-----
 .../kubernetes-selfhealing/readiness-example/pom.xml     | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml b/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml
index 66d8f096ce..f0d34d2231 100644
--- a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml
+++ b/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml
@@ -8,10 +8,10 @@
     <version>1.0-SNAPSHOT</version>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-1</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../../../parent-boot-1</relativePath>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud-kubernetes</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../../../spring-cloud-kubernetes</relativePath>
     </parent>
 
     <dependencies>
@@ -44,7 +44,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <spring-boot.version>1.5.17.RELEASE</spring-boot.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml b/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml
index fbb9e09d07..8bfd4d305d 100644
--- a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml
+++ b/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml
@@ -8,10 +8,10 @@
     <version>1.0-SNAPSHOT</version>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-1</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../../../parent-boot-1</relativePath>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud-kubernetes</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../../../spring-cloud-kubernetes</relativePath>
     </parent>
 
     <dependencies>
@@ -44,7 +44,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <spring-boot.version>1.5.17.RELEASE</spring-boot.version>
     </properties>
 
 </project>
\ No newline at end of file