From 4e00f9b74a224b7645f46a680cd187a08903171a Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 27 Jul 2023 20:57:39 +0000 Subject: [PATCH 1/7] Update SNAPSHOT to 4.0.1 --- docs/pom.xml | 2 +- pom.xml | 12 ++++++------ spring-cloud-starter-zookeeper-all/pom.xml | 2 +- spring-cloud-starter-zookeeper-config/pom.xml | 2 +- spring-cloud-starter-zookeeper-discovery/pom.xml | 2 +- spring-cloud-starter-zookeeper/pom.xml | 2 +- spring-cloud-zookeeper-config/pom.xml | 2 +- spring-cloud-zookeeper-core/pom.xml | 2 +- spring-cloud-zookeeper-dependencies/pom.xml | 4 ++-- spring-cloud-zookeeper-discovery/pom.xml | 2 +- spring-cloud-zookeeper-sample/pom.xml | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 3e9cffaf..dd46dcab 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1-SNAPSHOT + 4.0.1 spring-cloud-zookeeper-docs jar diff --git a/pom.xml b/pom.xml index e99fe583..1a4d403b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-zookeeper - 4.0.1-SNAPSHOT + 4.0.1 pom Spring Cloud Zookeeper Spring Cloud Zookeeper @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 4.0.4-SNAPSHOT + 4.0.5 @@ -150,10 +150,10 @@ - 4.0.4-SNAPSHOT - 4.0.4-SNAPSHOT - 4.0.4-SNAPSHOT - 4.0.4-SNAPSHOT + 4.0.5 + 4.0.4 + 4.0.4 + 4.0.4 1.17.6 5.15.0 diff --git a/spring-cloud-starter-zookeeper-all/pom.xml b/spring-cloud-starter-zookeeper-all/pom.xml index b2ef3798..d5d99fb1 100644 --- a/spring-cloud-starter-zookeeper-all/pom.xml +++ b/spring-cloud-starter-zookeeper-all/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1-SNAPSHOT + 4.0.1 .. spring-cloud-starter-zookeeper-all diff --git a/spring-cloud-starter-zookeeper-config/pom.xml b/spring-cloud-starter-zookeeper-config/pom.xml index de946458..ee754a72 100644 --- a/spring-cloud-starter-zookeeper-config/pom.xml +++ b/spring-cloud-starter-zookeeper-config/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1-SNAPSHOT + 4.0.1 .. spring-cloud-starter-zookeeper-config diff --git a/spring-cloud-starter-zookeeper-discovery/pom.xml b/spring-cloud-starter-zookeeper-discovery/pom.xml index a53f87cd..d7d8398b 100644 --- a/spring-cloud-starter-zookeeper-discovery/pom.xml +++ b/spring-cloud-starter-zookeeper-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1-SNAPSHOT + 4.0.1 .. spring-cloud-starter-zookeeper-discovery diff --git a/spring-cloud-starter-zookeeper/pom.xml b/spring-cloud-starter-zookeeper/pom.xml index 9cd29f89..d67a6cbb 100644 --- a/spring-cloud-starter-zookeeper/pom.xml +++ b/spring-cloud-starter-zookeeper/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1-SNAPSHOT + 4.0.1 .. spring-cloud-starter-zookeeper diff --git a/spring-cloud-zookeeper-config/pom.xml b/spring-cloud-zookeeper-config/pom.xml index c02c1e06..1dc31beb 100644 --- a/spring-cloud-zookeeper-config/pom.xml +++ b/spring-cloud-zookeeper-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1-SNAPSHOT + 4.0.1 .. diff --git a/spring-cloud-zookeeper-core/pom.xml b/spring-cloud-zookeeper-core/pom.xml index 631c196c..c8b93191 100644 --- a/spring-cloud-zookeeper-core/pom.xml +++ b/spring-cloud-zookeeper-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1-SNAPSHOT + 4.0.1 .. diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml index 9381d194..08efc6ef 100644 --- a/spring-cloud-zookeeper-dependencies/pom.xml +++ b/spring-cloud-zookeeper-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.0.4-SNAPSHOT + 4.0.5 spring-cloud-zookeeper-dependencies - 4.0.1-SNAPSHOT + 4.0.1 pom spring-cloud-zookeeper-dependencies Spring Cloud Zookeeper Dependencies diff --git a/spring-cloud-zookeeper-discovery/pom.xml b/spring-cloud-zookeeper-discovery/pom.xml index a1aeebb6..c8b38dd2 100644 --- a/spring-cloud-zookeeper-discovery/pom.xml +++ b/spring-cloud-zookeeper-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1-SNAPSHOT + 4.0.1 .. diff --git a/spring-cloud-zookeeper-sample/pom.xml b/spring-cloud-zookeeper-sample/pom.xml index acaf4cf3..a5e2e604 100644 --- a/spring-cloud-zookeeper-sample/pom.xml +++ b/spring-cloud-zookeeper-sample/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1-SNAPSHOT + 4.0.1 .. From f4615ffcbc1e267c073c3694cc04822b8cc6b5ce Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 27 Jul 2023 21:01:08 +0000 Subject: [PATCH 2/7] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 12 ++++++------ spring-cloud-starter-zookeeper-all/pom.xml | 2 +- spring-cloud-starter-zookeeper-config/pom.xml | 2 +- spring-cloud-starter-zookeeper-discovery/pom.xml | 2 +- spring-cloud-starter-zookeeper/pom.xml | 2 +- spring-cloud-zookeeper-config/pom.xml | 2 +- spring-cloud-zookeeper-core/pom.xml | 2 +- spring-cloud-zookeeper-dependencies/pom.xml | 4 ++-- spring-cloud-zookeeper-discovery/pom.xml | 2 +- spring-cloud-zookeeper-sample/pom.xml | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index dd46dcab..3e9cffaf 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1 + 4.0.1-SNAPSHOT spring-cloud-zookeeper-docs jar diff --git a/pom.xml b/pom.xml index 1a4d403b..e99fe583 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-zookeeper - 4.0.1 + 4.0.1-SNAPSHOT pom Spring Cloud Zookeeper Spring Cloud Zookeeper @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 4.0.5 + 4.0.4-SNAPSHOT @@ -150,10 +150,10 @@ - 4.0.5 - 4.0.4 - 4.0.4 - 4.0.4 + 4.0.4-SNAPSHOT + 4.0.4-SNAPSHOT + 4.0.4-SNAPSHOT + 4.0.4-SNAPSHOT 1.17.6 5.15.0 diff --git a/spring-cloud-starter-zookeeper-all/pom.xml b/spring-cloud-starter-zookeeper-all/pom.xml index d5d99fb1..b2ef3798 100644 --- a/spring-cloud-starter-zookeeper-all/pom.xml +++ b/spring-cloud-starter-zookeeper-all/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1 + 4.0.1-SNAPSHOT .. spring-cloud-starter-zookeeper-all diff --git a/spring-cloud-starter-zookeeper-config/pom.xml b/spring-cloud-starter-zookeeper-config/pom.xml index ee754a72..de946458 100644 --- a/spring-cloud-starter-zookeeper-config/pom.xml +++ b/spring-cloud-starter-zookeeper-config/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1 + 4.0.1-SNAPSHOT .. spring-cloud-starter-zookeeper-config diff --git a/spring-cloud-starter-zookeeper-discovery/pom.xml b/spring-cloud-starter-zookeeper-discovery/pom.xml index d7d8398b..a53f87cd 100644 --- a/spring-cloud-starter-zookeeper-discovery/pom.xml +++ b/spring-cloud-starter-zookeeper-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1 + 4.0.1-SNAPSHOT .. spring-cloud-starter-zookeeper-discovery diff --git a/spring-cloud-starter-zookeeper/pom.xml b/spring-cloud-starter-zookeeper/pom.xml index d67a6cbb..9cd29f89 100644 --- a/spring-cloud-starter-zookeeper/pom.xml +++ b/spring-cloud-starter-zookeeper/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1 + 4.0.1-SNAPSHOT .. spring-cloud-starter-zookeeper diff --git a/spring-cloud-zookeeper-config/pom.xml b/spring-cloud-zookeeper-config/pom.xml index 1dc31beb..c02c1e06 100644 --- a/spring-cloud-zookeeper-config/pom.xml +++ b/spring-cloud-zookeeper-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1 + 4.0.1-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-core/pom.xml b/spring-cloud-zookeeper-core/pom.xml index c8b93191..631c196c 100644 --- a/spring-cloud-zookeeper-core/pom.xml +++ b/spring-cloud-zookeeper-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1 + 4.0.1-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml index 08efc6ef..9381d194 100644 --- a/spring-cloud-zookeeper-dependencies/pom.xml +++ b/spring-cloud-zookeeper-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.0.5 + 4.0.4-SNAPSHOT spring-cloud-zookeeper-dependencies - 4.0.1 + 4.0.1-SNAPSHOT pom spring-cloud-zookeeper-dependencies Spring Cloud Zookeeper Dependencies diff --git a/spring-cloud-zookeeper-discovery/pom.xml b/spring-cloud-zookeeper-discovery/pom.xml index c8b38dd2..a1aeebb6 100644 --- a/spring-cloud-zookeeper-discovery/pom.xml +++ b/spring-cloud-zookeeper-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1 + 4.0.1-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-sample/pom.xml b/spring-cloud-zookeeper-sample/pom.xml index a5e2e604..acaf4cf3 100644 --- a/spring-cloud-zookeeper-sample/pom.xml +++ b/spring-cloud-zookeeper-sample/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1 + 4.0.1-SNAPSHOT .. From e18ce31b568e685a5cccfc820a1f3ba3f4137670 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 27 Jul 2023 21:01:08 +0000 Subject: [PATCH 3/7] Bumping versions to 4.0.2-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 12 ++++++------ spring-cloud-starter-zookeeper-all/pom.xml | 2 +- spring-cloud-starter-zookeeper-config/pom.xml | 2 +- spring-cloud-starter-zookeeper-discovery/pom.xml | 2 +- spring-cloud-starter-zookeeper/pom.xml | 2 +- spring-cloud-zookeeper-config/pom.xml | 2 +- spring-cloud-zookeeper-core/pom.xml | 2 +- spring-cloud-zookeeper-dependencies/pom.xml | 4 ++-- spring-cloud-zookeeper-discovery/pom.xml | 2 +- spring-cloud-zookeeper-sample/pom.xml | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 3e9cffaf..a2b6f0b0 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1-SNAPSHOT + 4.0.2-SNAPSHOT spring-cloud-zookeeper-docs jar diff --git a/pom.xml b/pom.xml index e99fe583..afc2b352 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-zookeeper - 4.0.1-SNAPSHOT + 4.0.2-SNAPSHOT pom Spring Cloud Zookeeper Spring Cloud Zookeeper @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 4.0.4-SNAPSHOT + 4.0.6-SNAPSHOT @@ -150,10 +150,10 @@ - 4.0.4-SNAPSHOT - 4.0.4-SNAPSHOT - 4.0.4-SNAPSHOT - 4.0.4-SNAPSHOT + 4.0.6-SNAPSHOT + 4.0.5-SNAPSHOT + 4.0.5-SNAPSHOT + 4.0.5-SNAPSHOT 1.17.6 5.15.0 diff --git a/spring-cloud-starter-zookeeper-all/pom.xml b/spring-cloud-starter-zookeeper-all/pom.xml index b2ef3798..7d553c5c 100644 --- a/spring-cloud-starter-zookeeper-all/pom.xml +++ b/spring-cloud-starter-zookeeper-all/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1-SNAPSHOT + 4.0.2-SNAPSHOT .. spring-cloud-starter-zookeeper-all diff --git a/spring-cloud-starter-zookeeper-config/pom.xml b/spring-cloud-starter-zookeeper-config/pom.xml index de946458..056a6ac9 100644 --- a/spring-cloud-starter-zookeeper-config/pom.xml +++ b/spring-cloud-starter-zookeeper-config/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1-SNAPSHOT + 4.0.2-SNAPSHOT .. spring-cloud-starter-zookeeper-config diff --git a/spring-cloud-starter-zookeeper-discovery/pom.xml b/spring-cloud-starter-zookeeper-discovery/pom.xml index a53f87cd..59d6724d 100644 --- a/spring-cloud-starter-zookeeper-discovery/pom.xml +++ b/spring-cloud-starter-zookeeper-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1-SNAPSHOT + 4.0.2-SNAPSHOT .. spring-cloud-starter-zookeeper-discovery diff --git a/spring-cloud-starter-zookeeper/pom.xml b/spring-cloud-starter-zookeeper/pom.xml index 9cd29f89..8eb0071b 100644 --- a/spring-cloud-starter-zookeeper/pom.xml +++ b/spring-cloud-starter-zookeeper/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1-SNAPSHOT + 4.0.2-SNAPSHOT .. spring-cloud-starter-zookeeper diff --git a/spring-cloud-zookeeper-config/pom.xml b/spring-cloud-zookeeper-config/pom.xml index c02c1e06..173f5b3e 100644 --- a/spring-cloud-zookeeper-config/pom.xml +++ b/spring-cloud-zookeeper-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1-SNAPSHOT + 4.0.2-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-core/pom.xml b/spring-cloud-zookeeper-core/pom.xml index 631c196c..bc2b6d53 100644 --- a/spring-cloud-zookeeper-core/pom.xml +++ b/spring-cloud-zookeeper-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1-SNAPSHOT + 4.0.2-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml index 9381d194..6944b72f 100644 --- a/spring-cloud-zookeeper-dependencies/pom.xml +++ b/spring-cloud-zookeeper-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.0.4-SNAPSHOT + 4.0.6-SNAPSHOT spring-cloud-zookeeper-dependencies - 4.0.1-SNAPSHOT + 4.0.2-SNAPSHOT pom spring-cloud-zookeeper-dependencies Spring Cloud Zookeeper Dependencies diff --git a/spring-cloud-zookeeper-discovery/pom.xml b/spring-cloud-zookeeper-discovery/pom.xml index a1aeebb6..dcbee1bd 100644 --- a/spring-cloud-zookeeper-discovery/pom.xml +++ b/spring-cloud-zookeeper-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1-SNAPSHOT + 4.0.2-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-sample/pom.xml b/spring-cloud-zookeeper-sample/pom.xml index acaf4cf3..a3392c26 100644 --- a/spring-cloud-zookeeper-sample/pom.xml +++ b/spring-cloud-zookeeper-sample/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-zookeeper - 4.0.1-SNAPSHOT + 4.0.2-SNAPSHOT .. From 51b29ae2436abc407e58065b13da0a683a48e671 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 20 Sep 2023 15:59:47 -0400 Subject: [PATCH 4/7] Ignores antora docs bits --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index 84d578d9..393da56d 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,9 @@ _site/ .DS_Store .vscode/ .flattened-pom.xml + +node +node_modules +build +package.json +package-lock.json From 0f74912a1abfcf9d2ea8f87c338a7ffab69e8ade Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 20 Sep 2023 16:18:15 -0400 Subject: [PATCH 5/7] Updates docs to reference 4.0.x --- README.adoc | 2 +- docs/src/main/asciidoc/README.adoc | 6 +++--- docs/src/main/asciidoc/spring-cloud-zookeeper.adoc | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.adoc b/README.adoc index ba34bba3..1a54917a 100644 --- a/README.adoc +++ b/README.adoc @@ -397,7 +397,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 diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index 453a501b..ebcb87ff 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -1,4 +1,4 @@ -image::https://travis-ci.org/spring-cloud/spring-cloud-zookeeper.svg?branch=master[Build Status, link=https://travis-ci.org/spring-cloud/spring-cloud-zookeeper] +image::https://github.com/spring-cloud/spring-cloud-zookeeper/workflows/Build/badge.svg?style=svg["Actions Status", link="https://github.com/spring-cloud/spring-cloud-zookeeper/actions"] include::intro.adoc[] @@ -39,8 +39,8 @@ Doing so brings in the required Spring Cloud Maven repositories and Build. == Building -include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/building.adoc[] +include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/4.0.x/docs/src/main/asciidoc/building.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-zookeeper.adoc b/docs/src/main/asciidoc/spring-cloud-zookeeper.adoc index c6eed276..c460ee6d 100644 --- a/docs/src/main/asciidoc/spring-cloud-zookeeper.adoc +++ b/docs/src/main/asciidoc/spring-cloud-zookeeper.adoc @@ -140,11 +140,11 @@ If you would like to disable the Zookeeper Discovery Client, you can set === Using the DiscoveryClient 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] +https://docs.spring.io/spring-cloud-openfeign/docs/current/reference/html/[OpenFeign] (a REST client builder), -https://github.com/spring-cloud/spring-cloud-netflix/blob/master/docs/src/main/ascii[Spring +https://docs.spring.io/spring-cloud-commons/docs/current/reference/html/#rest-template-loadbalancer-client[Spring `RestTemplate`] and -https://cloud.spring.io/spring-cloud-commons/reference/html/#loadbalanced-webclient[Spring WebFlux], using logical service names instead of physical URLs. +https://docs.spring.io/spring-cloud-commons/docs/current/reference/html/#webclinet-loadbalancer-clientt[Spring WebFlux], using logical service names instead of physical URLs. You can also use the `org.springframework.cloud.client.discovery.DiscoveryClient`, which provides a simple API for discovery clients that is not specific to Netflix, as shown in @@ -238,11 +238,11 @@ The following topics cover how to work with Spring Cloud Zookeeper dependencies: Spring Cloud Zookeeper gives you a possibility to provide dependencies of your application as properties. As dependencies, you can understand other applications that are registered in Zookeeper and which you would like to call through -https://github.com/spring-cloud/spring-cloud-netflix/blob/master/docs/src/main/asciidoc/spring-cloud-netflix.adoc#spring-cloud-feign[Feign] +https://docs.spring.io/spring-cloud-openfeign/docs/current/reference/html/[OpenFeign] (a REST client builder), -https://github.com/spring-cloud/spring-cloud-netflix/blob/master/docs/src/main/ascii[Spring +https://docs.spring.io/spring-cloud-commons/docs/current/reference/html/#rest-template-loadbalancer-client[Spring `RestTemplate`] and -https://cloud.spring.io/spring-cloud-commons/reference/html/#loadbalanced-webclient[Spring WebFlux]. +https://docs.spring.io/spring-cloud-commons/docs/current/reference/html/#webclinet-loadbalancer-client[Spring WebFlux]. You can also use the Zookeeper Dependency Watchers functionality to control and monitor the state of your dependencies. @@ -585,7 +585,7 @@ public class CustomCuratorFrameworkConfig { } ---- Consult -https://github.com/spring-cloud/spring-cloud-zookeeper/blob/master/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfiguration.java[the ZookeeperAutoConfiguration class] +https://github.com/spring-cloud/spring-cloud-zookeeper/blob/4.0.x/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfiguration.java[the ZookeeperAutoConfiguration class] to see how the `CuratorFramework` bean's default configuration. Alternatively, you can add your credentials from a class that depends on the existing From b3a1c2e256826ca967e1f3bdf203925c55d55e36 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 21 Sep 2023 10:38:54 +0000 Subject: [PATCH 6/7] Bumping versions --- README.adoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.adoc b/README.adoc index 1a54917a..24d436f0 100644 --- a/README.adoc +++ b/README.adoc @@ -5,7 +5,7 @@ Edit the files in the src/main/asciidoc/ directory instead. //// -image::https://travis-ci.org/spring-cloud/spring-cloud-zookeeper.svg?branch=master[Build Status, link=https://travis-ci.org/spring-cloud/spring-cloud-zookeeper] +image::https://github.com/spring-cloud/spring-cloud-zookeeper/workflows/Build/badge.svg?style=svg["Actions Status", link="https://github.com/spring-cloud/spring-cloud-zookeeper/actions"] @@ -397,7 +397,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 @@ -414,7 +414,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. @@ -425,7 +425,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. From 6bd390803a10d4c21d8b182a3729883354d3c554 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Wed, 20 Dec 2023 14:16:52 -0500 Subject: [PATCH 7/7] Support to use classes registered in bootstrap context. Fixes #324 (#325) Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> --- .../ZookeeperConfigServerBootstrapper.java | 24 +-- ...nfigServerBootstrapperCustomizerTests.java | 171 ++++++++++++++++++ 2 files changed, 183 insertions(+), 12 deletions(-) create mode 100644 spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapperCustomizerTests.java diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapper.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapper.java index 5bdd11f4..7f18ed2b 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapper.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapper.java @@ -168,22 +168,22 @@ public class ZookeeperConfigServerBootstrapper implements BootstrapRegistryIniti return Collections.emptyList(); } - ZookeeperProperties properties = binder.bind(ZookeeperProperties.PREFIX, Bindable.of(ZookeeperProperties.class)) - .orElse(new ZookeeperProperties()); - RetryPolicy retryPolicy = new ExponentialBackoffRetry(properties.getBaseSleepTimeMs(), properties.getMaxRetries(), - properties.getMaxSleepMs()); + ZookeeperProperties properties = context.getOrElse(ZookeeperProperties.class, binder.bind(ZookeeperProperties.PREFIX, Bindable.of(ZookeeperProperties.class)) + .orElse(new ZookeeperProperties())); + RetryPolicy retryPolicy = context.getOrElse(RetryPolicy.class, new ExponentialBackoffRetry(properties.getBaseSleepTimeMs(), properties.getMaxRetries(), + properties.getMaxSleepMs())); try { - CuratorFramework curatorFramework = CuratorFactory.curatorFramework(properties, retryPolicy, Stream::of, - () -> null, () -> null); - InstanceSerializer serializer = new JsonInstanceSerializer<>(ZookeeperInstance.class); - ZookeeperDiscoveryProperties discoveryProperties = binder.bind(ZookeeperDiscoveryProperties.PREFIX, Bindable + CuratorFramework curatorFramework = context.getOrElse(CuratorFramework.class, CuratorFactory.curatorFramework(properties, retryPolicy, Stream::of, + () -> null, () -> null)); + InstanceSerializer serializer = context.getOrElse(InstanceSerializer.class, new JsonInstanceSerializer<>(ZookeeperInstance.class)); + ZookeeperDiscoveryProperties discoveryProperties = context.getOrElse(ZookeeperDiscoveryProperties.class, binder.bind(ZookeeperDiscoveryProperties.PREFIX, Bindable .of(ZookeeperDiscoveryProperties.class), bindHandler) - .orElseGet(() -> new ZookeeperDiscoveryProperties(new InetUtils(new InetUtilsProperties()))); - DefaultServiceDiscoveryCustomizer customizer = new DefaultServiceDiscoveryCustomizer(curatorFramework, discoveryProperties, serializer); + .orElseGet(() -> new ZookeeperDiscoveryProperties(new InetUtils(new InetUtilsProperties())))); + ServiceDiscoveryCustomizer customizer = context.getOrElse(ServiceDiscoveryCustomizer.class, new DefaultServiceDiscoveryCustomizer(curatorFramework, discoveryProperties, serializer)); ServiceDiscovery serviceDiscovery = customizer.customize(ServiceDiscoveryBuilder.builder(ZookeeperInstance.class)); - ZookeeperDependencies dependencies = binder.bind(ZookeeperDependencies.PREFIX, Bindable + ZookeeperDependencies dependencies = context.getOrElse(ZookeeperDependencies.class, binder.bind(ZookeeperDependencies.PREFIX, Bindable .of(ZookeeperDependencies.class), bindHandler) - .orElseGet(ZookeeperDependencies::new); + .orElseGet(ZookeeperDependencies::new)); return new ZookeeperDiscoveryClient(serviceDiscovery, dependencies, discoveryProperties).getInstances(serviceId); } catch (Exception e) { diff --git a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapperCustomizerTests.java b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapperCustomizerTests.java new file mode 100644 index 00000000..def56e56 --- /dev/null +++ b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapperCustomizerTests.java @@ -0,0 +1,171 @@ +/* + * Copyright 2015-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.zookeeper.discovery.configclient; + +import java.util.concurrent.atomic.AtomicReference; + +import org.apache.commons.logging.Log; +import org.apache.curator.RetryPolicy; +import org.apache.curator.drivers.TracerDriver; +import org.apache.curator.ensemble.EnsembleProvider; +import org.apache.curator.ensemble.fixed.FixedEnsembleProvider; +import org.apache.curator.framework.CuratorFrameworkFactory; +import org.apache.curator.retry.ExponentialBackoffRetry; +import org.apache.curator.utils.DefaultTracerDriver; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; + +import org.springframework.boot.BootstrapRegistry; +import org.springframework.boot.BootstrapRegistryInitializer; +import org.springframework.boot.SpringBootConfiguration; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +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.zookeeper.CuratorFrameworkCustomizer; +import org.springframework.cloud.zookeeper.ZookeeperProperties; +import org.springframework.cloud.zookeeper.discovery.ZookeeperDiscoveryClient; +import org.springframework.cloud.zookeeper.test.ZookeeperTestingServer; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.core.Ordered; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + +/** + * @author Ryan Baxter + */ +public class ZookeeperConfigServerBootstrapperCustomizerTests { + private ConfigurableApplicationContext context; + + @AfterEach + public void after() { + if (context != null) { + context.close(); + } + } + + @Test + public void enabledAddsInstanceProviderFn() { + AtomicReference bootstrapDiscoveryClient = new AtomicReference<>(); + BindHandlerBootstrapper bindHandlerBootstrapper = new BindHandlerBootstrapper(); + context = new SpringApplicationBuilder(ZookeeperConfigServerBootstrapperTests.TestConfig.class) + .listeners(new ZookeeperTestingServer()) + .properties("--server.port=0", "spring.cloud.config.discovery.enabled=true", + "spring.cloud.zookeeper.discovery.metadata[mymetadataprop]=mymetadataval", + "spring.cloud.service-registry.auto-registration.enabled=false") + .addBootstrapRegistryInitializer(bindHandlerBootstrapper) + .addBootstrapRegistryInitializer(registry -> registry.addCloseListener(event -> { + ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext() + .get(ConfigServerInstanceProvider.Function.class); + assertThat(providerFn.apply("id", event.getBootstrapContext() + .get(Binder.class), event.getBootstrapContext() + .get(BindHandler.class), mock(Log.class))).as("Should return empty list.") + .isNotNull(); + bootstrapDiscoveryClient.set(event.getBootstrapContext().get(ZookeeperDiscoveryClient.class)); + CuratorFrameworkCustomizer curatorFrameworkCustomizer = event.getBootstrapContext() + .get(CuratorFrameworkCustomizer.class); + assertThat(curatorFrameworkCustomizer).isInstanceOf(MyCuratorFrameworkCustomizer.class); + RetryPolicy retryPolicy = event.getBootstrapContext().get(RetryPolicy.class); + assertThat(retryPolicy).isInstanceOf(RetryPolicy.class); + EnsembleProvider ensembleProvider = event.getBootstrapContext().get(EnsembleProvider.class); + assertThat(ensembleProvider).isInstanceOf(MyEnsembleProvider.class); + TracerDriver tracerDriver = event.getBootstrapContext().get(TracerDriver.class); + assertThat(tracerDriver).isInstanceOf(MyTracerDriver.class); + })).run(); + + ZookeeperDiscoveryClient discoveryClient = context.getBean(ZookeeperDiscoveryClient.class); + + assertThat(discoveryClient == bootstrapDiscoveryClient.get()).isTrue(); + assertThat(bindHandlerBootstrapper.onSuccessCount).isGreaterThan(0); + } + + @SpringBootConfiguration + @EnableAutoConfiguration + static class TestConfig { + + } + + static class BindHandlerBootstrapper implements BootstrapRegistryInitializer, Ordered { + + private int onSuccessCount = 0; + + private static void registerIfAbsentAndEnabled( + BootstrapRegistry registry, Class type, BootstrapRegistry.InstanceSupplier supplier) { + registry.registerIfAbsent(type, supplier); + } + + @Override + public void initialize(BootstrapRegistry registry) { + registry.register(BindHandler.class, context -> new BindHandler() { + @Override + public Object onSuccess(ConfigurationPropertyName name, Bindable target, BindContext context, + Object result) { + onSuccessCount++; + return result; + } + }); + + registerIfAbsentAndEnabled(registry, RetryPolicy.class, context -> + new MyRetryPolicy(context.get(ZookeeperProperties.class))); + + registerIfAbsentAndEnabled(registry, CuratorFrameworkCustomizer.class, context -> + new MyCuratorFrameworkCustomizer()); + + registerIfAbsentAndEnabled(registry, EnsembleProvider.class, context -> + new MyEnsembleProvider(context.get(ZookeeperProperties.class))); + + registerIfAbsentAndEnabled(registry, TracerDriver.class, context -> + new MyTracerDriver()); + } + + @Override + public int getOrder() { + return Ordered.HIGHEST_PRECEDENCE; + } + } + + static class MyRetryPolicy extends ExponentialBackoffRetry { + + MyRetryPolicy(ZookeeperProperties properties) { + super(properties.getBaseSleepTimeMs(), properties.getMaxRetries(), properties.getMaxSleepMs()); + } + } + + static class MyCuratorFrameworkCustomizer implements CuratorFrameworkCustomizer { + @Override + public void customize(CuratorFrameworkFactory.Builder builder) { + + } + } + + static class MyEnsembleProvider extends FixedEnsembleProvider { + MyEnsembleProvider(ZookeeperProperties properties) { + super(properties.getConnectString()); + } + + } + + static class MyTracerDriver extends DefaultTracerDriver { + + } + +}