From 4007cd4a0239823951624cf559f7df7666dcedd2 Mon Sep 17 00:00:00 2001
From: Ian Luo <ian.luo@gmail.com>
Date: Sun, 5 May 2019 16:34:59 +0800
Subject: [PATCH] dubbo-registry-nacos module is not bundled into Apache Dubbo
 2.7.1 (#3976)

Fixes #3797:
---
 dubbo-all/pom.xml                           |  1 +
 dubbo-dependencies-bom/pom.xml              |  8 +++++++-
 dubbo-distribution/pom.xml                  | 15 +++++++++++++++
 dubbo-registry/dubbo-registry-nacos/pom.xml |  7 +------
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/dubbo-all/pom.xml b/dubbo-all/pom.xml
index a5e674a1edd..cceac62cc82 100644
--- a/dubbo-all/pom.xml
+++ b/dubbo-all/pom.xml
@@ -582,6 +582,7 @@
                                     <include>org.apache.dubbo:dubbo-metadata-report-redis</include>
                                     <include>org.apache.dubbo:dubbo-metadata-report-zookeeper</include>
                                     <include>org.apache.dubbo:dubbo-metadata-report-consul</include>
+                                    <include>org.apache.dubbo:dubbo-metadata-report-etcd</include>
                                 </includes>
                             </artifactSet>
                             <transformers>
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 6d68457125b..0acf4773111 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -127,6 +127,7 @@
         <resteasy_version>3.0.19.Final</resteasy_version>
         <tomcat_embed_version>8.5.31</tomcat_embed_version>
         <jetcd_version>0.3.0</jetcd_version>
+        <nacos_version>1.0.0</nacos_version>
         <!-- Log libs -->
         <slf4j_version>1.7.25</slf4j_version>
         <jcl_version>1.2</jcl_version>
@@ -519,7 +520,7 @@
                 <artifactId>metrics-rest</artifactId>
                 <version>${metrics_version}</version>
             </dependency>
-            
+
             <!-- for dubbo-registry-sofa -->
             <dependency>
                 <groupId>com.alipay.sofa</groupId>
@@ -584,6 +585,11 @@
                 <artifactId>testcontainers</artifactId>
                 <version>${test_container_version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.alibaba.nacos</groupId>
+                <artifactId>nacos-client</artifactId>
+                <version>${nacos_version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/dubbo-distribution/pom.xml b/dubbo-distribution/pom.xml
index 76e73a3df67..f830aa4379c 100644
--- a/dubbo-distribution/pom.xml
+++ b/dubbo-distribution/pom.xml
@@ -180,6 +180,21 @@
             <artifactId>dubbo-registry-redis</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-registry-consul</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-registry-nacos</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-registry-etcd3</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-registry-sofa</artifactId>
diff --git a/dubbo-registry/dubbo-registry-nacos/pom.xml b/dubbo-registry/dubbo-registry-nacos/pom.xml
index e2a9d02e149..b8c952d267b 100644
--- a/dubbo-registry/dubbo-registry-nacos/pom.xml
+++ b/dubbo-registry/dubbo-registry-nacos/pom.xml
@@ -27,10 +27,6 @@
     <name>${project.artifactId}</name>
     <description>The Nacos registry module of Dubbo project</description>
 
-    <properties>
-        <nacos.version>1.0.0-RC3</nacos.version>
-    </properties>
-
     <dependencies>
 
         <dependency>
@@ -50,7 +46,6 @@
         <dependency>
             <groupId>com.alibaba.nacos</groupId>
             <artifactId>nacos-client</artifactId>
-            <version>${nacos.version}</version>
             <optional>true</optional>
         </dependency>
 
@@ -147,4 +142,4 @@
         </dependency>
 
     </dependencies>
-</project>
\ No newline at end of file
+</project>