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 630c22f4657f01ad3f0b22e6ad20d645ea6af83f Merge: 9049d68 e3aa406 Author: rfscholte <[email protected]> AuthorDate: Sun Dec 22 17:35:16 2019 +0100 Merge branch 'master' into MNG-6656 .../maven/artifact/testutils/TestFileManager.java | 3 +- .../DefaultPluginDependenciesResolver.java | 11 ++- .../DefaultProjectDependenciesResolver.java | 11 ++- .../model/validation/DefaultModelValidator.java | 7 +- .../org/apache/maven/model/merge/ModelMerger.java | 91 ++---------------- .../apache/maven/model/merge/ModelMergerTest.java | 102 ++++++++++++++++++++- 6 files changed, 126 insertions(+), 99 deletions(-)
