From 20beaf58f7d9637e93b92147a30130c19204054d Mon Sep 17 00:00:00 2001 From: spring-builds Date: Thu, 13 Mar 2025 10:22:21 +0000 Subject: [PATCH 01/10] Bumping versions --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 380a8fbf..5d9ed438 100644 --- a/README.adoc +++ b/README.adoc @@ -365,7 +365,7 @@ Spring Cloud Build brings along the `basepom:duplicate-finder-maven-plugin`, th [[duplicate-finder-configuration]] === Duplicate Finder configuration -Duplicate finder is *enabled by default* and will run in the `verify` phase of your Maven build, but it will only take effect in your project if you add the `duplicate-finder-maven-plugin` to the `build` section of the projecst's `pom.xml`. +Duplicate finder is *enabled by default* and will run in the `verify` phase of your Maven build, but it will only take effect in your project if you add the `duplicate-finder-maven-plugin` to the `build` section of the project's `pom.xml`. .pom.xml [source,xml] From 87258a03c73a13c1cd254412602c314c7e7966ed Mon Sep 17 00:00:00 2001 From: spring-builds Date: Thu, 13 Mar 2025 13:08:54 +0000 Subject: [PATCH 02/10] Bumping versions --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 380a8fbf..5d9ed438 100644 --- a/README.adoc +++ b/README.adoc @@ -365,7 +365,7 @@ Spring Cloud Build brings along the `basepom:duplicate-finder-maven-plugin`, th [[duplicate-finder-configuration]] === Duplicate Finder configuration -Duplicate finder is *enabled by default* and will run in the `verify` phase of your Maven build, but it will only take effect in your project if you add the `duplicate-finder-maven-plugin` to the `build` section of the projecst's `pom.xml`. +Duplicate finder is *enabled by default* and will run in the `verify` phase of your Maven build, but it will only take effect in your project if you add the `duplicate-finder-maven-plugin` to the `build` section of the project's `pom.xml`. .pom.xml [source,xml] From 4b94c0409b07f09758259e718d22bea28ae23bbf Mon Sep 17 00:00:00 2001 From: Been24 <894661859@qq.com> Date: Fri, 6 Dec 2024 13:14:13 +0800 Subject: [PATCH 03/10] Use spring-security-crypto rsa rather than spring-security rsa fixes gh-2667 --- .../config/client/ConfigServerConfigDataLocationResolver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolver.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolver.java index 16b43178..7a1d51bd 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolver.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolver.java @@ -61,7 +61,7 @@ public class ConfigServerConfigDataLocationResolver */ public static final String PREFIX = "configserver:"; static final boolean RSA_IS_PRESENT = ClassUtils - .isPresent("org.springframework.security.rsa.crypto.RsaSecretEncryptor", null); + .isPresent("org.springframework.security.crypto.encrypt.RsaSecretEncryptor", null); private final Log log; From e9df29e8447e5111be9f02223a0c27aedaa45994 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 18 Mar 2025 23:01:54 +0000 Subject: [PATCH 04/10] Update SNAPSHOT to 4.2.1 --- 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 325c5b9f..ce0492bf 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 4.2.1-SNAPSHOT + 4.2.1 .. jar diff --git a/pom.xml b/pom.xml index 9eb20e13..cfdbdf2a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 4.2.1-SNAPSHOT + 4.2.1 pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 4.2.1-SNAPSHOT + 4.2.1 @@ -27,7 +27,7 @@ config - 4.2.1-SNAPSHOT + 4.2.1 2.29.52 v1-rev20201112-1.30.10 2.35.2 diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index d1ac2dc1..433ead13 100644 --- a/spring-cloud-config-client-tls-tests/pom.xml +++ b/spring-cloud-config-client-tls-tests/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-config - 4.2.1-SNAPSHOT + 4.2.1 .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index 9c3216ac..b014fbf1 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 - 4.2.1-SNAPSHOT + 4.2.1 .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 4d000b00..e0e502b2 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 - 4.2.1-SNAPSHOT + 4.2.1 spring-cloud-config-dependencies - 4.2.1-SNAPSHOT + 4.2.1 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 9b10d66e..aa96a946 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 - 4.2.1-SNAPSHOT + 4.2.1 .. spring-cloud-config-monitor @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 4.2.1-SNAPSHOT + 4.2.1 diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index 57889d8c..d74729e6 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 - 4.2.1-SNAPSHOT + 4.2.1 .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 36a8394a..cccaf5bc 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 - 4.2.1-SNAPSHOT + 4.2.1 .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index 13b6d7c2..fd36e97a 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 - 4.2.1-SNAPSHOT + 4.2.1 spring-cloud-starter-config - 4.2.1-SNAPSHOT + 4.2.1 spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From eb4b88f9555ed498b4d70cad4b853051fa7f8bb8 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 18 Mar 2025 23:02:55 +0000 Subject: [PATCH 05/10] 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 ce0492bf..325c5b9f 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 4.2.1 + 4.2.1-SNAPSHOT .. jar diff --git a/pom.xml b/pom.xml index cfdbdf2a..9eb20e13 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 4.2.1 + 4.2.1-SNAPSHOT pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 4.2.1 + 4.2.1-SNAPSHOT @@ -27,7 +27,7 @@ config - 4.2.1 + 4.2.1-SNAPSHOT 2.29.52 v1-rev20201112-1.30.10 2.35.2 diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index 433ead13..d1ac2dc1 100644 --- a/spring-cloud-config-client-tls-tests/pom.xml +++ b/spring-cloud-config-client-tls-tests/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-config - 4.2.1 + 4.2.1-SNAPSHOT .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index b014fbf1..9c3216ac 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 - 4.2.1 + 4.2.1-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index e0e502b2..4d000b00 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 - 4.2.1 + 4.2.1-SNAPSHOT spring-cloud-config-dependencies - 4.2.1 + 4.2.1-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 aa96a946..9b10d66e 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 - 4.2.1 + 4.2.1-SNAPSHOT .. spring-cloud-config-monitor @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 4.2.1 + 4.2.1-SNAPSHOT diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index d74729e6..57889d8c 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 - 4.2.1 + 4.2.1-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index cccaf5bc..36a8394a 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 - 4.2.1 + 4.2.1-SNAPSHOT .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index fd36e97a..13b6d7c2 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 - 4.2.1 + 4.2.1-SNAPSHOT spring-cloud-starter-config - 4.2.1 + 4.2.1-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From 88899b580ee8dc7f2e06adf5f726999696bca3d9 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 18 Mar 2025 23:02:56 +0000 Subject: [PATCH 06/10] Bumping versions to 4.2.2-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-config-client-tls-tests/pom.xml | 2 +- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 2 +- spring-cloud-config-monitor/pom.xml | 2 +- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- spring-cloud-starter-config/pom.xml | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 325c5b9f..7216c00f 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. jar diff --git a/pom.xml b/pom.xml index 9eb20e13..5d2d6723 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT pom Spring Cloud Config Spring Cloud Config diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index d1ac2dc1..ff23c7a7 100644 --- a/spring-cloud-config-client-tls-tests/pom.xml +++ b/spring-cloud-config-client-tls-tests/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-config - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index 9c3216ac..f1f84b2c 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 - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 4d000b00..b7570203 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -10,7 +10,7 @@ spring-cloud-config-dependencies - 4.2.1-SNAPSHOT + 4.2.2-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 9b10d66e..3d40a276 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 - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. spring-cloud-config-monitor diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index 57889d8c..5d2ae6b2 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 - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 36a8394a..aa33696c 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 - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index 13b6d7c2..7779d130 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 - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT spring-cloud-starter-config - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From ad823c5d952b226cb3d1af422d83839b335f6839 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 18 Mar 2025 23:03:51 +0000 Subject: [PATCH 07/10] Bumping dependency versions after release --- pom.xml | 4 ++-- spring-cloud-config-dependencies/pom.xml | 2 +- spring-cloud-config-monitor/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 5d2d6723..3aad0579 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT @@ -27,7 +27,7 @@ config - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT 2.29.52 v1-rev20201112-1.30.10 2.35.2 diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index b7570203..12c147ff 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -6,7 +6,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT spring-cloud-config-dependencies diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index 3d40a276..f83fb6a0 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT From 0ebea97f39bcd00eea49ad4d90bc7cebd37623c1 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Wed, 19 Mar 2025 10:23:18 +0000 Subject: [PATCH 08/10] Bumping versions --- 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 7216c00f..325c5b9f 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT .. jar diff --git a/pom.xml b/pom.xml index 3aad0579..9eb20e13 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT @@ -27,7 +27,7 @@ config - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT 2.29.52 v1-rev20201112-1.30.10 2.35.2 diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index ff23c7a7..d1ac2dc1 100644 --- a/spring-cloud-config-client-tls-tests/pom.xml +++ b/spring-cloud-config-client-tls-tests/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-config - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index f1f84b2c..9c3216ac 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 - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 12c147ff..4d000b00 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 - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT spring-cloud-config-dependencies - 4.2.2-SNAPSHOT + 4.2.1-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 f83fb6a0..9b10d66e 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 - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT .. spring-cloud-config-monitor @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index 5d2ae6b2..57889d8c 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 - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index aa33696c..36a8394a 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 - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index 7779d130..13b6d7c2 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 - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT spring-cloud-starter-config - 4.2.2-SNAPSHOT + 4.2.1-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From 11544020fe66265fcfd7262558f3f300ea28f9cd Mon Sep 17 00:00:00 2001 From: spring-builds Date: Thu, 20 Mar 2025 10:22:29 +0000 Subject: [PATCH 09/10] Bumping versions --- 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 325c5b9f..7216c00f 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. jar diff --git a/pom.xml b/pom.xml index 9eb20e13..3aad0579 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT @@ -27,7 +27,7 @@ config - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT 2.29.52 v1-rev20201112-1.30.10 2.35.2 diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index d1ac2dc1..ff23c7a7 100644 --- a/spring-cloud-config-client-tls-tests/pom.xml +++ b/spring-cloud-config-client-tls-tests/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-config - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index 9c3216ac..f1f84b2c 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 - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 4d000b00..12c147ff 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 - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT spring-cloud-config-dependencies - 4.2.1-SNAPSHOT + 4.2.2-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 9b10d66e..f83fb6a0 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 - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. spring-cloud-config-monitor @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index 57889d8c..5d2ae6b2 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 - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 36a8394a..aa33696c 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 - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index 13b6d7c2..7779d130 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 - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT spring-cloud-starter-config - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From d959f4a071544c66f24fcaaaff0fed58ddc82f8d Mon Sep 17 00:00:00 2001 From: marnee01 <20825300+marnee01@users.noreply.github.com> Date: Fri, 21 Mar 2025 14:12:04 -0500 Subject: [PATCH 10/10] Config Client: Fix logic to try all URLs (#2798) There was a miss when implementing the MultipleUriStrategy.ALWAYS. It was not trying the next URL if response was null, or if the HTTP Status Code was not OK, but no exception was thrown. (This author does not know under what scenario null would be returned as a response, but the code was already checking for it, so I updated the logic to also try the next URL for null response.) Closes gh-2735 Signed-off-by: marnee01 --- .../client/ConfigServerConfigDataLoader.java | 17 ++++- .../ConfigServicePropertySourceLocator.java | 17 ++++- .../ConfigServerConfigDataLoaderTests.java | 63 +++++++++++++++++- ...nfigServicePropertySourceLocatorTests.java | 64 ++++++++++++++++++- 4 files changed, 157 insertions(+), 4 deletions(-) diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoader.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoader.java index 8b4fb439..223d2bab 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoader.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoader.java @@ -359,7 +359,22 @@ public class ConfigServerConfigDataLoader implements ConfigDataLoader logger); + ClientHttpRequestFactory requestFactory = mock(ClientHttpRequestFactory.class); + RestTemplate restTemplate = new RestTemplate(requestFactory); + mockRequestResponse(requestFactory, badURI, HttpStatus.TEMPORARY_REDIRECT); + mockRequestResponse(requestFactory, goodURI, HttpStatus.OK); + when(bootstrapContext.get(RestTemplate.class)).thenReturn(restTemplate); + assertThat(this.loader.load(context, resource)).isNull(); + } + + @Test + public void shouldUseNextUriFor_NoExceptionNotOK_And_CONNECTION_TIMEOUT_ONLY_Strategy_WithFailFastIsTrue() + throws Exception { + // At the time of this writing, TEMPORARY_REDIRECT will not cause an exception to + // be thrown back to + // getRemoteEnvironment, but since status is not OK, the method returns null and + // locate method will + // throw an IllegalStateException with no cause, since fail-fast=true. Second URL + // is never tried, due to the strategy. + assertNextUriIsNotTried(true, ConfigClientProperties.MultipleUriStrategy.CONNECTION_TIMEOUT_ONLY, + HttpStatus.TEMPORARY_REDIRECT, null // IllegalStateException has no cause, + // because getRemoteEnvironment did + // not throw an exception + ); + } + + @Test + public void shouldUseNextUriFor_NoExceptionNotOK_And_ALWAYS_Strategy() throws Exception { + // At the time of this writing, TEMPORARY_REDIRECT will not cause an exception to + // be thrown back to + // getRemoteEnvironment, but since status is not OK, the method will treat it the + // same as an exception and + // thus try the next URL. + assertNextUriIsTried(ConfigClientProperties.MultipleUriStrategy.ALWAYS, HttpStatus.TEMPORARY_REDIRECT); + } + @Test public void shouldUseNextUriFor_TimeOut_And_ALWAYS_Strategy() throws Exception { assertNextUriIsTriedOnTimeout(ConfigClientProperties.MultipleUriStrategy.ALWAYS); @@ -631,12 +686,18 @@ public class ConfigServerConfigDataLoaderTests { private void assertNextUriIsNotTried(ConfigClientProperties.MultipleUriStrategy multipleUriStrategy, HttpStatus firstUriResponse, Class expectedCause) throws Exception { + assertNextUriIsNotTried(true, multipleUriStrategy, firstUriResponse, expectedCause); + } + + private void assertNextUriIsNotTried(boolean failFast, + ConfigClientProperties.MultipleUriStrategy multipleUriStrategy, HttpStatus firstUriResponse, + Class expectedCause) throws Exception { // Set up with two URIs. String badURI = "http://baduri"; String goodURI = "http://localhost:8888"; String[] uris = new String[] { badURI, goodURI }; properties.setUri(uris); - properties.setFailFast(true); + properties.setFailFast(failFast); // Strategy is CONNECTION_TIMEOUT_ONLY, so it should not try the next URI for // INTERNAL_SERVER_ERROR properties.setMultipleUriStrategy(multipleUriStrategy); diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocatorTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocatorTests.java index b53d80a1..eda69567 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocatorTests.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocatorTests.java @@ -20,6 +20,7 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.net.URI; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; @@ -332,6 +333,61 @@ public class ConfigServicePropertySourceLocatorTests { assertNextUriIsTried(ConfigClientProperties.MultipleUriStrategy.ALWAYS, HttpStatus.INTERNAL_SERVER_ERROR); } + @Test + public void shouldUseNextUriFor_NoExceptionNotOK_And_CONNECTION_TIMEOUT_ONLY_Strategy_FailFastIsFalse() + throws Exception { + // At the time of this writing, TEMPORARY_REDIRECT will not cause an exception to + // be thrown back to + // getRemoteEnvironment, but since status is not OK, the method returns null and + // locate method will + // simply return null since fail-fast=false. (Second URL is never tried, due to + // the strategy. + + // Set up with two URIs. + ConfigClientProperties clientProperties = new ConfigClientProperties(this.environment); + String badURI = "http://baduri"; + String goodURI = "http://localhost:8888"; + String[] uris = new String[] { badURI, goodURI }; + clientProperties.setUri(uris); + clientProperties.setFailFast(false); + // Strategy is CONNECTION_TIMEOUT_ONLY, so it should not try the next URI for + // TEMPORARY_REDIRECT + clientProperties.setMultipleUriStrategy(ConfigClientProperties.MultipleUriStrategy.CONNECTION_TIMEOUT_ONLY); + this.locator = new ConfigServicePropertySourceLocator(clientProperties); + ClientHttpRequestFactory requestFactory = Mockito.mock(ClientHttpRequestFactory.class); + RestTemplate restTemplate1 = new RestTemplate(requestFactory); + mockRequestResponse(requestFactory, badURI, HttpStatus.TEMPORARY_REDIRECT); + mockRequestResponse(requestFactory, goodURI, HttpStatus.OK); + this.locator.setRestTemplate(restTemplate1); + assertThat(this.locator.locateCollection(this.environment)).isEqualTo(Collections.emptyList()); + } + + @Test + public void shouldUseNextUriFor_NoExceptionNotOK_And_CONNECTION_TIMEOUT_ONLY_Strategy_WithFailFastIsTrue() + throws Exception { + // At the time of this writing, TEMPORARY_REDIRECT will not cause an exception to + // be thrown back to + // getRemoteEnvironment, but since status is not OK, the method returns null and + // locate method will + // throw an IllegalStateException with no cause, since fail-fast=true. Second URL + // is never tried, due to the strategy. + assertNextUriIsNotTried(true, ConfigClientProperties.MultipleUriStrategy.CONNECTION_TIMEOUT_ONLY, + HttpStatus.TEMPORARY_REDIRECT, null // IllegalStateException has no cause, + // because getRemoteEnvironment did + // not throw an exception + ); + } + + @Test + public void shouldUseNextUriFor_NoExceptionNotOK_And_ALWAYS_Strategy() throws Exception { + // At the time of this writing, TEMPORARY_REDIRECT will not cause an exception to + // be thrown back to + // getRemoteEnvironment, but since status is not OK, the method will treat it the + // same as an exception and + // thus try the next URL. + assertNextUriIsTried(ConfigClientProperties.MultipleUriStrategy.ALWAYS, HttpStatus.TEMPORARY_REDIRECT); + } + @Test public void shouldUseNextUriFor_TimeOut_And_ALWAYS_Strategy() throws Exception { assertNextUriIsTriedOnTimeout(ConfigClientProperties.MultipleUriStrategy.ALWAYS); @@ -459,6 +515,12 @@ public class ConfigServicePropertySourceLocatorTests { private void assertNextUriIsNotTried(ConfigClientProperties.MultipleUriStrategy multipleUriStrategy, HttpStatus firstUriResponse, Class expectedCause) { + assertNextUriIsNotTried(true, multipleUriStrategy, firstUriResponse, expectedCause); + } + + private void assertNextUriIsNotTried(boolean failFast, + ConfigClientProperties.MultipleUriStrategy multipleUriStrategy, HttpStatus firstUriResponse, + Class expectedCause) { AbstractThrowableAssert throwableAssert = Assertions.assertThatThrownBy(() -> { // Set up with two URIs. ConfigClientProperties clientProperties = new ConfigClientProperties(this.environment); @@ -466,7 +528,7 @@ public class ConfigServicePropertySourceLocatorTests { String goodURI = "http://localhost:8888"; String[] uris = new String[] { badURI, goodURI }; clientProperties.setUri(uris); - clientProperties.setFailFast(true); + clientProperties.setFailFast(failFast); // Strategy is CONNECTION_TIMEOUT_ONLY, so it should not try the next URI for // INTERNAL_SERVER_ERROR clientProperties.setMultipleUriStrategy(multipleUriStrategy);