You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by cr...@apache.org on 2022/05/26 09:01:05 UTC
[dubbo] branch 3.0 updated: [3.0] Upgrade nacos version (#10024)
This is an automated email from the ASF dual-hosted git repository.
crazyhzm pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.0 by this push:
new 25fabf11aa [3.0] Upgrade nacos version (#10024)
25fabf11aa is described below
commit 25fabf11aab6ab250258aa8e8b18e54e5fdb7957
Author: Wang Chengming <63...@qq.com>
AuthorDate: Thu May 26 17:00:39 2022 +0800
[3.0] Upgrade nacos version (#10024)
* upgrade nacos version
* fix build error
Co-authored-by: 呈铭 <be...@antgroup.com>
---
dubbo-dependencies-bom/pom.xml | 2 +-
.../src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java | 2 +-
.../org/apache/dubbo/registry/nacos/util/NacosInstanceManageUtil.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index ed564a7a84..dc530298da 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -133,7 +133,7 @@
<resteasy_version>3.0.19.Final</resteasy_version>
<tomcat_embed_version>8.5.69</tomcat_embed_version>
<jetcd_version>0.5.3</jetcd_version>
- <nacos_version>2.0.4</nacos_version>
+ <nacos_version>2.1.0</nacos_version>
<grpc.version>1.31.1</grpc.version>
<!-- Log libs -->
<slf4j_version>1.7.25</slf4j_version>
diff --git a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
index 1c7b039606..f0ccdbe9d6 100644
--- a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
+++ b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
@@ -39,7 +39,7 @@ import com.alibaba.nacos.api.naming.listener.EventListener;
import com.alibaba.nacos.api.naming.listener.NamingEvent;
import com.alibaba.nacos.api.naming.pojo.Instance;
import com.alibaba.nacos.api.naming.pojo.ListView;
-import com.google.common.collect.Lists;
+import com.alibaba.nacos.shaded.com.google.common.collect.Lists;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosInstanceManageUtil.java b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosInstanceManageUtil.java
index c7cf05305a..cb0179f27a 100644
--- a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosInstanceManageUtil.java
+++ b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosInstanceManageUtil.java
@@ -19,8 +19,8 @@ package org.apache.dubbo.registry.nacos.util;
import org.apache.dubbo.common.utils.CollectionUtils;
import com.alibaba.nacos.api.naming.pojo.Instance;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import com.alibaba.nacos.shaded.com.google.common.collect.Lists;
+import com.alibaba.nacos.shaded.com.google.common.collect.Maps;
import java.util.List;
import java.util.Map;