diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-12-21 11:11:02 +0100 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-12-21 11:11:02 +0100 |
| commit | 44d39e707649ff14be60956f9aaa73e3a32ae268 (patch) | |
| tree | 0ce63453b824cc1940fd43b1738e466c6cff2e05 | |
| parent | 836782b1a2ee624aaec316887180598d15508b89 (diff) | |
Use version tag for guava:failureaccess
| -rw-r--r-- | dependency-versions/pom.xml | 1 | ||||
| -rw-r--r-- | maven-plugins/allowed-maven-dependencies.txt | 2 | ||||
| -rw-r--r-- | parent/pom.xml | 5 | ||||
| -rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 9a09c2783f0..31bcb6bdc91 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -94,6 +94,7 @@ <dropwizard.metrics.vespa.version>4.2.23</dropwizard.metrics.vespa.version> <!-- ZK 3.9.1 requires this --> <eclipse-collections.vespa.version>11.1.0</eclipse-collections.vespa.version> <eclipse-sisu.vespa.version>0.9.0.M2</eclipse-sisu.vespa.version> + <failureaccess.vespa.version>1.0.2</failureaccess.vespa.version> <felix.vespa.version>7.0.5</felix.vespa.version> <felix.log.vespa.version>1.3.0</felix.log.vespa.version> <findbugs.vespa.version>3.0.2</findbugs.vespa.version> <!-- Should be kept in sync with guava --> diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt index 1c66b81b448..930a5020dc6 100644 --- a/maven-plugins/allowed-maven-dependencies.txt +++ b/maven-plugins/allowed-maven-dependencies.txt @@ -6,7 +6,7 @@ com.fasterxml.jackson.core:jackson-core:${jackson2.vespa.version} com.fasterxml.jackson.core:jackson-databind:${jackson-databind.vespa.version} com.github.luben:zstd-jni:${luben.zstd.vespa.version} com.google.errorprone:error_prone_annotations:${error-prone-annotations.vespa.version} -com.google.guava:failureaccess:1.0.1 +com.google.guava:failureaccess:${failureaccess.vespa.version} com.google.guava:guava:${guava.vespa.version} com.google.inject:guice:${guice.vespa.version} com.google.j2objc:j2objc-annotations:2.8 diff --git a/parent/pom.xml b/parent/pom.xml index 0506c87493c..42d8a15bca2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -529,6 +529,11 @@ </dependency> <dependency> <groupId>com.google.guava</groupId> + <artifactId>failureaccess</artifactId> + <version>${failureaccess.vespa.version}</version> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <version>${guava.vespa.version}</version> <exclusions> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 8ffb4582e5f..66153cd3fda 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -24,7 +24,7 @@ com.github.luben:zstd-jni:${luben.zstd.vespa.version} 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 +com.google.guava:failureaccess:${failureaccess.vespa.version} com.google.guava:guava:${guava.vespa.version} com.google.inject:guice:${guice.vespa.version} com.google.j2objc:j2objc-annotations:2.8 |