From ac6d81174d790ab7e067fec0b73897004887c0a8 Mon Sep 17 00:00:00 2001 From: Liang Zhang Date: Sat, 21 Oct 2023 01:05:35 +0800 Subject: [PATCH] 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 --- .../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 526214cfcc03d..cbb616842760e 100644 --- a/mode/type/cluster/repository/provider/consul/pom.xml +++ b/mode/type/cluster/repository/provider/consul/pom.xml @@ -31,6 +31,21 @@ 4.5.13 + + + + com.ecwid.consul + consul-api + ${consul.api.version} + + + org.apache.httpcomponents + httpclient + ${httpclient.version} + + + + org.apache.shardingsphere @@ -48,17 +63,12 @@ com.ecwid.consul consul-api - ${consul.api.version} org.apache.httpcomponents httpclient - ${httpclient.version} - - - com.google.code.gson - gson + org.awaitility awaitility