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/21 16:47:41 UTC

[maven] branch master updated (aad48b7 -> 11b8b2d)

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

rfscholte pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git.


    from aad48b7  Removed duplication of License part.
     add 11b8b2d  [MNG-6824] ModelMerger is broken Fix modules Apply Java 8 Functions

No new revisions were added by this update.

Summary of changes:
 .../plugin/DefaultLifecycleBindingsInjector.java   |   6 +-
 .../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 +++++++++++++++++++++
 pom.xml                                            |   4 +-
 10 files changed, 477 insertions(+), 273 deletions(-)
 create mode 100644 maven-model/src/test/java/org/apache/maven/model/merge/ModelMergerTest.java