diff --git core/pom.xml core/pom.xml index 41ba531..c0d802c 100644 --- core/pom.xml +++ core/pom.xml @@ -230,7 +230,7 @@ ${thrift.version} - org.apache.hadoop.zookeeper + org.apache.hadoop zookeeper ${zookeeper.version} diff --git core/src/main/java/org/apache/hadoop/hbase/MiniZooKeeperCluster.java core/src/main/java/org/apache/hadoop/hbase/MiniZooKeeperCluster.java index 6ac61c4..3929955 100644 --- core/src/main/java/org/apache/hadoop/hbase/MiniZooKeeperCluster.java +++ core/src/main/java/org/apache/hadoop/hbase/MiniZooKeeperCluster.java @@ -26,6 +26,7 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.Reader; import java.net.BindException; +import java.net.InetSocketAddress; import java.net.Socket; import org.apache.commons.logging.Log; @@ -100,7 +101,7 @@ public class MiniZooKeeperCluster { ZooKeeperServer server = new ZooKeeperServer(dir, dir, tickTimeToUse); while (true) { try { - standaloneServerFactory = new NIOServerCnxn.Factory(clientPort); + standaloneServerFactory = new NIOServerCnxn.Factory(new InetSocketAddress(clientPort)); } catch (BindException e) { LOG.info("Faild binding ZK Server to client port: " + clientPort); //this port is already in use. try to use another diff --git core/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java core/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java index d344fd8..cbbeae5 100644 --- core/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java +++ core/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java @@ -119,7 +119,7 @@ public class TestHQuorumPeer extends HBaseTestCase { int syncLimit = config.getSyncLimit(); assertEquals(5, syncLimit); assertEquals(dataDir.toString(), config.getDataDir()); - assertEquals(2181, config.getClientPort()); + assertEquals(2181, config.getClientPortAddress().getPort()); Map servers = config.getServers(); assertEquals(1, servers.size()); assertTrue(servers.containsKey(Long.valueOf(0))); diff --git pom.xml pom.xml index 1f76c2e..6a8990c 100644 --- pom.xml +++ pom.xml @@ -166,8 +166,8 @@ 2.4 2.0 1.2 - - 3.2.2 + 3.3.0 + 0.2.0 1.4.0 1.5.8 @@ -176,6 +176,17 @@ + ibiblio.org + ibiblio mirror + http://mirrors.ibiblio.org/pub/mirrors/maven2/ + + false + + + true + + + java.net Java.Net http://download.java.net/maven/2/