From 7a93f33b8474fe4537556e38cc91117e7b243d22 Mon Sep 17 00:00:00 2001
From: slankka <slankka@users.noreply.github.com>
Date: Wed, 28 Jul 2021 20:05:09 +0800
Subject: [PATCH 1/2] Update spring-cloud-zookeeper.adoc

Curator 5.x not supports ZooKeeper 3.4.x, if use ZooKeeper 3.4.12, curator will change to 4.2.0
---
 .../main/asciidoc/spring-cloud-zookeeper.adoc | 94 +++++++++++++++----
 1 file changed, 74 insertions(+), 20 deletions(-)

diff --git a/docs/src/main/asciidoc/spring-cloud-zookeeper.adoc b/docs/src/main/asciidoc/spring-cloud-zookeeper.adoc
index c6eed276..8e09eeea 100644
--- a/docs/src/main/asciidoc/spring-cloud-zookeeper.adoc
+++ b/docs/src/main/asciidoc/spring-cloud-zookeeper.adoc
@@ -23,32 +23,86 @@ Starting with Curator 4.0 both versions of Zookeeper are supported via the same
 
 In case you are integrating with version 3.4 you need to change the Zookeeper dependency
 that comes shipped with `curator`, and thus `spring-cloud-zookeeper`.
-To do so simply exclude that dependency and add the 3.4.x version like shown below.
+To do so exclude that dependency and add the 3.4.x version like shown below, 
+Note that ZooKeeper 3.4.x is no longer supported by Curator 5.0,
+please check https://curator.apache.org/zk-compatibility-34.html[documentation].
+There will be a little steps, you need also change curator to 4.2.0.
+
+
 
 .maven
 [source,xml,indent=0]
 ----
-<dependency>
-    <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-starter-zookeeper-all</artifactId>
-    <exclusions>
-        <exclusion>
+<properties>
+        <curator.version>4.2.0</curator.version>
+</properties>
+<dependencies>
+   <dependency>
+        <groupId>org.springframework.cloud</groupId>
+        <artifactId>spring-cloud-starter-zookeeper-all</artifactId>
+    </dependency>
+
+    <dependency>
+        <groupId>org.apache.zookeeper</groupId>
+        <artifactId>zookeeper</artifactId>
+        <version>3.4.12</version>
+    </dependency>
+</dependencies>
+
+<dependencyManagement>
+     <dependencies>
+        <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-recipes</artifactId>
+            <version>${curator.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
-        </exclusion>
-    </exclusions>
-</dependency>
-<dependency>
-    <groupId>org.apache.zookeeper</groupId>
-    <artifactId>zookeeper</artifactId>
-    <version>3.4.12</version>
-    <exclusions>
-        <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-        </exclusion>
-    </exclusions>
-</dependency>
+            <version>3.4.12</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>log4j</artifactId>
+                    <groupId>log4j</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-x-async</artifactId>
+            <version>${curator.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-x-discovery</artifactId>
+            <version>${curator.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-framework</artifactId>
+            <version>${curator.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-client</artifactId>
+            <version>${curator.version}</version>
+        </dependency>
+    </dependencies>
+</dependencyManagement>
 ----
 
 .gradle

From 3eada457d5474a3e293af890be6d4b94fc1caf73 Mon Sep 17 00:00:00 2001
From: slankka <slankka@users.noreply.github.com>
Date: Wed, 28 Jul 2021 20:09:29 +0800
Subject: [PATCH 2/2] Update spring-cloud-zookeeper.adoc

---
 docs/src/main/asciidoc/spring-cloud-zookeeper.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/main/asciidoc/spring-cloud-zookeeper.adoc b/docs/src/main/asciidoc/spring-cloud-zookeeper.adoc
index 8e09eeea..b050731b 100644
--- a/docs/src/main/asciidoc/spring-cloud-zookeeper.adoc
+++ b/docs/src/main/asciidoc/spring-cloud-zookeeper.adoc
@@ -26,7 +26,7 @@ that comes shipped with `curator`, and thus `spring-cloud-zookeeper`.
 To do so exclude that dependency and add the 3.4.x version like shown below, 
 Note that ZooKeeper 3.4.x is no longer supported by Curator 5.0,
 please check https://curator.apache.org/zk-compatibility-34.html[documentation].
-There will be a little steps, you need also change curator to 4.2.0.
+There will be a few more steps, you need to change curator version to 4.2.0.