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

If DistributionManagement site url contains a property, build was failing. This is a quick fix and will still not return the correct URL. The problem is that interpolation occurs after inheritance and resolving URLs based on a parent is an inheritance issue. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@711888 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Britton Isbell 2008-11-06 16:12:17 +00:00
parent 3d85fa7874
commit 4256e417b9
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
View File

@ -372,19 +372,22 @@ public final class PomClassicTransformer
} }
//Site Rule //Site Rule
ModelProperty siteUrlProperty = getPropertyFor( ProjectUri.DistributionManagement.Site.url, tmp ); ModelProperty siteUrlProperty = getPropertyFor( ProjectUri.DistributionManagement.Site.url, tmp );
if ( siteUrl.length() == 0 && siteUrlProperty != null ) if ( siteUrl.length() == 0 && siteUrlProperty != null )
{ {
siteUrl.append( siteUrlProperty.getResolvedValue().substring(0, siteUrlProperty.getResolvedValue().lastIndexOf("/")) ); if(!siteUrlProperty.getResolvedValue().endsWith("}")) {
for ( String projectName : projectNames ) siteUrl.append( siteUrlProperty.getResolvedValue().substring(0, siteUrlProperty.getResolvedValue().lastIndexOf("/")) );
{
siteUrl.append( "/" ).append( projectName );
} }
int index = tmp.indexOf( siteUrlProperty ); for ( String projectName : projectNames )
tmp.remove( index ); {
tmp.add( index, new ModelProperty( ProjectUri.DistributionManagement.Site.url, siteUrl.toString() ) ); siteUrl.append( "/" ).append( projectName );
}
int index = tmp.indexOf( siteUrlProperty );
tmp.remove( index );
tmp.add( index, new ModelProperty( ProjectUri.DistributionManagement.Site.url, siteUrl.toString() ) );
} }
//If DistributionManagement site URL is property,
//SCM Rule //SCM Rule
ModelProperty scmUrlProperty = getPropertyFor( ProjectUri.Scm.url, tmp ); ModelProperty scmUrlProperty = getPropertyFor( ProjectUri.Scm.url, tmp );
if ( scmUrl.length() == 0 && scmUrlProperty != null ) if ( scmUrl.length() == 0 && scmUrlProperty != null )