diff --git a/pom.xml b/pom.xml
index 3f0da48..23a315e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
jar-pom
com.addthis.common.build.maven.pom
- 3.1.0
+ 3.4.0
com.addthis
@@ -32,32 +32,17 @@
-
- true
+ 2.2.2
+ 2.7.0
+ 3.9.3.Final
+ 3.4.6
-
-
-
- org.apache.maven.plugins
- maven-enforcer-plugin
- 1.3.1
-
-
-
-
- true
- ${enforcer.skip}
-
-
-
-
-
com.addthis
basis
- 2.2.2
+ ${bark.dep.basis.version}
com.fasterxml.jackson.core
@@ -109,7 +94,7 @@
org.apache.zookeeper
zookeeper
- 3.4.5
+ ${bark.dep.zookeeper.version}
@@ -139,12 +124,11 @@
io.netty
netty
- 3.9.3.Final
org.apache.curator
curator-recipes
- 2.4.0
+ ${bark.dep.curator.version}
org.slf4j
@@ -159,7 +143,7 @@
org.apache.curator
curator-test
- 2.4.0
+ ${bark.dep.curator.version}
org.slf4j
@@ -195,6 +179,16 @@
+
+
+
+ io.netty
+ netty
+ ${bark.dep.netty3.version}
+
+
+
+
@@ -210,7 +204,7 @@
org.apache.rat
apache-rat-plugin
- 0.10
+ 0.11
diff --git a/src/test/java/com/addthis/bark/ZkGroupMembershipTest.java b/src/test/java/com/addthis/bark/ZkGroupMembershipTest.java
index ca9dff4..e9e955a 100644
--- a/src/test/java/com/addthis/bark/ZkGroupMembershipTest.java
+++ b/src/test/java/com/addthis/bark/ZkGroupMembershipTest.java
@@ -17,7 +17,6 @@
import com.google.common.collect.ImmutableSet;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.CyclicBarrier;
@@ -47,18 +46,21 @@ public class ZkGroupMembershipTest {
private CuratorFramework myZkClient;
+ private TestingServer myKeeper;
+
@Before
public void startKeepers() throws Exception {
InstanceSpec spec = new InstanceSpec(null, -1, -1, -1, true, -1, 2000, 10);
System.setProperty("zk.servers", "localhost:" + spec.getPort());
System.setProperty("zookeeper.serverCnxnFactory", "org.apache.zookeeper.server.NettyServerCnxnFactory");
- TestingServer myKeeper = new TestingServer(spec);
+ myKeeper = new TestingServer(spec, true);
myZkClient = CuratorFrameworkFactory.newClient("localhost:" + spec.getPort(), new RetryOneTime(1000));
myZkClient.start();
}
@After
public void stopKeepers() throws IOException {
+ myKeeper.stop();
}
diff --git a/src/main/java/com/addthis/bark/ZkStartUtil.java b/src/test/java/com/addthis/bark/ZkStartUtil.java
similarity index 92%
rename from src/main/java/com/addthis/bark/ZkStartUtil.java
rename to src/test/java/com/addthis/bark/ZkStartUtil.java
index cfaad0c..b9e59aa 100644
--- a/src/main/java/com/addthis/bark/ZkStartUtil.java
+++ b/src/test/java/com/addthis/bark/ZkStartUtil.java
@@ -16,10 +16,7 @@
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.RetryOneTime;
-import org.apache.curator.test.InstanceSpec;
-import org.apache.curator.test.QuorumConfigBuilder;
import org.apache.curator.test.TestingServer;
-import org.apache.curator.test.TestingZooKeeperServer;
import org.junit.After;
import org.junit.Before;