From eb92ed8142f9dbcc26438dde63c6fa6f516d92be Mon Sep 17 00:00:00 2001
From: Sean Owen <srowen@gmail.com>
Date: Wed, 6 Aug 2014 09:21:14 +0100
Subject: [PATCH] Directly depend on zookeeper in external/kafka tests, because
 tests use ZK directly. Don't depend on ZK explicitly from core and remove
 unused zookeeper.version

---
 external/kafka/pom.xml | 10 ++++++----
 pom.xml                |  4 ----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/external/kafka/pom.xml b/external/kafka/pom.xml
index 4e2275ab238f7..2cc0c4e535719 100644
--- a/external/kafka/pom.xml
+++ b/external/kafka/pom.xml
@@ -68,12 +68,14 @@
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-simple</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>org.apache.zookeeper</groupId>
-          <artifactId>zookeeper</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.apache.zookeeper</groupId>
+      <artifactId>zookeeper</artifactId>
+      <version>3.4.5</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>net.sf.jopt-simple</groupId>
       <artifactId>jopt-simple</artifactId>
diff --git a/pom.xml b/pom.xml
index 9cbf3ea5995c3..bb9f99aedcb4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,6 @@
     <protobuf.version>2.4.1</protobuf.version>
     <yarn.version>${hadoop.version}</yarn.version>
     <hbase.version>0.94.6</hbase.version>
-    <zookeeper.version>3.4.5</zookeeper.version>
     <hive.version>0.12.0</hive.version>
     <parquet.version>1.4.3</parquet.version>
     <jblas.version>1.2.3</jblas.version>
@@ -1139,7 +1138,6 @@
         <hadoop.version>1.0.3-mapr-3.0.3</hadoop.version>
         <yarn.version>2.3.0-mapr-4.0.0-FCS</yarn.version>
         <hbase.version>0.94.17-mapr-1405</hbase.version>
-        <zookeeper.version>3.4.5-mapr-1406</zookeeper.version>
       </properties>
     </profile>
 
@@ -1152,7 +1150,6 @@
         <hadoop.version>2.3.0-mapr-4.0.0-FCS</hadoop.version>
         <yarn.version>2.3.0-mapr-4.0.0-FCS</yarn.version>
         <hbase.version>0.94.17-mapr-1405-4.0.0-FCS</hbase.version>
-        <zookeeper.version>3.4.5-mapr-1406</zookeeper.version>
       </properties>
       <dependencies>
         <dependency>
@@ -1219,7 +1216,6 @@
         <dependency>
           <groupId>org.apache.zookeeper</groupId>
           <artifactId>zookeeper</artifactId>
-          <version>${zookeeper.version}</version>
           <scope>provided</scope>
         </dependency>
       </dependencies>