You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by eo...@apache.org on 2021/07/06 09:07:23 UTC
[curator] branch master updated: CURATOR-588 Upgrade ZooKeeper to
3.6.3 (#386)
This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/curator.git
The following commit(s) were added to refs/heads/master by this push:
new e42a07a CURATOR-588 Upgrade ZooKeeper to 3.6.3 (#386)
e42a07a is described below
commit e42a07a0203038d601957d7e24895fece8cd96dc
Author: Enrico Olivelli <eo...@gmail.com>
AuthorDate: Tue Jul 6 11:06:58 2021 +0200
CURATOR-588 Upgrade ZooKeeper to 3.6.3 (#386)
Co-authored-by: Enrico Olivelli <eo...@apache.org>
---
.../java/org/apache/curator/framework/imps/TestFrameworkEdges.java | 6 +++++-
.../main/java/org/apache/curator/test/TestingQuorumPeerMain.java | 2 +-
pom.xml | 6 ++++--
3 files changed, 10 insertions(+), 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
index 1fda248..3ddae4d 100644
--- 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 class TestFrameworkEdges extends BaseClassForTests
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
index de9ea92..49d47c5 100644
--- 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 @@ class TestingQuorumPeerMain extends QuorumPeerMain implements ZooKeeperMainFace
}
@Override
- public void close() throws IOException
+ public void close()
{
if ( (quorumPeer != null) && !isClosed )
{
diff --git a/pom.xml b/pom.xml
index 68cd14b..55a33f7 100644
--- 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>