[drill] branch master updated: DRILL-7712: Fix issues after ZK upgrade

[luoc]

This is an automated email from the ASF dual-hosted git repository.

luoc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git


The following commit(s) were added to refs/heads/master by this push:
     new a460c3a  DRILL-7712: Fix issues after ZK upgrade
a460c3a is described below

commit a460c3aa5599b5916463568ae827c418dadab0ef
Author: YaybeNo <y...@example.com>
AuthorDate: Tue Jan 26 12:53:52 2021 -0500

    DRILL-7712: Fix issues after ZK upgrade
---
 .../test/java/org/apache/drill/exec/coord/zk/TestEphemeralStore.java  | 4 ++--
 pom.xml                                                               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/exec/java-exec/src/test/java/org/apache/drill/exec/coord/zk/TestEphemeralStore.java
 
b/exec/java-exec/src/test/java/org/apache/drill/exec/coord/zk/TestEphemeralStore.java
index 81a4c70..c9ad7a9 100644
--- 
a/exec/java-exec/src/test/java/org/apache/drill/exec/coord/zk/TestEphemeralStore.java
+++ 
b/exec/java-exec/src/test/java/org/apache/drill/exec/coord/zk/TestEphemeralStore.java
@@ -22,7 +22,7 @@ import java.io.IOException;
 import org.apache.curator.RetryPolicy;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
-import org.apache.curator.framework.listen.ListenerContainer;
+import org.apache.curator.framework.listen.MappingListenerManager;
 import org.apache.curator.framework.recipes.cache.PathChildrenCache;
 import org.apache.curator.framework.recipes.cache.PathChildrenCacheListener;
 import org.apache.curator.retry.RetryNTimes;
@@ -117,7 +117,7 @@ public class TestEphemeralStore extends BaseTest {
         .thenReturn(cache);
 
     @SuppressWarnings("unchecked")
-    final ListenerContainer<PathChildrenCacheListener> container = 
Mockito.mock(ListenerContainer.class);
+    final 
MappingListenerManager<PathChildrenCacheListener,PathChildrenCacheListener> 
container = Mockito.mock(MappingListenerManager.class);
     Mockito
         .when(cache.getListenable())
         .thenReturn(container);
diff --git a/pom.xml b/pom.xml
index 2319f5d..1bd1dac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
     <netty.tcnative.classifier />
     <commons.io.version>2.4</commons.io.version>
     <hamcrest.core.version>1.3</hamcrest.core.version>
-    <curator.version>4.3.0</curator.version>
+    <curator.version>5.1.0</curator.version>
     <wiremock.standalone.version>2.23.2</wiremock.standalone.version>
     <jmockit.version>1.47</jmockit.version>
     <logback.version>1.2.3</logback.version>