summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--clustercontroller-core/pom.xml7
-rw-r--r--parent/pom.xml8
2 files changed, 15 insertions, 0 deletions
diff --git a/clustercontroller-core/pom.xml b/clustercontroller-core/pom.xml
index 3b1cb16aa96..9ac7c93134c 100644
--- a/clustercontroller-core/pom.xml
+++ b/clustercontroller-core/pom.xml
@@ -66,6 +66,13 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <!-- Not used by this module, but compilation fails without it because zookeeper uses these annotations.
+ Provided scoped here to avoid dependents getting it transitively. -->
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<scope>provided</scope>
diff --git a/parent/pom.xml b/parent/pom.xml
index 945af96b14b..035bc311735 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -419,6 +419,14 @@
<version>1.6</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>
+ <dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-standalone</artifactId>
<version>2.6.0</version>