From 01b40d7e149df23c84a7a13560208e862480ce3a Mon Sep 17 00:00:00 2001
From: jonmv <venstad@gmail.com>
Date: Fri, 15 Dec 2023 10:39:57 +0100
Subject: Revert "Merge pull request #29669 from
 vespa-engine/revert-29662-revert-29661-revert-29658-jonmv/zk-3.9.1-clients-2"

This reverts commit 9c8ba2608384ee79e143babd1e5a18a62166541f, reversing
changes made to 954785e4eb91286bd166c304e98042ec63b7eb84.
---
 zkfacade/pom.xml                                   | 33 ++--------------------
 .../main/java/com/yahoo/vespa/curator/Curator.java |  2 +-
 .../yahoo/vespa/zookeeper/client/package-info.java |  4 +++
 3 files changed, 8 insertions(+), 31 deletions(-)
 create mode 100644 zkfacade/src/main/java/com/yahoo/vespa/zookeeper/client/package-info.java

(limited to 'zkfacade')

diff --git a/zkfacade/pom.xml b/zkfacade/pom.xml
index daaa7dfa14f..02be1006bc3 100644
--- a/zkfacade/pom.xml
+++ b/zkfacade/pom.xml
@@ -58,36 +58,9 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.zookeeper</groupId>
-      <artifactId>zookeeper</artifactId>
-      <exclusions>
-        <!--
-          Container provides wiring for all common log libraries
-          Duplicate embedding results in various warnings being printed to stderr
-        -->
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <!-- snappy-java and metrics-core are included here
-     to be able to work with ZooKeeper >= 3.6.2 due to
-     class loading issues -->
-    <dependency>
-      <groupId>io.dropwizard.metrics</groupId>
-      <artifactId>metrics-core</artifactId>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.xerial.snappy</groupId>
-      <artifactId>snappy-java</artifactId>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>${zookeeper.client.artifactId}</artifactId>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
index c372c69ad6b..169aee416e5 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
@@ -8,7 +8,7 @@ import com.yahoo.concurrent.DaemonThreadFactory;
 import com.yahoo.path.Path;
 import com.yahoo.vespa.curator.recipes.CuratorCounter;
 import com.yahoo.vespa.defaults.Defaults;
-import com.yahoo.vespa.zookeeper.VespaZooKeeperServer;
+import com.yahoo.vespa.zookeeper.server.VespaZooKeeperServer;
 import com.yahoo.vespa.zookeeper.client.ZkClientConfigBuilder;
 import org.apache.curator.RetryPolicy;
 import org.apache.curator.framework.CuratorFramework;
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/client/package-info.java b/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/client/package-info.java
new file mode 100644
index 00000000000..7c81b651f30
--- /dev/null
+++ b/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/client/package-info.java
@@ -0,0 +1,4 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+@ExportPackage
+package com.yahoo.vespa.zookeeper.client;
+import com.yahoo.osgi.annotation.ExportPackage;
-- 
cgit v1.2.3