You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@maven.apache.org by rf...@apache.org on 2019/12/30 14:23:40 UTC

[maven] 04/06: Merge branch 'master' into MNG-6656

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch MNG-6656
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 9049d68bba18a69036ac8328a1e8bb11714e3af2
Merge: d9cc0e4 11b8b2d
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Dec 21 19:47:51 2019 +0100

    Merge branch 'master' into MNG-6656

 README.md                                          |   6 +-
 .../plugin/DefaultLifecycleBindingsInjector.java   |   6 +-
 .../maven/cli/transfer/FileSizeFormatTest.java     |  21 +-
 .../inheritance/DefaultInheritanceAssembler.java   |   8 +-
 .../DefaultDependencyManagementInjector.java       |   4 +-
 .../DefaultPluginManagementInjector.java           |   8 +-
 .../apache/maven/model/merge/MavenModelMerger.java |  48 +--
 .../model/profile/DefaultProfileInjector.java      |  16 +-
 maven-model/pom.xml                                |   5 +
 .../org/apache/maven/model/merge/ModelMerger.java  | 317 ++++++-------------
 .../apache/maven/model/merge/ModelMergerTest.java  | 334 +++++++++++++++++++++
 .../plugin/lifecycle/LifecycleXpp3ReaderTest.java  |  55 ----
 maven-plugin-api/src/test/resources/lifecycle.xml  |  39 ---
 pom.xml                                            |  26 +-
 14 files changed, 483 insertions(+), 410 deletions(-)