diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2023-12-08 08:54:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-08 08:54:23 +0100 |
| commit | 2908eb01b5d7d8d427af68efe1f05cc225a76423 (patch) | |
| tree | a5f8d19ab8e80934f5192082c53f11474c185059 | |
| parent | a608b398c85f5586cdbe3f75c15fad9e7905529d (diff) | |
| parent | 8192d06f10f9f068713417948e9947002598d381 (diff) | |
Merge pull request #29579 from vespa-engine/renovate/com.github.spotbugs-spotbugs-annotations-4.x
Update dependency com.github.spotbugs:spotbugs-annotations to v4
| -rw-r--r-- | dependency-versions/pom.xml | 1 | ||||
| -rw-r--r-- | parent/pom.xml | 6 | ||||
| -rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index f1769320ec6..35bba2d5e74 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 4009c78a0c1..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>3.1.9</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 |