Repository: kafka Updated Branches: refs/heads/trunk 8a8c49028 -> 48cc2dc0e
Revert KAFKA-1485 Upgrade to Zookeeper 3.4.6 since system tests are failing Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/48cc2dc0 Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/48cc2dc0 Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/48cc2dc0 Branch: refs/heads/trunk Commit: 48cc2dc0ead0df1501abf16f583b3e365488e2d0 Parents: 8a8c490 Author: Joe Stein <[email protected]> Authored: Tue Aug 12 12:49:29 2014 -0400 Committer: Joe Stein <[email protected]> Committed: Tue Aug 12 12:49:29 2014 -0400 ---------------------------------------------------------------------- build.gradle | 2 +- core/src/test/scala/unit/kafka/zk/EmbeddedZookeeper.scala | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/48cc2dc0/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 45cf502..b514ac8 100644 --- a/build.gradle +++ b/build.gradle @@ -197,7 +197,7 @@ project(':core') { dependencies { compile project(':clients') compile "org.scala-lang:scala-library:$scalaVersion" - compile 'org.apache.zookeeper:zookeeper:3.4.6' + compile 'org.apache.zookeeper:zookeeper:3.3.4' compile 'com.101tec:zkclient:0.3' compile 'com.yammer.metrics:metrics-core:2.2.0' compile 'net.sf.jopt-simple:jopt-simple:3.2' http://git-wip-us.apache.org/repos/asf/kafka/blob/48cc2dc0/core/src/test/scala/unit/kafka/zk/EmbeddedZookeeper.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/zk/EmbeddedZookeeper.scala b/core/src/test/scala/unit/kafka/zk/EmbeddedZookeeper.scala index 3021a8c..d883bde 100644 --- a/core/src/test/scala/unit/kafka/zk/EmbeddedZookeeper.scala +++ b/core/src/test/scala/unit/kafka/zk/EmbeddedZookeeper.scala @@ -19,7 +19,6 @@ package kafka.zk import org.apache.zookeeper.server.ZooKeeperServer import org.apache.zookeeper.server.NIOServerCnxn -import org.apache.zookeeper.server.NIOServerCnxnFactory import kafka.utils.TestUtils import java.net.InetSocketAddress import kafka.utils.Utils @@ -30,8 +29,7 @@ class EmbeddedZookeeper(val connectString: String) { val tickTime = 500 val zookeeper = new ZooKeeperServer(snapshotDir, logDir, tickTime) val port = connectString.split(":")(1).toInt - val factory = new NIOServerCnxnFactory() - factory.configure(new InetSocketAddress("127.0.0.1", port),0) + val factory = new NIOServerCnxn.Factory(new InetSocketAddress("127.0.0.1", port)) factory.startup(zookeeper) def shutdown() {
