diff options
| author | Harald Musum <musum@verizonmedia.com> | 2019-10-26 11:44:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-26 11:44:56 +0200 |
| commit | 5b4544bb226235e8b541eefc229ac00ecdd38eec (patch) | |
| tree | e3a07bcba7d0d1f5aac2c0e9a4f88536b00ab214 /parent | |
| parent | c13358c3a86323ad89d9e883dbe919bb09baed99 (diff) | |
| parent | 6daa95d998561df8e8d4a0e5b5d16b0c13f20abd (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 'parent')
| -rw-r--r-- | parent/pom.xml | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/parent/pom.xml b/parent/pom.xml index 56158086fae..e7cb674822e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -651,15 +651,6 @@ <version>1.7</version> </dependency> <dependency> - <!-- Explicitly force Zookeeper version, - can be excluded if you want the Zookeeper version - used by curator by default - --> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - <version>${zookeeper.version}</version> - </dependency> - <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <version>3.11.1</version> @@ -788,7 +779,7 @@ <protobuf.version>3.7.0</protobuf.version> <surefire.version>2.22.0</surefire.version> <tensorflow.version>1.12.0</tensorflow.version> - <zookeeper.version>3.4.14</zookeeper.version> + <zookeeper.client.version>3.4.14</zookeeper.client.version> <doclint>all</doclint> <test.hide>true</test.hide> |