Skip to content

Commit

Permalink
Fix NacosRegistry and Reference (#4485)
Browse files Browse the repository at this point in the history
fixes #3695, #4348
  • Loading branch information
mercyblitz authored and chickenlj committed Jul 8, 2019
1 parent f932569 commit 374d41b
Show file tree
Hide file tree
Showing 68 changed files with 71 additions and 71 deletions.
4 changes: 2 additions & 2 deletions all/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>dubbo</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
<packaging>jar</packaging>
<name>dubbo-all</name>
<description>The all in one project of dubbo</description>
Expand Down
2 changes: 1 addition & 1 deletion bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<groupId>com.alibaba</groupId>
<artifactId>dubbo-bom</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
<packaging>pom</packaging>

<name>dubbo-bom</name>
Expand Down
2 changes: 1 addition & 1 deletion dependencies-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<groupId>com.alibaba</groupId>
<artifactId>dubbo-dependencies-bom</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
<packaging>pom</packaging>

<name>dubbo-dependencies-bom</name>
Expand Down
2 changes: 1 addition & 1 deletion distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-distribution</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-cluster/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-cluster</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-common</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-config/dubbo-config-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-config</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-config-api</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-config/dubbo-config-spring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-config</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-config-spring</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-config</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-container/dubbo-container-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-container</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-container-api</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-container/dubbo-container-log4j/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-container</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-container-log4j</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-container/dubbo-container-logback/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-container</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-container-logback</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-container/dubbo-container-spring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-container</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-container-spring</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-container/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-container</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-demo/dubbo-demo-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-demo</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-demo-api</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-demo/dubbo-demo-consumer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-demo</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-demo-consumer</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-demo/dubbo-demo-provider/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-demo</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-demo-provider</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-demo</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-filter/dubbo-filter-cache/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-filter</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-filter-cache</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-filter/dubbo-filter-validation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-filter</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-filter-validation</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-filter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-filter</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-monitor/dubbo-monitor-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-monitor</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-monitor-api</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-monitor/dubbo-monitor-default/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-monitor</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-monitor-default</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-monitor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-monitor</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-plugin/dubbo-qos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-plugin</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion dubbo-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<artifactId>dubbo-parent</artifactId>
<groupId>com.alibaba</groupId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion dubbo-registry/dubbo-registry-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-registry</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-registry-api</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-registry/dubbo-registry-default/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-registry</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-registry-default</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-registry/dubbo-registry-multicast/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-registry</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-registry-multicast</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-registry/dubbo-registry-nacos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<artifactId>dubbo-registry</artifactId>
<groupId>com.alibaba</groupId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-registry/dubbo-registry-redis/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-registry</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-registry-redis</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-registry/dubbo-registry-zookeeper/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-registry</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-registry-zookeeper</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-registry/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-registry</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-remoting/dubbo-remoting-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-remoting-api</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-remoting/dubbo-remoting-grizzly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-remoting-grizzly</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-remoting/dubbo-remoting-http/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-remoting-http</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-remoting/dubbo-remoting-mina/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-remoting-mina</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-remoting/dubbo-remoting-netty/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-remoting-netty</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-remoting/dubbo-remoting-netty4/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<artifactId>dubbo-remoting</artifactId>
<groupId>com.alibaba</groupId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion dubbo-remoting/dubbo-remoting-p2p/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-remoting-p2p</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-remoting/dubbo-remoting-zookeeper/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-remoting-zookeeper</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-remoting/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-parent</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-remoting</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-rpc/dubbo-rpc-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc</artifactId>
<version>2.6.7-SNAPSHOT</version>
<version>2.6.7</version>
</parent>
<artifactId>dubbo-rpc-api</artifactId>
<packaging>jar</packaging>
Expand Down
Loading

0 comments on commit 374d41b

Please sign in to comment.