summaryrefslogtreecommitdiffstats
path: root/parent
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2019-09-17 06:34:11 +0200
committerGitHub <noreply@github.com>2019-09-17 06:34:11 +0200
commita7a14309b04838023f26c41d294f29eaf6303d5d (patch)
tree3832bee43ce7c2d1df314897dd9071bb15444618 /parent
parent4e7d59fc813746b2795ee713b137203c43c80a07 (diff)
Revert "Hmusum/upgrade to zookeeper 3.5"
Diffstat (limited to 'parent')
-rw-r--r--parent/pom.xml19
1 files changed, 2 insertions, 17 deletions
diff --git a/parent/pom.xml b/parent/pom.xml
index ade0bc8725e..7efe36e73f7 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>
@@ -803,7 +789,6 @@
<junit.version>5.4.2</junit.version>
<prometheus.client.version>0.6.0</prometheus.client.version>
<protobuf.version>3.7.0</protobuf.version>
- <zookeeper.version>3.5.5</zookeeper.version>
</properties>
</project>