From 937088716d515fe9fbee9b713c8dc21e988e1fd3 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 27 Apr 2023 14:58:13 +0000 Subject: [PATCH 1/5] Update SNAPSHOT to 3.1.7 --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-config-client-tls-tests/pom.xml | 2 +- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 4 ++-- spring-cloud-config-monitor/pom.xml | 4 ++-- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- spring-cloud-starter-config/pom.xml | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index e73cec9f..39204944 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 3.1.7-SNAPSHOT + 3.1.7 .. diff --git a/pom.xml b/pom.xml index c26d3618..35353cc8 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 3.1.7-SNAPSHOT + 3.1.7 pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.7-SNAPSHOT + 3.1.7 @@ -27,7 +27,7 @@ config - 3.1.7-SNAPSHOT + 3.1.6 1.11.911 v1-rev20201112-1.30.10 1.16.2 diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index 9324a6d3..f5c6c0d8 100644 --- a/spring-cloud-config-client-tls-tests/pom.xml +++ b/spring-cloud-config-client-tls-tests/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 3.1.7-SNAPSHOT + 3.1.7 .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index 0bb075c0..82224773 100644 --- a/spring-cloud-config-client/pom.xml +++ b/spring-cloud-config-client/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 3.1.7-SNAPSHOT + 3.1.7 .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 61edd59c..43fcdb96 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.7-SNAPSHOT + 3.1.7 spring-cloud-config-dependencies - 3.1.7-SNAPSHOT + 3.1.7 pom spring-cloud-config-dependencies Spring Cloud Config Dependencies diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index 3517978f..f04744f9 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-config - 3.1.7-SNAPSHOT + 3.1.7 .. spring-cloud-config-monitor @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 3.1.3-SNAPSHOT + 3.1.2 diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index f3f34d11..5dfc7566 100644 --- a/spring-cloud-config-sample/pom.xml +++ b/spring-cloud-config-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 3.1.7-SNAPSHOT + 3.1.7 .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 9c327052..65c769b6 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 3.1.7-SNAPSHOT + 3.1.7 .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index a4333569..77103309 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -6,10 +6,10 @@ org.springframework.cloud spring-cloud-config - 3.1.7-SNAPSHOT + 3.1.7 spring-cloud-starter-config - 3.1.7-SNAPSHOT + 3.1.7 spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From 265b5fdb871c5ea156f1b16d44d52c6c340bbd6c Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 27 Apr 2023 15:00:39 +0000 Subject: [PATCH 2/5] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-config-client-tls-tests/pom.xml | 2 +- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 4 ++-- spring-cloud-config-monitor/pom.xml | 4 ++-- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- spring-cloud-starter-config/pom.xml | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 39204944..e73cec9f 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 3.1.7 + 3.1.7-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 35353cc8..c26d3618 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 3.1.7 + 3.1.7-SNAPSHOT pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.7 + 3.1.7-SNAPSHOT @@ -27,7 +27,7 @@ config - 3.1.6 + 3.1.7-SNAPSHOT 1.11.911 v1-rev20201112-1.30.10 1.16.2 diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index f5c6c0d8..9324a6d3 100644 --- a/spring-cloud-config-client-tls-tests/pom.xml +++ b/spring-cloud-config-client-tls-tests/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 3.1.7 + 3.1.7-SNAPSHOT .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index 82224773..0bb075c0 100644 --- a/spring-cloud-config-client/pom.xml +++ b/spring-cloud-config-client/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 3.1.7 + 3.1.7-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 43fcdb96..61edd59c 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.7 + 3.1.7-SNAPSHOT spring-cloud-config-dependencies - 3.1.7 + 3.1.7-SNAPSHOT pom spring-cloud-config-dependencies Spring Cloud Config Dependencies diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index f04744f9..3517978f 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-config - 3.1.7 + 3.1.7-SNAPSHOT .. spring-cloud-config-monitor @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 3.1.2 + 3.1.3-SNAPSHOT diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index 5dfc7566..f3f34d11 100644 --- a/spring-cloud-config-sample/pom.xml +++ b/spring-cloud-config-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 3.1.7 + 3.1.7-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 65c769b6..9c327052 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 3.1.7 + 3.1.7-SNAPSHOT .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index 77103309..a4333569 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -6,10 +6,10 @@ org.springframework.cloud spring-cloud-config - 3.1.7 + 3.1.7-SNAPSHOT spring-cloud-starter-config - 3.1.7 + 3.1.7-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From 0449471adedfdd0bd345a2d285681b364d463d14 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 27 Apr 2023 15:00:40 +0000 Subject: [PATCH 3/5] Bumping versions to 3.1.8-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-config-client-tls-tests/pom.xml | 2 +- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 4 ++-- spring-cloud-config-monitor/pom.xml | 4 ++-- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- spring-cloud-starter-config/pom.xml | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index e73cec9f..71af8b0f 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 3.1.7-SNAPSHOT + 3.1.8-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index c26d3618..a21af5ee 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 3.1.7-SNAPSHOT + 3.1.8-SNAPSHOT pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.7-SNAPSHOT + 3.1.8-SNAPSHOT @@ -27,7 +27,7 @@ config - 3.1.7-SNAPSHOT + 3.1.6 1.11.911 v1-rev20201112-1.30.10 1.16.2 diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index 9324a6d3..3beef982 100644 --- a/spring-cloud-config-client-tls-tests/pom.xml +++ b/spring-cloud-config-client-tls-tests/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 3.1.7-SNAPSHOT + 3.1.8-SNAPSHOT .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index 0bb075c0..6e2262f2 100644 --- a/spring-cloud-config-client/pom.xml +++ b/spring-cloud-config-client/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 3.1.7-SNAPSHOT + 3.1.8-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 61edd59c..15ea9177 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.7-SNAPSHOT + 3.1.8-SNAPSHOT spring-cloud-config-dependencies - 3.1.7-SNAPSHOT + 3.1.8-SNAPSHOT pom spring-cloud-config-dependencies Spring Cloud Config Dependencies diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index 3517978f..3a5d3f2f 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-config - 3.1.7-SNAPSHOT + 3.1.8-SNAPSHOT .. spring-cloud-config-monitor @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 3.1.3-SNAPSHOT + 3.1.2 diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index f3f34d11..2485030c 100644 --- a/spring-cloud-config-sample/pom.xml +++ b/spring-cloud-config-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 3.1.7-SNAPSHOT + 3.1.8-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 9c327052..5c8688db 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 3.1.7-SNAPSHOT + 3.1.8-SNAPSHOT .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index a4333569..9872d63f 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -6,10 +6,10 @@ org.springframework.cloud spring-cloud-config - 3.1.7-SNAPSHOT + 3.1.8-SNAPSHOT spring-cloud-starter-config - 3.1.7-SNAPSHOT + 3.1.8-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From 4c93ad7e7500fc62f842b3976f8a9ca1351ca0d4 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Sat, 29 Apr 2023 00:26:32 +0000 Subject: [PATCH 4/5] Bumping versions --- pom.xml | 2 +- spring-cloud-config-monitor/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a21af5ee..acd43ad3 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ config - 3.1.6 + 3.1.7-SNAPSHOT 1.11.911 v1-rev20201112-1.30.10 1.16.2 diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index 3a5d3f2f..c668aef3 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 3.1.2 + 3.1.3-SNAPSHOT From 5a1797ac474193e0fd75a0cdfeb80e03abac0e89 Mon Sep 17 00:00:00 2001 From: Kaveh Shamsi Date: Wed, 3 May 2023 19:33:14 +0200 Subject: [PATCH 5/5] Loads the default configuration for application names prefixed with (#2262) --- .../server/environment/NativeEnvironmentRepository.java | 2 +- .../environment/NativeEnvironmentRepositoryTests.java | 9 +++++++++ .../test/dev/applicationxyz/application.properties | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 spring-cloud-config-server/src/test/resources/test/dev/applicationxyz/application.properties diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java index 07e2382a..7929ef79 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java @@ -219,7 +219,7 @@ public class NativeEnvironmentRepository implements EnvironmentRepository, Searc Map map = new HashMap<>(); map.put("spring.profiles.active", profile); String config = application; - if (!config.startsWith("application")) { + if (!config.equals("application")) { config = "application," + config; } map.put("spring.config.name", config); diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepositoryTests.java index 09932e71..f33b405a 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepositoryTests.java @@ -191,6 +191,15 @@ public class NativeEnvironmentRepositoryTests { assertThat(environment.getPropertySources().get(0).getSource().get("foo")).isEqualTo("app"); } + @Test + public void placeholdersApplicationWithPrefixAndProfile() { + this.repository.setSearchLocations("classpath:/test/{profile}/{application}/"); + // gh-2259 application name starts with "application" + Environment environment = this.repository.findOne("applicationxyz", "dev", "master"); + assertThat(environment.getPropertySources().size()).isEqualTo(1); + assertThat(environment.getPropertySources().get(0).getSource().get("foo")).isEqualTo("default-app"); + } + @Test public void locationPlaceholdersApplication() { this.repository.setSearchLocations("classpath:/test/{application}"); diff --git a/spring-cloud-config-server/src/test/resources/test/dev/applicationxyz/application.properties b/spring-cloud-config-server/src/test/resources/test/dev/applicationxyz/application.properties new file mode 100644 index 00000000..558a6c48 --- /dev/null +++ b/spring-cloud-config-server/src/test/resources/test/dev/applicationxyz/application.properties @@ -0,0 +1 @@ +foo:default-app