You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/06/01 15:19:21 UTC
svn commit: r780642 -
/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuilder.java
Author: bentmann
Date: Mon Jun 1 13:19:20 2009
New Revision: 780642
URL: http://svn.apache.org/viewvc?rev=780642&view=rev
Log:
o Fixed resolution of local parents
Modified:
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuilder.java
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuilder.java?rev=780642&r1=780641&r2=780642&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuilder.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuilder.java Mon Jun 1 13:19:20 2009
@@ -330,6 +330,10 @@
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;