upgrade curator 5.5.0 zookeeper 3.8.2 (#732)

Co-authored-by: lishanglin <[email protected]>
ctripcorp · Oct 17, 2023 · 2b06424 · 2b06424
1 parent 44ce244
commit 2b06424
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/core/src/main/java/com/ctrip/xpipe/concurrent/KeyedOneThreadTaskExecutor.java b/core/src/main/java/com/ctrip/xpipe/concurrent/KeyedOneThreadTaskExecutor.java
@@ -4,12 +4,12 @@
 import com.ctrip.xpipe.api.factory.ObjectFactory;
 import com.ctrip.xpipe.api.lifecycle.Destroyable;
 import com.ctrip.xpipe.utils.MapUtils;
-import org.jboss.netty.util.internal.ConcurrentHashMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executor;
 
 /**

diff --git a/pom.xml b/pom.xml
@@ -17,8 +17,8 @@
 
     <properties>
         <commons-io.version>2.4</commons-io.version>
-        <curator.version>2.11.0</curator.version>
-        <zookeeper.version>3.4.9</zookeeper.version>
+        <curator.version>5.5.0</curator.version>
+        <zookeeper.version>3.8.2</zookeeper.version>
         <maven-jar-plugin.version>2.6</maven-jar-plugin.version>
         <maven-assembly-plugin.version>2.6</maven-assembly-plugin.version>
         <maven-source-plugin.version>3.0.0</maven-source-plugin.version>
@@ -387,6 +387,20 @@
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>
                 <version>${zookeeper.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>io.netty</groupId>
+                        <artifactId>netty-handler</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>io.netty</groupId>
+                        <artifactId>netty-transport-native-epoll</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>ch.qos.logback</groupId>
+                        <artifactId>logback-classic</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>

diff --git a/...c/test/java/com/ctrip/xpipe/redis/core/protocal/cmd/pubsub/TestAbstractSubscribeTest.java b/...c/test/java/com/ctrip/xpipe/redis/core/protocal/cmd/pubsub/TestAbstractSubscribeTest.java
@@ -11,19 +11,16 @@
 import com.ctrip.xpipe.redis.core.protocal.protocal.ArrayParser;
 import com.ctrip.xpipe.simpleserver.Server;
 import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufUtil;
 import io.netty.buffer.CompositeByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel;
 import io.netty.channel.embedded.EmbeddedChannel;
-import org.jboss.netty.util.internal.ByteBufferUtil;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.io.IOException;
-import java.nio.ByteBuffer;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiConsumer;

diff --git a/...rc/main/java/com/ctrip/xpipe/redis/keeper/monitor/impl/AbstractKeepersMonitorManager.java b/...rc/main/java/com/ctrip/xpipe/redis/keeper/monitor/impl/AbstractKeepersMonitorManager.java
@@ -4,15 +4,14 @@
 import com.ctrip.xpipe.redis.keeper.RedisKeeperServer;
 import com.ctrip.xpipe.redis.keeper.monitor.KeeperMonitor;
 import com.ctrip.xpipe.redis.keeper.monitor.KeepersMonitorManager;
-import com.ctrip.xpipe.utils.ClusterShardAwareThreadFactory;
 import com.ctrip.xpipe.utils.MapUtils;
 import com.ctrip.xpipe.utils.OsUtils;
 import com.ctrip.xpipe.utils.XpipeThreadFactory;
-import org.jboss.netty.util.internal.ConcurrentHashMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 

diff --git a/...-proxy/src/main/java/com/ctrip/xpipe/redis/proxy/monitor/DefaultTunnelMonitorManager.java b/...-proxy/src/main/java/com/ctrip/xpipe/redis/proxy/monitor/DefaultTunnelMonitorManager.java
@@ -7,13 +7,13 @@
 import com.ctrip.xpipe.redis.proxy.resource.ResourceManager;
 import com.ctrip.xpipe.utils.MapUtils;
 import com.ctrip.xpipe.utils.VisibleForTesting;
-import org.jboss.netty.util.internal.ConcurrentHashMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * @author chen.zhu