diff options
| author | gjoranv <gv@verizonmedia.com> | 2022-05-19 22:53:47 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2022-06-08 11:45:22 +0200 |
| commit | ef90737f0e313ec3fe6cd340020ccbfe73add7ec (patch) | |
| tree | ba59f59ed81b7ca095f3e68c0ae698dd98cfa65d | |
| parent | a3c011b941b39d066ed390f8817c9e91809d1138 (diff) | |
Move exclusions from container-dep-versions to container-dev
- The exclusions in container-dep-versions would affect users
that explicitly depend on guava.
| -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 | 17 | ||||
| -rw-r--r-- | container-dev/pom.xml | 15 |
4 files changed, 17 insertions, 19 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 56da8c20922..e55a22ba512 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -92,7 +92,7 @@ <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:[2.5.4, ${jackson2.version}]:jar:provided</include> <include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:[2.5.4, ${jackson2.version}]:jar:provided</include> - <!-- guava with dependencies --> + <!-- Guava with its internal dependencies --> <include>com.google.guava:guava:[${guava.version}]:jar:provided</include> <include>com.google.errorprone:error_prone_annotations:[2.2.0]:jar:provided</include> <include>com.google.guava:failureaccess:[1.0.1]:jar:provided</include> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 10105245c6b..e9e48b8259f 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -71,7 +71,7 @@ <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:[2.5.4, ${jackson2.version}]:jar:provided</include> <include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:[2.5.4, ${jackson2.version}]:jar:provided</include> - <!-- guava with dependencies --> + <!-- Guava with its internal dependencies --> <include>com.google.guava:guava:[${guava.version}]:jar:provided</include> <include>com.google.errorprone:error_prone_annotations:[2.2.0]:jar:provided</include> <include>com.google.guava:failureaccess:[1.0.1]:jar:provided</include> diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 6788e3530b2..872d0b2fa64 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -81,23 +81,6 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <version>${guava.version}</version> - <exclusions> - <exclusion> - <!-- Empty artifact for gradle projects, see the artifact's pom.xml --> - <groupId>com.google.guava</groupId> - <artifactId>listenablefuture</artifactId> - </exclusion> - <exclusion> - <!-- Annotations with retention Runtime. Remove exclusion if needed. --> - <groupId>org.checkerframework</groupId> - <artifactId>checker-qual</artifactId> - </exclusion> - <exclusion> - <!-- Annotation with retention class only --> - <groupId>org.codehaus.mojo</groupId> - <artifactId>animal-sniffer-annotations</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.google.inject.extensions</groupId> diff --git a/container-dev/pom.xml b/container-dev/pom.xml index 1c889448a40..f5c77a198c6 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -48,6 +48,21 @@ <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> </exclusion> + <exclusion> + <!-- Empty artifact for gradle projects, see the artifact's pom.xml --> + <groupId>com.google.guava</groupId> + <artifactId>listenablefuture</artifactId> + </exclusion> + <exclusion> + <!-- Annotations with retention Runtime. Remove exclusion if needed. --> + <groupId>org.checkerframework</groupId> + <artifactId>checker-qual</artifactId> + </exclusion> + <exclusion> + <!-- Annotation with retention class only --> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-annotations</artifactId> + </exclusion> </exclusions> </dependency> <dependency> |