Revert "Reapply "Move ZooKeeperServer to another module""

12 files changed, 2 insertions, 36 deletions

diff --git a/clustercontroller-apps/pom.xml b/clustercontroller-apps/pom.xml
index 8d8255493bf..acd9656db38 100644
--- a/clustercontroller-apps/pom.xml
+++ b/clustercontroller-apps/pom.xml
@@ -54,12 +54,6 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.yahoo.vespa</groupId>
-            <artifactId>zookeeper-server</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
             <groupId>org.codehaus.jettison</groupId>
             <artifactId>jettison</artifactId>
             <scope>test</scope>
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
index e45bf3f0921..a9af815aa1e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
@@ -29,7 +29,7 @@ public class ClusterControllerContainer extends Container implements
         ZookeeperServerConfig.Producer
 {
     private static final ComponentSpecification CLUSTERCONTROLLER_BUNDLE = new ComponentSpecification("clustercontroller-apps");
-    private static final ComponentSpecification ZOOKEEPER_SERVER_BUNDLE = new ComponentSpecification("zookeeper-server");
+    private static final ComponentSpecification ZOOKEEPER_SERVER_BUNDLE = new ComponentSpecification("zkfacade");
 
     private final Set<String> bundles = new TreeSet<>();
 
@@ -59,7 +59,6 @@ public class ClusterControllerContainer extends Container implements
         addFileBundle("lib/jars/clustercontroller-apputil-jar-with-dependencies.jar");
         addFileBundle("lib/jars/clustercontroller-core-jar-with-dependencies.jar");
         addFileBundle("lib/jars/clustercontroller-utils-jar-with-dependencies.jar");
-        addFileBundle("lib/jars/zookeeper-server-jar-with-dependencies.jar");
     }
 
     @Override
diff --git a/configserver/CMakeLists.txt b/configserver/CMakeLists.txt
index 54961945407..8f939e54d55 100644
--- a/configserver/CMakeLists.txt
+++ b/configserver/CMakeLists.txt
@@ -20,5 +20,4 @@ install_symlink(lib/jars/service-monitor-jar-with-dependencies.jar conf/configse
 install_symlink(lib/jars/application-model-jar-with-dependencies.jar conf/configserver-app/components/application-model.jar)
 install_symlink(lib/jars/node-repository-jar-with-dependencies.jar conf/configserver-app/components/node-repository.jar)
 install_symlink(lib/jars/zkfacade-jar-with-dependencies.jar conf/configserver-app/components/zkfacade.jar)
-install_symlink(lib/jars/zookeeper-server-jar-with-dependencies.jar conf/configserver-app/components/zookeeper-server.jar)
 install_symlink(conf/configserver-app/components lib/jars/config-models)
diff --git a/configserver/pom.xml b/configserver/pom.xml
index de7fe02452f..778b6264f5e 100644
--- a/configserver/pom.xml
+++ b/configserver/pom.xml
@@ -191,12 +191,6 @@
       <scope>compile</scope> <!-- TODO Should ideally be provided, but this bundle is not installed as part of configserver. Orchestrator bundle also includes jaxrs_client_utils in compile scope -->
     </dependency>
     <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>zookeeper-server</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
       <scope>provided</scope>
diff --git a/configserver/src/main/resources/configserver-app/services.xml b/configserver/src/main/resources/configserver-app/services.xml
index 25e6a727841..97b2156e8ca 100644
--- a/configserver/src/main/resources/configserver-app/services.xml
+++ b/configserver/src/main/resources/configserver-app/services.xml
@@ -11,7 +11,7 @@
 
     <component id="com.yahoo.vespa.config.server.ConfigServerBootstrap" bundle="configserver" />
     <component id="com.yahoo.vespa.config.server.monitoring.Metrics" bundle="configserver" />
-    <component id="com.yahoo.vespa.zookeeper.ZooKeeperServer" bundle="zookeeper-server" />
+    <component id="com.yahoo.vespa.zookeeper.ZooKeeperServer" bundle="zkfacade" />
     <component id="com.yahoo.vespa.config.server.rpc.RpcServer" bundle="configserver" />
     <component id="com.yahoo.vespa.config.server.ConfigServerDB" bundle="configserver" />
     <component id="com.yahoo.vespa.config.server.session.FileDistributionFactory" bundle="configserver" />
diff --git a/container-disc/pom.xml b/container-disc/pom.xml
index 98fb483f9bc..6506d6862cb 100644
--- a/container-disc/pom.xml
+++ b/container-disc/pom.xml
@@ -166,7 +166,6 @@
                 defaults-jar-with-dependencies.jar,
                 component-jar-with-dependencies.jar,
                 zkfacade-jar-with-dependencies.jar,
-                zookeeper-server-jar-with-dependencies.jar,
                 <!-- Misc 3rd party bundles -->
                 bcpkix-jdk15on-${bouncycastle.version}.jar,
                 bcprov-jdk15on-${bouncycastle.version}.jar,
diff --git a/standalone-container/vespa-standalone-container.spec b/standalone-container/vespa-standalone-container.spec
index c8029a81bf6..31312bde6f7 100644
--- a/standalone-container/vespa-standalone-container.spec
+++ b/standalone-container/vespa-standalone-container.spec
@@ -62,7 +62,6 @@ declare -a modules=(
   vespa-athenz
   vespaclient-container-plugin
   zkfacade
-  zookeeper-server
 )
 for module in "${modules[@]}"; do
     cp "$module"/target/"$module"-jar-with-dependencies.jar "$jars_dir"
diff --git a/zkfacade/pom.xml b/zkfacade/pom.xml
index e32a86937e8..8b2a90abc12 100644
--- a/zkfacade/pom.xml
+++ b/zkfacade/pom.xml
@@ -36,12 +36,6 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>zookeeper-server</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.curator</groupId>
       <artifactId>curator-recipes</artifactId>
     </dependency>
@@ -66,12 +60,6 @@
       <artifactId>slf4j-jdk14</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>
-    <dependency>
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>vespalog</artifactId>
       <version>${project.version}</version>
diff --git a/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java b/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java
index 252dc6697b0..252dc6697b0 100644
--- a/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java
diff --git a/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/package-info.java b/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/package-info.java
index 470d1350f9c..470d1350f9c 100644
--- a/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/package-info.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/package-info.java
diff --git a/zookeeper-server/src/test/java/com/yahoo/vespa/zookeeper/ZooKeeperServerTest.java b/zkfacade/src/test/java/com/yahoo/vespa/zookeeper/ZooKeeperServerTest.java
index 3f33892fd45..3f33892fd45 100644
--- a/zookeeper-server/src/test/java/com/yahoo/vespa/zookeeper/ZooKeeperServerTest.java
+++ b/zkfacade/src/test/java/com/yahoo/vespa/zookeeper/ZooKeeperServerTest.java
diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml
index 3ccda41d1b9..54d73b8a702 100644
--- a/zookeeper-server/pom.xml
+++ b/zookeeper-server/pom.xml
@@ -45,12 +45,6 @@
       <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>