This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git.
from 114a0e9 Updated Quick Build information.
new db462ae [MNG-6059] renamed attributes to get more flexibility for scm
urls
new f97316c [MNG-6505] inherit child.x.y.inherit.append.path values
new 07bd550 [MNG-6505] tweaked distributionManagement.site inheritance
The 3 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/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 ++++++++++++++++-----
13 files changed, 286 insertions(+), 85 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%)
