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

(Merged from 384102.) Fixing site URL calculation to disregard child module path adjustment. Second attempt. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384107 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey 2006-03-08 03:28:38 +00:00
parent 063474e205
commit 55dc9e4ccb
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-core-it/it0095/sub1/src/test/verifier/verifications.xml
View File

@ -2,7 +2,7 @@
<files>
<file>
<location>target/effective-pom.xml</location>
<contains>scp://host/path/sub1</contains>
<contains>scp://host/path/parent/sub1</contains>
</file>
<file>
<location>target/effective-pom.xml</location>

7
maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
View File

@ -108,7 +108,7 @@ public class DefaultModelInheritanceAssembler
}
}
assembleDistributionInheritence( child, parent, childPathAdjustment, appendPaths );
assembleDistributionInheritence( child, parent, appendPaths );
// issueManagement
if ( child.getIssueManagement() == null )
@ -399,8 +399,7 @@ public class DefaultModelInheritanceAssembler
}
}
private void assembleDistributionInheritence( Model child, Model parent, String childPathAdjustment,
boolean appendPaths )
private void assembleDistributionInheritence( Model child, Model parent, boolean appendPaths )
{
if ( parent.getDistributionManagement() != null )
{
@ -432,7 +431,7 @@ public class DefaultModelInheritanceAssembler
if ( site.getUrl() != null )
{
site.setUrl(
appendPath( site.getUrl(), child.getArtifactId(), childPathAdjustment, appendPaths ) );
appendPath( site.getUrl(), child.getArtifactId(), null, appendPaths ) );
}
}
}