This is an automated email from the ASF dual-hosted git repository.
sunnianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new ac6d81174d7 Resolve conflict of repository-consul dependencies version
(#28818)
ac6d81174d7 is described below
commit ac6d81174d790ab7e067fec0b73897004887c0a8
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Oct 21 01:05:35 2023 +0800
Resolve conflict of repository-consul dependencies version (#28818)
* Resolve conflict of repository-consul dependencies version
* Resolve conflict of repository-consul dependencies version
* Resolve conflict of repository-consul dependencies version
* Resolve conflict of repository-consul dependencies version
* Resolve conflict of repository-consul dependencies version
---
.../cluster/repository/provider/consul/pom.xml | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/mode/type/cluster/repository/provider/consul/pom.xml
b/mode/type/cluster/repository/provider/consul/pom.xml
index 526214cfcc0..cbb61684276 100644
--- a/mode/type/cluster/repository/provider/consul/pom.xml
+++ b/mode/type/cluster/repository/provider/consul/pom.xml
@@ -31,6 +31,21 @@
<httpclient.version>4.5.13</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,12 @@
<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>
