Repository: maven Updated Branches: refs/heads/master d8b66aebf -> 8b751f6a8
[MNG-5971] Imported dependencies should be available to inheritance processing o Updated to stop reporting model problems for conflicting imports twice. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8b751f6a Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8b751f6a Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8b751f6a Branch: refs/heads/master Commit: 8b751f6a8ac4d11d6b9932f0f8b7de795c0296d3 Parents: d8b66ae Author: Christian Schulte <schu...@apache.org> Authored: Tue Feb 23 14:43:19 2016 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Tue Feb 23 14:43:19 2016 +0100 ---------------------------------------------------------------------- .../org/apache/maven/model/building/DefaultModelBuilder.java | 6 ------ 1 file changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/8b751f6a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java index 00ee475..df9d2bd 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java @@ -843,12 +843,6 @@ public class DefaultModelBuilder final Model model = lineage.get( i ); this.configureResolver( lenientRequest.getModelResolver(), intermediateLineage.get( i ), problems, true ); this.importDependencyManagement( model, "import", lenientRequest, problems, new HashSet<String>() ); - - if ( i != superModelIdx ) - { - problems.setSource( model ); - modelValidator.validateRawModel( model, lenientRequest, problems ); - } } }
