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-common/CMakeLists.txt         |  2 -
 zookeeper-server/zookeeper-server-common/pom.xml   | 52 ----------------------
 .../vespa/zookeeper/VespaZooKeeperServer.java      | 11 -----
 .../com/yahoo/vespa/zookeeper/package-info.java    |  5 ---
 4 files changed, 70 deletions(-)
 delete mode 100644 zookeeper-server/zookeeper-server-common/CMakeLists.txt
 delete mode 100644 zookeeper-server/zookeeper-server-common/pom.xml
 delete mode 100644 zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServer.java
 delete mode 100644 zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/package-info.java

(limited to 'zookeeper-server/zookeeper-server-common')

diff --git a/zookeeper-server/zookeeper-server-common/CMakeLists.txt b/zookeeper-server/zookeeper-server-common/CMakeLists.txt
deleted file mode 100644
index fd467aca067..00000000000
--- a/zookeeper-server/zookeeper-server-common/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_fat_java_artifact(zookeeper-server-common)
diff --git a/zookeeper-server/zookeeper-server-common/pom.xml b/zookeeper-server/zookeeper-server-common/pom.xml
deleted file mode 100644
index 66e5bc2075c..00000000000
--- a/zookeeper-server/zookeeper-server-common/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.yahoo.vespa</groupId>
-    <artifactId>zookeeper-server</artifactId>
-    <version>7-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  <artifactId>zookeeper-server-common</artifactId>
-  <packaging>container-plugin</packaging>
-  <version>7-SNAPSHOT</version>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <compilerArgs>
-            <arg>-Xlint:all</arg>
-            <arg>-Werror</arg>
-          </compilerArgs>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <redirectTestOutputToFile>${test.hide}</redirectTestOutputToFile>
-          <forkMode>once</forkMode>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <configuration>
-          <updateReleaseInfo>true</updateReleaseInfo>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>com.yahoo.vespa</groupId>
-        <artifactId>bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <importPackage>com.sun.management</importPackage>
-          <bundleSymbolicName>zookeeper-server</bundleSymbolicName>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServer.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServer.java
deleted file mode 100644
index 5a1f31a75c3..00000000000
--- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServer.java
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.zookeeper;
-
-/**
- * Interface for a component that writes zookeeper config and starts a zookeeper server.
- *
- * @author Harald Musum
- */
-public interface VespaZooKeeperServer {
-
-}
diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/package-info.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/package-info.java
deleted file mode 100644
index 470d1350f9c..00000000000
--- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage
-package com.yahoo.vespa.zookeeper;
-
-import com.yahoo.osgi.annotation.ExportPackage;
-- 
cgit v1.2.3