You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2017/12/28 16:22:42 UTC
maven git commit: [MNG-6330] Parents relativePath not verified anymore
Repository: maven
Updated Branches:
refs/heads/MNG-6330_RelativePath [created] 4eb5747e8
[MNG-6330] Parents relativePath not verified anymore
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4eb5747e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4eb5747e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4eb5747e
Branch: refs/heads/MNG-6330_RelativePath
Commit: 4eb5747e8229d0201b707052ce7f8ae2fe24eec2
Parents: 98af937
Author: rfscholte <rf...@apache.org>
Authored: Thu Dec 28 17:22:29 2017 +0100
Committer: rfscholte <rf...@apache.org>
Committed: Thu Dec 28 17:22:29 2017 +0100
----------------------------------------------------------------------
.../org/apache/maven/model/building/DefaultModelBuilder.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/4eb5747e/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 463bf1c..c3dd043 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
@@ -845,8 +845,8 @@ public class DefaultModelBuilder
{
ModelSource expectedParentSource = getParentPomFile( childModel, childSource );
- if ( expectedParentSource instanceof ModelSource2
- && !pomFile.toURI().equals( ( (ModelSource2) expectedParentSource ).getLocationURI() ) )
+ if ( expectedParentSource == null || ( expectedParentSource instanceof ModelSource2
+ && !pomFile.toURI().equals( ( (ModelSource2) expectedParentSource ).getLocationURI() ) ) )
{
parentData = readParentExternally( childModel, request, problems );
}