diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2019-10-25 20:10:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-25 20:10:35 +0200 |
| commit | b4b92200de63b327f8d4bcea4ccb33b79f0b4138 (patch) | |
| tree | 92433e634411e8289b7d74e3ed6c0feaa60e2461 /parent | |
| parent | 209e250212e6156e30c1f18a4e769ebb6e47134f (diff) | |
| parent | 1b793e4266eb60fbe30b244e7abbfba44d0f685c (diff) | |
Merge pull request #11112 from vespa-engine/revert-11101-revert-11098-revert-11096-revert-11095-revert-11089-hmusum/create-versioned-zookeeper-bundles
Revert "Reapply "Create seperate bundles compiled against different ZooKeeper versions""
Diffstat (limited to 'parent')
| -rw-r--r-- | parent/pom.xml | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/parent/pom.xml b/parent/pom.xml index e7cb674822e..56158086fae 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -651,6 +651,15 @@ <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> @@ -779,7 +788,7 @@ <protobuf.version>3.7.0</protobuf.version> <surefire.version>2.22.0</surefire.version> <tensorflow.version>1.12.0</tensorflow.version> - <zookeeper.client.version>3.4.14</zookeeper.client.version> + <zookeeper.version>3.4.14</zookeeper.version> <doclint>all</doclint> <test.hide>true</test.hide> |