Repository: maven Updated Branches: refs/heads/master ee4fcfd54 -> 2858fd32d
[MNG-5971] Imported dependencies should be available to inheritance processing o Updated to remove redundant re-configuration of the resolver introduced by latest commit. The integration test for MNG-4347 still fails but due to the a profile from settings disappearing on successive model building requests. Needs further analysis. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/2858fd32 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/2858fd32 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/2858fd32 Branch: refs/heads/master Commit: 2858fd32d7b58255ecf487325eff68db99a2909e Parents: ee4fcfd Author: Christian Schulte <schu...@apache.org> Authored: Mon Dec 12 05:54:58 2016 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Mon Dec 12 05:58:51 2016 +0100 ---------------------------------------------------------------------- .../java/org/apache/maven/model/building/DefaultModelBuilder.java | 3 --- 1 file changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/2858fd32/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 21d9d83..119ac6c 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 @@ -533,9 +533,6 @@ public class DefaultModelBuilder lifecycleBindingsInjector.injectLifecycleBindings( resultModel, request, problems ); } - // Re-configure the resolver to reflect the effective result model. - // It may have been modified during include scope processing. - this.configureResolver( request.getModelResolver(), resultModel, problems, true ); this.importDependencyManagement( resultModel, "import", request, problems, new HashSet<String>() ); // dependency management injection
