diff options
author | jonmv <venstad@gmail.com> | 2023-12-17 12:45:29 +0100 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2023-12-17 12:45:29 +0100 |
commit | 5eb199b2b5670458324c4e6073a5a810bee33364 (patch) | |
tree | caf488f7fe3c1d0c4062248d394547384d8ab21c /zkfacade | |
parent | f9c603a4bb98169c29372e93ebaf8203deb24089 (diff) |
Revert "Merge pull request #29683 from vespa-engine/revert-29678-jonmv/reapply-zk-3.9.1"
This reverts commit c8ece8b229362c7bf725e4433ef4fec86024cd29, reversing
changes made to d42b67f0fe821d122548a345f27fda7f9c9c9d10.
Diffstat (limited to 'zkfacade')
-rw-r--r-- | zkfacade/pom.xml | 33 | ||||
-rw-r--r-- | zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java | 2 | ||||
-rw-r--r-- | zkfacade/src/main/java/com/yahoo/vespa/zookeeper/client/package-info.java | 4 |
3 files changed, 8 insertions, 31 deletions
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; |