From 1b793e4266eb60fbe30b244e7abbfba44d0f685c Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@verizonmedia.com>
Date: Fri, 25 Oct 2019 19:27:09 +0200
Subject: Revert "Reapply "Create seperate bundles compiled against different
 ZooKeeper versions""

---
 parent/pom.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'parent')

diff --git a/parent/pom.xml b/parent/pom.xml
index e7cb674822e..56158086fae 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -650,6 +650,15 @@
                 <artifactId>velocity</artifactId>
                 <version>1.7</version>
             </dependency>
+            <dependency>
+            <!-- Explicitly force Zookeeper version,
+                     can be excluded if you want the Zookeeper version
+                     used by curator by default
+            -->
+                <groupId>org.apache.zookeeper</groupId>
+                <artifactId>zookeeper</artifactId>
+                <version>${zookeeper.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.assertj</groupId>
                 <artifactId>assertj-core</artifactId>
@@ -779,7 +788,7 @@
         <protobuf.version>3.7.0</protobuf.version>
         <surefire.version>2.22.0</surefire.version>
         <tensorflow.version>1.12.0</tensorflow.version>
-        <zookeeper.client.version>3.4.14</zookeeper.client.version>
+        <zookeeper.version>3.4.14</zookeeper.version>
 
         <doclint>all</doclint>
         <test.hide>true</test.hide>
-- 
cgit v1.2.3