diff --git a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java index 59433176dc..077c87c8d6 100644 --- a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java +++ b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java @@ -670,7 +670,7 @@ private List getDomainModelParentsFromLocalPath( PomClassicDomainMo { return domainModels; } - + File parentFile = new File( projectDirectory, domainModel.getRelativePathOfParent() ).getCanonicalFile(); if ( parentFile.isDirectory() ) { @@ -716,7 +716,7 @@ private List getDomainModelParentsFromLocalPath( PomClassicDomainMo { 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 { diff --git a/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java index d4f626b887..3ee647254f 100644 --- a/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java +++ b/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java @@ -1409,15 +1409,8 @@ public void testDistributionManagement() { PomTestWrapper pom = this.buildPom( "distribution-management"); 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 ) { String a = actual.toString();