CURATOR-588 Upgrade ZooKeeper to 3.6.3 (#386)

Co-authored-by: Enrico Olivelli <eolivelli@apache.org>
apache · Jul 6, 2021 · e42a07a · e42a07a
1 parent a574966
commit e42a07a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkEdges.java b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkEdges.java
@@ -670,9 +670,13 @@ public void testFailure() throws Exception
             client.checkExists().forPath("/hey");
             fail();
         }
+        catch ( KeeperException.SessionExpiredException e )
+        {
+            // correct, this happens on ZK 3.6.3+
+        }
         catch ( KeeperException.ConnectionLossException e )
         {
-            // correct
+            // correct, this happens on ZK 3.5.x, 3.6.0 -> 3.6.2
         }
         finally
         {

diff --git a/curator-test/src/main/java/org/apache/curator/test/TestingQuorumPeerMain.java b/curator-test/src/main/java/org/apache/curator/test/TestingQuorumPeerMain.java
@@ -60,7 +60,7 @@ public QuorumPeer getTestingQuorumPeer()
     }
 
     @Override
-    public void close() throws IOException
+    public void close()
     {
         if ( (quorumPeer != null) && !isClosed )
         {

diff --git a/pom.xml b/pom.xml
@@ -66,8 +66,10 @@
         <short-jdk-version>8</short-jdk-version>
         <jdk-version>1.${short-jdk-version}</jdk-version>
 
+        <redirectTestOutputToFile>true</redirectTestOutputToFile>
+
         <!-- versions -->
-        <zookeeper-version>3.6.0</zookeeper-version>
+        <zookeeper-version>3.6.3</zookeeper-version>
         <maven-bundle-plugin-version>5.1.1</maven-bundle-plugin-version>
         <maven-javadoc-plugin-version>3.0.1</maven-javadoc-plugin-version>
         <doxia-module-confluence-version>1.8</doxia-module-confluence-version>
@@ -772,7 +774,7 @@
                 <configuration>
                     <threadCount>1</threadCount>
                     <reuseForks>false</reuseForks>
-                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                    <redirectTestOutputToFile>${redirectTestOutputToFile}</redirectTestOutputToFile>
                     <rerunFailingTestsCount>2</rerunFailingTestsCount>
                 </configuration>
             </plugin>