diff options
| author | gjoranv <gv@verizonmedia.com> | 2019-09-10 11:59:36 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2019-09-10 14:02:21 +0200 |
| commit | 27fad86819988d1a374091c1d7772932e882efb6 (patch) | |
| tree | 107a28b69827b82e100dbc5bf8ced0caca9f25a8 | |
| parent | 07a51de2783d16f3d55133694f2d94afc5c75861 (diff) | |
Add spotbugs dep to clustercontroller-core.
+ Use version property for zk in parent pom
| -rw-r--r-- | clustercontroller-core/pom.xml | 7 | ||||
| -rw-r--r-- | parent/pom.xml | 19 |
2 files changed, 24 insertions, 2 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 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> @@ -525,6 +528,17 @@ <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> @@ -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> |