summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@vespa.ai>2023-12-07 16:13:15 +0100
committerBjørn Christian Seime <bjorncs@vespa.ai>2023-12-07 16:13:15 +0100
commit8192d06f10f9f068713417948e9947002598d381 (patch)
tree647536599327c52f7fc9a963bbacde842cff94f6
parent52b74cd32acdc3f55148af270c143ec82650aa48 (diff)
Add version property
-rw-r--r--dependency-versions/pom.xml1
-rw-r--r--parent/pom.xml6
-rw-r--r--vespa-dependencies-enforcer/allowed-maven-dependencies.txt2
3 files changed, 5 insertions, 4 deletions
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml
index 3ae42efb144..916646ee239 100644
--- a/dependency-versions/pom.xml
+++ b/dependency-versions/pom.xml
@@ -131,6 +131,7 @@
<protobuf.vespa.version>3.25.1</protobuf.vespa.version>
<questdb.vespa.version>7.3.5</questdb.vespa.version>
<spifly.vespa.version>1.3.7</spifly.vespa.version>
+ <spotbugs.vespa.version>4.8.1</spotbugs.vespa.version> <!-- Must match major version in https://github.com/apache/zookeeper/blob/master/pom.xml -->
<snappy.vespa.version>1.1.10.5</snappy.vespa.version>
<surefire.vespa.version>3.2.2</surefire.vespa.version>
<velocity.vespa.version>2.3</velocity.vespa.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index d9e9d7df9bd..f8bb67fa544 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -511,11 +511,11 @@
</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. -->
+ Version must be the same as the one zk uses - check the zk pom file.
+ https://github.com/apache/zookeeper/blob/master/pom.xml -->
<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>4.8.1</version>
+ <version>${spotbugs.vespa.version}</version>
</dependency>
<dependency>
<groupId>org.wiremock</groupId>
diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
index 64204feed83..625b0242fb0 100644
--- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
+++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
@@ -21,7 +21,7 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson2.vespa.versio
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2.vespa.version}
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jackson2.vespa.version}
com.github.luben:zstd-jni:${luben.zstd.vespa.version}
-com.github.spotbugs:spotbugs-annotations:3.1.9
+com.github.spotbugs:spotbugs-annotations:${spotbugs.vespa.version}
com.google.code.findbugs:jsr305:${findbugs.vespa.version}
com.google.errorprone:error_prone_annotations:${error-prone-annotations.vespa.version}
com.google.guava:failureaccess:1.0.1