summaryrefslogtreecommitdiffstats
path: root/zkfacade
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2019-10-25 18:27:05 +0200
committerGitHub <noreply@github.com>2019-10-25 18:27:05 +0200
commit209e250212e6156e30c1f18a4e769ebb6e47134f (patch)
treec790f4b69b9165e4354c511b4bddf2d126ce4922 /zkfacade
parent540e1a9ac4b4b78fec26a3a03374c89dbd84f4a2 (diff)
parent96a975551790c4ea7f89399926d71905c40e38a8 (diff)
Merge pull request #11101 from vespa-engine/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>