From c4a4b36621b536f3eba1caf2549477630dc7e2b6 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 27 Jul 2023 20:33:51 +0000 Subject: [PATCH 1/9] Update SNAPSHOT to 4.0.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 ae7b015c9..c05f7bd3f 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.3-SNAPSHOT + 4.0.3 spring-cloud-consul-docs jar diff --git a/pom.xml b/pom.xml index f529416e1..4fdd2714c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.3-SNAPSHOT + 4.0.3 pom Spring Cloud Consul Spring Cloud Consul @@ -14,18 +14,18 @@ org.springframework.cloud spring-cloud-build - 4.0.4-SNAPSHOT + 4.0.5 - 4.0.3-SNAPSHOT - 4.0.4-SNAPSHOT - 4.0.4-SNAPSHOT + 4.0.1 + 4.0.4 + 4.0.4 2.8.3 - 4.0.4-SNAPSHOT - 4.0.4-SNAPSHOT + 4.0.4 + 4.0.4 1.17.6 5.15.0 diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index 892238060..74a5689a6 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 - 4.0.3-SNAPSHOT + 4.0.3 .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 5e2b95755..704783912 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 - 4.0.3-SNAPSHOT + 4.0.3 .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index fa2ddb4df..2033b4f69 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 - 4.0.3-SNAPSHOT + 4.0.3 .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index 68ee42d13..4f6de3271 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 - 4.0.4-SNAPSHOT + 4.0.5 spring-cloud-consul-dependencies - 4.0.3-SNAPSHOT + 4.0.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 363f52b6b..0a7846a92 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 - 4.0.3-SNAPSHOT + 4.0.3 .. diff --git a/spring-cloud-consul-integration-tests/pom.xml b/spring-cloud-consul-integration-tests/pom.xml index 6aee43def..ea67a158d 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 - 4.0.3-SNAPSHOT + 4.0.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 2f8f31e4d..585611007 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 - 4.0.3-SNAPSHOT + 4.0.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 1ef59af3b..d50456072 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 - 4.0.3-SNAPSHOT + 4.0.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 6c4190f5c..d5afdb124 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 - 4.0.3-SNAPSHOT + 4.0.3 .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index 9080eeeeb..0afdcef81 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 - 4.0.3-SNAPSHOT + 4.0.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 799c4f2e9..4d46ececd 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 - 4.0.3-SNAPSHOT + 4.0.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 9c690d9d3..47d1fc815 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 - 4.0.3-SNAPSHOT + 4.0.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 2c209d125..c4709777c 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 - 4.0.3-SNAPSHOT + 4.0.3 .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index 0ebd5b24f..0383343d1 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 - 4.0.3-SNAPSHOT + 4.0.3 .. spring-cloud-starter-consul From 0b0b971b7f257c88612060c0d115cc6660eabe7a Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 27 Jul 2023 20:36:21 +0000 Subject: [PATCH 2/9] 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 c05f7bd3f..ae7b015c9 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.3 + 4.0.3-SNAPSHOT spring-cloud-consul-docs jar diff --git a/pom.xml b/pom.xml index 4fdd2714c..f529416e1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.3 + 4.0.3-SNAPSHOT pom Spring Cloud Consul Spring Cloud Consul @@ -14,18 +14,18 @@ org.springframework.cloud spring-cloud-build - 4.0.5 + 4.0.4-SNAPSHOT - 4.0.1 - 4.0.4 - 4.0.4 + 4.0.3-SNAPSHOT + 4.0.4-SNAPSHOT + 4.0.4-SNAPSHOT 2.8.3 - 4.0.4 - 4.0.4 + 4.0.4-SNAPSHOT + 4.0.4-SNAPSHOT 1.17.6 5.15.0 diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index 74a5689a6..892238060 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 - 4.0.3 + 4.0.3-SNAPSHOT .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 704783912..5e2b95755 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 - 4.0.3 + 4.0.3-SNAPSHOT .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index 2033b4f69..fa2ddb4df 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 - 4.0.3 + 4.0.3-SNAPSHOT .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index 4f6de3271..68ee42d13 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 - 4.0.5 + 4.0.4-SNAPSHOT spring-cloud-consul-dependencies - 4.0.3 + 4.0.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 0a7846a92..363f52b6b 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 - 4.0.3 + 4.0.3-SNAPSHOT .. diff --git a/spring-cloud-consul-integration-tests/pom.xml b/spring-cloud-consul-integration-tests/pom.xml index ea67a158d..6aee43def 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 - 4.0.3 + 4.0.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 585611007..2f8f31e4d 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 - 4.0.3 + 4.0.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 d50456072..1ef59af3b 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 - 4.0.3 + 4.0.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 d5afdb124..6c4190f5c 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 - 4.0.3 + 4.0.3-SNAPSHOT .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index 0afdcef81..9080eeeeb 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 - 4.0.3 + 4.0.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 4d46ececd..799c4f2e9 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 - 4.0.3 + 4.0.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 47d1fc815..9c690d9d3 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 - 4.0.3 + 4.0.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 c4709777c..2c209d125 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 - 4.0.3 + 4.0.3-SNAPSHOT .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index 0383343d1..0ebd5b24f 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 - 4.0.3 + 4.0.3-SNAPSHOT .. spring-cloud-starter-consul From dc0200e3a3840d13823b471f859d4f22c98461f7 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 27 Jul 2023 20:36:22 +0000 Subject: [PATCH 3/9] Bumping versions to 4.0.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 ae7b015c9..df6507fb6 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.3-SNAPSHOT + 4.0.4-SNAPSHOT spring-cloud-consul-docs jar diff --git a/pom.xml b/pom.xml index f529416e1..4fe25ae9e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.3-SNAPSHOT + 4.0.4-SNAPSHOT pom Spring Cloud Consul Spring Cloud Consul @@ -14,18 +14,18 @@ org.springframework.cloud spring-cloud-build - 4.0.4-SNAPSHOT + 4.0.6-SNAPSHOT - 4.0.3-SNAPSHOT - 4.0.4-SNAPSHOT - 4.0.4-SNAPSHOT + 4.0.1 + 4.0.5-SNAPSHOT + 4.0.5-SNAPSHOT 2.8.3 - 4.0.4-SNAPSHOT - 4.0.4-SNAPSHOT + 4.0.5-SNAPSHOT + 4.0.5-SNAPSHOT 1.17.6 5.15.0 diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index 892238060..b7d3a97c2 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 - 4.0.3-SNAPSHOT + 4.0.4-SNAPSHOT .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 5e2b95755..07f03420f 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 - 4.0.3-SNAPSHOT + 4.0.4-SNAPSHOT .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index fa2ddb4df..265803472 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 - 4.0.3-SNAPSHOT + 4.0.4-SNAPSHOT .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index 68ee42d13..0e9793c04 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 - 4.0.4-SNAPSHOT + 4.0.6-SNAPSHOT spring-cloud-consul-dependencies - 4.0.3-SNAPSHOT + 4.0.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 363f52b6b..39e757f34 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 - 4.0.3-SNAPSHOT + 4.0.4-SNAPSHOT .. diff --git a/spring-cloud-consul-integration-tests/pom.xml b/spring-cloud-consul-integration-tests/pom.xml index 6aee43def..3711f9f53 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 - 4.0.3-SNAPSHOT + 4.0.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 2f8f31e4d..c7739cc56 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 - 4.0.3-SNAPSHOT + 4.0.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 1ef59af3b..d4877d3c6 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 - 4.0.3-SNAPSHOT + 4.0.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 6c4190f5c..c927ebe6b 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 - 4.0.3-SNAPSHOT + 4.0.4-SNAPSHOT .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index 9080eeeeb..297ea7597 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 - 4.0.3-SNAPSHOT + 4.0.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 799c4f2e9..5e72882de 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 - 4.0.3-SNAPSHOT + 4.0.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 9c690d9d3..c60b7a975 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 - 4.0.3-SNAPSHOT + 4.0.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 2c209d125..1dca33494 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 - 4.0.3-SNAPSHOT + 4.0.4-SNAPSHOT .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index 0ebd5b24f..60f1eaa04 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 - 4.0.3-SNAPSHOT + 4.0.4-SNAPSHOT .. spring-cloud-starter-consul From 94a81f5595eb2052b32a4359e97534336a417e77 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 27 Jul 2023 21:36:41 +0000 Subject: [PATCH 4/9] Bumping versions --- 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 df6507fb6..ae7b015c9 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.4-SNAPSHOT + 4.0.3-SNAPSHOT spring-cloud-consul-docs jar diff --git a/pom.xml b/pom.xml index 4fe25ae9e..f529416e1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.4-SNAPSHOT + 4.0.3-SNAPSHOT pom Spring Cloud Consul Spring Cloud Consul @@ -14,18 +14,18 @@ org.springframework.cloud spring-cloud-build - 4.0.6-SNAPSHOT + 4.0.4-SNAPSHOT - 4.0.1 - 4.0.5-SNAPSHOT - 4.0.5-SNAPSHOT + 4.0.3-SNAPSHOT + 4.0.4-SNAPSHOT + 4.0.4-SNAPSHOT 2.8.3 - 4.0.5-SNAPSHOT - 4.0.5-SNAPSHOT + 4.0.4-SNAPSHOT + 4.0.4-SNAPSHOT 1.17.6 5.15.0 diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index b7d3a97c2..892238060 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 - 4.0.4-SNAPSHOT + 4.0.3-SNAPSHOT .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 07f03420f..5e2b95755 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 - 4.0.4-SNAPSHOT + 4.0.3-SNAPSHOT .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index 265803472..fa2ddb4df 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 - 4.0.4-SNAPSHOT + 4.0.3-SNAPSHOT .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index 0e9793c04..68ee42d13 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 - 4.0.6-SNAPSHOT + 4.0.4-SNAPSHOT spring-cloud-consul-dependencies - 4.0.4-SNAPSHOT + 4.0.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 39e757f34..363f52b6b 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 - 4.0.4-SNAPSHOT + 4.0.3-SNAPSHOT .. diff --git a/spring-cloud-consul-integration-tests/pom.xml b/spring-cloud-consul-integration-tests/pom.xml index 3711f9f53..6aee43def 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 - 4.0.4-SNAPSHOT + 4.0.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 c7739cc56..2f8f31e4d 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 - 4.0.4-SNAPSHOT + 4.0.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 d4877d3c6..1ef59af3b 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 - 4.0.4-SNAPSHOT + 4.0.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 c927ebe6b..6c4190f5c 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 - 4.0.4-SNAPSHOT + 4.0.3-SNAPSHOT .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index 297ea7597..9080eeeeb 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 - 4.0.4-SNAPSHOT + 4.0.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 5e72882de..799c4f2e9 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 - 4.0.4-SNAPSHOT + 4.0.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 c60b7a975..9c690d9d3 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 - 4.0.4-SNAPSHOT + 4.0.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 1dca33494..2c209d125 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 - 4.0.4-SNAPSHOT + 4.0.3-SNAPSHOT .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index 60f1eaa04..0ebd5b24f 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 - 4.0.4-SNAPSHOT + 4.0.3-SNAPSHOT .. spring-cloud-starter-consul From eaf1979d956d46993162f38cc260e56e52530eb7 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 28 Jul 2023 21:37:03 +0000 Subject: [PATCH 5/9] Bumping versions --- 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 ae7b015c9..df6507fb6 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.3-SNAPSHOT + 4.0.4-SNAPSHOT spring-cloud-consul-docs jar diff --git a/pom.xml b/pom.xml index f529416e1..4fe25ae9e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.0.3-SNAPSHOT + 4.0.4-SNAPSHOT pom Spring Cloud Consul Spring Cloud Consul @@ -14,18 +14,18 @@ org.springframework.cloud spring-cloud-build - 4.0.4-SNAPSHOT + 4.0.6-SNAPSHOT - 4.0.3-SNAPSHOT - 4.0.4-SNAPSHOT - 4.0.4-SNAPSHOT + 4.0.1 + 4.0.5-SNAPSHOT + 4.0.5-SNAPSHOT 2.8.3 - 4.0.4-SNAPSHOT - 4.0.4-SNAPSHOT + 4.0.5-SNAPSHOT + 4.0.5-SNAPSHOT 1.17.6 5.15.0 diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index 892238060..b7d3a97c2 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 - 4.0.3-SNAPSHOT + 4.0.4-SNAPSHOT .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 5e2b95755..07f03420f 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 - 4.0.3-SNAPSHOT + 4.0.4-SNAPSHOT .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index fa2ddb4df..265803472 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 - 4.0.3-SNAPSHOT + 4.0.4-SNAPSHOT .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index 68ee42d13..0e9793c04 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 - 4.0.4-SNAPSHOT + 4.0.6-SNAPSHOT spring-cloud-consul-dependencies - 4.0.3-SNAPSHOT + 4.0.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 363f52b6b..39e757f34 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 - 4.0.3-SNAPSHOT + 4.0.4-SNAPSHOT .. diff --git a/spring-cloud-consul-integration-tests/pom.xml b/spring-cloud-consul-integration-tests/pom.xml index 6aee43def..3711f9f53 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 - 4.0.3-SNAPSHOT + 4.0.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 2f8f31e4d..c7739cc56 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 - 4.0.3-SNAPSHOT + 4.0.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 1ef59af3b..d4877d3c6 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 - 4.0.3-SNAPSHOT + 4.0.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 6c4190f5c..c927ebe6b 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 - 4.0.3-SNAPSHOT + 4.0.4-SNAPSHOT .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index 9080eeeeb..297ea7597 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 - 4.0.3-SNAPSHOT + 4.0.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 799c4f2e9..5e72882de 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 - 4.0.3-SNAPSHOT + 4.0.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 9c690d9d3..c60b7a975 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 - 4.0.3-SNAPSHOT + 4.0.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 2c209d125..1dca33494 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 - 4.0.3-SNAPSHOT + 4.0.4-SNAPSHOT .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index 0ebd5b24f..60f1eaa04 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 - 4.0.3-SNAPSHOT + 4.0.4-SNAPSHOT .. spring-cloud-starter-consul From 881cabb8d669a9807178b43a3d202f6146771799 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 20 Sep 2023 15:32:09 -0400 Subject: [PATCH 6/9] Ignore antora doc bits --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index 7acf4f8a0..9b4671f51 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,9 @@ consul_*.zip consul_*.zip.* .vscode/ .flattened-pom.xml + +node +node_modules +build +package.json +package-lock.json \ No newline at end of file From 39cb92c779e51ac7d2fff3c00779b47c0c91b699 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 20 Sep 2023 15:39:12 -0400 Subject: [PATCH 7/9] Update docs to point to 4.0.x --- README.adoc | 10 +++++----- docs/src/main/asciidoc/README.adoc | 8 ++++---- docs/src/main/asciidoc/spring-cloud-consul.adoc | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.adoc b/README.adoc index 2b22b5f34..11713b7c0 100644 --- a/README.adoc +++ b/README.adoc @@ -5,8 +5,8 @@ Edit the files in the src/main/asciidoc/ directory instead. //// -image::https://circleci.com/gh/spring-cloud/spring-cloud-consul/tree/master.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-consul/tree/master"] -image::https://codecov.io/gh/spring-cloud/spring-cloud-consul/branch/master/graph/badge.svg["Codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-consul/branch/master"] +image::https://github.com/spring-cloud/spring-cloud-consul/workflows/Build/badge.svg?style=svg["Actions Status", link="https://github.com/spring-cloud/spring-cloud-consul/actions"] +image::https://codecov.io/gh/spring-cloud/spring-cloud-consul/branch/4.0.x/graph/badge.svg["Codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-consul/branch/4.0.x"] This project provides Consul integrations for Spring Boot apps through autoconfiguration and binding to the Spring Environment and other Spring programming model idioms. With a few @@ -364,7 +364,7 @@ from the `file` menu. == Contributing -:spring-cloud-build-branch: master +:spring-cloud-build-branch: 4.0.x Spring Cloud is released under the non-restrictive Apache 2.0 license, and follows a very standard Github development process, using Github @@ -381,7 +381,7 @@ author credit if we do. Active contributors might be asked to join the core tea given the ability to merge pull requests. === Code of Conduct -This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc[code of +This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/{spring-cloud-build-branch}/docs/src/main/asciidoc/code-of-conduct.adoc[code of conduct]. By participating, you are expected to uphold this code. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io. @@ -392,7 +392,7 @@ added after the original pull request but before a merge. * Use the Spring Framework code format conventions. If you use Eclipse you can import formatter settings using the `eclipse-code-formatter.xml` file from the - https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring + https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring Cloud Build] project. If using IntelliJ, you can use the https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] to import the same file. diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index 92781cd49..c45bbc14a 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -1,5 +1,5 @@ -image::https://circleci.com/gh/spring-cloud/spring-cloud-consul/tree/master.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-consul/tree/master"] -image::https://codecov.io/gh/spring-cloud/spring-cloud-consul/branch/master/graph/badge.svg["Codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-consul/branch/master"] +image::https://github.com/spring-cloud/spring-cloud-consul/workflows/Build/badge.svg?style=svg["Actions Status", link="https://github.com/spring-cloud/spring-cloud-consul/actions"] +image::https://codecov.io/gh/spring-cloud/spring-cloud-consul/branch/4.0.x/graph/badge.svg["Codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-consul/branch/4.0.x"] include::intro.adoc[] @@ -40,8 +40,8 @@ See the https://consul.io/intro/index.html[intro] for more information. == Building -include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/building-jdk8.adoc[] +include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/4.0.x/docs/src/main/asciidoc/building-jdk8.adoc[] == Contributing -include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing.adoc[] +include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/4.0.x/docs/src/main/asciidoc/contributing.adoc[] diff --git a/docs/src/main/asciidoc/spring-cloud-consul.adoc b/docs/src/main/asciidoc/spring-cloud-consul.adoc index c2722e4e8..9a7478b10 100644 --- a/docs/src/main/asciidoc/spring-cloud-consul.adoc +++ b/docs/src/main/asciidoc/spring-cloud-consul.adoc @@ -174,7 +174,7 @@ spring: You can disable the HTTP health check entirely by setting `spring.cloud.consul.discovery.register-health-check=false`. ===== Applying Headers -Headers can be applied to health check requests. For example, if you're trying to register a https://cloud.spring.io/spring-cloud-config/[Spring Cloud Config] server that uses https://github.com/spring-cloud/spring-cloud-config/blob/master/docs/src/main/asciidoc/spring-cloud-config.adoc#vault-backend[Vault Backend]: +Headers can be applied to health check requests. For example, if you're trying to register a https://cloud.spring.io/spring-cloud-config/[Spring Cloud Config] server that uses https://github.com/spring-cloud/spring-cloud-config/blob/4.0.x/docs/src/main/asciidoc/spring-cloud-config.adoc#vault-backend[Vault Backend]: .application.yml ---- @@ -348,7 +348,7 @@ With this metadata, and multiple service instances deployed on localhost, the ra ==== Using Load-balancer -Spring Cloud has support for https://github.com/spring-cloud/spring-cloud-netflix/blob/master/docs/src/main/asciidoc/spring-cloud-netflix.adoc#spring-cloud-feign[Feign] (a REST client builder) and also https://docs.spring.io/spring-cloud-commons/docs/current/reference/html/#rest-template-loadbalancer-client[Spring `RestTemplate`] +Spring Cloud has support for https://docs.spring.io/spring-cloud-openfeign/docs/current/reference/html/[OpenFeign] (a REST client builder) and also https://docs.spring.io/spring-cloud-commons/docs/current/reference/html/#rest-template-loadbalancer-client[Spring `RestTemplate`] for looking up services using the logical service names/ids instead of physical URLs. Both Feign and the discovery-aware RestTemplate utilize https://docs.spring.io/spring-cloud-commons/docs/current/reference/html/#spring-cloud-loadbalancer[Spring Cloud LoadBalancer] for client-side load balancing. If you want to access service STORES using the RestTemplate simply declare: @@ -541,7 +541,7 @@ bar.properties foo-development.properties foo-production.yml foo.properties -master.ref +main.ref ---- the following property sources would be created: From b9ec6ee141425b7e34dae901dc51e5dae6e5de5a Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 20 Sep 2023 21:36:32 +0000 Subject: [PATCH 8/9] Bumping versions --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 11713b7c0..fe822621f 100644 --- a/README.adoc +++ b/README.adoc @@ -364,7 +364,7 @@ from the `file` menu. == Contributing -:spring-cloud-build-branch: 4.0.x +:spring-cloud-build-branch: master Spring Cloud is released under the non-restrictive Apache 2.0 license, and follows a very standard Github development process, using Github From daae7d26b400d803d498a051a7ec264764530a57 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Tue, 23 Jan 2024 20:40:45 -0500 Subject: [PATCH 9/9] Remove ConsulFunction and Use PropertyResolver (#833) This relates to https://github.com/spring-cloud/spring-cloud-config/pull/2375 It reverts portions of #819 Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> --- .../ConsulConfigServerBootstrapper.java | 107 +++++------------- 1 file changed, 30 insertions(+), 77 deletions(-) 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 4773cc51f..8616895bd 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,21 +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; +import org.springframework.cloud.config.client.ConfigServerConfigDataLocationResolver; import org.springframework.cloud.config.client.ConfigServerInstanceProvider; import org.springframework.cloud.consul.ConsulAutoConfiguration; import org.springframework.cloud.consul.ConsulProperties; @@ -51,15 +48,15 @@ public void initialize(BootstrapRegistry registry) { } // create consul client registry.registerIfAbsent(ConsulProperties.class, context -> { - Binder binder = context.get(Binder.class); - if (!isDiscoveryEnabled(binder)) { + if (!isDiscoveryEnabled(context)) { return null; } - return binder.bind(ConsulProperties.PREFIX, Bindable.of(ConsulProperties.class), getBindHandler(context)) - .orElseGet(ConsulProperties::new); + ConfigServerConfigDataLocationResolver.PropertyResolver propertyResolver = getPropertyResolver(context); + return propertyResolver.resolveConfigurationProperties(ConsulProperties.PREFIX, ConsulProperties.class, + ConsulProperties::new); }); registry.registerIfAbsent(ConsulClient.class, context -> { - if (!isDiscoveryEnabled(context.get(Binder.class))) { + if (!isDiscoveryEnabled(context)) { return null; } ConsulProperties consulProperties = context.get(ConsulProperties.class); @@ -67,20 +64,19 @@ public void initialize(BootstrapRegistry registry) { ConsulAutoConfiguration.createConsulRawClientBuilder()); }); registry.registerIfAbsent(ConsulDiscoveryClient.class, context -> { - Binder binder = context.get(Binder.class); - if (!isDiscoveryEnabled(binder)) { + if (!isDiscoveryEnabled(context)) { return null; } + ConfigServerConfigDataLocationResolver.PropertyResolver propertyResolver = getPropertyResolver(context); ConsulClient consulClient = context.get(ConsulClient.class); - ConsulDiscoveryProperties properties = binder - .bind(ConsulDiscoveryProperties.PREFIX, Bindable.of(ConsulDiscoveryProperties.class), - getBindHandler(context)) - .orElseGet(() -> new ConsulDiscoveryProperties(new InetUtils(new InetUtilsProperties()))); + ConsulDiscoveryProperties properties = propertyResolver.resolveConfigurationProperties( + ConsulDiscoveryProperties.PREFIX, ConsulDiscoveryProperties.class, + () -> new ConsulDiscoveryProperties(new InetUtils(new InetUtilsProperties()))); return new ConsulDiscoveryClient(consulClient, properties); }); // promote discovery client if created registry.addCloseListener(event -> { - if (!isDiscoveryEnabled(event.getBootstrapContext().get(Binder.class))) { + if (!isDiscoveryEnabled(event.getBootstrapContext())) { return; } ConsulDiscoveryClient discoveryClient = event.getBootstrapContext().get(ConsulDiscoveryClient.class); @@ -90,71 +86,28 @@ public void initialize(BootstrapRegistry registry) { } }); - // 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::create); - } - - private BindHandler getBindHandler(org.springframework.boot.BootstrapContext context) { - return context.getOrElse(BindHandler.class, null); + registry.registerIfAbsent(ConfigServerInstanceProvider.Function.class, context -> { + if (!isDiscoveryEnabled(context)) { + return (id) -> Collections.emptyList(); + } + ConsulDiscoveryClient discoveryClient = context.get(ConsulDiscoveryClient.class); + return discoveryClient::getInstances; + }); } - 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); + private static ConfigServerConfigDataLocationResolver.PropertyResolver getPropertyResolver( + BootstrapContext context) { + return context.getOrElseSupply(ConfigServerConfigDataLocationResolver.PropertyResolver.class, + () -> new ConfigServerConfigDataLocationResolver.PropertyResolver(context.get(Binder.class), + context.getOrElse(BindHandler.class, null))); } - /* - * 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; - } - - public static ConsulFunction create(BootstrapContext context) { - return new ConsulFunction(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, - ConsulAutoConfiguration.createConsulRawClientBuilder()); - 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); - } - + public static boolean isDiscoveryEnabled(BootstrapContext bootstrapContext) { + ConfigServerConfigDataLocationResolver.PropertyResolver propertyResolver = getPropertyResolver( + bootstrapContext); + return propertyResolver.get(ConfigClientProperties.CONFIG_DISCOVERY_ENABLED, Boolean.class, false) + && propertyResolver.get(ConditionalOnConsulDiscoveryEnabled.PROPERTY, Boolean.class, true) + && propertyResolver.get("spring.cloud.discovery.enabled", Boolean.class, true); } }