Skip to content

Commit

Permalink
Resolve conflict of repository-consul dependencies version
Browse files Browse the repository at this point in the history
  • Loading branch information
terrymanu committed Oct 20, 2023
1 parent 0d3f10e commit 2fa34e7
Showing 1 changed file with 18 additions and 12 deletions.
30 changes: 18 additions & 12 deletions mode/type/cluster/repository/provider/consul/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down

0 comments on commit 2fa34e7

Please sign in to comment.