diff --git a/spring-cloud/spring-cloud-config/client-config/config-client-production.properties b/spring-cloud/spring-cloud-config/client-config/config-client-production.properties deleted file mode 100644 index cd2e14fcc3..0000000000 --- a/spring-cloud/spring-cloud-config/client-config/config-client-production.properties +++ /dev/null @@ -1 +0,0 @@ -user.role=User diff --git a/spring-cloud/spring-cloud-config/client/pom.xml b/spring-cloud/spring-cloud-config/client/pom.xml index 0ef4b35581..2c4b748e8a 100644 --- a/spring-cloud/spring-cloud-config/client/pom.xml +++ b/spring-cloud/spring-cloud-config/client/pom.xml @@ -6,49 +6,30 @@ com.baeldung.spring.cloud spring-cloud-config - 0.0.1-SNAPSHOT + 1.0-SNAPSHOT client - jar - - client - Demo project for Spring Cloud Config Client - - - UTF-8 - UTF-8 - 1.8 - org.springframework.cloud spring-cloud-starter-config + 1.2.0.RELEASE org.springframework.boot spring-boot-starter-web + ${org.springframework.boot.version} org.springframework.boot spring-boot-starter-test + ${org.springframework.boot.version} test - - - - org.springframework.cloud - spring-cloud-dependencies - Brixton.BUILD-SNAPSHOT - pom - import - - - - @@ -57,23 +38,4 @@ - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - 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 index 18982a93b5..5dde8baa28 100644 --- a/spring-cloud/spring-cloud-config/client/src/main/resources/bootstrap.properties +++ b/spring-cloud/spring-cloud-config/client/src/main/resources/bootstrap.properties @@ -3,3 +3,4 @@ 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/client-config/config-client-development.properties b/spring-cloud/spring-cloud-config/config-repo/config-client-development.properties similarity index 100% rename from spring-cloud/spring-cloud-config/client-config/config-client-development.properties rename to spring-cloud/spring-cloud-config/config-repo/config-client-development.properties diff --git a/spring-cloud/spring-cloud-config/config-repo/config-client-production.properties b/spring-cloud/spring-cloud-config/config-repo/config-client-production.properties new file mode 100644 index 0000000000..ca00f0e390 --- /dev/null +++ b/spring-cloud/spring-cloud-config/config-repo/config-client-production.properties @@ -0,0 +1,2 @@ +user.role=User +user.password=pass diff --git a/spring-cloud/spring-cloud-config/pom.xml b/spring-cloud/spring-cloud-config/pom.xml index 8e0e4b8706..7d9fd97ee4 100644 --- a/spring-cloud/spring-cloud-config/pom.xml +++ b/spring-cloud/spring-cloud-config/pom.xml @@ -5,7 +5,7 @@ com.baeldung.spring.cloud spring-cloud-config - 0.0.1-SNAPSHOT + 1.0-SNAPSHOT pom @@ -16,9 +16,22 @@ org.springframework.boot spring-boot-starter-parent - 1.3.5.RELEASE + 1.4.1.RELEASE + + + + + org.springframework.cloud + spring-cloud-dependencies + Camden.SR1 + pom + import + + + + @@ -36,7 +49,10 @@ - 1.3.5.RELEASE + UTF-8 + UTF-8 + 1.8 + 1.4.1.RELEASE 2.19.1 diff --git a/spring-cloud/spring-cloud-config/server/pom.xml b/spring-cloud/spring-cloud-config/server/pom.xml index c3f68854bb..33fac435b1 100644 --- a/spring-cloud/spring-cloud-config/server/pom.xml +++ b/spring-cloud/spring-cloud-config/server/pom.xml @@ -6,77 +6,42 @@ com.baeldung.spring.cloud spring-cloud-config - 0.0.1-SNAPSHOT + 1.0-SNAPSHOT server - server - Demo project for Spring Cloud Config Server - - - UTF-8 - UTF-8 - 1.8 - - org.springframework.cloud spring-cloud-config-server + 1.2.0.RELEASE org.springframework.boot spring-boot-starter-security + ${org.springframework.boot.version} org.springframework.boot spring-boot-starter-web + ${org.springframework.boot.version} org.springframework.boot spring-boot-starter-test + ${org.springframework.boot.version} test - - - - org.springframework.cloud - spring-cloud-dependencies - Brixton.BUILD-SNAPSHOT - pom - import - - - - org.springframework.boot spring-boot-maven-plugin + ${org.springframework.boot.version} - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - diff --git a/spring-cloud/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/ConfigServer.java b/spring-cloud/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/ConfigServer.java index 4dd34ae3ff..7c5933e509 100644 --- a/spring-cloud/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/ConfigServer.java +++ b/spring-cloud/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/ConfigServer.java @@ -3,11 +3,9 @@ package com.baeldung.spring.cloud.config.server; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.config.server.EnableConfigServer; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; @SpringBootApplication @EnableConfigServer -@EnableWebSecurity public class ConfigServer { public static void main(String[] args) { SpringApplication.run(ConfigServer.class, args); 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 9476887a1c..3d4f3bcd47 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 @@ -1,5 +1,5 @@ server.port=8888 -spring.cloud.config.server.git.uri=https://github.com/spring-cloud-samples/config-repo +spring.cloud.config.server.git.uri= spring.cloud.config.server.git.clone-on-start=true security.user.name=root security.user.password=s3cr3t