diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2023-02-17 08:14:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-17 08:14:58 +0100 |
| commit | fbb36d07b14a6288aa8b02a40f7814ac3648db8a (patch) | |
| tree | 7470983a11f865e83c25215969e3461a3cb48142 | |
| parent | c60a589c49c6843f7c085fa79ce16b3ab666bcca (diff) | |
| parent | d900b45fb85658ed26d03ce0eb585acdb4349ab6 (diff) | |
Merge pull request #26071 from vespa-engine/bjorncs/cleanup
Deduplicate versions
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 2 | ||||
| -rw-r--r-- | container-dependencies-enforcer/pom.xml | 2 | ||||
| -rw-r--r-- | container-dependency-versions/pom.xml | 7 | ||||
| -rw-r--r-- | maven-plugins/allowed-maven-dependencies.txt | 2 | ||||
| -rw-r--r-- | parent/pom.xml | 10 | ||||
| -rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 6 |
6 files changed, 23 insertions, 6 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 5e5325fd5ad..82842a8c28b 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -85,7 +85,7 @@ <!-- Guava with its internal dependencies --> <include>com.google.guava:guava:${guava.version}:provided</include> - <include>com.google.errorprone:error_prone_annotations:2.2.0:provided</include> + <include>com.google.errorprone:error_prone_annotations:2.18.0:provided</include> <include>com.google.guava:failureaccess:1.0.1:provided</include> <include>com.google.j2objc:j2objc-annotations:1.1:provided</include> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 8c420328fe2..d63a1867f9a 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -71,7 +71,7 @@ <!-- Guava with its internal dependencies --> <include>com.google.guava:guava:${guava.version}:provided</include> - <include>com.google.errorprone:error_prone_annotations:2.2.0:provided</include> + <include>com.google.errorprone:error_prone_annotations:2.18.0:provided</include> <include>com.google.guava:failureaccess:1.0.1:provided</include> <include>com.google.j2objc:j2objc-annotations:1.1:provided</include> diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 1665d9b7782..d7600cac927 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -66,6 +66,12 @@ <version>${guava.version}</version> </dependency> <dependency> + <!-- Only listed because it's a dependency of Guava --> + <groupId>com.google.errorprone</groupId> + <artifactId>error_prone_annotations</artifactId> + <version>${error-prone-annotations.version}</version> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> <version>${guice.version}</version> @@ -234,6 +240,7 @@ <properties> <aopalliance.version>1.0</aopalliance.version> + <error-prone-annotations.version>2.18.0</error-prone-annotations.version> <guava.version>27.1-jre</guava.version> <guice.version>4.2.3</guice.version> <jackson2.version>2.13.4</jackson2.version> diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt index c6f41406f4f..a3cc4cc7045 100644 --- a/maven-plugins/allowed-maven-dependencies.txt +++ b/maven-plugins/allowed-maven-dependencies.txt @@ -6,7 +6,7 @@ aopalliance:aopalliance:1.0 com.fasterxml.jackson.core:jackson-annotations:2.13.4 com.fasterxml.jackson.core:jackson-core:2.13.4 com.fasterxml.jackson.core:jackson-databind:2.13.4.2 -com.google.errorprone:error_prone_annotations:2.2.0 +com.google.errorprone:error_prone_annotations:2.18.0 com.google.guava:failureaccess:1.0.1 com.google.guava:guava:27.1-jre com.google.inject:guice:4.2.3:no_aop diff --git a/parent/pom.xml b/parent/pom.xml index 93945575588..2fcf5527302 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1093,6 +1093,16 @@ <artifactId>json</artifactId> <version>${org.json.version}</version> </dependency> + <dependency> + <groupId>com.google.errorprone</groupId> + <artifactId>error_prone_annotations</artifactId> + <version>2.18.0</version> + </dependency> + <dependency> + <groupId>org.checkerframework</groupId> + <artifactId>checker-qual</artifactId> + <version>3.30.0</version> + </dependency> </dependencies> </dependencyManagement> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 0f046daf226..2cd7c6247dd 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -25,7 +25,7 @@ com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.13.4 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.13.4 com.github.spotbugs:spotbugs-annotations:3.1.9 com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.2.0 +com.google.errorprone:error_prone_annotations:2.18.0 com.google.guava:failureaccess:1.0.1 com.google.guava:guava:27.1-jre com.google.inject:guice:4.2.3 @@ -127,9 +127,9 @@ org.apache.maven.wagon:wagon-provider-api:2.10 org.apache.opennlp:opennlp-tools:1.9.3 org.apache.velocity:velocity-engine-core:2.3 org.apache.yetus:audience-annotations:0.12.0 +org.apache.zookeeper:zookeeper:3.8.0 org.apache.zookeeper:zookeeper:3.8.1 org.apache.zookeeper:zookeeper-jute:3.8.0 -org.apache.zookeeper:zookeeper:3.8.0 org.apache.zookeeper:zookeeper-jute:3.8.1 org.apiguardian:apiguardian-api:1.1.2 org.bouncycastle:bcpkix-jdk18on:1.72 @@ -227,7 +227,7 @@ net.bytebuddy:byte-buddy:1.11.19 net.bytebuddy:byte-buddy-agent:1.11.19 org.apache.curator:curator-test:5.3.0 org.assertj:assertj-core:3.11.1 -org.checkerframework:checker-qual:2.5.2 +org.checkerframework:checker-qual:3.30.0 org.cthul:cthul-matchers:1.0 org.hamcrest:hamcrest-all:1.3 org.hamcrest:hamcrest-core:1.3 |