Repository: maven Updated Branches: refs/heads/master 9f2452adb -> 814b51661
[MNG-5971] Imported dependencies should be available to inheritance processing [MNG-6079] 3.4 regression: cannot override version of a dependencyManagement in a submodule any more o Updated to interpolate intermediate models using the effective properties of the result model to build. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/814b5166 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/814b5166 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/814b5166 Branch: refs/heads/master Commit: 814b5166123c54b21545038038536063ce8dba1c Parents: 9f2452a Author: Christian Schulte <schu...@apache.org> Authored: Sat Aug 13 01:25:45 2016 +0200 Committer: Christian Schulte <schu...@apache.org> Committed: Sat Aug 13 01:25:45 2016 +0200 ---------------------------------------------------------------------- .../org/apache/maven/model/building/DefaultModelBuilder.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/814b5166/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 93c62d0..ecd0a9a 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 @@ -850,13 +850,17 @@ public class DefaultModelBuilder child.setRepositories( repositories ); } + final Properties effectiveProperties = intermediateLineage.get( 0 ).getProperties(); + final DefaultModelProblemCollector intermediateProblems = new DefaultModelProblemCollector( new DefaultModelBuildingResult() ); // Interpolates the intermediate model. + // MNG-6079: Uses the effective properties of the result model to support property overriding. for ( int i = 0, s0 = intermediateLineage.size(); i < s0; i++ ) { final Model model = intermediateLineage.get( i ); + model.setProperties( effectiveProperties ); intermediateProblems.setSource( model ); this.interpolateModel( model, request, intermediateProblems ); }
