maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From khmarba...@apache.org
Subject [21/50] [abbrv] maven git commit: [MNG-6330] Parents relativePath not verified anymore
Date Sat, 17 Feb 2018 20:30:42 GMT
[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/df5169bd
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/df5169bd
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/df5169bd

Branch: refs/heads/MNG-5227
Commit: df5169bdf9fead590d48e23fb182d7f73f1deb3d
Parents: 98af937
Author: rfscholte <rfscholte@apache.org>
Authored: Fri Dec 29 10:39:45 2017 +0100
Committer: rfscholte <rfscholte@apache.org>
Committed: Fri Dec 29 10:39:45 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/df5169bd/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
);
                     }


Mime
View raw message