From 5f0b24ff60c2c8f9d3d16edf221aff873b68e651 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 29 Jun 2023 11:16:43 +0000 Subject: [PATCH 1/5] Update SNAPSHOT to 3.1.8 --- 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 71af8b0f..82e9cbbd 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 3.1.8-SNAPSHOT + 3.1.8 .. diff --git a/pom.xml b/pom.xml index acd43ad3..176fcc6b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 3.1.8-SNAPSHOT + 3.1.8 pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.8-SNAPSHOT + 3.1.8 @@ -27,7 +27,7 @@ config - 3.1.7-SNAPSHOT + 3.1.7 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 3beef982..17609512 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.8-SNAPSHOT + 3.1.8 .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index 6e2262f2..ae3faebf 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.8-SNAPSHOT + 3.1.8 .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 15ea9177..25bc896c 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.8-SNAPSHOT + 3.1.8 spring-cloud-config-dependencies - 3.1.8-SNAPSHOT + 3.1.8 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 c668aef3..30f82323 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.8-SNAPSHOT + 3.1.8 .. 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 2485030c..5f45f7b1 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.8-SNAPSHOT + 3.1.8 .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 5c8688db..eed29b92 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.8-SNAPSHOT + 3.1.8 .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index 9872d63f..55676f4b 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.8-SNAPSHOT + 3.1.8 spring-cloud-starter-config - 3.1.8-SNAPSHOT + 3.1.8 spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From 7fcb3766105efe7f6561dbf1d10e5c675f550891 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 29 Jun 2023 11:18:59 +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 82e9cbbd..71af8b0f 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 3.1.8 + 3.1.8-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 176fcc6b..acd43ad3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 3.1.8 + 3.1.8-SNAPSHOT pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.8 + 3.1.8-SNAPSHOT @@ -27,7 +27,7 @@ config - 3.1.7 + 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 17609512..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.8 + 3.1.8-SNAPSHOT .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index ae3faebf..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.8 + 3.1.8-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 25bc896c..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.8 + 3.1.8-SNAPSHOT spring-cloud-config-dependencies - 3.1.8 + 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 30f82323..c668aef3 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.8 + 3.1.8-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 5f45f7b1..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.8 + 3.1.8-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index eed29b92..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.8 + 3.1.8-SNAPSHOT .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index 55676f4b..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.8 + 3.1.8-SNAPSHOT spring-cloud-starter-config - 3.1.8 + 3.1.8-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From c3ba78549528f7bc44a6ceeef3d9c9750437f30e Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 29 Jun 2023 11:18:59 +0000 Subject: [PATCH 3/5] Bumping versions to 3.1.9-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 71af8b0f..21586f2b 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 3.1.8-SNAPSHOT + 3.1.9-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index acd43ad3..1e734f3d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 3.1.8-SNAPSHOT + 3.1.9-SNAPSHOT pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.8-SNAPSHOT + 3.1.9-SNAPSHOT @@ -27,7 +27,7 @@ config - 3.1.7-SNAPSHOT + 3.1.8-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 3beef982..7d60ec27 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.8-SNAPSHOT + 3.1.9-SNAPSHOT .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index 6e2262f2..1d889264 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.8-SNAPSHOT + 3.1.9-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 15ea9177..2d2a4221 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.8-SNAPSHOT + 3.1.9-SNAPSHOT spring-cloud-config-dependencies - 3.1.8-SNAPSHOT + 3.1.9-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 c668aef3..9f1da8cf 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.8-SNAPSHOT + 3.1.9-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 2485030c..04c70e60 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.8-SNAPSHOT + 3.1.9-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 5c8688db..232bf015 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.8-SNAPSHOT + 3.1.9-SNAPSHOT .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index 9872d63f..fa831f79 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.8-SNAPSHOT + 3.1.9-SNAPSHOT spring-cloud-starter-config - 3.1.8-SNAPSHOT + 3.1.9-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From d1ec6e56fc39c14d65bf5e6f2f6c01a477fc897a Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 30 Jun 2023 14:09:46 +0000 Subject: [PATCH 4/5] Bumping versions --- spring-cloud-config-monitor/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index 9f1da8cf..fe6dcd4d 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 3910fbff565cad3e1fc2a0cda0acfad6ea8595f6 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Sun, 16 Jul 2023 19:14:22 -0400 Subject: [PATCH 5/5] Fix IllegalArgumentException in equals and hashcodes. Fixes #2304 (#2307) Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> --- .../ConfigServerConfigDataResource.java | 24 +++++++++++++------ .../ConfigServerConfigDataResourceTests.java | 11 +++++++++ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataResource.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataResource.java index e72253b9..89a312f3 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataResource.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataResource.java @@ -123,17 +123,27 @@ public class ConfigServerConfigDataResource extends ConfigDataResource { } private boolean uriEqual(String thisUriString, String thatUriString) { - UriComponents thisUri = UriComponentsBuilder.fromHttpUrl(thisUriString).build(); - UriComponents thatUri = UriComponentsBuilder.fromHttpUrl(thatUriString).build(); - return Objects.equals(thisUri.getHost(), thatUri.getHost()) - && Objects.equals(thisUri.getPort(), thatUri.getPort()) - && Objects.equals(thisUri.getPath(), thatUri.getPath()); + try { + UriComponents thisUri = UriComponentsBuilder.fromHttpUrl(thisUriString).build(); + UriComponents thatUri = UriComponentsBuilder.fromHttpUrl(thatUriString).build(); + return Objects.equals(thisUri.getHost(), thatUri.getHost()) + && Objects.equals(thisUri.getPort(), thatUri.getPort()) + && Objects.equals(thisUri.getPath(), thatUri.getPath()); + } + catch (Exception e) { + return Objects.equals(thisUriString, thatUriString); + } } private int urisHashCode(String[] uris) { return Arrays.stream(uris).mapToInt(uriString -> { - UriComponents uriComponents = UriComponentsBuilder.fromHttpUrl(uriString).build(); - return Objects.hash(uriComponents.getHost(), uriComponents.getPath(), uriComponents.getPort()); + try { + UriComponents uriComponents = UriComponentsBuilder.fromHttpUrl(uriString).build(); + return Objects.hash(uriComponents.getHost(), uriComponents.getPath(), uriComponents.getPort()); + } + catch (Exception e) { + return Arrays.hashCode(uris); + } }).sum(); } diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataResourceTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataResourceTests.java index de4f5ce8..b2d5726c 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataResourceTests.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataResourceTests.java @@ -318,4 +318,15 @@ class ConfigServerConfigDataResourceTests { assertThat(r1.hashCode()).isNotEqualTo(r2.hashCode()); } + @Test + void testInvalidUri() { + ConfigClientProperties r1Properties = new ConfigClientProperties(); + r1Properties.setUri(new String[] { "//" }); + ConfigServerConfigDataResource r1 = new ConfigServerConfigDataResource(r1Properties, true, null); + ConfigClientProperties r2Properties = new ConfigClientProperties(); + r2Properties.setUri(new String[] { "//" }); + ConfigServerConfigDataResource r2 = new ConfigServerConfigDataResource(r2Properties, true, null); + assertThat(r1).isEqualTo(r2); + } + }