From 27fad86819988d1a374091c1d7772932e882efb6 Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Tue, 10 Sep 2019 11:59:36 +0200
Subject: Add spotbugs dep to clustercontroller-core.

+ Use version property for zk in parent pom
---
 parent/pom.xml | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'parent/pom.xml')

diff --git a/parent/pom.xml b/parent/pom.xml
index 655f33c5852..ade0bc8725e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -505,14 +505,17 @@
                 <artifactId>commons-pool</artifactId>
                 <version>1.5.6</version>
             </dependency>
-            <!-- Explicitly included to get Zookeeper version 3.5.5,
+
+            <!-- BEGIN zookeeper -->
+
+            <!-- Explicitly force Zookeeper version,
                  can be excluded if you want the Zookeeper version
                  used by curator by default
             -->
             <dependency>
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>
-                <version>3.5.5</version>
+                <version>${zookeeper.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.curator</groupId>
@@ -524,6 +527,17 @@
                 <artifactId>curator-test</artifactId>
                 <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>
@@ -789,6 +803,7 @@
         <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>
-- 
cgit v1.2.3