Merge pull request #9421 from sampada07/JAVA-913

JAVA-913: migrate parent-boot-1 articles to parent-boot-2

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>

spring-cloud-bus/spring-cloud-config-client/pom.xml

@@ -34,6 +34,11 @@
             <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>
             <artifactId>spring-cloud-starter-bus-amqp</artifactId>

spring-cloud-bus/spring-cloud-config-client/src/main/resources/application.yml

@@ -5,3 +5,13 @@ spring:
     port: 5672
     username: guest
     password: guest
+  cloud:
+    bus:
+      enabled: true
+      refresh:
+        enabled: true
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"

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

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

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>

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>