summaryrefslogtreecommitdiffstats
path: root/clustercontroller-core
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2023-12-13 12:00:00 +0100
committerjonmv <venstad@gmail.com>2023-12-14 15:29:22 +0100
commit87770f47457385aef9b9c4e490865a85849fa39c (patch)
tree285782baff6aaaea0db92bcad08374ae8954e68c /clustercontroller-core
parent4576e6d67df0d48f963f05cb2091d0eb66d4ca90 (diff)
Embed ZK in zookeeper-client-common
Diffstat (limited to 'clustercontroller-core')
-rw-r--r--clustercontroller-core/pom.xml10
1 files changed, 8 insertions, 2 deletions
diff --git a/clustercontroller-core/pom.xml b/clustercontroller-core/pom.xml
index 7f845a26c73..4cbe98bad22 100644
--- a/clustercontroller-core/pom.xml
+++ b/clustercontroller-core/pom.xml
@@ -96,12 +96,18 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>com.yahoo.vespa</groupId>
<artifactId>zookeeper-client-common</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
- </dependency>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ </exclusion>
+ </dependency-->
<dependency>
<!-- Not used by this module, but compilation fails without it because zookeeper uses these annotations.
Provided scoped here to avoid dependents getting it transitively. -->