From 0f74912a1abfcf9d2ea8f87c338a7ffab69e8ade Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 20 Sep 2023 16:18:15 -0400 Subject: [PATCH] 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