summaryrefslogtreecommitdiffstats
path: root/zkfacade
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2019-10-26 11:44:56 +0200
committerGitHub <noreply@github.com>2019-10-26 11:44:56 +0200
commit5b4544bb226235e8b541eefc229ac00ecdd38eec (patch)
treee3a07bcba7d0d1f5aac2c0e9a4f88536b00ab214 /zkfacade
parentc13358c3a86323ad89d9e883dbe919bb09baed99 (diff)
parent6daa95d998561df8e8d4a0e5b5d16b0c13f20abd (diff)
Merge pull request #11113 from vespa-engine/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>