Apache/maven
1
0
Fork 0
mirror of https://github.com/apache/maven.git synced 2025-02-10 03:56:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MNG-2318] - resolution of parent pom.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@767640 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Britton Isbell 2009-04-22 20:03:43 +00:00
parent b401496dca
commit 034562a96f
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
View File

@ -670,7 +670,7 @@ private List<DomainModel> getDomainModelParentsFromLocalPath( PomClassicDomainMo
{ {
return domainModels; return domainModels;
} }
File parentFile = new File( projectDirectory, domainModel.getRelativePathOfParent() ).getCanonicalFile(); File parentFile = new File( projectDirectory, domainModel.getRelativePathOfParent() ).getCanonicalFile();
if ( parentFile.isDirectory() ) if ( parentFile.isDirectory() )
{ {
@ -716,7 +716,7 @@ private List<DomainModel> getDomainModelParentsFromLocalPath( PomClassicDomainMo
{ {
if ( isParentLocal( parentDomainModel.getRelativePathOfParent(), parentFile.getParentFile() ) ) if ( isParentLocal( parentDomainModel.getRelativePathOfParent(), parentFile.getParentFile() ) )
{ {
domainModels.addAll( getDomainModelParentsFromLocalPath( parentDomainModel, localRepository, remoteRepositories, topProject.getFile(), projectBuilderConfiguration ) ); domainModels.addAll( getDomainModelParentsFromLocalPath( parentDomainModel, localRepository, remoteRepositories, topProject.getFile().getParentFile(), projectBuilderConfiguration ) );
} }
else else
{ {

11
maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
View File

@ -1409,15 +1409,8 @@ public void testDistributionManagement()
{ {
PomTestWrapper pom = this.buildPom( "distribution-management"); PomTestWrapper pom = this.buildPom( "distribution-management");
assertEquals("legacy", pom.getValue( "distributionManagement/repository/layout" )); assertEquals("legacy", pom.getValue( "distributionManagement/repository/layout" ));
} }
/*
public void testRelativePath()
throws Exception
{
PomTestWrapper pom = this.buildPom( "relative-path/C");
System.out.println(pom.getDomainModel().asString());
}
*/
private void assertPathSuffixEquals( String expected, Object actual ) private void assertPathSuffixEquals( String expected, Object actual )
{ {
String a = actual.toString(); String a = actual.toString();