You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2009/04/22 22:03:43 UTC
svn commit: r767640 - in /maven/components/trunk/maven-project/src:
main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
test/java/org/apache/maven/project/PomConstructionTest.java
Author: sisbell
Date: Wed Apr 22 20:03:43 2009
New Revision: 767640
URL: http://svn.apache.org/viewvc?rev=767640&view=rev
Log:
[MNG-2318] - resolution of parent pom.
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=767640&r1=767639&r2=767640&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Wed Apr 22 20:03:43 2009
@@ -670,7 +670,7 @@
{
return domainModels;
}
-
+
File parentFile = new File( projectDirectory, domainModel.getRelativePathOfParent() ).getCanonicalFile();
if ( parentFile.isDirectory() )
{
@@ -716,7 +716,7 @@
{
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
{
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=767640&r1=767639&r2=767640&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java Wed Apr 22 20:03:43 2009
@@ -1409,15 +1409,8 @@
{
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();