maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject [maven] branch MNG-6059 updated (11312d5 -> 4d39646)
Date Sun, 11 Nov 2018 18:02:48 GMT
This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a change to branch MNG-6059
in repository https://gitbox.apache.org/repos/asf/maven.git.


 discard 11312d5  [MNG-6059] tweaked distributionManagement.site inheritance
     new 4d39646  [MNG-6505] tweaked distributionManagement.site inheritance

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   (11312d5)
            \
             N -- N -- N   refs/heads/MNG-6059 (4d39646)

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:
 .../org/apache/maven/model/merge/MavenModelMerger.java     | 14 ++++++++++++--
 .../model/inheritance/DefaultInheritanceAssemblerTest.java | 12 +++++++++++-
 .../poms/inheritance/no-append-urls2-expected.xml          |  2 --
 .../resources/poms/inheritance/no-append-urls2-parent.xml  |  6 ------
 .../{flat-urls-child.xml => no-append-urls3-child.xml}     |  7 +++++++
 ...end-urls2-expected.xml => no-append-urls3-expected.xml} | 14 ++++++--------
 ...-append-urls2-parent.xml => no-append-urls3-parent.xml} |  6 ------
 7 files changed, 36 insertions(+), 25 deletions(-)
 copy maven-model-builder/src/test/resources/poms/inheritance/{flat-urls-child.xml => no-append-urls3-child.xml}
(81%)
 copy maven-model-builder/src/test/resources/poms/inheritance/{no-append-urls2-expected.xml
=> no-append-urls3-expected.xml} (79%)
 copy maven-model-builder/src/test/resources/poms/inheritance/{no-append-urls2-parent.xml
=> no-append-urls3-parent.xml} (90%)


Mime
View raw message