From f2e1ea7e365b84d358627ed0aedd6ce02922edfa Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 21 Nov 2019 15:44:44 -0500 Subject: [PATCH 1/3] Removing resource class from circileci config --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 133de9bd..51328131 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,6 @@ jobs: branches: ignore: - gh-pages # list of branches to ignore - resource_class: large steps: - checkout - restore_cache: From af772dbafb31e58d7535e99463a295a8ba437d8f Mon Sep 17 00:00:00 2001 From: Tim Ysewyn Date: Mon, 9 Dec 2019 14:57:26 +0100 Subject: [PATCH 2/3] Bumped spring-security-rsa --- spring-cloud-commons-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index f53c0f45..293eb7fe 100644 --- a/spring-cloud-commons-dependencies/pom.xml +++ b/spring-cloud-commons-dependencies/pom.xml @@ -15,7 +15,7 @@ spring-cloud-commons-dependencies Spring Cloud Commons Dependencies - 1.0.7.RELEASE + 1.0.9.RELEASE From b7bef1d3e023e256b18d8266347bcb5b2dace8fb Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Wed, 11 Dec 2019 16:23:35 -0500 Subject: [PATCH 3/3] Added clarification to documentation on where to set spring.profiles.active. Fixes #612 --- docs/src/main/asciidoc/spring-cloud-commons.adoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/src/main/asciidoc/spring-cloud-commons.adoc b/docs/src/main/asciidoc/spring-cloud-commons.adoc index 20114c22..222df979 100644 --- a/docs/src/main/asciidoc/spring-cloud-commons.adoc +++ b/docs/src/main/asciidoc/spring-cloud-commons.adoc @@ -45,6 +45,8 @@ If your application needs any application-specific configuration from the server In order for the property `spring.application.name` to be used as the application's context ID you must set it in `bootstrap.[properties | yml]`. +If you want to retrieve specific profile configuration, you should also set `spring.profiles.active` in `bootstrap.[properties | yml]`. + You can disable the bootstrap process completely by setting `spring.cloud.bootstrap.enabled=false` (for example, in system properties). === Application Context Hierarchies