This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 17e86ce5009a26da39a600d9ab3e506ca21f6106
Merge: ad61a068f4 352a0df89d
Author: wangxin813 <wangxin...@jd.com>
AuthorDate: Thu Jul 15 14:17:52 2021 +0800
Merge remote-tracking branch 'dubbo_rem/master'
dubbo-all/pom.xml | 8 +
dubbo-bom/pom.xml | 5 +
dubbo-compatible/pom.xml | 5 +
.../dubbo-configcenter-zookeeper/pom.xml | 5 +
.../ZookeeperDynamicConfigurationFactory.java | 6 +
.../zookeeper/ZookeeperMetadataReportFactory.java | 6 +
dubbo-registry/dubbo-registry-zookeeper/pom.xml | 7 +-
.../zookeeper/ZookeeperRegistryFactory.java | 8 +-
dubbo-remoting/dubbo-remoting-api/pom.xml | 2 +-
.../zookeeper}/AbstractZookeeperClient.java | 6 +-
.../zookeeper}/AbstractZookeeperTransporter.java | 10 +-
.../dubbo/remoting/zookeeper/ChildListener.java | 0
.../dubbo/remoting/zookeeper/DataListener.java | 0
.../apache/dubbo/remoting/zookeeper/EventType.java | 21 ---
.../dubbo/remoting/zookeeper/StateListener.java | 0
.../dubbo/remoting/zookeeper/ZookeeperClient.java | 0
.../remoting/zookeeper/ZookeeperTransporter.java | 30 +++-
.../pom.xml | 14 +-
.../curator5/Curator5ZookeeperClient.java} | 36 ++--
.../curator5/Curator5ZookeeperTransporter.java} | 16 +-
...e.dubbo.remoting.zookeeper.ZookeeperTransporter | 1 +
.../curator5/Curator5ZookeeperClientTest.java | 196 +++++++++++++++++++++
.../curator5/Curator5ZookeeperTransporterTest.java | 57 ++++++
.../support/AbstractZookeeperTransporterTest.java | 9 +-
dubbo-remoting/dubbo-remoting-zookeeper/pom.xml | 2 +-
.../zookeeper/curator/CuratorZookeeperClient.java | 2 +-
.../curator/CuratorZookeeperTransporter.java | 2 +-
.../support/AbstractZookeeperTransporterTest.java | 3 +-
dubbo-remoting/pom.xml | 3 +-
29 files changed, 384 insertions(+), 76 deletions(-)
