From 2fa34e7d5ab1e684a2cc36a69b40ae9b9eb5a093 Mon Sep 17 00:00:00 2001
From: zhangliang <zhangliang@apache.org>
Date: Fri, 20 Oct 2023 23:45:38 +0800
Subject: [PATCH 1/5] Resolve conflict of repository-consul dependencies
 version

---
 .../repository/provider/consul/pom.xml        | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/mode/type/cluster/repository/provider/consul/pom.xml b/mode/type/cluster/repository/provider/consul/pom.xml
index 526214cfcc03d..8cec1c6f509f4 100644
--- a/mode/type/cluster/repository/provider/consul/pom.xml
+++ b/mode/type/cluster/repository/provider/consul/pom.xml
@@ -27,10 +27,25 @@
     <name>${project.artifactId}</name>
     
     <properties>
-        <consul.api.version>1.4.1</consul.api.version>
-        <httpclient.version>4.5.13</httpclient.version>
+        <consul.api.version>1.4.5</consul.api.version>
+        <httpclient.version>4.5.14</httpclient.version>
     </properties>
     
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.ecwid.consul</groupId>
+                <artifactId>consul-api</artifactId>
+                <version>${consul.api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>${httpclient.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
@@ -48,17 +63,8 @@
         <dependency>
             <groupId>com.ecwid.consul</groupId>
             <artifactId>consul-api</artifactId>
-            <version>${consul.api.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>${httpclient.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>

From 64a54332c34224eaf53700bf3acf29794f23364f Mon Sep 17 00:00:00 2001
From: zhangliang <zhangliang@apache.org>
Date: Fri, 20 Oct 2023 23:50:52 +0800
Subject: [PATCH 2/5] Resolve conflict of repository-consul dependencies
 version

---
 mode/type/cluster/repository/provider/consul/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/type/cluster/repository/provider/consul/pom.xml b/mode/type/cluster/repository/provider/consul/pom.xml
index 8cec1c6f509f4..b8f80a11888dd 100644
--- a/mode/type/cluster/repository/provider/consul/pom.xml
+++ b/mode/type/cluster/repository/provider/consul/pom.xml
@@ -27,7 +27,7 @@
     <name>${project.artifactId}</name>
     
     <properties>
-        <consul.api.version>1.4.5</consul.api.version>
+        <consul.api.version>1.4.1</consul.api.version>
         <httpclient.version>4.5.14</httpclient.version>
     </properties>
     

From 8fcc26379cf70d27dd1634cf53db2758629d3003 Mon Sep 17 00:00:00 2001
From: zhangliang <zhangliang@apache.org>
Date: Fri, 20 Oct 2023 23:56:56 +0800
Subject: [PATCH 3/5] Resolve conflict of repository-consul dependencies
 version

---
 mode/type/cluster/repository/provider/consul/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/type/cluster/repository/provider/consul/pom.xml b/mode/type/cluster/repository/provider/consul/pom.xml
index b8f80a11888dd..c2ac1852abf56 100644
--- a/mode/type/cluster/repository/provider/consul/pom.xml
+++ b/mode/type/cluster/repository/provider/consul/pom.xml
@@ -28,7 +28,7 @@
     
     <properties>
         <consul.api.version>1.4.1</consul.api.version>
-        <httpclient.version>4.5.14</httpclient.version>
+        <httpclient.version>4.5.13</httpclient.version>
     </properties>
     
     <dependencyManagement>

From 86d9624e44e1d607b3209d038e4fa368538300cc Mon Sep 17 00:00:00 2001
From: zhangliang <zhangliang@apache.org>
Date: Sat, 21 Oct 2023 00:47:27 +0800
Subject: [PATCH 4/5] Resolve conflict of repository-consul dependencies
 version

---
 mode/type/cluster/repository/provider/consul/pom.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mode/type/cluster/repository/provider/consul/pom.xml b/mode/type/cluster/repository/provider/consul/pom.xml
index c2ac1852abf56..48606813c89f2 100644
--- a/mode/type/cluster/repository/provider/consul/pom.xml
+++ b/mode/type/cluster/repository/provider/consul/pom.xml
@@ -27,8 +27,8 @@
     <name>${project.artifactId}</name>
     
     <properties>
-        <consul.api.version>1.4.1</consul.api.version>
-        <httpclient.version>4.5.13</httpclient.version>
+        <consul.api.version>1.4.5</consul.api.version>
+        <httpclient.version>4.5.14</httpclient.version>
     </properties>
     
     <dependencyManagement>
@@ -64,6 +64,10 @@
             <groupId>com.ecwid.consul</groupId>
             <artifactId>consul-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
         
         <dependency>
             <groupId>org.awaitility</groupId>

From 94eabec30c53f264b00aeb8972665ff53556d6fa Mon Sep 17 00:00:00 2001
From: zhangliang <zhangliang@apache.org>
Date: Sat, 21 Oct 2023 00:51:38 +0800
Subject: [PATCH 5/5] Resolve conflict of repository-consul dependencies
 version

---
 mode/type/cluster/repository/provider/consul/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/type/cluster/repository/provider/consul/pom.xml b/mode/type/cluster/repository/provider/consul/pom.xml
index 48606813c89f2..cbb616842760e 100644
--- a/mode/type/cluster/repository/provider/consul/pom.xml
+++ b/mode/type/cluster/repository/provider/consul/pom.xml
@@ -27,8 +27,8 @@
     <name>${project.artifactId}</name>
     
     <properties>
-        <consul.api.version>1.4.5</consul.api.version>
-        <httpclient.version>4.5.14</httpclient.version>
+        <consul.api.version>1.4.1</consul.api.version>
+        <httpclient.version>4.5.13</httpclient.version>
     </properties>
     
     <dependencyManagement>