Skip to content

Commit e42a07a

Browse files
authored
CURATOR-588 Upgrade ZooKeeper to 3.6.3 (#386)
Co-authored-by: Enrico Olivelli <[email protected]>
1 parent a574966 commit e42a07a

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkEdges.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -670,9 +670,13 @@ public void testFailure() throws Exception
670670
client.checkExists().forPath("/hey");
671671
fail();
672672
}
673+
catch ( KeeperException.SessionExpiredException e )
674+
{
675+
// correct, this happens on ZK 3.6.3+
676+
}
673677
catch ( KeeperException.ConnectionLossException e )
674678
{
675-
// correct
679+
// correct, this happens on ZK 3.5.x, 3.6.0 -> 3.6.2
676680
}
677681
finally
678682
{

curator-test/src/main/java/org/apache/curator/test/TestingQuorumPeerMain.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public QuorumPeer getTestingQuorumPeer()
6060
}
6161

6262
@Override
63-
public void close() throws IOException
63+
public void close()
6464
{
6565
if ( (quorumPeer != null) && !isClosed )
6666
{

pom.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,10 @@
6666
<short-jdk-version>8</short-jdk-version>
6767
<jdk-version>1.${short-jdk-version}</jdk-version>
6868

69+
<redirectTestOutputToFile>true</redirectTestOutputToFile>
70+
6971
<!-- versions -->
70-
<zookeeper-version>3.6.0</zookeeper-version>
72+
<zookeeper-version>3.6.3</zookeeper-version>
7173
<maven-bundle-plugin-version>5.1.1</maven-bundle-plugin-version>
7274
<maven-javadoc-plugin-version>3.0.1</maven-javadoc-plugin-version>
7375
<doxia-module-confluence-version>1.8</doxia-module-confluence-version>
@@ -772,7 +774,7 @@
772774
<configuration>
773775
<threadCount>1</threadCount>
774776
<reuseForks>false</reuseForks>
775-
<redirectTestOutputToFile>true</redirectTestOutputToFile>
777+
<redirectTestOutputToFile>${redirectTestOutputToFile}</redirectTestOutputToFile>
776778
<rerunFailingTestsCount>2</rerunFailingTestsCount>
777779
</configuration>
778780
</plugin>

0 commit comments

Comments
 (0)