This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MNG-6512-build-11
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 0e260ed [MNG-6512] PoC - set minimum JDK to 11
add db462ae [MNG-6059] renamed attributes to get more flexibility for scm
urls
add f97316c [MNG-6505] inherit child.x.y.inherit.append.path values
add 07bd550 [MNG-6505] tweaked distributionManagement.site inheritance
new 2bfee74 [MNG-6512] PoC - set minimum JDK to 11
new b2b2f5f Enforcer and sniffer - skip
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 (0e260ed)
\
N -- N -- N refs/heads/MNG-6512-build-11 (b2b2f5f)
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 2 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:
Jenkinsfile | 2 +-
maven-artifact/pom.xml | 4 +-
.../apache/maven/model/merge/MavenModelMerger.java | 42 ++++++--
maven-model-builder/src/site/apt/index.apt | 8 ++
.../DefaultInheritanceAssemblerTest.java | 22 +++-
.../poms/inheritance/no-append-urls-expected.xml | 11 +-
.../poms/inheritance/no-append-urls-parent.xml | 10 +-
...at-urls-child.xml => no-append-urls2-child.xml} | 9 ++
...s-expected.xml => no-append-urls2-expected.xml} | 16 +--
...-urls-parent.xml => no-append-urls2-parent.xml} | 18 ++--
...at-urls-child.xml => no-append-urls3-child.xml} | 7 ++
...s-expected.xml => no-append-urls3-expected.xml} | 12 +--
...-urls-parent.xml => no-append-urls3-parent.xml} | 18 ++--
.../org/apache/maven/model/merge/ModelMerger.java | 81 ++++++++++++++
maven-model/src/main/mdo/maven.mdo | 117 ++++++++++++++++-----
pom.xml | 26 ++++-
16 files changed, 314 insertions(+), 89 deletions(-)
copy
maven-model-builder/src/test/resources/poms/inheritance/{flat-urls-child.xml =>
no-append-urls2-child.xml} (77%)
copy
maven-model-builder/src/test/resources/poms/inheritance/{no-append-urls-expected.xml
=> no-append-urls2-expected.xml} (79%)
copy
maven-model-builder/src/test/resources/poms/inheritance/{flat-urls-parent.xml
=> no-append-urls2-parent.xml} (76%)
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-urls-expected.xml
=> no-append-urls3-expected.xml} (84%)
copy
maven-model-builder/src/test/resources/poms/inheritance/{flat-urls-parent.xml
=> no-append-urls3-parent.xml} (76%)
