Repository: maven Updated Branches: refs/heads/master 2313861df -> 45327208f
[MNG-5971] Imported dependencies should be available to inheritance processing o Updated to add various comments regarding the issue. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/45327208 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/45327208 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/45327208 Branch: refs/heads/master Commit: 45327208f0fee9d1e0acc168ec072b29b6bbbb98 Parents: 2313861 Author: Christian Schulte <[email protected]> Authored: Fri Feb 19 23:22:48 2016 +0100 Committer: Christian Schulte <[email protected]> Committed: Fri Feb 19 23:22:48 2016 +0100 ---------------------------------------------------------------------- .../apache/maven/model/building/DefaultModelBuilder.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/45327208/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 27252f9..72df9d9 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 @@ -374,7 +374,7 @@ public class DefaultModelBuilder problems.setSource( inputModel ); checkPluginVersions( lineage, request, problems ); - // import processing + // [MNG-5971] Imported dependencies should be available to inheritance processing processImports( lineage, request, problems ); // inheritance assembly @@ -716,7 +716,9 @@ public class DefaultModelBuilder private void processImports( final List<ModelData> lineage, final ModelBuildingRequest request, final DefaultModelProblemCollector problems ) { - // Creates an intermediate model with property inheritance and interpolation. + // [MNG-5971] Imported dependencies should be available to inheritance processing + + // Creates an intermediate model with property and repository inheritance. final List<Model> intermediateLineage = new ArrayList<>( lineage.size() ); for ( int i = 0, s0 = lineage.size(); i < s0; i++ ) @@ -749,6 +751,7 @@ public class DefaultModelBuilder child.setRepositories( repositories ); } + // Interpolates the intermediate model. for ( int i = 0, s0 = intermediateLineage.size(); i < s0; i++ ) { final Model model = intermediateLineage.get( i ); @@ -756,7 +759,7 @@ public class DefaultModelBuilder this.interpolateModel( model, request, problems ); } - // Exchanges 'include' scope dependencies in the original lineage with possibly interpolated values. + // Exchanges 'import' scope dependencies in the original lineage with possibly interpolated values. for ( int i = 0, s0 = lineage.size(); i < s0; i++ ) { final Model model = lineage.get( i ).getModel(); @@ -778,7 +781,7 @@ public class DefaultModelBuilder } } - // Performs inclusion of dependencies in the original lineage. + // Imports dependencies into the original model using the repositories of the intermediate model. for ( int i = 0, s0 = lineage.size(), superModelIdx = lineage.size() - 1; i < s0; i++ ) { final Model model = lineage.get( i ).getModel();
