diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-08-28 23:41:07 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-08-28 23:48:11 +0200 |
commit | 8604efff05ce59b982e1c0ee9cde5ded79d92210 (patch) | |
tree | 28926d62b43d88f446a9da0a2d3065a5a75915bb | |
parent | 9bcb1c20af863a250afae346250f61cfe67e6e6c (diff) |
Update error_prone_annotations to 2.21.1
-rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 2 | ||||
-rw-r--r-- | container-dependencies-enforcer/pom.xml | 2 | ||||
-rw-r--r-- | dependency-versions/pom.xml | 1 | ||||
-rw-r--r-- | maven-plugins/allowed-maven-dependencies.txt | 4 | ||||
-rw-r--r-- | parent/pom.xml | 2 | ||||
-rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 4 |
6 files changed, 8 insertions, 7 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 08d7ee07b0f..a13d094d19c 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -49,7 +49,7 @@ <!-- Guava with its internal dependencies --> <include>com.google.guava:guava:${guava.vespa.version}:provided</include> - <include>com.google.errorprone:error_prone_annotations:[2.18.0, 3):provided</include> + <include>com.google.errorprone:error_prone_annotations:[2.21.1, 3):provided</include> <include>com.google.guava:failureaccess:[1.0.1, 2):provided</include> <include>com.google.j2objc:j2objc-annotations:[2.8, 3):provided</include> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 10e0af3ce7a..e633df304fa 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -69,7 +69,7 @@ <!-- Guava with its internal dependencies --> <include>com.google.guava:guava:${guava.vespa.version}:provided</include> - <include>com.google.errorprone:error_prone_annotations:[2.18.0, 3):provided</include> + <include>com.google.errorprone:error_prone_annotations:[2.21.1, 3):provided</include> <include>com.google.guava:failureaccess:[1.0.1, 2):provided</include> <include>com.google.j2objc:j2objc-annotations:[2.8, 3):provided</include> diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 6666259b3cb..5ae550b8353 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -97,6 +97,7 @@ <junit.vespa.version>5.8.1</junit.vespa.version> <junit.platform.vespa.version>1.8.1</junit.platform.vespa.version> <junit4.vespa.version>4.13.2</junit4.vespa.version> + <luben.zstd.vespa.version>1.5.5-5</luben.zstd.vespa.version> <lucene.vespa.version>9.7.0</lucene.vespa.version> <maven-archiver.vespa.version>3.6.1</maven-archiver.vespa.version> <maven-wagon.vespa.version>2.12</maven-wagon.vespa.version> diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt index 3943f6e9ad6..100c6b81e9c 100644 --- a/maven-plugins/allowed-maven-dependencies.txt +++ b/maven-plugins/allowed-maven-dependencies.txt @@ -6,8 +6,8 @@ aopalliance:aopalliance:1.0 com.fasterxml.jackson.core:jackson-annotations:2.15.2 com.fasterxml.jackson.core:jackson-core:2.15.2 com.fasterxml.jackson.core:jackson-databind:2.15.2 -com.github.luben:zstd-jni:1.5.5-4 -com.google.errorprone:error_prone_annotations:2.18.0 +com.github.luben:zstd-jni:1.5.5-5 +com.google.errorprone:error_prone_annotations:2.21.1 com.google.guava:failureaccess:1.0.1 com.google.guava:guava:32.1.1-jre com.google.inject:guice:4.2.3 diff --git a/parent/pom.xml b/parent/pom.xml index dad1c014f52..2d065fc78ac 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -493,7 +493,7 @@ <dependency> <groupId>com.github.luben</groupId> <artifactId>zstd-jni</artifactId> - <version>1.5.5-4</version> + <version>${luben.zstd.vespa.version}</version> </dependency> <dependency> <!-- Needed by zookeeper, which has an optional dependency. diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 75f11b76532..f1185cca941 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -23,14 +23,14 @@ com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2 com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.15.2 com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.15.2 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.15.2 -com.github.luben:zstd-jni:1.5.5-4 +com.github.luben:zstd-jni:1.5.5-5 com.github.spotbugs:spotbugs-annotations:3.1.9 com.google.auth:google-auth-library-credentials:1.19.0 com.google.auth:google-auth-library-oauth2-http:1.19.0 com.google.auto.value:auto-value-annotations:1.10.1 com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.10 -com.google.errorprone:error_prone_annotations:2.18.0 +com.google.errorprone:error_prone_annotations:2.21.1 com.google.guava:failureaccess:1.0.1 com.google.guava:guava:32.1.1-jre com.google.http-client:google-http-client:1.43.3 |