This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MNG-7422 in repository https://gitbox.apache.org/repos/asf/maven.git
commit 8ce5bba52bb24079c41b70bfca4b06727ac67a40 Author: Karl Heinz Marbaise <[email protected]> AuthorDate: Mon Feb 21 20:36:30 2022 +0100 [MNG-7422] - Remove dependency to guava --- maven-core/pom.xml | 8 -------- maven-embedder/pom.xml | 24 +++++------------------- maven-model-builder/pom.xml | 10 ---------- maven-resolver-provider/pom.xml | 20 -------------------- pom.xml | 38 +++++--------------------------------- 5 files changed, 10 insertions(+), 90 deletions(-) diff --git a/maven-core/pom.xml b/maven-core/pom.xml index f46fdeb..27eda76 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -118,14 +118,6 @@ 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 a40ecca..c18b877 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -82,25 +82,6 @@ under the License. <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> <classifier>no_aop</classifier> - <exclusions> - <exclusion> - <groupId>aopalliance</groupId> - <artifactId>aopalliance</artifactId> - </exclusion> - <!-- MNG-7068 Active dependency management for Google Guice / Google Guava. Excludes of Guava are managed in parent POM --> - <exclusion> - <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> @@ -154,6 +135,11 @@ under the License. <artifactId>commons-lang3</artifactId> </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index 27ec86f..bfef9a4 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -79,16 +79,6 @@ 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 0027e34..adcb9a5 100644 --- a/maven-resolver-provider/pom.xml +++ b/maven-resolver-provider/pom.xml @@ -83,26 +83,6 @@ under the License. <artifactId>guice</artifactId> <classifier>no_aop</classifier> <optional>true</optional> - <exclusions> - <exclusion> - <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> diff --git a/pom.xml b/pom.xml index 1ff9ccf..91287a6 100644 --- a/pom.xml +++ b/pom.xml @@ -217,45 +217,17 @@ under the License. <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> + <groupId>aopalliance</groupId> + <artifactId>aopalliance</artifactId> </exclusion> </exclusions> </dependency> <dependency> - <!-- This is a transitive dep of com.google.guava:guava --> + <!-- Currently used only in maven-embedder for a single test (MavenCliTest) --> <groupId>com.google.guava</groupId> - <artifactId>failureaccess</artifactId> - <version>${guavafailureaccessVersion}</version> + <artifactId>guava</artifactId> + <version>${guavaVersion}</version> </dependency> <dependency> <groupId>org.eclipse.sisu</groupId>
