Merge pull request #11482 from chaos2418/JAVA-7832

JAVA-7832: spring-cloud-config bootstrap.properties need to change to application.properties/yml

spring-cloud/spring-cloud-config/client/src/main/resources/application.properties

@@ -0,0 +1,3 @@
+spring.application.name=config-client
+spring.profiles.active=development
+spring.config.import=optional:configserver:http://root:s3cr3t@localhost:8888 

spring-cloud/spring-cloud-config/client/src/main/resources/bootstrap.properties

@@ -1,6 +0,0 @@
-spring.application.name=config-client
-spring.profiles.active=development
-spring.cloud.config.uri=http://localhost:8888
-spring.cloud.config.username=root
-spring.cloud.config.password=s3cr3t
-spring.cloud.config.fail-fast=true

spring-cloud/spring-cloud-config/server/src/main/resources/application.properties

@@ -3,3 +3,8 @@ spring.cloud.config.server.git.uri=
 spring.cloud.config.server.git.clone-on-start=true
 spring.security.user.name=root
 spring.security.user.password=s3cr3t
+
+encrypt.keyStore.location=classpath:/config-server.jks
+encrypt.keyStore.password=my-s70r3-s3cr3t
+encrypt.keyStore.alias=config-server-key
+encrypt.keyStore.secret=my-k34-s3cr3t

spring-cloud/spring-cloud-config/server/src/main/resources/bootstrap.properties

@@ -1,4 +0,0 @@
-encrypt.keyStore.location=classpath:/config-server.jks
-encrypt.keyStore.password=my-s70r3-s3cr3t
-encrypt.keyStore.alias=config-server-key
-encrypt.keyStore.secret=my-k34-s3cr3t