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 2019/07/11 05:50:54 UTC
[dubbo] branch 2.6.7-release updated: Update the nacos-client
dependency to 1.1.1 (#4537)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 2.6.7-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/2.6.7-release by this push:
new 7e041b2 Update the nacos-client dependency to 1.1.1 (#4537)
7e041b2 is described below
commit 7e041b25a8fe74238fae4ccebf7ae9722153bdda
Author: Mercy Ma <me...@gmail.com>
AuthorDate: Thu Jul 11 13:50:47 2019 +0800
Update the nacos-client dependency to 1.1.1 (#4537)
fixes #4535
---
dubbo-registry/dubbo-registry-nacos/pom.xml | 15 +++++++--------
.../dubbo/registry/nacos/NacosRegistryFactory.java | 3 +--
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/dubbo-registry/dubbo-registry-nacos/pom.xml b/dubbo-registry/dubbo-registry-nacos/pom.xml
index 6f7eb66..f5054a7 100644
--- a/dubbo-registry/dubbo-registry-nacos/pom.xml
+++ b/dubbo-registry/dubbo-registry-nacos/pom.xml
@@ -27,12 +27,18 @@
<artifactId>dubbo-registry-nacos</artifactId>
<properties>
- <nacos.version>0.6.2</nacos.version>
+ <nacos.version>1.1.1</nacos.version>
</properties>
<dependencies>
<dependency>
+ <groupId>com.alibaba.nacos</groupId>
+ <artifactId>nacos-client</artifactId>
+ <version>${nacos.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-registry-api</artifactId>
<version>${project.version}</version>
@@ -46,13 +52,6 @@
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>com.alibaba.nacos</groupId>
- <artifactId>nacos-client</artifactId>
- <version>${nacos.version}</version>
- <optional>true</optional>
- </dependency>
-
<!-- Test Libraries -->
<dependency>
<groupId>com.alibaba</groupId>
diff --git a/dubbo-registry/dubbo-registry-nacos/src/main/java/com/alibaba/dubbo/registry/nacos/NacosRegistryFactory.java b/dubbo-registry/dubbo-registry-nacos/src/main/java/com/alibaba/dubbo/registry/nacos/NacosRegistryFactory.java
index 56de760..7f42714 100644
--- a/dubbo-registry/dubbo-registry-nacos/src/main/java/com/alibaba/dubbo/registry/nacos/NacosRegistryFactory.java
+++ b/dubbo-registry/dubbo-registry-nacos/src/main/java/com/alibaba/dubbo/registry/nacos/NacosRegistryFactory.java
@@ -17,14 +17,13 @@
package com.alibaba.dubbo.registry.nacos;
import com.alibaba.dubbo.common.URL;
+import com.alibaba.dubbo.common.utils.StringUtils;
import com.alibaba.dubbo.registry.Registry;
import com.alibaba.dubbo.registry.RegistryFactory;
import com.alibaba.dubbo.registry.support.AbstractRegistryFactory;
import com.alibaba.nacos.api.NacosFactory;
import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.api.naming.NamingService;
-import com.alibaba.nacos.client.naming.utils.StringUtils;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;