From 9442d5f310003c550c24d33cc610121239629568 Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@verizonmedia.com>
Date: Sat, 26 Oct 2019 11:45:07 +0200
Subject: Revert "Reapply "Create seperate bundles compiled against different
 ZooKeeper versions""

---
 zookeeper-server/pom.xml | 40 ++++++++++++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 6 deletions(-)

(limited to 'zookeeper-server/pom.xml')

diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml
index fe182645681..3ccda41d1b9 100644
--- a/zookeeper-server/pom.xml
+++ b/zookeeper-server/pom.xml
@@ -9,20 +9,48 @@
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <artifactId>zookeeper-server</artifactId>
-  <packaging>pom</packaging>
+  <packaging>container-plugin</packaging>
   <version>7-SNAPSHOT</version>
-  <modules>
-    <module>zookeeper-server-common</module>
-    <module>zookeeper-server-3.4</module>
-    <module>zookeeper-server-3.5</module>
-  </modules>
   <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>defaults</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>container-dev</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>vespajlib</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>vespalog</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.zookeeper</groupId>
+      <artifactId>zookeeper</artifactId>
+    </dependency>
+    <dependency>
+      <!-- Needed to have the same version as slf4j-api -->
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.7.5</version>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
-- 
cgit v1.2.3