This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch 3.0-k8s in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.0-k8s by this push: new 8d2f1b0 upgrade grpc and jecd versions (#6612) 8d2f1b0 is described below commit 8d2f1b080a9b3cd5a751cf4ce7295c9264232c85 Author: Albumen Kevin <jhq0...@gmail.com> AuthorDate: Tue Aug 18 15:47:32 2020 +0800 upgrade grpc and jecd versions (#6612) --- .../support/etcd/EtcdDynamicConfigurationTest.java | 2 +- dubbo-dependencies-bom/pom.xml | 11 +++-------- dubbo-registry/dubbo-registry-dns/pom.xml | 16 ++++++++++++++++ .../dubbo/remoting/etcd/jetcd/JEtcdClientWrapper.java | 4 ++-- .../org/apache/dubbo/remoting/etcd/jetcd/LeaseTest.java | 4 ++-- 5 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dubbo-configcenter/dubbo-configcenter-etcd/src/test/java/org/apache/dubbo/configcenter/support/etcd/EtcdDynamicConfigurationTest.java b/dubbo-configcenter/dubbo-configcenter-etcd/src/test/java/org/apache/dubbo/configcenter/support/etcd/EtcdDynamicConfigurationTest.java index 86dd306..e6ed4b5 100644 --- a/dubbo-configcenter/dubbo-configcenter-etcd/src/test/java/org/apache/dubbo/configcenter/support/etcd/EtcdDynamicConfigurationTest.java +++ b/dubbo-configcenter/dubbo-configcenter-etcd/src/test/java/org/apache/dubbo/configcenter/support/etcd/EtcdDynamicConfigurationTest.java @@ -49,7 +49,7 @@ public class EtcdDynamicConfigurationTest { private static EtcdDynamicConfiguration config; - public EtcdCluster etcdCluster = EtcdClusterFactory.buildCluster(getClass().getSimpleName(), 3, false, false); + public EtcdCluster etcdCluster = EtcdClusterFactory.buildCluster(getClass().getSimpleName(), 3, false); private static Client client; diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 200e8e2..32a70ae 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -129,9 +129,9 @@ <rs_api_version>2.0</rs_api_version> <resteasy_version>3.0.19.Final</resteasy_version> <tomcat_embed_version>8.5.31</tomcat_embed_version> - <jetcd_version>0.4.1</jetcd_version> + <jetcd_version>0.5.3</jetcd_version> <nacos_version>1.3.1</nacos_version> - <grpc.version>1.22.1</grpc.version> + <grpc.version>1.31.1</grpc.version> <!-- Log libs --> <slf4j_version>1.7.25</slf4j_version> <jcl_version>1.2</jcl_version> @@ -154,7 +154,7 @@ <jaxb_version>2.2.7</jaxb_version> <activation_version>1.2.0</activation_version> <test_container_version>1.11.2</test_container_version> - <etcd_launcher_version>0.3.0</etcd_launcher_version> + <etcd_launcher_version>0.5.3</etcd_launcher_version> <hessian_lite_version>3.2.8</hessian_lite_version> <swagger_version>1.5.19</swagger_version> <spring_test_version>4.3.16.RELEASE</spring_test_version> @@ -471,11 +471,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>io.etcd</groupId> - <artifactId>jetcd-launcher</artifactId> - <version>${jetcd_version}</version> - </dependency> <!-- Log libs --> <dependency> <groupId>org.slf4j</groupId> diff --git a/dubbo-registry/dubbo-registry-dns/pom.xml b/dubbo-registry/dubbo-registry-dns/pom.xml index 4484f9a..54e526c 100644 --- a/dubbo-registry/dubbo-registry-dns/pom.xml +++ b/dubbo-registry/dubbo-registry-dns/pom.xml @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> diff --git a/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClientWrapper.java b/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClientWrapper.java index f1c0151..d6c5733 100644 --- a/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClientWrapper.java +++ b/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClientWrapper.java @@ -29,9 +29,7 @@ import org.apache.dubbo.remoting.etcd.StateListener; import io.etcd.jetcd.ByteSequence; import io.etcd.jetcd.Client; import io.etcd.jetcd.ClientBuilder; -import io.etcd.jetcd.CloseableClient; import io.etcd.jetcd.KeyValue; -import io.etcd.jetcd.Observers; import io.etcd.jetcd.common.exception.ErrorCode; import io.etcd.jetcd.common.exception.EtcdException; import io.etcd.jetcd.kv.GetResponse; @@ -39,6 +37,8 @@ import io.etcd.jetcd.kv.PutResponse; import io.etcd.jetcd.lease.LeaseKeepAliveResponse; import io.etcd.jetcd.options.GetOption; import io.etcd.jetcd.options.PutOption; +import io.etcd.jetcd.support.CloseableClient; +import io.etcd.jetcd.support.Observers; import io.grpc.ConnectivityState; import io.grpc.ManagedChannel; import io.grpc.Status; diff --git a/dubbo-remoting/dubbo-remoting-etcd3/src/test/java/org/apache/dubbo/remoting/etcd/jetcd/LeaseTest.java b/dubbo-remoting/dubbo-remoting-etcd3/src/test/java/org/apache/dubbo/remoting/etcd/jetcd/LeaseTest.java index 2b378ef..898e1a9 100644 --- a/dubbo-remoting/dubbo-remoting-etcd3/src/test/java/org/apache/dubbo/remoting/etcd/jetcd/LeaseTest.java +++ b/dubbo-remoting/dubbo-remoting-etcd3/src/test/java/org/apache/dubbo/remoting/etcd/jetcd/LeaseTest.java @@ -36,14 +36,14 @@ package org.apache.dubbo.remoting.etcd.jetcd; import com.google.common.base.Charsets; import io.etcd.jetcd.ByteSequence; import io.etcd.jetcd.Client; -import io.etcd.jetcd.CloseableClient; import io.etcd.jetcd.KV; import io.etcd.jetcd.Lease; -import io.etcd.jetcd.Observers; import io.etcd.jetcd.launcher.EtcdCluster; import io.etcd.jetcd.launcher.EtcdClusterFactory; import io.etcd.jetcd.lease.LeaseKeepAliveResponse; import io.etcd.jetcd.options.PutOption; +import io.etcd.jetcd.support.CloseableClient; +import io.etcd.jetcd.support.Observers; import io.grpc.stub.StreamObserver; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach;