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/08/23 15:02:27 UTC
[maven] branch MNG-7502 updated (05d1f5581 -> ea8687614)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MNG-7502
in repository https://gitbox.apache.org/repos/asf/maven.git
omit 05d1f5581 [MNG-7502] Upgrade to Guice 5.1.0
add 29c53d674 [MNG-7193] Introduce MAVEN_ARGS environment variable
add b762fa9d5 [3.9.x] [MNG-7401] [MNG-7474] Keep a single maven session and fix session scope (#743)
new ea8687614 [MNG-7502] Upgrade to Guice 5.1.0
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (05d1f5581)
\
N -- N -- N refs/heads/MNG-7502 (ea8687614)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
apache-maven/src/bin/mvn | 3 +-
apache-maven/src/bin/mvn.cmd | 3 +-
apache-maven/src/bin/mvnDebug | 1 +
apache-maven/src/bin/mvnDebug.cmd | 1 +
apache-maven/src/bin/mvnyjp | 1 +
.../org/apache/maven/execution/MavenSession.java | 20 ++-
.../lifecycle/internal/BuildListCalculator.java | 7 +-
.../lifecycle/internal/LifecycleModuleBuilder.java | 10 --
.../maven/lifecycle/internal/LifecycleStarter.java | 4 +-
.../maven/lifecycle/internal/ReactorContext.java | 14 +-
.../maven/session/scope/internal/SessionScope.java | 148 +++++++++------------
.../internal/BuildListCalculatorTest.java | 5 +
.../internal/LifecycleModuleBuilderTest.java | 101 ++++++++++++++
13 files changed, 195 insertions(+), 123 deletions(-)
create mode 100644 maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilderTest.java
[maven] 01/01: [MNG-7502] Upgrade to Guice 5.1.0
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-7502
in repository https://gitbox.apache.org/repos/asf/maven.git
commit ea86876149c9c176c466274e6892fdb46cd2c297
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Tue Aug 23 14:52:02 2022 +0200
[MNG-7502] Upgrade to Guice 5.1.0
---
apache-maven/src/main/appended-resources/META-INF/NOTICE.vm | 5 +++--
.../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, 6 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 3cfd92583..24eae78ae 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,10 @@
##
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 77d17a0e9..3488b404c 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -103,7 +103,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 d991ffaa2..ab7f45b44 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -77,12 +77,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 cd432cb11..1d7bd169f 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -71,7 +71,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 d273a738f..6b3321020 100644
--- a/maven-resolver-provider/pom.xml
+++ b/maven-resolver-provider/pom.xml
@@ -73,7 +73,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 ae5e77637..f5a12dbe8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,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>
@@ -243,7 +243,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>
@@ -599,6 +598,7 @@ under the License.
! Excluded the license files itself cause they do not have have a license of themselves.
-->
<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>