From bdcb4790153c3d5dea5cd2ecc7564189fff09553 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Mon, 1 Jun 2009 13:19:20 +0000 Subject: [PATCH] o Fixed resolution of local parents git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780642 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/apache/maven/model/DefaultModelBuilder.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuilder.java index 0931086563..7a8ef91998 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuilder.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuilder.java @@ -330,6 +330,10 @@ public class DefaultModelBuilder Parent parent = childModel.getParent(); File pomFile = new File( new File( projectDirectory, parent.getRelativePath() ).toURI().normalize() ); + if ( pomFile.isDirectory() ) + { + pomFile = new File( pomFile, "pom.xml" ); + } if ( !pomFile.isFile() ) { return null;