This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-6965
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 7e7de12 formatting
omit b2874fb Update
maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
omit 0b858f6 Retain origin dep graph transformer
omit 69be879 [MNG-6965] Drop Maven 2 support - stop injecting old
plexus-utils
add dd54c1e update ASF CI url
add e26f2f0 update ASF CI url
add 2a23d7b [MNG-6772] Prevent Super POM central entry from overriding
add 8b7f6f0 [MNG-6987] Reorder groupId before artifactId when writing an
exclusion using maven-model
add 5fbe40a Bump ant from 1.10.4 to 1.10.8 in /maven-wrapper
add ac80f5c Refactor MavenCli.populateRequest
add 2c3949c Run Github CI builds with Java 8, 11, 15 and 16-ea
add 0e3c7a4 [MNG-6949] Get the correct PR origin user and branch name
from the GitHub Actions context, in order to run the matching integration tests
repo and branch.
add df67c00 [MNG-6991] Restore how the local repository is determined
add 39641ac [MNG-6983] Plugin key can get out of sync with artifactId and
groupId
new f6713af [MNG-6965] Drop Maven 2 support - stop injecting old
plexus-utils
new 7c81e18 Retain origin dep graph transformer
new 4e54ae7 Update
maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
new ed0b82c formatting
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 (7e7de12)
\
N -- N -- N refs/heads/MNG-6965 (ed0b82c)
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 4 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:
.github/workflows/maven.yml | 15 +-
README.md | 12 +-
.../execution/DefaultMavenExecutionRequest.java | 6 +-
.../apache/maven/project/ProjectModelResolver.java | 2 +-
.../apache/maven/project/ProjectBuilderTest.java | 14 +
.../project-builder/MNG-6983/parent-pom.xml | 38 ++
.../test/projects/project-builder/MNG-6983/pom.xml | 22 +
.../main/java/org/apache/maven/cli/MavenCli.java | 492 ++++++++++++---------
.../java/org/apache/maven/cli/MavenCliTest.java | 91 +++-
maven-model/src/main/mdo/maven.mdo | 16 +-
.../repository/internal/DefaultModelResolver.java | 2 +-
maven-wrapper/pom.xml | 2 +-
pom.xml | 2 +-
13 files changed, 481 insertions(+), 233 deletions(-)
create mode 100644
maven-core/src/test/projects/project-builder/MNG-6983/parent-pom.xml
create mode 100644
maven-core/src/test/projects/project-builder/MNG-6983/pom.xml
