diff options
author | gjoranv <gv@verizonmedia.com> | 2019-09-27 16:50:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-27 16:50:07 +0200 |
commit | a3daaac29a529cab2765885abe918b9267a13b7a (patch) | |
tree | 431a1294c40bcf93661d3547bb2a2384da045af9 /parent/pom.xml | |
parent | e28efabad1bac5b5265b48003f1b05a53d47ae5a (diff) | |
parent | f026a03707025043dd607b911d4859894f1d65a4 (diff) |
Merge pull request #10802 from vespa-engine/revert-10797-revert-10679-revert-10654-hmusum/upgrade-to-zookeeper-3.5
Revert "Reapply "upgrade to zookeeper 3.5""
Diffstat (limited to 'parent/pom.xml')
-rw-r--r-- | parent/pom.xml | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/parent/pom.xml b/parent/pom.xml index 348737070d3..0404249571f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -505,17 +505,14 @@ <artifactId>commons-pool</artifactId> <version>1.5.6</version> </dependency> - - <!-- BEGIN zookeeper --> - - <!-- Explicitly force Zookeeper version, + <!-- Explicitly included to get Zookeeper version 3.4.14, can be excluded if you want the Zookeeper version used by curator by default --> <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>${zookeeper.version}</version> + <version>3.4.14</version> </dependency> <dependency> <groupId>org.apache.curator</groupId> @@ -528,17 +525,6 @@ <version>${curator.version}</version> </dependency> <dependency> - <!-- Needed by zookeeper, which has an optional dependency. - Version must be the same as the one zk uses - check the zk pom file. --> - <groupId>com.github.spotbugs</groupId> - <artifactId>spotbugs-annotations</artifactId> - <!-- No version property, as we don't want maven-dependency-plugin to alert about newer versions. --> - <version>3.1.9</version> - </dependency> - - <!-- END zookeeper --> - - <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId> <version>${junit.version}</version> @@ -797,7 +783,6 @@ <maven-shade-plugin.version>3.2.1</maven-shade-plugin.version> <prometheus.client.version>0.6.0</prometheus.client.version> <protobuf.version>3.7.0</protobuf.version> - <zookeeper.version>3.5.5</zookeeper.version> <surefire.version>2.22.0</surefire.version> <tensorflow.version>1.12.0</tensorflow.version> |