From ae26c0c61a583f01c899ab8eeeda3e368bca585f Mon Sep 17 00:00:00 2001
From: chaos2418 <>
Date: Sat, 20 Nov 2021 17:23:33 +0530
Subject: [PATCH] JAVA-7832: spring-cloud-config bootstrap.properties need to
 change to application.properties/yml

---
 .../client/src/main/resources/application.properties        | 3 +++
 .../client/src/main/resources/bootstrap.properties          | 6 ------
 .../server/src/main/resources/application.properties        | 5 +++++
 .../server/src/main/resources/bootstrap.properties          | 4 ----
 4 files changed, 8 insertions(+), 10 deletions(-)
 create mode 100644 spring-cloud/spring-cloud-config/client/src/main/resources/application.properties
 delete mode 100644 spring-cloud/spring-cloud-config/client/src/main/resources/bootstrap.properties
 delete mode 100644 spring-cloud/spring-cloud-config/server/src/main/resources/bootstrap.properties

diff --git a/spring-cloud/spring-cloud-config/client/src/main/resources/application.properties b/spring-cloud/spring-cloud-config/client/src/main/resources/application.properties
new file mode 100644
index 0000000000..6366bc515c
--- /dev/null
+++ b/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 
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-config/client/src/main/resources/bootstrap.properties b/spring-cloud/spring-cloud-config/client/src/main/resources/bootstrap.properties
deleted file mode 100644
index 5dde8baa28..0000000000
--- a/spring-cloud/spring-cloud-config/client/src/main/resources/bootstrap.properties
+++ /dev/null
@@ -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
diff --git a/spring-cloud/spring-cloud-config/server/src/main/resources/application.properties b/spring-cloud/spring-cloud-config/server/src/main/resources/application.properties
index 18d4b3596a..366ecddf86 100644
--- a/spring-cloud/spring-cloud-config/server/src/main/resources/application.properties
+++ b/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
diff --git a/spring-cloud/spring-cloud-config/server/src/main/resources/bootstrap.properties b/spring-cloud/spring-cloud-config/server/src/main/resources/bootstrap.properties
deleted file mode 100644
index f2d75f5846..0000000000
--- a/spring-cloud/spring-cloud-config/server/src/main/resources/bootstrap.properties
+++ /dev/null
@@ -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