You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2020/08/27 08:27:34 UTC
[dubbo-spi-extensions] branch master updated (1fa6ce0 -> 7f404f6)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-spi-extensions.git.
from 1fa6ce0 unify parent pom version to {revision}
new c1b0fd9 update version to 3.0.0-SNAPSHOT
new 408c748 add travis job
new 7f404f6 fix service discovery impls
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 22 ++++++++++++++++++++++
README.md | 1 +
dubbo-all/pom.xml | 2 +-
.../dubbo-configcenter-consul/pom.xml | 2 +-
.../dubbo-configcenter-etcd/pom.xml | 2 +-
dubbo-spi-container/dubbo-container-log4j/pom.xml | 2 +-
.../dubbo-container-logback/pom.xml | 2 +-
.../dubbo-metadata-report-consul/pom.xml | 2 +-
.../dubbo-metadata-report-etcd/pom.xml | 2 +-
dubbo-spi-registry/dubbo-registry-consul/pom.xml | 2 +-
.../registry/consul/ConsulServiceDiscovery.java | 19 +++++++++++--------
dubbo-spi-registry/dubbo-registry-default/pom.xml | 2 +-
dubbo-spi-registry/dubbo-registry-etcd3/pom.xml | 2 +-
.../dubbo/registry/etcd/EtcdServiceDiscovery.java | 7 +++++--
dubbo-spi-registry/dubbo-registry-eureka/pom.xml | 2 +-
.../registry/eureka/EurekaServiceDiscovery.java | 5 ++++-
dubbo-spi-registry/dubbo-registry-redis/pom.xml | 2 +-
dubbo-spi-registry/dubbo-registry-sofa/pom.xml | 2 +-
dubbo-spi-remoting/dubbo-remoting-etcd3/pom.xml | 2 +-
dubbo-spi-remoting/dubbo-remoting-grizzly/pom.xml | 2 +-
dubbo-spi-remoting/dubbo-remoting-http/pom.xml | 2 +-
dubbo-spi-remoting/dubbo-remoting-mina/pom.xml | 2 +-
dubbo-spi-remoting/dubbo-remoting-p2p/pom.xml | 2 +-
dubbo-spi-rpc/dubbo-rpc-hessian/pom.xml | 2 +-
dubbo-spi-rpc/dubbo-rpc-http/pom.xml | 2 +-
dubbo-spi-rpc/dubbo-rpc-memcached/pom.xml | 2 +-
dubbo-spi-rpc/dubbo-rpc-native-thrift/pom.xml | 4 ++--
dubbo-spi-rpc/dubbo-rpc-redis/pom.xml | 2 +-
dubbo-spi-rpc/dubbo-rpc-rmi/pom.xml | 2 +-
dubbo-spi-rpc/dubbo-rpc-thrift/pom.xml | 2 +-
dubbo-spi-rpc/dubbo-rpc-webservice/pom.xml | 2 +-
dubbo-spi-rpc/dubbo-rpc-xml/pom.xml | 2 +-
.../dubbo-serialization-avro/pom.xml | 2 +-
.../dubbo-serialization-fastjson/pom.xml | 2 +-
.../dubbo-serialization-fst/pom.xml | 2 +-
.../dubbo-serialization-gson/pom.xml | 2 +-
.../dubbo-serialization-kryo/pom.xml | 2 +-
.../dubbo-serialization-native-hession/pom.xml | 2 +-
.../dubbo-serialization-protobuf/pom.xml | 2 +-
.../dubbo-serialization-protostuff/pom.xml | 2 +-
.../dubbo-serialization-test/pom.xml | 2 +-
41 files changed, 80 insertions(+), 48 deletions(-)
create mode 100644 .travis.yml
[dubbo-spi-extensions] 01/03: update version to 3.0.0-SNAPSHOT
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-spi-extensions.git
commit c1b0fd9c5350005e52c98d5405166237223a041a
Author: ken.lj <ke...@gmail.com>
AuthorDate: Thu Aug 27 15:11:55 2020 +0800
update version to 3.0.0-SNAPSHOT
---
dubbo-all/pom.xml | 2 +-
dubbo-spi-configcenter/dubbo-configcenter-consul/pom.xml | 2 +-
dubbo-spi-configcenter/dubbo-configcenter-etcd/pom.xml | 2 +-
dubbo-spi-container/dubbo-container-log4j/pom.xml | 2 +-
dubbo-spi-container/dubbo-container-logback/pom.xml | 2 +-
dubbo-spi-metadata/dubbo-metadata-report-consul/pom.xml | 2 +-
dubbo-spi-metadata/dubbo-metadata-report-etcd/pom.xml | 2 +-
dubbo-spi-registry/dubbo-registry-consul/pom.xml | 2 +-
dubbo-spi-registry/dubbo-registry-default/pom.xml | 2 +-
dubbo-spi-registry/dubbo-registry-etcd3/pom.xml | 2 +-
dubbo-spi-registry/dubbo-registry-eureka/pom.xml | 2 +-
dubbo-spi-registry/dubbo-registry-redis/pom.xml | 2 +-
dubbo-spi-registry/dubbo-registry-sofa/pom.xml | 2 +-
dubbo-spi-remoting/dubbo-remoting-etcd3/pom.xml | 2 +-
dubbo-spi-remoting/dubbo-remoting-grizzly/pom.xml | 2 +-
dubbo-spi-remoting/dubbo-remoting-http/pom.xml | 2 +-
dubbo-spi-remoting/dubbo-remoting-mina/pom.xml | 2 +-
dubbo-spi-remoting/dubbo-remoting-p2p/pom.xml | 2 +-
dubbo-spi-rpc/dubbo-rpc-hessian/pom.xml | 2 +-
dubbo-spi-rpc/dubbo-rpc-http/pom.xml | 2 +-
dubbo-spi-rpc/dubbo-rpc-memcached/pom.xml | 2 +-
dubbo-spi-rpc/dubbo-rpc-native-thrift/pom.xml | 4 ++--
dubbo-spi-rpc/dubbo-rpc-redis/pom.xml | 2 +-
dubbo-spi-rpc/dubbo-rpc-rmi/pom.xml | 2 +-
dubbo-spi-rpc/dubbo-rpc-thrift/pom.xml | 2 +-
dubbo-spi-rpc/dubbo-rpc-webservice/pom.xml | 2 +-
dubbo-spi-rpc/dubbo-rpc-xml/pom.xml | 2 +-
dubbo-spi-serialization/dubbo-serialization-avro/pom.xml | 2 +-
dubbo-spi-serialization/dubbo-serialization-fastjson/pom.xml | 2 +-
dubbo-spi-serialization/dubbo-serialization-fst/pom.xml | 2 +-
dubbo-spi-serialization/dubbo-serialization-gson/pom.xml | 2 +-
dubbo-spi-serialization/dubbo-serialization-kryo/pom.xml | 2 +-
dubbo-spi-serialization/dubbo-serialization-native-hession/pom.xml | 2 +-
dubbo-spi-serialization/dubbo-serialization-protobuf/pom.xml | 2 +-
dubbo-spi-serialization/dubbo-serialization-protostuff/pom.xml | 2 +-
dubbo-spi-serialization/dubbo-serialization-test/pom.xml | 2 +-
36 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/dubbo-all/pom.xml b/dubbo-all/pom.xml
index 495ef55..93898ca 100644
--- a/dubbo-all/pom.xml
+++ b/dubbo-all/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-parent</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-all</artifactId>
<packaging>jar</packaging>
diff --git a/dubbo-spi-configcenter/dubbo-configcenter-consul/pom.xml b/dubbo-spi-configcenter/dubbo-configcenter-consul/pom.xml
index 674728c..3349bff 100644
--- a/dubbo-spi-configcenter/dubbo-configcenter-consul/pom.xml
+++ b/dubbo-spi-configcenter/dubbo-configcenter-consul/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-configcenter</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-configcenter-consul</artifactId>
diff --git a/dubbo-spi-configcenter/dubbo-configcenter-etcd/pom.xml b/dubbo-spi-configcenter/dubbo-configcenter-etcd/pom.xml
index 22d5f6d..9fcc2fe 100644
--- a/dubbo-spi-configcenter/dubbo-configcenter-etcd/pom.xml
+++ b/dubbo-spi-configcenter/dubbo-configcenter-etcd/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-configcenter</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-configcenter-etcd</artifactId>
diff --git a/dubbo-spi-container/dubbo-container-log4j/pom.xml b/dubbo-spi-container/dubbo-container-log4j/pom.xml
index d4503df..1b5b3d2 100644
--- a/dubbo-spi-container/dubbo-container-log4j/pom.xml
+++ b/dubbo-spi-container/dubbo-container-log4j/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-container</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-container-log4j</artifactId>
<packaging>jar</packaging>
diff --git a/dubbo-spi-container/dubbo-container-logback/pom.xml b/dubbo-spi-container/dubbo-container-logback/pom.xml
index a6f7014..d4437eb 100644
--- a/dubbo-spi-container/dubbo-container-logback/pom.xml
+++ b/dubbo-spi-container/dubbo-container-logback/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-container</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-container-logback</artifactId>
<packaging>jar</packaging>
diff --git a/dubbo-spi-metadata/dubbo-metadata-report-consul/pom.xml b/dubbo-spi-metadata/dubbo-metadata-report-consul/pom.xml
index 215fabc..4c3cc36 100644
--- a/dubbo-spi-metadata/dubbo-metadata-report-consul/pom.xml
+++ b/dubbo-spi-metadata/dubbo-metadata-report-consul/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-metadata</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/dubbo-spi-metadata/dubbo-metadata-report-etcd/pom.xml b/dubbo-spi-metadata/dubbo-metadata-report-etcd/pom.xml
index 0b53419..675257f 100644
--- a/dubbo-spi-metadata/dubbo-metadata-report-etcd/pom.xml
+++ b/dubbo-spi-metadata/dubbo-metadata-report-etcd/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-metadata</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/dubbo-spi-registry/dubbo-registry-consul/pom.xml b/dubbo-spi-registry/dubbo-registry-consul/pom.xml
index 090c3e6..43b3180 100644
--- a/dubbo-spi-registry/dubbo-registry-consul/pom.xml
+++ b/dubbo-spi-registry/dubbo-registry-consul/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>dubbo-registry</artifactId>
<groupId>org.apache.dubbo</groupId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/dubbo-spi-registry/dubbo-registry-default/pom.xml b/dubbo-spi-registry/dubbo-registry-default/pom.xml
index 37df8f2..1dd05a9 100644
--- a/dubbo-spi-registry/dubbo-registry-default/pom.xml
+++ b/dubbo-spi-registry/dubbo-registry-default/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-registry</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-registry-default</artifactId>
<packaging>jar</packaging>
diff --git a/dubbo-spi-registry/dubbo-registry-etcd3/pom.xml b/dubbo-spi-registry/dubbo-registry-etcd3/pom.xml
index 6d9d60c..510ae33 100644
--- a/dubbo-spi-registry/dubbo-registry-etcd3/pom.xml
+++ b/dubbo-spi-registry/dubbo-registry-etcd3/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>dubbo-registry</artifactId>
<groupId>org.apache.dubbo</groupId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-registry-etcd3</artifactId>
diff --git a/dubbo-spi-registry/dubbo-registry-eureka/pom.xml b/dubbo-spi-registry/dubbo-registry-eureka/pom.xml
index b2a6abe..c71f21e 100644
--- a/dubbo-spi-registry/dubbo-registry-eureka/pom.xml
+++ b/dubbo-spi-registry/dubbo-registry-eureka/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-registry</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-registry-eureka</artifactId>
diff --git a/dubbo-spi-registry/dubbo-registry-redis/pom.xml b/dubbo-spi-registry/dubbo-registry-redis/pom.xml
index fe6bd40..a8e2ec0 100644
--- a/dubbo-spi-registry/dubbo-registry-redis/pom.xml
+++ b/dubbo-spi-registry/dubbo-registry-redis/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-registry</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-registry-redis</artifactId>
<packaging>jar</packaging>
diff --git a/dubbo-spi-registry/dubbo-registry-sofa/pom.xml b/dubbo-spi-registry/dubbo-registry-sofa/pom.xml
index 66dc846..109a3c0 100644
--- a/dubbo-spi-registry/dubbo-registry-sofa/pom.xml
+++ b/dubbo-spi-registry/dubbo-registry-sofa/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-registry</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/dubbo-spi-remoting/dubbo-remoting-etcd3/pom.xml b/dubbo-spi-remoting/dubbo-remoting-etcd3/pom.xml
index e7428e0..1fab42b 100644
--- a/dubbo-spi-remoting/dubbo-remoting-etcd3/pom.xml
+++ b/dubbo-spi-remoting/dubbo-remoting-etcd3/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>dubbo-remoting</artifactId>
<groupId>org.apache.dubbo</groupId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-remoting-etcd3</artifactId>
<packaging>jar</packaging>
diff --git a/dubbo-spi-remoting/dubbo-remoting-grizzly/pom.xml b/dubbo-spi-remoting/dubbo-remoting-grizzly/pom.xml
index cd18536..5162711 100644
--- a/dubbo-spi-remoting/dubbo-remoting-grizzly/pom.xml
+++ b/dubbo-spi-remoting/dubbo-remoting-grizzly/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-remoting</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-remoting-grizzly</artifactId>
<packaging>jar</packaging>
diff --git a/dubbo-spi-remoting/dubbo-remoting-http/pom.xml b/dubbo-spi-remoting/dubbo-remoting-http/pom.xml
index 19c8220..1bcdca2 100644
--- a/dubbo-spi-remoting/dubbo-remoting-http/pom.xml
+++ b/dubbo-spi-remoting/dubbo-remoting-http/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-remoting</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-remoting-http</artifactId>
<packaging>jar</packaging>
diff --git a/dubbo-spi-remoting/dubbo-remoting-mina/pom.xml b/dubbo-spi-remoting/dubbo-remoting-mina/pom.xml
index 4808a17..f36ce1b 100644
--- a/dubbo-spi-remoting/dubbo-remoting-mina/pom.xml
+++ b/dubbo-spi-remoting/dubbo-remoting-mina/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-remoting</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-remoting-mina</artifactId>
<packaging>jar</packaging>
diff --git a/dubbo-spi-remoting/dubbo-remoting-p2p/pom.xml b/dubbo-spi-remoting/dubbo-remoting-p2p/pom.xml
index f947606..bfda7ad 100644
--- a/dubbo-spi-remoting/dubbo-remoting-p2p/pom.xml
+++ b/dubbo-spi-remoting/dubbo-remoting-p2p/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-remoting</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-remoting-p2p</artifactId>
<packaging>jar</packaging>
diff --git a/dubbo-spi-rpc/dubbo-rpc-hessian/pom.xml b/dubbo-spi-rpc/dubbo-rpc-hessian/pom.xml
index 99ef99d..8c0ac96 100644
--- a/dubbo-spi-rpc/dubbo-rpc-hessian/pom.xml
+++ b/dubbo-spi-rpc/dubbo-rpc-hessian/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-rpc</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-rpc-hessian</artifactId>
<packaging>jar</packaging>
diff --git a/dubbo-spi-rpc/dubbo-rpc-http/pom.xml b/dubbo-spi-rpc/dubbo-rpc-http/pom.xml
index 8552d73..5785259 100644
--- a/dubbo-spi-rpc/dubbo-rpc-http/pom.xml
+++ b/dubbo-spi-rpc/dubbo-rpc-http/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>dubbo-rpc</artifactId>
<groupId>org.apache.dubbo</groupId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/dubbo-spi-rpc/dubbo-rpc-memcached/pom.xml b/dubbo-spi-rpc/dubbo-rpc-memcached/pom.xml
index bcfeea6..94ef107 100644
--- a/dubbo-spi-rpc/dubbo-rpc-memcached/pom.xml
+++ b/dubbo-spi-rpc/dubbo-rpc-memcached/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-rpc</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-rpc-memcached</artifactId>
<packaging>jar</packaging>
diff --git a/dubbo-spi-rpc/dubbo-rpc-native-thrift/pom.xml b/dubbo-spi-rpc/dubbo-rpc-native-thrift/pom.xml
index bcc3cf9..41b8186 100644
--- a/dubbo-spi-rpc/dubbo-rpc-native-thrift/pom.xml
+++ b/dubbo-spi-rpc/dubbo-rpc-native-thrift/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-rpc</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-rpc-native-thrift</artifactId>
<packaging>jar</packaging>
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-serialization-jdk</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/dubbo-spi-rpc/dubbo-rpc-redis/pom.xml b/dubbo-spi-rpc/dubbo-rpc-redis/pom.xml
index 8145d31..5fad732 100644
--- a/dubbo-spi-rpc/dubbo-rpc-redis/pom.xml
+++ b/dubbo-spi-rpc/dubbo-rpc-redis/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-rpc</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-rpc-redis</artifactId>
<packaging>jar</packaging>
diff --git a/dubbo-spi-rpc/dubbo-rpc-rmi/pom.xml b/dubbo-spi-rpc/dubbo-rpc-rmi/pom.xml
index 7e560b2..3af40ac 100644
--- a/dubbo-spi-rpc/dubbo-rpc-rmi/pom.xml
+++ b/dubbo-spi-rpc/dubbo-rpc-rmi/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-rpc</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-rpc-rmi</artifactId>
<packaging>jar</packaging>
diff --git a/dubbo-spi-rpc/dubbo-rpc-thrift/pom.xml b/dubbo-spi-rpc/dubbo-rpc-thrift/pom.xml
index d6e20ed..4aa545f 100644
--- a/dubbo-spi-rpc/dubbo-rpc-thrift/pom.xml
+++ b/dubbo-spi-rpc/dubbo-rpc-thrift/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-rpc</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-rpc-thrift</artifactId>
<packaging>jar</packaging>
diff --git a/dubbo-spi-rpc/dubbo-rpc-webservice/pom.xml b/dubbo-spi-rpc/dubbo-rpc-webservice/pom.xml
index 70078f8..fab4642 100644
--- a/dubbo-spi-rpc/dubbo-rpc-webservice/pom.xml
+++ b/dubbo-spi-rpc/dubbo-rpc-webservice/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-rpc</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-rpc-webservice</artifactId>
<packaging>jar</packaging>
diff --git a/dubbo-spi-rpc/dubbo-rpc-xml/pom.xml b/dubbo-spi-rpc/dubbo-rpc-xml/pom.xml
index 9afede9..ea8ea27 100644
--- a/dubbo-spi-rpc/dubbo-rpc-xml/pom.xml
+++ b/dubbo-spi-rpc/dubbo-rpc-xml/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-rpc</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-rpc-xml</artifactId>
diff --git a/dubbo-spi-serialization/dubbo-serialization-avro/pom.xml b/dubbo-spi-serialization/dubbo-serialization-avro/pom.xml
index 908c49e..91ee1bc 100644
--- a/dubbo-spi-serialization/dubbo-serialization-avro/pom.xml
+++ b/dubbo-spi-serialization/dubbo-serialization-avro/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-serialization</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-serialization-avro</artifactId>
<packaging>jar</packaging>
diff --git a/dubbo-spi-serialization/dubbo-serialization-fastjson/pom.xml b/dubbo-spi-serialization/dubbo-serialization-fastjson/pom.xml
index 6553abd..93b9879 100644
--- a/dubbo-spi-serialization/dubbo-serialization-fastjson/pom.xml
+++ b/dubbo-spi-serialization/dubbo-serialization-fastjson/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-serialization</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-serialization-fastjson</artifactId>
<packaging>jar</packaging>
diff --git a/dubbo-spi-serialization/dubbo-serialization-fst/pom.xml b/dubbo-spi-serialization/dubbo-serialization-fst/pom.xml
index 1f2936e..f998b9d 100644
--- a/dubbo-spi-serialization/dubbo-serialization-fst/pom.xml
+++ b/dubbo-spi-serialization/dubbo-serialization-fst/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-serialization</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-serialization-fst</artifactId>
<packaging>jar</packaging>
diff --git a/dubbo-spi-serialization/dubbo-serialization-gson/pom.xml b/dubbo-spi-serialization/dubbo-serialization-gson/pom.xml
index 3822d37..dfa8845 100644
--- a/dubbo-spi-serialization/dubbo-serialization-gson/pom.xml
+++ b/dubbo-spi-serialization/dubbo-serialization-gson/pom.xml
@@ -19,7 +19,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
<parent>
<artifactId>dubbo-serialization</artifactId>
<groupId>org.apache.dubbo</groupId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-serialization-gson</artifactId>
<packaging>jar</packaging>
diff --git a/dubbo-spi-serialization/dubbo-serialization-kryo/pom.xml b/dubbo-spi-serialization/dubbo-serialization-kryo/pom.xml
index 86b5083..ee9c1fc 100644
--- a/dubbo-spi-serialization/dubbo-serialization-kryo/pom.xml
+++ b/dubbo-spi-serialization/dubbo-serialization-kryo/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-serialization</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-serialization-kryo</artifactId>
<packaging>jar</packaging>
diff --git a/dubbo-spi-serialization/dubbo-serialization-native-hession/pom.xml b/dubbo-spi-serialization/dubbo-serialization-native-hession/pom.xml
index 5293b29..66fdf9e 100644
--- a/dubbo-spi-serialization/dubbo-serialization-native-hession/pom.xml
+++ b/dubbo-spi-serialization/dubbo-serialization-native-hession/pom.xml
@@ -19,7 +19,7 @@ limitations under the License.
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-serialization</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/dubbo-spi-serialization/dubbo-serialization-protobuf/pom.xml b/dubbo-spi-serialization/dubbo-serialization-protobuf/pom.xml
index c268d18..af501b4 100644
--- a/dubbo-spi-serialization/dubbo-serialization-protobuf/pom.xml
+++ b/dubbo-spi-serialization/dubbo-serialization-protobuf/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-serialization</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-serialization-protobuf</artifactId>
<packaging>jar</packaging>
diff --git a/dubbo-spi-serialization/dubbo-serialization-protostuff/pom.xml b/dubbo-spi-serialization/dubbo-serialization-protostuff/pom.xml
index 0631f13..45980d0 100644
--- a/dubbo-spi-serialization/dubbo-serialization-protostuff/pom.xml
+++ b/dubbo-spi-serialization/dubbo-serialization-protostuff/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-serialization</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>dubbo-serialization-protostuff</artifactId>
diff --git a/dubbo-spi-serialization/dubbo-serialization-test/pom.xml b/dubbo-spi-serialization/dubbo-serialization-test/pom.xml
index aac9fb0..59c9891 100644
--- a/dubbo-spi-serialization/dubbo-serialization-test/pom.xml
+++ b/dubbo-spi-serialization/dubbo-serialization-test/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-serialization</artifactId>
- <version>${revision}</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
[dubbo-spi-extensions] 02/03: add travis job
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-spi-extensions.git
commit 408c748986ab7995efbe8a8e5d2f521aa8783f6e
Author: ken.lj <ke...@gmail.com>
AuthorDate: Thu Aug 27 16:26:58 2020 +0800
add travis job
---
.travis.yml | 22 ++++++++++++++++++++++
README.md | 1 +
2 files changed, 23 insertions(+)
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..f13d3e6
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,22 @@
+language: java
+sudo: false # faster builds
+
+jdk:
+ - openjdk11
+ - openjdk8
+
+cache:
+ directories:
+ - $HOME/.m2
+
+install: true
+
+script:
+ - rm -rf $HOME/.m2/repository/org/glassfish/javax.el/3.0.1-b08
+ - travis_wait 30 ./mvnw --batch-mode --no-transfer-progress clean install -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true
+
+after_success:
+ - bash <(curl -s https://codecov.io/bash)
+
+after_failure:
+ - echo "build failed!"
diff --git a/README.md b/README.md
index 3b188df..8d875cc 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,2 @@
# dubbo-spi-extensions
+[](https://travis-ci.org/apache/dubbo-spi-extensions)
\ No newline at end of file
[dubbo-spi-extensions] 03/03: fix service discovery impls
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-spi-extensions.git
commit 7f404f6c647b3a1249f5b982123ec4787d109298
Author: ken.lj <ke...@gmail.com>
AuthorDate: Thu Aug 27 16:27:15 2020 +0800
fix service discovery impls
---
.../dubbo/registry/consul/ConsulServiceDiscovery.java | 19 +++++++++++--------
.../dubbo/registry/etcd/EtcdServiceDiscovery.java | 7 +++++--
.../dubbo/registry/eureka/EurekaServiceDiscovery.java | 5 ++++-
3 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/dubbo-spi-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscovery.java b/dubbo-spi-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscovery.java
index 5d5e98b..f1d3d3b 100644
--- a/dubbo-spi-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscovery.java
+++ b/dubbo-spi-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscovery.java
@@ -23,6 +23,7 @@ import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.NamedThreadFactory;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.event.EventListener;
+import org.apache.dubbo.registry.client.AbstractServiceDiscovery;
import org.apache.dubbo.registry.client.DefaultServiceInstance;
import org.apache.dubbo.registry.client.ServiceDiscovery;
import org.apache.dubbo.registry.client.ServiceInstance;
@@ -65,7 +66,7 @@ import static org.apache.dubbo.registry.consul.AbstractConsulRegistry.WATCH_TIME
/**
* 2019-07-31
*/
-public class ConsulServiceDiscovery implements ServiceDiscovery, EventListener<ServiceInstancesChangedEvent> {
+public class ConsulServiceDiscovery extends AbstractServiceDiscovery implements EventListener<ServiceInstancesChangedEvent> {
private static final Logger logger = LoggerFactory.getLogger(ConsulServiceDiscovery.class);
@@ -120,6 +121,7 @@ public class ConsulServiceDiscovery implements ServiceDiscovery, EventListener<S
@Override
public void register(ServiceInstance serviceInstance) throws RuntimeException {
+ super.register(serviceInstance);
NewService consulService = buildService(serviceInstance);
ttlScheduler.add(consulService.getId());
client.agentServiceRegister(consulService);
@@ -127,17 +129,18 @@ public class ConsulServiceDiscovery implements ServiceDiscovery, EventListener<S
@Override
public void addServiceInstancesChangedListener(ServiceInstancesChangedListener listener) throws NullPointerException, IllegalArgumentException {
- if (notifier == null) {
- String serviceName = listener.getServiceName();
- Response<List<HealthService>> response = getHealthServices(serviceName, -1, buildWatchTimeout());
- Long consulIndex = response.getConsulIndex();
- notifier = new ConsulNotifier(serviceName, consulIndex);
- }
- notifierExecutor.execute(notifier);
+// if (notifier == null) {
+// String serviceName = listener.getServiceNames();
+// Response<List<HealthService>> response = getHealthServices(serviceName, -1, buildWatchTimeout());
+// Long consulIndex = response.getConsulIndex();
+// notifier = new ConsulNotifier(serviceName, consulIndex);
+// }
+// notifierExecutor.execute(notifier);
}
@Override
public void update(ServiceInstance serviceInstance) throws RuntimeException {
+ super.register(serviceInstance);
// TODO
// client.catalogRegister(buildCatalogService(serviceInstance));
}
diff --git a/dubbo-spi-registry/dubbo-registry-etcd3/src/main/java/org/apache/dubbo/registry/etcd/EtcdServiceDiscovery.java b/dubbo-spi-registry/dubbo-registry-etcd3/src/main/java/org/apache/dubbo/registry/etcd/EtcdServiceDiscovery.java
index a26ebc6..0f41de3 100644
--- a/dubbo-spi-registry/dubbo-registry-etcd3/src/main/java/org/apache/dubbo/registry/etcd/EtcdServiceDiscovery.java
+++ b/dubbo-spi-registry/dubbo-registry-etcd3/src/main/java/org/apache/dubbo/registry/etcd/EtcdServiceDiscovery.java
@@ -24,6 +24,7 @@ import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.ConcurrentHashSet;
import org.apache.dubbo.event.EventDispatcher;
import org.apache.dubbo.event.EventListener;
+import org.apache.dubbo.registry.client.AbstractServiceDiscovery;
import org.apache.dubbo.registry.client.DefaultServiceInstance;
import org.apache.dubbo.registry.client.ServiceDiscovery;
import org.apache.dubbo.registry.client.ServiceInstance;
@@ -50,7 +51,7 @@ import java.util.concurrent.ConcurrentHashMap;
/**
* 2019-07-08
*/
-public class EtcdServiceDiscovery implements ServiceDiscovery, EventListener<ServiceInstancesChangedEvent> {
+public class EtcdServiceDiscovery extends AbstractServiceDiscovery implements EventListener<ServiceInstancesChangedEvent> {
private final static Logger logger = LoggerFactory.getLogger(EtcdServiceDiscovery.class);
@@ -102,6 +103,7 @@ public class EtcdServiceDiscovery implements ServiceDiscovery, EventListener<Ser
@Override
public void register(ServiceInstance serviceInstance) throws RuntimeException {
+ super.register(serviceInstance);
try {
this.serviceInstance = serviceInstance;
String path = toPath(serviceInstance);
@@ -127,6 +129,7 @@ public class EtcdServiceDiscovery implements ServiceDiscovery, EventListener<Ser
@Override
public void update(ServiceInstance serviceInstance) throws RuntimeException {
+ super.register(serviceInstance);
try {
String path = toPath(serviceInstance);
etcdClient.putEphemeral(path, new Gson().toJson(serviceInstance));
@@ -158,7 +161,7 @@ public class EtcdServiceDiscovery implements ServiceDiscovery, EventListener<Ser
@Override
public void addServiceInstancesChangedListener(ServiceInstancesChangedListener listener) throws NullPointerException, IllegalArgumentException {
- registerServiceWatcher(listener.getServiceName());
+ listener.getServiceNames().forEach(serviceName -> registerServiceWatcher(serviceName));
}
@Override
diff --git a/dubbo-spi-registry/dubbo-registry-eureka/src/main/java/org/apache/dubbo/registry/eureka/EurekaServiceDiscovery.java b/dubbo-spi-registry/dubbo-registry-eureka/src/main/java/org/apache/dubbo/registry/eureka/EurekaServiceDiscovery.java
index bb49c10..3aebd7a 100644
--- a/dubbo-spi-registry/dubbo-registry-eureka/src/main/java/org/apache/dubbo/registry/eureka/EurekaServiceDiscovery.java
+++ b/dubbo-spi-registry/dubbo-registry-eureka/src/main/java/org/apache/dubbo/registry/eureka/EurekaServiceDiscovery.java
@@ -18,6 +18,7 @@ package org.apache.dubbo.registry.eureka;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.event.EventDispatcher;
+import org.apache.dubbo.registry.client.AbstractServiceDiscovery;
import org.apache.dubbo.registry.client.DefaultServiceInstance;
import org.apache.dubbo.registry.client.ServiceDiscovery;
import org.apache.dubbo.registry.client.ServiceInstance;
@@ -53,7 +54,7 @@ import static org.apache.dubbo.registry.client.ServiceDiscoveryRegistry.parseSer
/**
* Eureka {@link ServiceDiscovery} implementation based on Eureka API
*/
-public class EurekaServiceDiscovery implements ServiceDiscovery {
+public class EurekaServiceDiscovery extends AbstractServiceDiscovery {
private final EventDispatcher eventDispatcher = getDefaultExtension();
@@ -205,6 +206,7 @@ public class EurekaServiceDiscovery implements ServiceDiscovery {
@Override
public void register(ServiceInstance serviceInstance) throws RuntimeException {
+ super.register(serviceInstance);
initEurekaClient(serviceInstance);
setInstanceStatus(InstanceInfo.InstanceStatus.UP);
}
@@ -217,6 +219,7 @@ public class EurekaServiceDiscovery implements ServiceDiscovery {
@Override
public void update(ServiceInstance serviceInstance) throws RuntimeException {
+ super.update(serviceInstance);
setInstanceStatus(serviceInstance.isHealthy() ? InstanceInfo.InstanceStatus.UP :
InstanceInfo.InstanceStatus.UNKNOWN);
}