iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9421 from sampada07/JAVA-913

Browse Source 
JAVA-913: migrate parent-boot-1 articles to parent-boot-2
This commit is contained in:
Dhawal Kapil 2020-06-03 10:47:42 +05:30 committed by GitHub
commit d34fe14d61
7 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-bus/pom.xml
View File

@ -11,9 +11,9 @@
<parent> <parent>
<groupId>com.baeldung</groupId> <groupId>com.baeldung</groupId>
<artifactId>parent-boot-1</artifactId> <artifactId>parent-boot-2</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<relativePath>../parent-boot-1</relativePath> <relativePath>../parent-boot-2</relativePath>
</parent> </parent>
<modules> <modules>
@ -34,7 +34,7 @@
</dependencyManagement> </dependencyManagement>
<properties> <properties>
<spring-cloud-dependencies.version>Brixton.SR7</spring-cloud-dependencies.version> <spring-cloud-dependencies.version>Hoxton.SR4</spring-cloud-dependencies.version>
</properties> </properties>
</project> </project>

5
spring-cloud-bus/spring-cloud-config-client/pom.xml
View File

@ -33,6 +33,11 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-actuator</artifactId> <artifactId>spring-boot-actuator</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-actuator-autoconfigure</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>

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

@ -4,4 +4,14 @@ spring:
host: localhost host: localhost
port: 5672 port: 5672
username: guest username: guest
password: guest password: guest
cloud:
bus:
enabled: true
refresh:
enabled: true
management:
endpoints:
web:
exposure:
include: "*"

9
spring-cloud-bus/spring-cloud-config-server/src/main/resources/application.properties
View File

@ -1,11 +1,8 @@
server.port=8888 server.port=8888
spring.cloud.config.server.git.uri= spring.cloud.config.server.git.uri=
security.user.name=root spring.cloud.bus.enabled=true
security.user.password=s3cr3t spring.security.user.name=root
encrypt.key-store.location=classpath:/config-server.jks spring.security.user.password=s3cr3t
encrypt.key-store.password=my-s70r3-s3cr3t
encrypt.key-store.alias=config-server-key
encrypt.key-store.secret=my-k34-s3cr3t
spring.rabbitmq.host=localhost spring.rabbitmq.host=localhost
spring.rabbitmq.port=5672 spring.rabbitmq.port=5672
spring.rabbitmq.username=guest spring.rabbitmq.username=guest

4
spring-cloud-bus/spring-cloud-config-server/src/main/resources/bootstrap.properties Normal file
View File

@ -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

9
spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml
View File

@ -8,10 +8,10 @@
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<parent> <parent>
<groupId>com.baeldung</groupId> <groupId>com.baeldung.spring.cloud</groupId>
<artifactId>parent-boot-1</artifactId> <artifactId>spring-cloud-kubernetes</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<relativePath>../../../../parent-boot-1</relativePath> <relativePath>../../../spring-cloud-kubernetes</relativePath>
</parent> </parent>
<dependencies> <dependencies>
@ -44,7 +44,6 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spring-boot.version>1.5.17.RELEASE</spring-boot.version>
</properties> </properties>
</project> </project>

9
spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml
View File

@ -8,10 +8,10 @@
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<parent> <parent>
<groupId>com.baeldung</groupId> <groupId>com.baeldung.spring.cloud</groupId>
<artifactId>parent-boot-1</artifactId> <artifactId>spring-cloud-kubernetes</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<relativePath>../../../../parent-boot-1</relativePath> <relativePath>../../../spring-cloud-kubernetes</relativePath>
</parent> </parent>
<dependencies> <dependencies>
@ -44,7 +44,6 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spring-boot.version>1.5.17.RELEASE</spring-boot.version>
</properties> </properties>
</project> </project>