summaryrefslogtreecommitdiffstats
path: root/zkfacade
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2019-10-26 17:14:07 +0200
committerGitHub <noreply@github.com>2019-10-26 17:14:07 +0200
commit935cf534c4e775ec17feff0c62d0f587c064257b (patch)
treec1e0f656e8ab810986c42e1386a8ed5b69f5540c /zkfacade
parenta92f65c46645fca9040dcfc3b0fbda0386ae7f60 (diff)
parentbb2ea5d1973748c97f968279ffca9a51b7101a1c (diff)
Merge pull request #11117 from vespa-engine/revert-11115-revert-11113-revert-11112-revert-11101-revert-11098-revert-11096-revert-11095-revert-11089-hmusum/create-versioned-zookeeper-bundles
Reapply "Create seperate bundles compiled against different ZooKeeper versions"
Diffstat (limited to 'zkfacade')
-rw-r--r--zkfacade/pom.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/zkfacade/pom.xml b/zkfacade/pom.xml
index e32a86937e8..b857c31d262 100644
--- a/zkfacade/pom.xml
+++ b/zkfacade/pom.xml
@@ -37,7 +37,7 @@
</dependency>
<dependency>
<groupId>com.yahoo.vespa</groupId>
- <artifactId>zookeeper-server</artifactId>
+ <artifactId>zookeeper-server-common</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -80,6 +80,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
+ <version>${zookeeper.client.version}</version>
</dependency>
</dependencies>
<build>