From da65b721134633ea8293d737c1cfb7bb2449e732 Mon Sep 17 00:00:00 2001
From: "everywhere.z" <weenyc31@163.com>
Date: Fri, 21 Oct 2022 18:21:35 +0800
Subject: [PATCH] =?UTF-8?q?enhancement=20#I5X1O6=20=E6=8F=90=E5=8D=87?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=80=A7=EF=BC=8C=E6=9B=B4=E6=96=B0=E4=B8=8D?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=9A=84=E7=AC=AC=E4=B8=89=E6=96=B9=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../liteflow-rule-etcd/pom.xml                | 11 ++++++++
 .../liteflow-rule-nacos/pom.xml               | 17 ++++--------
 liteflow-rule-plugin/liteflow-rule-zk/pom.xml | 21 +++++++++++++++
 pom.xml                                       | 27 ++++++++++++++++---
 4 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/liteflow-rule-plugin/liteflow-rule-etcd/pom.xml b/liteflow-rule-plugin/liteflow-rule-etcd/pom.xml
index b891a2cb5..60ed59a3b 100644
--- a/liteflow-rule-plugin/liteflow-rule-etcd/pom.xml
+++ b/liteflow-rule-plugin/liteflow-rule-etcd/pom.xml
@@ -23,6 +23,17 @@
         <dependency>
             <groupId>io.etcd</groupId>
             <artifactId>jetcd-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jetcd-grpc</artifactId>
+                    <groupId>io.etcd</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler</artifactId>
+            <version>${netty.version}</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/liteflow-rule-plugin/liteflow-rule-nacos/pom.xml b/liteflow-rule-plugin/liteflow-rule-nacos/pom.xml
index 9ce7edb33..930452e40 100644
--- a/liteflow-rule-plugin/liteflow-rule-nacos/pom.xml
+++ b/liteflow-rule-plugin/liteflow-rule-nacos/pom.xml
@@ -24,18 +24,11 @@
         <dependency>
             <groupId>com.alibaba.nacos</groupId>
             <artifactId>nacos-client</artifactId>
-            <version>1.2.1</version>
-            <!-- 版本冲突 , 排除低版本就近引入liteflow-core内部版本-->
-            <exclusions>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                </exclusion>
-            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>${httpclient.version}</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/liteflow-rule-plugin/liteflow-rule-zk/pom.xml b/liteflow-rule-plugin/liteflow-rule-zk/pom.xml
index dff987bcd..8aa6f15b1 100644
--- a/liteflow-rule-plugin/liteflow-rule-zk/pom.xml
+++ b/liteflow-rule-plugin/liteflow-rule-zk/pom.xml
@@ -43,5 +43,26 @@
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec</artifactId>
+            <version>${netty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-common</artifactId>
+            <version>${netty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler</artifactId>
+            <version>${netty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 4cef7d4e4..3c2a02c2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,21 +47,25 @@
 		<springboot.version>2.0.5.RELEASE</springboot.version>
 		<spring.version>5.0.9.RELEASE</spring.version>
 		<org.slf4j.version>1.7.32</org.slf4j.version>
-		<jackson.version>2.13.3</jackson.version>
-		<snakeyaml.version>1.29</snakeyaml.version>
+		<jackson.version>2.14.0-rc2</jackson.version>
+		<snakeyaml.version>1.32</snakeyaml.version>
 		<dom4j.version>2.1.3</dom4j.version>
-		<curator.version>5.1.0</curator.version>
+		<curator.version>5.3.0</curator.version>
 		<junit.version>4.12</junit.version>
-		<hutool-core.version>5.7.19</hutool-core.version>
+		<hutool-core.version>5.8.8</hutool-core.version>
 		<transmittable-thread-local.version>2.12.3</transmittable-thread-local.version>
 		<curator-test.version>5.1.0</curator-test.version>
 		<zkclient.version>0.10</zkclient.version>
 		<jetcd.version>0.7.3</jetcd.version>
+		<nacos.version>1.4.4</nacos.version>
 		<qlexpress.version>3.3.0</qlexpress.version>
 		<groovy.version>3.0.8</groovy.version>
 		<bytebuddy.version>1.11.13</bytebuddy.version>
 		<aspectjweaver.version>1.8.13</aspectjweaver.version>
 		<logback-classic.version>1.2.3</logback-classic.version>
+		<netty.version>4.1.84.Final</netty.version>
+		<guava.version>31.1-jre</guava.version>
+		<httpclient.version>4.5.13</httpclient.version>
 	</properties>
 
 	<dependencyManagement>
@@ -173,6 +177,21 @@
 				<artifactId>jetcd-core</artifactId>
 				<version>${jetcd.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>com.alibaba.nacos</groupId>
+				<artifactId>nacos-client</artifactId>
+				<version>1.4.4</version>
+				<exclusions>
+					<exclusion>
+						<groupId>com.fasterxml.jackson.core</groupId>
+						<artifactId>jackson-databind</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>com.fasterxml.jackson.core</groupId>
+						<artifactId>jackson-core</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
 			<dependency>
 				<groupId>com.alibaba</groupId>
 				<artifactId>QLExpress</artifactId>