You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2021/02/05 10:44:31 UTC
[maven] 04/08: [MNG-7068] Active dependency management for Google
Guice/Guava
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch revert-MNG-6772
in repository https://gitbox.apache.org/repos/asf/maven.git
commit cf2dfbe2635b2e0b7ba70479968dab9480b7337c
Author: boris-unckel <bu...@mail.unckel.net>
AuthorDate: Tue Jan 5 23:00:26 2021 +0100
[MNG-7068] Active dependency management for Google Guice/Guava
This closes #462
---
maven-core/pom.xml | 8 +++++++
maven-embedder/pom.xml | 30 ++++++++++-----------------
maven-model-builder/pom.xml | 10 +++++++++
maven-resolver-provider/pom.xml | 14 +++++++++++++
pom.xml | 46 +++++++++++++++++++++++++++++++++++++++++
5 files changed, 89 insertions(+), 19 deletions(-)
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 4316ff7..d0d73a1 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -110,6 +110,14 @@ under the License.
<classifier>no_aop</classifier>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>failureaccess</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 0ca1244..b83dd0e 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -87,30 +87,22 @@ under the License.
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</exclusion>
- <!-- MNG-6549 remove unused transitive dependencies of Guava, that is a dependency of Guice -->
+ <!-- MNG-7068 Active dependency management for Google Guice / Google Guava. Excludes of Guava are managed in parent POM -->
<exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.checkerframework</groupId>
- <artifactId>checker-qual</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.j2objc</groupId>
- <artifactId>j2objc-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-annotations</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>failureaccess</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index 3beadaf..ed56dce 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -79,6 +79,16 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>failureaccess</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
<scope>test</scope>
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index 5bbeb84..bb51172 100644
--- a/maven-resolver-provider/pom.xml
+++ b/maven-resolver-provider/pom.xml
@@ -80,8 +80,22 @@ under the License.
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>failureaccess</artifactId>
+ <optional>true</optional>
+ </dependency>
<!-- Testing -->
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/pom.xml b/pom.xml
index 07aa46a..655557b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,8 @@ under the License.
<plexusInterpolationVersion>1.26</plexusInterpolationVersion>
<plexusUtilsVersion>3.3.0</plexusUtilsVersion>
<guiceVersion>4.2.3</guiceVersion>
+ <guavaVersion>30.1-jre</guavaVersion>
+ <guavafailureaccessVersion>1.0.1</guavafailureaccessVersion>
<sisuInjectVersion>0.3.4</sisuInjectVersion>
<wagonVersion>3.4.2</wagonVersion>
<jsoupVersion>1.12.1</jsoupVersion>
@@ -274,6 +276,50 @@ under the License.
<artifactId>guice</artifactId>
<version>${guiceVersion}</version>
<classifier>no_aop</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <!-- This is a transitive dep of com.google.inject:guice -->
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guavaVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>failureaccess</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>listenablefuture</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.j2objc</groupId>
+ <artifactId>j2objc-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <!-- This is a transitive dep of com.google.guava:guava -->
+ <groupId>com.google.guava</groupId>
+ <artifactId>failureaccess</artifactId>
+ <version>${guavafailureaccessVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>