Skip to content

Commit

Permalink
Merge pull request #106 from dengkang/patch-1
Browse files Browse the repository at this point in the history 
Dubbo-samples-async-onerror ${dubbo.version} ， ${dubbo.rpc.version} 2.7.3-SNAPSHOT not found and Dubbo-configcenter-zookeeper configuration has two
  • Loading branch information
@beiwei30
beiwei30 committed Jul 23, 2019
2 parents 085275d + 1f81524 commit 3504347
Show file tree
Hide file tree
Showing 77 changed files with 84 additions and 88 deletions.
2 changes: 1 addition & 1 deletion dubbo-samples-annotation/pom.xml
View file
Expand Up @@ -31,7 +31,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring-test.version>4.3.16.RELEASE</spring-test.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-api/pom.xml
View file
Expand Up @@ -29,7 +29,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
<jib-maven-plugin.version>1.2.0</jib-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-async/dubbo-samples-async-generated-future/pom.xml
View file
Expand Up @@ -31,7 +31,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
8 changes: 2 additions & 6 deletions dubbo-samples-async/dubbo-samples-async-onerror/pom.xml
View file
Expand Up @@ -32,8 +32,8 @@
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<spring.version>4.3.16.RELEASE</spring.version>
<dubbo.version>2.7.3-SNAPSHOT</dubbo.version>
<dubbo.rpc.version>2.7.3-SNAPSHOT</dubbo.rpc.version>
<dubbo.version>2.7.3</dubbo.version>
<dubbo.rpc.version>2.7.3</dubbo.rpc.version>
<zookeeper.version>3.4.13</zookeeper.version>
<curator.version>4.0.1</curator.version>
<validation-api.version>1.1.0.Final</validation-api.version>
Expand Down Expand Up @@ -199,10 +199,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-configcenter-zookeeper</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-async/dubbo-samples-async-original-future/pom.xml
View file
Expand Up @@ -31,7 +31,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-async/dubbo-samples-async-provider/pom.xml
View file
Expand Up @@ -31,7 +31,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-async/dubbo-samples-async-simple/pom.xml
View file
Expand Up @@ -31,7 +31,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-attachment/pom.xml
View file
Expand Up @@ -31,7 +31,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-basic/pom.xml
View file
Expand Up @@ -28,7 +28,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<junit.version>4.12</junit.version>
<spring-test.version>4.3.16.RELEASE</spring-test.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-cache/pom.xml
View file
Expand Up @@ -28,7 +28,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-callback/pom.xml
View file
Expand Up @@ -28,7 +28,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<junit.version>4.12</junit.version>
<spring-test.version>4.3.16.RELEASE</spring-test.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-chain/pom.xml
View file
Expand Up @@ -31,7 +31,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-compatible/pom.xml
View file
Expand Up @@ -31,7 +31,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-configcenter/dubbo-samples-configcenter-annotation/pom.xml
View file
Expand Up @@ -32,7 +32,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-configcenter/dubbo-samples-configcenter-api/pom.xml
View file
Expand Up @@ -29,7 +29,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
4 changes: 2 additions & 2 deletions dubbo-samples-configcenter/dubbo-samples-configcenter-apollo/pom.xml
View file
Expand Up @@ -33,8 +33,8 @@
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<spring.version>4.3.16.RELEASE</spring.version>
<dubbo.version>2.7.0</dubbo.version>
<dubbo.rpc.version>2.7.0</dubbo.rpc.version>
<dubbo.version>2.7.3</dubbo.version>
<dubbo.rpc.version>2.7.3</dubbo.rpc.version>
<zookeeper.version>3.4.13</zookeeper.version>
<curator.version>4.0.1</curator.version>
<validation-api.version>1.1.0.Final</validation-api.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-configcenter/dubbo-samples-configcenter-externalconfiguration/pom.xml
View file
Expand Up @@ -31,7 +31,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<spring.boot.version>1.5.21.RELEASE</spring.boot.version>
<junit.version>4.12</junit.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-configcenter/dubbo-samples-configcenter-multi-registries/pom.xml
View file
Expand Up @@ -32,7 +32,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-configcenter/dubbo-samples-configcenter-multiprotocol/pom.xml
View file
Expand Up @@ -32,7 +32,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-configcenter/dubbo-samples-configcenter-xml/pom.xml
View file
Expand Up @@ -31,7 +31,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.3-SNAPSHOT</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-consul/pom.xml
View file
Expand Up @@ -31,7 +31,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-context/pom.xml
View file
Expand Up @@ -28,7 +28,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-direct/pom.xml
View file
Expand Up @@ -28,7 +28,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-docker/pom.xml
View file
Expand Up @@ -28,7 +28,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<spring.boot.version>1.5.21.RELEASE</spring.boot.version>
<junit.version>4.12</junit.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-echo/pom.xml
View file
Expand Up @@ -29,7 +29,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-edas/dubbo-samples-edas-consumer/pom.xml
View file
Expand Up @@ -13,7 +13,7 @@

<properties>
<spring-boot.version>2.1.1.RELEASE</spring-boot.version>
<dubbo.version>2.7.1</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-edas/dubbo-samples-edas-provider/pom.xml
View file
Expand Up @@ -13,7 +13,7 @@

<properties>
<spring-boot.version>2.1.1.RELEASE</spring-boot.version>
<dubbo.version>2.7.1</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-environment-keys/pom.xml
View file
Expand Up @@ -28,7 +28,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.3-SNAPSHOT</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
<jib-maven-plugin.version>1.2.0</jib-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-generic/dubbo-samples-generic-call/dubbo-samples-generic-call-consumer/pom.xml
View file
Expand Up @@ -31,7 +31,7 @@
<artifactId>dubbo-samples-generic-call-consumer</artifactId>

<properties>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-generic/dubbo-samples-generic-call/dubbo-samples-generic-call-provider/pom.xml
View file
Expand Up @@ -33,7 +33,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-generic/dubbo-samples-generic-impl/dubbo-samples-generic-impl-consumer/pom.xml
View file
Expand Up @@ -31,7 +31,7 @@
<artifactId>dubbo-samples-generic-impl-consumer</artifactId>

<properties>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-generic/dubbo-samples-generic-impl/dubbo-samples-generic-impl-provider/pom.xml
View file
Expand Up @@ -33,7 +33,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-generic/dubbo-samples-generic-type/pom.xml
View file
Expand Up @@ -33,7 +33,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-governance/dubbo-samples-applevel-override/pom.xml
View file
Expand Up @@ -31,7 +31,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.3-SNAPSHOT</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-governance/dubbo-samples-configconditionrouter/pom.xml
View file
Expand Up @@ -31,7 +31,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.3-SNAPSHOT</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-governance/dubbo-samples-servicelevel-override/pom.xml
View file
Expand Up @@ -31,7 +31,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-governance/dubbo-samples-tagrouter/pom.xml
View file
Expand Up @@ -30,7 +30,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.3-SNAPSHOT</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-group/pom.xml
View file
Expand Up @@ -29,7 +29,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-http/pom.xml
View file
Expand Up @@ -29,7 +29,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
Expand Down
4 changes: 2 additions & 2 deletions dubbo-samples-jetty/pom.xml
View file
Expand Up @@ -31,8 +31,8 @@
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<spring.version>4.3.16.RELEASE</spring.version>
<dubbo.version>2.7.0</dubbo.version>
<dubbo.rpc.version>2.7.0</dubbo.rpc.version>
<dubbo.version>2.7.3</dubbo.version>
<dubbo.rpc.version>2.7.3</dubbo.rpc.version>
<zookeeper.version>3.4.13</zookeeper.version>
<curator.version>4.0.1</curator.version>
<validation-api.version>1.1.0.Final</validation-api.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-local/pom.xml
View file
Expand Up @@ -28,7 +28,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-merge/dubbo-samples-merge-consumer/pom.xml
View file
Expand Up @@ -29,7 +29,7 @@
<artifactId>dubbo-samples-merge-consumer</artifactId>

<properties>
<dubbo.version>2.7.2</dubbo.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
Expand Down

0 comments on commit 3504347

Please sign in to comment.