diff options
author | Harald Musum <musum@yahooinc.com> | 2023-12-15 15:49:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-15 15:49:02 +0100 |
commit | 28f8cf3e298d51ca703ceee36a992297d38637cc (patch) | |
tree | 5767022d30c0bd4de34a6671e514e1e5c7fb6aea /zkfacade | |
parent | 3a9f89fe60e3420eed435daee435a4f8534c9512 (diff) | |
parent | 76a89eb98d9e5ce63cd7a725d3549c38d0b681e8 (diff) |
Merge pull request #29674 from vespa-engine/revert-29671-jonmv/reapply-zk-3.9.1
Revert "Jonmv/reapply zk 3.9.1"
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, 31 insertions, 8 deletions
diff --git a/zkfacade/pom.xml b/zkfacade/pom.xml index 02be1006bc3..daaa7dfa14f 100644 --- a/zkfacade/pom.xml +++ b/zkfacade/pom.xml @@ -58,9 +58,36 @@ </exclusions> </dependency> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>${zookeeper.client.artifactId}</artifactId> - <version>${project.version}</version> + <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> <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 169aee416e5..c372c69ad6b 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.server.VespaZooKeeperServer; +import com.yahoo.vespa.zookeeper.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 deleted file mode 100644 index 7c81b651f30..00000000000 --- a/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/client/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -// 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; |