diff --git a/pom.xml b/pom.xml
index a10d6daa8..60aa27d51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
- src/main/resources/bootstrap.yml
+ src/main/resources/application.yml
@@ -77,13 +77,6 @@
org.springframework.boot
spring-boot-maven-plugin
-
- true
-
-
- true
-
-
diff --git a/spring-petclinic-admin-server/pom.xml b/spring-petclinic-admin-server/pom.xml
index 31ea39289..095a0c0d0 100644
--- a/spring-petclinic-admin-server/pom.xml
+++ b/spring-petclinic-admin-server/pom.xml
@@ -27,10 +27,6 @@
org.springframework.boot
spring-boot-starter
-
- org.springframework.cloud
- spring-cloud-starter-bootstrap
-
org.springframework.cloud
spring-cloud-starter-config
diff --git a/spring-petclinic-admin-server/src/main/resources/application.yml b/spring-petclinic-admin-server/src/main/resources/application.yml
new file mode 100644
index 000000000..d745bb18b
--- /dev/null
+++ b/spring-petclinic-admin-server/src/main/resources/application.yml
@@ -0,0 +1,13 @@
+spring:
+ application:
+ name: admin-server
+ config:
+ import: optional:configserver:${CONFIG_SERVER_URL:http://localhost:8888/}
+
+
+---
+spring:
+ config:
+ activate:
+ on-profile: docker
+ import: configserver:http://config-server:8888
diff --git a/spring-petclinic-admin-server/src/main/resources/bootstrap.yml b/spring-petclinic-admin-server/src/main/resources/bootstrap.yml
deleted file mode 100644
index d1ec2a854..000000000
--- a/spring-petclinic-admin-server/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-spring:
- cloud:
- config:
- uri: http://localhost:8888
- application:
- name: admin-server
----
-spring:
- config:
- activate:
- on-profile: docker
- cloud:
- config:
- uri: http://config-server:8888
diff --git a/spring-petclinic-api-gateway/pom.xml b/spring-petclinic-api-gateway/pom.xml
index c2d950d7a..4c82edc9b 100644
--- a/spring-petclinic-api-gateway/pom.xml
+++ b/spring-petclinic-api-gateway/pom.xml
@@ -51,10 +51,6 @@
org.springframework.cloud
spring-cloud-sleuth-zipkin
-
- org.springframework.cloud
- spring-cloud-starter-bootstrap
-
org.springframework.cloud
spring-cloud-starter-circuitbreaker-reactor-resilience4j
diff --git a/spring-petclinic-api-gateway/src/main/resources/application.yml b/spring-petclinic-api-gateway/src/main/resources/application.yml
index 74da17a05..48ead7d0f 100644
--- a/spring-petclinic-api-gateway/src/main/resources/application.yml
+++ b/spring-petclinic-api-gateway/src/main/resources/application.yml
@@ -1,8 +1,9 @@
spring:
+ application:
+ name: api-gateway
+ config:
+ import: optional:configserver:${CONFIG_SERVER_URL:http://localhost:8888/}
cloud:
- loadbalancer:
- ribbon:
- enabled: false
gateway:
routes:
- id: vets-service
@@ -23,3 +24,12 @@ spring:
- Path=/api/customer/**
filters:
- StripPrefix=2
+
+
+
+---
+spring:
+ config:
+ activate:
+ on-profile: docker
+ import: configserver:http://config-server:8888
diff --git a/spring-petclinic-api-gateway/src/main/resources/bootstrap.yml b/spring-petclinic-api-gateway/src/main/resources/bootstrap.yml
deleted file mode 100644
index 9aef7487e..000000000
--- a/spring-petclinic-api-gateway/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-spring:
- cloud:
- config:
- uri: http://localhost:8888
- application:
- name: api-gateway
----
-spring:
- config:
- activate:
- on-profile: docker
- cloud:
- config:
- uri: http://config-server:8888
diff --git a/spring-petclinic-api-gateway/src/test/resources/bootstrap-test.yml b/spring-petclinic-api-gateway/src/test/resources/application-test.yml
similarity index 100%
rename from spring-petclinic-api-gateway/src/test/resources/bootstrap-test.yml
rename to spring-petclinic-api-gateway/src/test/resources/application-test.yml
diff --git a/spring-petclinic-config-server/pom.xml b/spring-petclinic-config-server/pom.xml
index 192b42f6a..68d1f0eb0 100644
--- a/spring-petclinic-config-server/pom.xml
+++ b/spring-petclinic-config-server/pom.xml
@@ -32,10 +32,6 @@
org.springframework.cloud
spring-cloud-config-server
-
- org.springframework.cloud
- spring-cloud-starter-bootstrap
-
diff --git a/spring-petclinic-config-server/src/main/resources/bootstrap.yml b/spring-petclinic-config-server/src/main/resources/application.yml
similarity index 91%
rename from spring-petclinic-config-server/src/main/resources/bootstrap.yml
rename to spring-petclinic-config-server/src/main/resources/application.yml
index 43e3e9906..9a58811ba 100644
--- a/spring-petclinic-config-server/src/main/resources/bootstrap.yml
+++ b/spring-petclinic-config-server/src/main/resources/application.yml
@@ -5,6 +5,7 @@ spring:
server:
git:
uri: https://github.com/spring-petclinic/spring-petclinic-microservices-config
+ default-label: main
# Use the File System Backend to avoid git pulling. Enable "native" profile in the Config Server.
native:
searchLocations: file:///${GIT_REPO}
diff --git a/spring-petclinic-customers-service/pom.xml b/spring-petclinic-customers-service/pom.xml
index 0a565e46d..0f224495b 100644
--- a/spring-petclinic-customers-service/pom.xml
+++ b/spring-petclinic-customers-service/pom.xml
@@ -41,10 +41,6 @@
-
- org.springframework.cloud
- spring-cloud-starter-bootstrap
-
org.springframework.cloud
spring-cloud-starter-config
diff --git a/spring-petclinic-customers-service/src/main/resources/application.properties b/spring-petclinic-customers-service/src/main/resources/application.properties
deleted file mode 100644
index e69de29bb..000000000
diff --git a/spring-petclinic-customers-service/src/main/resources/application.yml b/spring-petclinic-customers-service/src/main/resources/application.yml
new file mode 100644
index 000000000..7c95adf78
--- /dev/null
+++ b/spring-petclinic-customers-service/src/main/resources/application.yml
@@ -0,0 +1,13 @@
+spring:
+ application:
+ name: customers-service
+ config:
+ import: optional:configserver:${CONFIG_SERVER_URL:http://localhost:8888/}
+
+
+---
+spring:
+ config:
+ activate:
+ on-profile: docker
+ import: configserver:http://config-server:8888
diff --git a/spring-petclinic-customers-service/src/main/resources/bootstrap.yml b/spring-petclinic-customers-service/src/main/resources/bootstrap.yml
deleted file mode 100644
index 58281a444..000000000
--- a/spring-petclinic-customers-service/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-spring:
- cloud:
- config:
- uri: http://localhost:8888
- application:
- name: customers-service
----
-spring:
- config:
- activate:
- on-profile: docker
- cloud:
- config:
- uri: http://config-server:8888
diff --git a/spring-petclinic-customers-service/src/test/resources/application-test.yml b/spring-petclinic-customers-service/src/test/resources/application-test.yml
index 0abdac443..b9c699b5f 100644
--- a/spring-petclinic-customers-service/src/test/resources/application-test.yml
+++ b/spring-petclinic-customers-service/src/test/resources/application-test.yml
@@ -1,9 +1,18 @@
-spring.jpa.hibernate.ddl-auto: none
-
spring:
- datasource:
- schema: classpath*:db/hsqldb/schema.sql
- data: classpath*:db/hsqldb/data.sql
+ cloud:
+ config:
+ enabled: false
+ sql:
+ init:
+ schema-locations: classpath*:db/hsqldb/schema.sql
+ data-locations: classpath*:db/hsqldb/data.sql
+ jpa:
+ hibernate:
+ ddl-auto: none
+
+eureka:
+ client:
+ enabled: false
logging.level.org.springframework: INFO
diff --git a/spring-petclinic-customers-service/src/test/resources/bootstrap-test.yml b/spring-petclinic-customers-service/src/test/resources/bootstrap-test.yml
deleted file mode 100644
index cb8e4f5f7..000000000
--- a/spring-petclinic-customers-service/src/test/resources/bootstrap-test.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-spring.cloud.config.enabled: false
-eureka.client.enabled: false
diff --git a/spring-petclinic-discovery-server/pom.xml b/spring-petclinic-discovery-server/pom.xml
index a56a26319..0c9321960 100644
--- a/spring-petclinic-discovery-server/pom.xml
+++ b/spring-petclinic-discovery-server/pom.xml
@@ -30,16 +30,12 @@
org.springframework.cloud
- spring-cloud-starter-bootstrap
+ spring-cloud-starter-netflix-eureka-server
org.springframework.cloud
spring-cloud-starter-config
-
- org.springframework.cloud
- spring-cloud-starter-netflix-eureka-server
-
diff --git a/spring-petclinic-discovery-server/src/main/resources/application.yml b/spring-petclinic-discovery-server/src/main/resources/application.yml
new file mode 100644
index 000000000..9fbcbc588
--- /dev/null
+++ b/spring-petclinic-discovery-server/src/main/resources/application.yml
@@ -0,0 +1,21 @@
+spring:
+ application:
+ name: discovery-server
+ config:
+ import: optional:configserver:${CONFIG_SERVER_URL:http://localhost:8888/}
+
+# Avoid some debugging logs at startup
+logging:
+ level:
+ org:
+ springframework:
+ boot: INFO
+ web: INFO
+
+---
+spring:
+ config:
+ activate:
+ on-profile: docker
+ import: configserver:http://config-server:8888
+
diff --git a/spring-petclinic-discovery-server/src/main/resources/bootstrap.yml b/spring-petclinic-discovery-server/src/main/resources/bootstrap.yml
deleted file mode 100644
index eba87c89e..000000000
--- a/spring-petclinic-discovery-server/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-spring:
- cloud:
- config:
- uri: http://localhost:8888
- application:
- name: discovery-server
----
-spring:
- config:
- activate:
- on-profile: docker
- cloud:
- config:
- uri: http://config-server:8888
diff --git a/spring-petclinic-vets-service/pom.xml b/spring-petclinic-vets-service/pom.xml
index b6392f426..2e017f92f 100644
--- a/spring-petclinic-vets-service/pom.xml
+++ b/spring-petclinic-vets-service/pom.xml
@@ -53,10 +53,6 @@
org.springframework.cloud
spring-cloud-sleuth-zipkin
-
- org.springframework.cloud
- spring-cloud-starter-bootstrap
-
org.springframework.cloud
spring-cloud-starter-config
diff --git a/spring-petclinic-vets-service/src/main/resources/application.properties b/spring-petclinic-vets-service/src/main/resources/application.properties
deleted file mode 100644
index 68f17e806..000000000
--- a/spring-petclinic-vets-service/src/main/resources/application.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-spring.profiles.active=production
-spring.cache.cache-names=vets
diff --git a/spring-petclinic-vets-service/src/main/resources/application.yml b/spring-petclinic-vets-service/src/main/resources/application.yml
new file mode 100644
index 000000000..983a015db
--- /dev/null
+++ b/spring-petclinic-vets-service/src/main/resources/application.yml
@@ -0,0 +1,16 @@
+spring:
+ application:
+ name: vets-service
+ config:
+ import: optional:configserver:${CONFIG_SERVER_URL:http://localhost:8888/}
+ cache:
+ cache-names: vets
+ profiles:
+ active: production
+
+---
+spring:
+ config:
+ activate:
+ on-profile: docker
+ import: configserver:http://config-server:8888
diff --git a/spring-petclinic-vets-service/src/main/resources/bootstrap.yml b/spring-petclinic-vets-service/src/main/resources/bootstrap.yml
deleted file mode 100644
index bc2f683e5..000000000
--- a/spring-petclinic-vets-service/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-spring:
- cloud:
- config:
- uri: http://localhost:8888
- application:
- name: vets-service
----
-spring:
- config:
- activate:
- on-profile: docker
- cloud:
- config:
- uri: http://config-server:8888
diff --git a/spring-petclinic-vets-service/src/test/resources/application-test.yml b/spring-petclinic-vets-service/src/test/resources/application-test.yml
index 2d18cfdea..684fa8988 100644
--- a/spring-petclinic-vets-service/src/test/resources/application-test.yml
+++ b/spring-petclinic-vets-service/src/test/resources/application-test.yml
@@ -1,9 +1,18 @@
-spring.jpa.hibernate.ddl-auto: none
-
spring:
- datasource:
- schema: classpath*:db/hsqldb/schema.sql
- data: classpath*:db/hsqldb/data.sql
+ cloud:
+ config:
+ enabled: false
+ sql:
+ init:
+ schema-locations: classpath*:db/hsqldb/schema.sql
+ data-locations: classpath*:db/hsqldb/data.sql
+ jpa:
+ hibernate:
+ ddl-auto: none
+
+eureka:
+ client:
+ enabled: false
vets:
cache:
diff --git a/spring-petclinic-vets-service/src/test/resources/bootstrap-test.yml b/spring-petclinic-vets-service/src/test/resources/bootstrap-test.yml
deleted file mode 100644
index cb8e4f5f7..000000000
--- a/spring-petclinic-vets-service/src/test/resources/bootstrap-test.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-spring.cloud.config.enabled: false
-eureka.client.enabled: false
diff --git a/spring-petclinic-visits-service/pom.xml b/spring-petclinic-visits-service/pom.xml
index 4bfb20abb..5df45a4ba 100644
--- a/spring-petclinic-visits-service/pom.xml
+++ b/spring-petclinic-visits-service/pom.xml
@@ -40,10 +40,6 @@
-
- org.springframework.cloud
- spring-cloud-starter-bootstrap
-
org.springframework.cloud
spring-cloud-starter-config
diff --git a/spring-petclinic-visits-service/src/main/resources/application.properties b/spring-petclinic-visits-service/src/main/resources/application.properties
deleted file mode 100644
index e69de29bb..000000000
diff --git a/spring-petclinic-visits-service/src/main/resources/application.yml b/spring-petclinic-visits-service/src/main/resources/application.yml
new file mode 100644
index 000000000..ada02194c
--- /dev/null
+++ b/spring-petclinic-visits-service/src/main/resources/application.yml
@@ -0,0 +1,13 @@
+spring:
+ application:
+ name: visits-service
+ config:
+ import: optional:configserver:${CONFIG_SERVER_URL:http://localhost:8888/}
+
+
+---
+spring:
+ config:
+ activate:
+ on-profile: docker
+ import: configserver:http://config-server:8888
diff --git a/spring-petclinic-visits-service/src/main/resources/bootstrap.yml b/spring-petclinic-visits-service/src/main/resources/bootstrap.yml
deleted file mode 100644
index 92f4fcae3..000000000
--- a/spring-petclinic-visits-service/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-spring:
- cloud:
- config:
- uri: http://localhost:8888
- application:
- name: visits-service
----
-spring:
- config:
- activate:
- on-profile: docker
- cloud:
- config:
- uri: http://config-server:8888
diff --git a/spring-petclinic-visits-service/src/test/resources/application-test.yml b/spring-petclinic-visits-service/src/test/resources/application-test.yml
index 0abdac443..b9c699b5f 100644
--- a/spring-petclinic-visits-service/src/test/resources/application-test.yml
+++ b/spring-petclinic-visits-service/src/test/resources/application-test.yml
@@ -1,9 +1,18 @@
-spring.jpa.hibernate.ddl-auto: none
-
spring:
- datasource:
- schema: classpath*:db/hsqldb/schema.sql
- data: classpath*:db/hsqldb/data.sql
+ cloud:
+ config:
+ enabled: false
+ sql:
+ init:
+ schema-locations: classpath*:db/hsqldb/schema.sql
+ data-locations: classpath*:db/hsqldb/data.sql
+ jpa:
+ hibernate:
+ ddl-auto: none
+
+eureka:
+ client:
+ enabled: false
logging.level.org.springframework: INFO
diff --git a/spring-petclinic-visits-service/src/test/resources/bootstrap-test.yml b/spring-petclinic-visits-service/src/test/resources/bootstrap-test.yml
deleted file mode 100644
index cb8e4f5f7..000000000
--- a/spring-petclinic-visits-service/src/test/resources/bootstrap-test.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-spring.cloud.config.enabled: false
-eureka.client.enabled: false