Repository: maven Updated Branches: refs/heads/master fb6b2c690 -> 8c3a2b717
[MNG-5971] Imported dependencies should be available to inheritance processing o Updated to account for MNG-4488. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8c3a2b71 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8c3a2b71 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8c3a2b71 Branch: refs/heads/master Commit: 8c3a2b717366b32877b9905b70101dd4f6e534e2 Parents: fb6b2c6 Author: Christian Schulte <[email protected]> Authored: Sat Feb 20 13:46:18 2016 +0100 Committer: Christian Schulte <[email protected]> Committed: Sat Feb 20 13:46:18 2016 +0100 ---------------------------------------------------------------------- .../model/building/DefaultModelBuilder.java | 22 +++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/8c3a2b71/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 72df9d9..072be72 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 @@ -781,17 +781,33 @@ public class DefaultModelBuilder } } + // [MNG-4488] [regression] Parent POMs resolved from repository are validated in strict mode + ModelBuildingRequest lenientRequest = request; + if ( request.getValidationLevel() > ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0 ) + { + lenientRequest = new FilterModelBuildingRequest( request ) + { + + @Override + public int getValidationLevel() + { + return ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0; + } + + }; + } + // 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(); - this.configureResolver( request.getModelResolver(), intermediateLineage.get( i ), problems, true ); - this.importDependencyManagement( model, "import", request, problems, new HashSet<String>() ); + 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, request, problems ); + modelValidator.validateRawModel( model, lenientRequest, problems ); } } }
