diff --git a/mode/type/cluster/repository/provider/consul/pom.xml b/mode/type/cluster/repository/provider/consul/pom.xml index ef9be694cd132..641b2d2162ccf 100644 --- a/mode/type/cluster/repository/provider/consul/pom.xml +++ b/mode/type/cluster/repository/provider/consul/pom.xml @@ -32,6 +32,12 @@ com.ecwid.consul consul-api ${consul.api.version} + + + org.apache.httpcomponents + httpcore + + org.apache.httpcomponents diff --git a/mode/type/cluster/repository/provider/consul/src/main/java/org/apache/shardingsphere/mode/repository/cluster/consul/ShardingSphereQueryParams.java b/mode/type/cluster/repository/provider/consul/src/main/java/org/apache/shardingsphere/mode/repository/cluster/consul/ShardingSphereQueryParams.java index f1110840f0bce..80715ffb5af62 100644 --- a/mode/type/cluster/repository/provider/consul/src/main/java/org/apache/shardingsphere/mode/repository/cluster/consul/ShardingSphereQueryParams.java +++ b/mode/type/cluster/repository/provider/consul/src/main/java/org/apache/shardingsphere/mode/repository/cluster/consul/ShardingSphereQueryParams.java @@ -18,7 +18,6 @@ package org.apache.shardingsphere.mode.repository.cluster.consul; import com.ecwid.consul.UrlParameters; -import com.ecwid.consul.Utils; import lombok.RequiredArgsConstructor; import java.util.ArrayList; @@ -42,7 +41,7 @@ public List toUrlParameters() { result.add(String.format("wait=%dms", TimeUnit.MILLISECONDS.toMillis(waitMillis))); } if (-1 != index) { - result.add(String.format("index=%s", Utils.toUnsignedString(index))); + result.add(String.format("index=%s", Long.toUnsignedString(index))); } return result; } diff --git a/mode/type/cluster/repository/provider/consul/src/main/java/org/apache/shardingsphere/mode/repository/cluster/consul/lock/ConsulDistributedLock.java b/mode/type/cluster/repository/provider/consul/src/main/java/org/apache/shardingsphere/mode/repository/cluster/consul/lock/ConsulDistributedLock.java index 18c43de83aacc..a91b8130243de 100644 --- a/mode/type/cluster/repository/provider/consul/src/main/java/org/apache/shardingsphere/mode/repository/cluster/consul/lock/ConsulDistributedLock.java +++ b/mode/type/cluster/repository/provider/consul/src/main/java/org/apache/shardingsphere/mode/repository/cluster/consul/lock/ConsulDistributedLock.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.mode.repository.cluster.consul.lock; import com.ecwid.consul.ConsulException; -import com.ecwid.consul.transport.RawResponse; +import com.ecwid.consul.transport.HttpResponse; import com.ecwid.consul.v1.ConsulClient; import com.ecwid.consul.v1.OperationException; import com.ecwid.consul.v1.QueryParams; @@ -133,7 +133,7 @@ private long waitUntilRelease(final long valueIndex, final long timeoutMillis) { } } - private Response getResponse(final RawResponse rawResponse) { + private Response getResponse(final HttpResponse rawResponse) { if (200 == rawResponse.getStatusCode()) { List value = JsonUtils.fromJsonString(rawResponse.getContent(), new TypeReference>() { }); diff --git a/pom.xml b/pom.xml index 75556ef6199b7..dea546a1551cb 100644 --- a/pom.xml +++ b/pom.xml @@ -106,11 +106,11 @@ 3.9.0 0.12.0 0.7.6 - 1.4.1 + 1.4.5 1.58.0 3.21.12 - 4.5.13 + 4.5.14 4.12.0 3.0.4