You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2022/09/07 15:04:16 UTC
[maven] 01/01: [MNG-7502] Upgrade to Guice 5.1.0
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-7531v2
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 1c9460a62b29fb27785e4472c1952c6c504e13ca
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Tue Aug 23 16:46:31 2022 +0200
[MNG-7502] Upgrade to Guice 5.1.0
---
apache-maven/src/main/appended-resources/META-INF/NOTICE.vm | 4 ++--
.../appended-resources/licenses/unrecognized-aopalliance-1.0.txt | 1 +
maven-core/pom.xml | 1 -
maven-embedder/pom.xml | 5 -----
maven-model-builder/pom.xml | 1 -
maven-resolver-provider/pom.xml | 1 -
pom.xml | 4 ++--
7 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/apache-maven/src/main/appended-resources/META-INF/NOTICE.vm b/apache-maven/src/main/appended-resources/META-INF/NOTICE.vm
index b9a517eb8..dabe9f3fe 100644
--- a/apache-maven/src/main/appended-resources/META-INF/NOTICE.vm
+++ b/apache-maven/src/main/appended-resources/META-INF/NOTICE.vm
@@ -18,9 +18,9 @@
##
This software bundles the following NOTICE files from third party library providers:
-META-INF/NOTICE in archive lib/guice-4.2.1-no_aop.jar
+META-INF/NOTICE in archive lib/guice-5.1.0.jar
Google Guice - Core Library
-Copyright 2006-2018 Google, Inc.
+Copyright 2006-2022 Google, Inc.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/apache-maven/src/main/appended-resources/licenses/unrecognized-aopalliance-1.0.txt b/apache-maven/src/main/appended-resources/licenses/unrecognized-aopalliance-1.0.txt
new file mode 100644
index 000000000..a7a158b93
--- /dev/null
+++ b/apache-maven/src/main/appended-resources/licenses/unrecognized-aopalliance-1.0.txt
@@ -0,0 +1 @@
+Public Domain
\ No newline at end of file
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 62c33d2d8..8455f8eb6 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -112,7 +112,6 @@ under the License.
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
- <classifier>no_aop</classifier>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 2013c7bde..df897de9a 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -85,12 +85,7 @@ under the License.
<dependency>
<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>
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index 27ec86f33..5d60f511d 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -75,7 +75,6 @@ under the License.
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
- <classifier>no_aop</classifier>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index 5b416a4ef..c3ece6a26 100644
--- a/maven-resolver-provider/pom.xml
+++ b/maven-resolver-provider/pom.xml
@@ -81,7 +81,6 @@ under the License.
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
- <classifier>no_aop</classifier>
<optional>true</optional>
<exclusions>
<exclusion>
diff --git a/pom.xml b/pom.xml
index 5d7daf8e8..3ef430426 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@ under the License.
<plexusVersion>2.1.0</plexusVersion>
<plexusInterpolationVersion>1.26</plexusInterpolationVersion>
<plexusUtilsVersion>3.4.2</plexusUtilsVersion>
- <guiceVersion>4.2.3</guiceVersion>
+ <guiceVersion>5.1.0</guiceVersion>
<guavaVersion>30.1-jre</guavaVersion>
<guavafailureaccessVersion>1.0.1</guavafailureaccessVersion>
<wagonVersion>3.5.2</wagonVersion>
@@ -209,7 +209,6 @@ under the License.
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>${guiceVersion}</version>
- <classifier>no_aop</classifier>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
@@ -585,6 +584,7 @@ under the License.
-->
<exclude>src/main/appended-resources/licenses/MIT-slf4j-api-1.7.30.txt</exclude>
<exclude>src/main/appended-resources/licenses/EPL-1.0.txt</exclude>
+ <exclude>src/main/appended-resources/licenses/unrecognized-aopalliance-1.0.txt</exclude>
<exclude>src/main/appended-resources/licenses/unrecognized-javax.annotation-api-1.3.2.txt</exclude>
</excludes>
</configuration>