From 05928832555443d7ace55550f0667c0c9077c345 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 27 Apr 2023 15:13:04 +0000 Subject: [PATCH 1/5] Update SNAPSHOT to 3.1.3 --- docs/pom.xml | 2 +- pom.xml | 14 +++++++------- spring-cloud-consul-binder/pom.xml | 2 +- spring-cloud-consul-config/pom.xml | 2 +- spring-cloud-consul-core/pom.xml | 2 +- spring-cloud-consul-dependencies/pom.xml | 4 ++-- spring-cloud-consul-discovery/pom.xml | 2 +- spring-cloud-consul-integration-tests/pom.xml | 2 +- .../spring-cloud-consul-bootstrap-tests/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-consul-configdata-tests/pom.xml | 2 +- spring-cloud-starter-consul-all/pom.xml | 2 +- spring-cloud-starter-consul-bus/pom.xml | 2 +- spring-cloud-starter-consul-config/pom.xml | 2 +- spring-cloud-starter-consul-discovery/pom.xml | 2 +- spring-cloud-starter-consul/pom.xml | 2 +- 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 89919c4c..208de2e4 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.3 spring-cloud-consul-docs jar diff --git a/pom.xml b/pom.xml index a19a0b28..abd71491 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.3 pom Spring Cloud Consul Spring Cloud Consul @@ -14,18 +14,18 @@ org.springframework.cloud spring-cloud-build - 3.1.7-SNAPSHOT + 3.1.7 - 3.1.3-SNAPSHOT - 3.1.7-SNAPSHOT - 3.1.7-SNAPSHOT + 3.1.2 + 3.1.6 + 3.1.7 1.0.3.RELEASE - 3.1.7-SNAPSHOT - 3.2.8-SNAPSHOT + 3.1.7 + 3.2.8 1.17.6 diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index 46937b7b..f5316cb4 100644 --- a/spring-cloud-consul-binder/pom.xml +++ b/spring-cloud-consul-binder/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.3 .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 13b4a11b..7d1e4741 100644 --- a/spring-cloud-consul-config/pom.xml +++ b/spring-cloud-consul-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.3 .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index bee0485c..defaae8f 100644 --- a/spring-cloud-consul-core/pom.xml +++ b/spring-cloud-consul-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.3 .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index 9f723a38..6090cb48 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.7-SNAPSHOT + 3.1.7 spring-cloud-consul-dependencies - 3.1.3-SNAPSHOT + 3.1.3 pom spring-cloud-consul-dependencies Spring Cloud Consul Dependencies diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml index a2f6ea76..c2fd0334 100644 --- a/spring-cloud-consul-discovery/pom.xml +++ b/spring-cloud-consul-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.3 .. diff --git a/spring-cloud-consul-integration-tests/pom.xml b/spring-cloud-consul-integration-tests/pom.xml index 5007883e..63bb747f 100644 --- a/spring-cloud-consul-integration-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.3 .. spring-cloud-consul-integration-tests diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml index 591b41de..514169e8 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.3-SNAPSHOT + 3.1.3 .. diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml index bd4d3b0f..49346043 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.3-SNAPSHOT + 3.1.3 .. diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml index 9fef73c3..fb06837d 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.3-SNAPSHOT + 3.1.3 .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index f1a7a242..980e6719 100644 --- a/spring-cloud-starter-consul-all/pom.xml +++ b/spring-cloud-starter-consul-all/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.3 .. spring-cloud-starter-consul-all diff --git a/spring-cloud-starter-consul-bus/pom.xml b/spring-cloud-starter-consul-bus/pom.xml index 975d3371..38cc878c 100644 --- a/spring-cloud-starter-consul-bus/pom.xml +++ b/spring-cloud-starter-consul-bus/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.3 .. spring-cloud-starter-consul-bus diff --git a/spring-cloud-starter-consul-config/pom.xml b/spring-cloud-starter-consul-config/pom.xml index d2b3c975..423cd804 100644 --- a/spring-cloud-starter-consul-config/pom.xml +++ b/spring-cloud-starter-consul-config/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.3 .. spring-cloud-starter-consul-config diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml index 7f1e2f22..685bf8e8 100644 --- a/spring-cloud-starter-consul-discovery/pom.xml +++ b/spring-cloud-starter-consul-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.3 .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index 089ba623..35e7f3d4 100644 --- a/spring-cloud-starter-consul/pom.xml +++ b/spring-cloud-starter-consul/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.3 .. spring-cloud-starter-consul From df4af5a6b350335a6567486574cd18dfc3578e9d Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 27 Apr 2023 15:15:07 +0000 Subject: [PATCH 2/5] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 14 +++++++------- spring-cloud-consul-binder/pom.xml | 2 +- spring-cloud-consul-config/pom.xml | 2 +- spring-cloud-consul-core/pom.xml | 2 +- spring-cloud-consul-dependencies/pom.xml | 4 ++-- spring-cloud-consul-discovery/pom.xml | 2 +- spring-cloud-consul-integration-tests/pom.xml | 2 +- .../spring-cloud-consul-bootstrap-tests/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-consul-configdata-tests/pom.xml | 2 +- spring-cloud-starter-consul-all/pom.xml | 2 +- spring-cloud-starter-consul-bus/pom.xml | 2 +- spring-cloud-starter-consul-config/pom.xml | 2 +- spring-cloud-starter-consul-discovery/pom.xml | 2 +- spring-cloud-starter-consul/pom.xml | 2 +- 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 208de2e4..89919c4c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3 + 3.1.3-SNAPSHOT spring-cloud-consul-docs jar diff --git a/pom.xml b/pom.xml index abd71491..a19a0b28 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3 + 3.1.3-SNAPSHOT pom Spring Cloud Consul Spring Cloud Consul @@ -14,18 +14,18 @@ org.springframework.cloud spring-cloud-build - 3.1.7 + 3.1.7-SNAPSHOT - 3.1.2 - 3.1.6 - 3.1.7 + 3.1.3-SNAPSHOT + 3.1.7-SNAPSHOT + 3.1.7-SNAPSHOT 1.0.3.RELEASE - 3.1.7 - 3.2.8 + 3.1.7-SNAPSHOT + 3.2.8-SNAPSHOT 1.17.6 diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index f5316cb4..46937b7b 100644 --- a/spring-cloud-consul-binder/pom.xml +++ b/spring-cloud-consul-binder/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3 + 3.1.3-SNAPSHOT .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 7d1e4741..13b4a11b 100644 --- a/spring-cloud-consul-config/pom.xml +++ b/spring-cloud-consul-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3 + 3.1.3-SNAPSHOT .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index defaae8f..bee0485c 100644 --- a/spring-cloud-consul-core/pom.xml +++ b/spring-cloud-consul-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3 + 3.1.3-SNAPSHOT .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index 6090cb48..9f723a38 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.7 + 3.1.7-SNAPSHOT spring-cloud-consul-dependencies - 3.1.3 + 3.1.3-SNAPSHOT pom spring-cloud-consul-dependencies Spring Cloud Consul Dependencies diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml index c2fd0334..a2f6ea76 100644 --- a/spring-cloud-consul-discovery/pom.xml +++ b/spring-cloud-consul-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3 + 3.1.3-SNAPSHOT .. diff --git a/spring-cloud-consul-integration-tests/pom.xml b/spring-cloud-consul-integration-tests/pom.xml index 63bb747f..5007883e 100644 --- a/spring-cloud-consul-integration-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3 + 3.1.3-SNAPSHOT .. spring-cloud-consul-integration-tests diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml index 514169e8..591b41de 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.3 + 3.1.3-SNAPSHOT .. diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml index 49346043..bd4d3b0f 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.3 + 3.1.3-SNAPSHOT .. diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml index fb06837d..9fef73c3 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.3 + 3.1.3-SNAPSHOT .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index 980e6719..f1a7a242 100644 --- a/spring-cloud-starter-consul-all/pom.xml +++ b/spring-cloud-starter-consul-all/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3 + 3.1.3-SNAPSHOT .. spring-cloud-starter-consul-all diff --git a/spring-cloud-starter-consul-bus/pom.xml b/spring-cloud-starter-consul-bus/pom.xml index 38cc878c..975d3371 100644 --- a/spring-cloud-starter-consul-bus/pom.xml +++ b/spring-cloud-starter-consul-bus/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3 + 3.1.3-SNAPSHOT .. spring-cloud-starter-consul-bus diff --git a/spring-cloud-starter-consul-config/pom.xml b/spring-cloud-starter-consul-config/pom.xml index 423cd804..d2b3c975 100644 --- a/spring-cloud-starter-consul-config/pom.xml +++ b/spring-cloud-starter-consul-config/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3 + 3.1.3-SNAPSHOT .. spring-cloud-starter-consul-config diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml index 685bf8e8..7f1e2f22 100644 --- a/spring-cloud-starter-consul-discovery/pom.xml +++ b/spring-cloud-starter-consul-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3 + 3.1.3-SNAPSHOT .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index 35e7f3d4..089ba623 100644 --- a/spring-cloud-starter-consul/pom.xml +++ b/spring-cloud-starter-consul/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3 + 3.1.3-SNAPSHOT .. spring-cloud-starter-consul From 3b863f20b346e3a2953438f7f109f88d81edadba Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 27 Apr 2023 15:15:08 +0000 Subject: [PATCH 3/5] Bumping versions to 3.1.4-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 14 +++++++------- spring-cloud-consul-binder/pom.xml | 2 +- spring-cloud-consul-config/pom.xml | 2 +- spring-cloud-consul-core/pom.xml | 2 +- spring-cloud-consul-dependencies/pom.xml | 4 ++-- spring-cloud-consul-discovery/pom.xml | 2 +- spring-cloud-consul-integration-tests/pom.xml | 2 +- .../spring-cloud-consul-bootstrap-tests/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-consul-configdata-tests/pom.xml | 2 +- spring-cloud-starter-consul-all/pom.xml | 2 +- spring-cloud-starter-consul-bus/pom.xml | 2 +- spring-cloud-starter-consul-config/pom.xml | 2 +- spring-cloud-starter-consul-discovery/pom.xml | 2 +- spring-cloud-starter-consul/pom.xml | 2 +- 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 89919c4c..1f302634 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT spring-cloud-consul-docs jar diff --git a/pom.xml b/pom.xml index a19a0b28..49f95dd4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT pom Spring Cloud Consul Spring Cloud Consul @@ -14,18 +14,18 @@ org.springframework.cloud spring-cloud-build - 3.1.7-SNAPSHOT + 3.1.8-SNAPSHOT - 3.1.3-SNAPSHOT - 3.1.7-SNAPSHOT - 3.1.7-SNAPSHOT + 3.1.2 + 3.1.6 + 3.1.8-SNAPSHOT 1.0.3.RELEASE - 3.1.7-SNAPSHOT - 3.2.8-SNAPSHOT + 3.1.8-SNAPSHOT + 3.2.9-SNAPSHOT 1.17.6 diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index 46937b7b..4ce8beb6 100644 --- a/spring-cloud-consul-binder/pom.xml +++ b/spring-cloud-consul-binder/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 13b4a11b..0f976c10 100644 --- a/spring-cloud-consul-config/pom.xml +++ b/spring-cloud-consul-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index bee0485c..e27d97c9 100644 --- a/spring-cloud-consul-core/pom.xml +++ b/spring-cloud-consul-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index 9f723a38..90e56dec 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.7-SNAPSHOT + 3.1.8-SNAPSHOT spring-cloud-consul-dependencies - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT pom spring-cloud-consul-dependencies Spring Cloud Consul Dependencies diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml index a2f6ea76..41e1b7ad 100644 --- a/spring-cloud-consul-discovery/pom.xml +++ b/spring-cloud-consul-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT .. diff --git a/spring-cloud-consul-integration-tests/pom.xml b/spring-cloud-consul-integration-tests/pom.xml index 5007883e..f6b2fff9 100644 --- a/spring-cloud-consul-integration-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT .. spring-cloud-consul-integration-tests diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml index 591b41de..244369d9 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT .. diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml index bd4d3b0f..90267a77 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT .. diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml index 9fef73c3..56d5e562 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index f1a7a242..e5e098b9 100644 --- a/spring-cloud-starter-consul-all/pom.xml +++ b/spring-cloud-starter-consul-all/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT .. spring-cloud-starter-consul-all diff --git a/spring-cloud-starter-consul-bus/pom.xml b/spring-cloud-starter-consul-bus/pom.xml index 975d3371..02da9aa4 100644 --- a/spring-cloud-starter-consul-bus/pom.xml +++ b/spring-cloud-starter-consul-bus/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT .. spring-cloud-starter-consul-bus diff --git a/spring-cloud-starter-consul-config/pom.xml b/spring-cloud-starter-consul-config/pom.xml index d2b3c975..9d09d6d8 100644 --- a/spring-cloud-starter-consul-config/pom.xml +++ b/spring-cloud-starter-consul-config/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT .. spring-cloud-starter-consul-config diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml index 7f1e2f22..41048a49 100644 --- a/spring-cloud-starter-consul-discovery/pom.xml +++ b/spring-cloud-starter-consul-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index 089ba623..9fa31d99 100644 --- a/spring-cloud-starter-consul/pom.xml +++ b/spring-cloud-starter-consul/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.3-SNAPSHOT + 3.1.4-SNAPSHOT .. spring-cloud-starter-consul From 4c4e0128574077255e77d547127cbd731802ca49 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 28 Apr 2023 19:09:50 +0000 Subject: [PATCH 4/5] Bumping versions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 49f95dd4..fbd80a72 100644 --- a/pom.xml +++ b/pom.xml @@ -20,8 +20,8 @@ - 3.1.2 - 3.1.6 + 3.1.3-SNAPSHOT + 3.1.7-SNAPSHOT 3.1.8-SNAPSHOT 1.0.3.RELEASE 3.1.8-SNAPSHOT From cf29e78379f21d21a758f1ac07bddef828d8d611 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Tue, 13 Jun 2023 16:20:09 -0400 Subject: [PATCH 5/5] Implement new API in ConfigServerInstanceProvider.Function (#819) Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> --- pom.xml | 11 ++ spring-cloud-consul-discovery/pom.xml | 10 ++ .../ConsulConfigServerBootstrapper.java | 63 ++++++-- .../ConsulConfigServerBootstrapperIT.java | 135 ++++++++++++++++++ .../ConsulConfigServerBootstrapperTests.java | 47 +++--- .../src/test/resources/bootstrapper.yaml | 8 ++ 6 files changed, 247 insertions(+), 27 deletions(-) create mode 100644 spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperIT.java create mode 100644 spring-cloud-consul-discovery/src/test/resources/bootstrapper.yaml diff --git a/pom.xml b/pom.xml index fbd80a72..5096a6f7 100644 --- a/pom.xml +++ b/pom.xml @@ -27,6 +27,7 @@ 3.1.8-SNAPSHOT 3.2.9-SNAPSHOT 1.17.6 + 5.15.0 @@ -156,11 +157,21 @@ consul ${testcontainers.version} + + org.testcontainers + mockserver + ${testcontainers.version} + org.testcontainers junit-jupiter ${testcontainers.version} + + org.mock-server + mockserver-client-java + ${mockserverclient.version} + diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml index 41e1b7ad..839a6a55 100644 --- a/spring-cloud-consul-discovery/pom.xml +++ b/spring-cloud-consul-discovery/pom.xml @@ -134,6 +134,16 @@ consul test + + org.testcontainers + mockserver + test + + + org.mock-server + mockserver-client-java + test + org.testcontainers junit-jupiter diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapper.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapper.java index 30a35d5d..725537c9 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapper.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapper.java @@ -17,14 +17,18 @@ package org.springframework.cloud.consul.discovery.configclient; import java.util.Collections; +import java.util.List; import com.ecwid.consul.v1.ConsulClient; +import org.apache.commons.logging.Log; +import org.springframework.boot.BootstrapContext; import org.springframework.boot.BootstrapRegistry; import org.springframework.boot.BootstrapRegistryInitializer; import org.springframework.boot.context.properties.bind.BindHandler; import org.springframework.boot.context.properties.bind.Bindable; import org.springframework.boot.context.properties.bind.Binder; +import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.commons.util.InetUtils; import org.springframework.cloud.commons.util.InetUtilsProperties; import org.springframework.cloud.config.client.ConfigClientProperties; @@ -84,24 +88,67 @@ public class ConsulConfigServerBootstrapper implements BootstrapRegistryInitiali discoveryClient); } }); - registry.registerIfAbsent(ConfigServerInstanceProvider.Function.class, context -> { - if (!isDiscoveryEnabled(context.get(Binder.class))) { - return (id) -> Collections.emptyList(); - } - ConsulDiscoveryClient discoveryClient = context.get(ConsulDiscoveryClient.class); - return discoveryClient::getInstances; - }); + // We need to pass the lambda here so we do not create a new instance of + // ConfigServerInstanceProvider.Function + // which would result in a ClassNotFoundException when Spring Cloud Config is not + // on the classpath + registry.registerIfAbsent(ConfigServerInstanceProvider.Function.class, ConsulFunction::new); } private BindHandler getBindHandler(org.springframework.boot.BootstrapContext context) { return context.getOrElse(BindHandler.class, null); } - private boolean isDiscoveryEnabled(Binder binder) { + private static boolean isDiscoveryEnabled(Binder binder) { return binder.bind(ConfigClientProperties.CONFIG_DISCOVERY_ENABLED, Boolean.class).orElse(false) && binder.bind(ConditionalOnConsulDiscoveryEnabled.PROPERTY, Boolean.class).orElse(true) && binder.bind("spring.cloud.discovery.enabled", Boolean.class).orElse(true); } + /* + * This Function is executed when loading config data. Because of this we cannot rely + * on the BootstrapContext because Boot has not finished loading all the configuration + * data so if we ask the BootstrapContext for configuration data it will not have it. + * The apply method in this function is passed the Binder and BindHandler from the + * config data context which has the configuration properties that have been loaded so + * far in the config data process. + * + * We will create many of the same beans in this function as we do above in the + * initializer above. We do both to maintain compatibility since we are promoting + * those beans to the main application context. + */ + static final class ConsulFunction implements ConfigServerInstanceProvider.Function { + + private final BootstrapContext context; + + private ConsulFunction(BootstrapContext context) { + this.context = context; + } + + @Override + public List apply(String serviceId) { + return apply(serviceId, null, null, null); + } + + @Override + public List apply(String serviceId, Binder binder, BindHandler bindHandler, Log log) { + if (binder == null || !isDiscoveryEnabled(binder)) { + return Collections.emptyList(); + } + + ConsulProperties consulProperties = binder + .bind(ConsulProperties.PREFIX, Bindable.of(ConsulProperties.class), bindHandler) + .orElseGet(ConsulProperties::new); + ConsulClient consulClient = ConsulAutoConfiguration.createConsulClient(consulProperties); + ConsulDiscoveryProperties properties = binder + .bind(ConsulDiscoveryProperties.PREFIX, Bindable.of(ConsulDiscoveryProperties.class), bindHandler) + .orElseGet(() -> new ConsulDiscoveryProperties(new InetUtils(new InetUtilsProperties()))); + ConsulDiscoveryClient discoveryClient = new ConsulDiscoveryClient(consulClient, properties); + + return discoveryClient.getInstances(serviceId); + } + + } + } diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperIT.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperIT.java new file mode 100644 index 00000000..ff0a3814 --- /dev/null +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperIT.java @@ -0,0 +1,135 @@ +/* + * Copyright 2012-2023 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.cloud.consul.discovery.configclient; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; + +import com.ecwid.consul.v1.ConsulClient; +import com.ecwid.consul.v1.agent.model.NewService; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockserver.client.MockServerClient; +import org.testcontainers.consul.ConsulContainer; +import org.testcontainers.containers.MockServerContainer; +import org.testcontainers.junit.jupiter.Container; +import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.utility.DockerImageName; + +import org.springframework.boot.SpringBootConfiguration; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.cloud.config.environment.Environment; +import org.springframework.cloud.config.environment.PropertySource; +import org.springframework.cloud.consul.ConsulAutoConfiguration; +import org.springframework.cloud.consul.ConsulProperties; +import org.springframework.cloud.consul.test.ConsulTestcontainers; +import org.springframework.context.ConfigurableApplicationContext; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockserver.model.HttpRequest.request; +import static org.mockserver.model.HttpResponse.response; + +/** + * @author Ryan Baxter + */ + +@Testcontainers +public class ConsulConfigServerBootstrapperIT { + + public static final DockerImageName MOCKSERVER_IMAGE = DockerImageName.parse("mockserver/mockserver") + .withTag("mockserver-" + MockServerClient.class.getPackage().getImplementationVersion()); + + @Container + static ConsulContainer consul = ConsulTestcontainers.createConsulContainer("1.10"); + + @Container + static MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE); + + private ConfigurableApplicationContext context; + + @BeforeEach + void before() { + ConsulProperties consulProperties = new ConsulProperties(); + consulProperties.setHost(consul.getHost()); + consulProperties.setPort(consul.getMappedPort(ConsulTestcontainers.DEFAULT_PORT)); + ConsulClient client = ConsulAutoConfiguration.createConsulClient(consulProperties); + NewService newService = new NewService(); + newService.setId("consul-configserver"); + newService.setName("consul-configserver"); + newService.setAddress(mockServer.getHost()); + newService.setPort(mockServer.getServerPort()); + client.agentServiceRegister(newService); + + } + + @AfterEach + void after() { + this.context.close(); + } + + @Test + public void contextLoads() throws JsonProcessingException { + Environment environment = new Environment("test", "default"); + Map properties = new HashMap<>(); + properties.put("hello", "world"); + PropertySource p = new PropertySource("p1", properties); + environment.add(p); + ObjectMapper objectMapper = new ObjectMapper(); + try (MockServerClient mockServerClient = new MockServerClient(mockServer.getHost(), + mockServer.getMappedPort(MockServerContainer.PORT))) { + mockServerClient.when(request().withPath("/application/default")) + .respond(response().withBody(objectMapper.writeValueAsString(environment)) + .withHeader("content-type", "application/json")); + this.context = setup().run(); + assertThat(this.context.getEnvironment().getProperty("hello")).isEqualTo("world"); + } + + } + + SpringApplicationBuilder setup(String... env) { + SpringApplicationBuilder builder = new SpringApplicationBuilder(TestConfig.class) + .properties(addDefaultEnv(env)); + return builder; + } + + private String[] addDefaultEnv(String[] env) { + Set set = new LinkedHashSet<>(); + if (env != null && env.length > 0) { + set.addAll(Arrays.asList(env)); + } + set.add("spring.config.import=classpath:bootstrapper.yaml"); + set.add("spring.cloud.config.enabled=true"); + set.add("spring.cloud.service-registry.auto-registration.enabled=false"); + set.add(ConsulProperties.PREFIX + ".host=" + consul.getHost()); + set.add(ConsulProperties.PREFIX + ".port=" + consul.getMappedPort(ConsulTestcontainers.DEFAULT_PORT)); + return set.toArray(new String[0]); + } + + @SpringBootConfiguration + @EnableAutoConfiguration + static class TestConfig { + + } + +} diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperTests.java index dc1d61e9..00274f37 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperTests.java @@ -20,6 +20,7 @@ import java.util.Collections; import java.util.concurrent.atomic.AtomicReference; import com.ecwid.consul.transport.TransportException; +import org.apache.commons.logging.Log; import org.junit.jupiter.api.Test; import org.springframework.boot.BootstrapRegistry; @@ -30,6 +31,7 @@ import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.context.properties.bind.BindContext; import org.springframework.boot.context.properties.bind.BindHandler; import org.springframework.boot.context.properties.bind.Bindable; +import org.springframework.boot.context.properties.bind.Binder; import org.springframework.boot.context.properties.source.ConfigurationPropertyName; import org.springframework.cloud.config.client.ConfigServerInstanceProvider; import org.springframework.cloud.consul.discovery.ConsulDiscoveryClient; @@ -37,6 +39,7 @@ import org.springframework.context.ConfigurableApplicationContext; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.Mockito.mock; public class ConsulConfigServerBootstrapperTests { @@ -47,37 +50,41 @@ public class ConsulConfigServerBootstrapperTests { .addBootstrapRegistryInitializer(registry -> registry.addCloseListener(event -> { ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext() .get(ConfigServerInstanceProvider.Function.class); - assertThat(providerFn.apply("id")) - .as("ConfigServerInstanceProvider.Function should return empty list") - .isEqualTo(Collections.EMPTY_LIST); + Log log = mock(Log.class); + assertThat(providerFn.apply("id", event.getBootstrapContext().get(Binder.class), + event.getBootstrapContext().get(BindHandler.class), log)) + .as("ConfigServerInstanceProvider.Function should return empty list") + .isEqualTo(Collections.EMPTY_LIST); })).run().close(); } @Test public void consulDiscoveryClientNotEnabledProvidesEmptyList() { new SpringApplicationBuilder(TestConfig.class) - .properties("--server.port=0", "spring.cloud.service-registry.auto-registration.enabled=false", - "spring.cloud.config.discovery.enabled=true", "spring.cloud.consul.discovery.enabled=false") + .properties("--server.port=0", "spring.cloud.service-registry.auto-registration.enabled=false") .addBootstrapRegistryInitializer(registry -> registry.addCloseListener(event -> { ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext() .get(ConfigServerInstanceProvider.Function.class); - assertThat(providerFn.apply("id")) - .as("ConfigServerInstanceProvider.Function should return empty list") - .isEqualTo(Collections.EMPTY_LIST); + Log log = mock(Log.class); + assertThat(providerFn.apply("id", event.getBootstrapContext().get(Binder.class), + event.getBootstrapContext().get(BindHandler.class), log)) + .as("ConfigServerInstanceProvider.Function should return empty list") + .isEqualTo(Collections.EMPTY_LIST); })).run().close(); } @Test public void springCloudDiscoveryClientNotEnabledProvidesEmptyList() { new SpringApplicationBuilder(TestConfig.class) - .properties("--server.port=0", "spring.cloud.service-registry.auto-registration.enabled=false", - "spring.cloud.config.discovery.enabled=true", "spring.cloud.discovery.enabled=false") + .properties("--server.port=0", "spring.cloud.service-registry.auto-registration.enabled=false") .addBootstrapRegistryInitializer(registry -> registry.addCloseListener(event -> { ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext() .get(ConfigServerInstanceProvider.Function.class); - assertThat(providerFn.apply("id")) - .as("ConfigServerInstanceProvider.Function should return empty list") - .isEqualTo(Collections.EMPTY_LIST); + Log log = mock(Log.class); + assertThat(providerFn.apply("id", event.getBootstrapContext().get(Binder.class), + event.getBootstrapContext().get(BindHandler.class), log)) + .as("ConfigServerInstanceProvider.Function should return empty list") + .isEqualTo(Collections.EMPTY_LIST); })).run().close(); } @@ -88,17 +95,19 @@ public class ConsulConfigServerBootstrapperTests { ConfigurableApplicationContext context = new SpringApplicationBuilder(TestConfig.class) .properties("--server.port=0", "spring.cloud.config.discovery.enabled=true", "spring.cloud.consul.discovery.hostname=myhost", - "spring.cloud.service-registry.auto-registration.enabled=false", - "spring.cloud.consul.host=localhost") + "spring.cloud.service-registry.auto-registration.enabled=false") .addBootstrapRegistryInitializer(bindHandlerBootstrapper) .addBootstrapRegistryInitializer(registry -> registry.addCloseListener(event -> { bootstrapDiscoveryClient.set(event.getBootstrapContext().get(ConsulDiscoveryClient.class)); ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext() .get(ConfigServerInstanceProvider.Function.class); - assertThatThrownBy(() -> providerFn.apply("id")).isInstanceOf(TransportException.class) - .hasMessageContaining( - "org.apache.http.conn.HttpHostConnectException: Connect to localhost:8500") - .as("Should have tried to reach out to Consul to get config server instance").isNotNull(); + assertThatThrownBy(() -> providerFn.apply("id", event.getBootstrapContext().get(Binder.class), + event.getBootstrapContext().get(BindHandler.class), mock(Log.class))) + .isInstanceOf(TransportException.class) + .hasMessageContaining( + "org.apache.http.conn.HttpHostConnectException: Connect to localhost:8500") + .as("Should have tried to reach out to Consul to get config server instance") + .isNotNull(); })).run(); ConsulDiscoveryClient discoveryClient = context.getBean(ConsulDiscoveryClient.class); assertThat(discoveryClient == bootstrapDiscoveryClient.get()).isTrue(); diff --git a/spring-cloud-consul-discovery/src/test/resources/bootstrapper.yaml b/spring-cloud-consul-discovery/src/test/resources/bootstrapper.yaml new file mode 100644 index 00000000..13b4e728 --- /dev/null +++ b/spring-cloud-consul-discovery/src/test/resources/bootstrapper.yaml @@ -0,0 +1,8 @@ +spring: + config: + import: "optional:configserver:" + cloud: + config: + discovery: + service-id: consul-configserver + enabled: true