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

Fix for it0141 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@712680 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Britton Isbell 2008-11-10 15:44:37 +00:00
parent 6468b08bda
commit 1249c89962
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -376,12 +376,13 @@ public final class PomClassicTransformer
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 )
{ {
if(!siteUrlProperty.getResolvedValue().endsWith("}")) { siteUrl.append( siteUrlProperty.getResolvedValue());//.substring(0, siteUrlProperty.getResolvedValue().lastIndexOf("/")) );
siteUrl.append( siteUrlProperty.getResolvedValue().substring(0, siteUrlProperty.getResolvedValue().lastIndexOf("/")) );
}
for ( String projectName : projectNames ) for ( String projectName : projectNames )
{ {
siteUrl.append( "/" ).append( projectName ); if(!siteUrl.toString().endsWith( "/")) {
siteUrl.append( "/" );
}
siteUrl.append( projectName );
} }
int index = tmp.indexOf( siteUrlProperty ); int index = tmp.indexOf( siteUrlProperty );
tmp.remove( index ); tmp.remove( index );
@ -602,7 +603,9 @@ public final class PomClassicTransformer
aliases.put( "\\$\\{project.build.", "\\$\\{build."); aliases.put( "\\$\\{project.build.", "\\$\\{build.");
List<String> aliasList = Arrays.asList("artifactId", "groupId", "version", "packaging", "name", "description", List<String> aliasList = Arrays.asList("artifactId", "groupId", "version", "packaging", "name", "description",
"url", "inceptionYear", "scm.url", "ciManagement.url", "distributionManagement.repository.name", "url", "inceptionYear", "scm.url", "ciManagement.url",
"distributionManagement.repository.name",
"distributionManagement.site.url",
"reporting.outputDirectory", "parent.groupId", "parent.artifactId", "reporting.outputDirectory", "parent.groupId", "parent.artifactId",
"parent.version", "prerequisites.maven", "issueManagement.url", "organization.name"); "parent.version", "prerequisites.maven", "issueManagement.url", "organization.name");
for(String alias : aliasList) { for(String alias : aliasList) {