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

[MNG-3134] Use childPathAdjustment when calculating distributionManagement/site/url just like we do for url and scm/*Url. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@565777 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey 2007-08-14 14:41:16 +00:00
parent c08d1fa49b
commit b1517c1421
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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