This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-7651
in repository https://gitbox.apache.org/repos/asf/maven.git
omit aae070bba [MNG-7651] Simplify and document merge of maven.config file
and CLI args
add 6178f6ed8 [MNG-7648] Fix locationTracking in
DefaultModelBuildingRequest copy constructor (#940)
new 5af08d005 [MNG-7651] Simplify and document merge of maven.config file
and CLI args
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 (aae070bba)
\
N -- N -- N refs/heads/MNG-7651 (5af08d005)
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/project/ProjectBuilderTest.java | 32 ++++++++++++++-
.../test/projects/project-builder/MNG-7648/pom.xml | 48 ++++++++++++++++++++++
.../org/apache/maven/its/bom/0.1/bom-0.1.pom | 21 ++++++++++
.../org/apache/maven/its/bom}/maven-metadata.xml | 3 +-
.../org/apache/maven/its/parent/0.1/parent-0.1.pom | 22 ++++++++++
.../apache/maven/its/parent}/maven-metadata.xml | 3 +-
.../building/DefaultModelBuildingRequest.java | 1 +
7 files changed, 125 insertions(+), 5 deletions(-)
create mode 100644
maven-core/src/test/projects/project-builder/MNG-7648/pom.xml
create mode 100644
maven-core/src/test/remote-repo/org/apache/maven/its/bom/0.1/bom-0.1.pom
copy {maven-compat/src/test/remote-repo/org/apache/maven/its/a =>
maven-core/src/test/remote-repo/org/apache/maven/its/bom}/maven-metadata.xml
(74%)
create mode 100644
maven-core/src/test/remote-repo/org/apache/maven/its/parent/0.1/parent-0.1.pom
copy {maven-compat/src/test/remote-repo/org/apache/maven/its/a =>
maven-core/src/test/remote-repo/org/apache/maven/its/parent}/maven-metadata.xml
(74%)
