From 7e041b25a8fe74238fae4ccebf7ae9722153bdda Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Thu, 11 Jul 2019 13:50:47 +0800
Subject: [PATCH] Update the nacos-client dependency to 1.1.1 (#4537)

fixes #4535
---
 dubbo-registry/dubbo-registry-nacos/pom.xml       | 15 +++++++--------
 .../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 6f7eb66569a..f5054a7410c 100644
--- a/dubbo-registry/dubbo-registry-nacos/pom.xml
+++ b/dubbo-registry/dubbo-registry-nacos/pom.xml
@@ -27,11 +27,17 @@
     <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>
@@ -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 56de76076d4..7f427146228 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;