Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o Fixed resolution of local parents 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780642 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-06-01 13:19:20 +00:00
parent 6548d31804
commit bdcb479015
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuilder.java
View File

@ -330,6 +330,10 @@ public class DefaultModelBuilder
Parent parent = childModel.getParent(); Parent parent = childModel.getParent();
File pomFile = new File( new File( projectDirectory, parent.getRelativePath() ).toURI().normalize() ); File pomFile = new File( new File( projectDirectory, parent.getRelativePath() ).toURI().normalize() );
if ( pomFile.isDirectory() )
{
pomFile = new File( pomFile, "pom.xml" );
}
if ( !pomFile.isFile() ) if ( !pomFile.isFile() )
{ {
return null; return null;