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/03/23 22:06:02 UTC
svn commit: r757543 - in /maven/components/trunk/maven-project/src:
main/java/org/apache/maven/project/processor/
test/java/org/apache/maven/project/
Author: sisbell
Date: Mon Mar 23 21:06:00 2009
New Revision: 757543
URL: http://svn.apache.org/viewvc?rev=757543&view=rev
Log:
[MNG-3846: Inherited URLs are not automatically extended with the child's artifactId]
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.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/processor/DistributionManagementProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java?rev=757543&r1=757542&r2=757543&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java Mon Mar 23 21:06:00 2009
@@ -56,6 +56,11 @@
{
copy( p.getDistributionManagement(), t.getDistributionManagement(), false, c.getArtifactId() );
}
+ else if(t.getDistributionManagement() != null && t.getDistributionManagement().getSite() != null)
+ {
+ copySite( t.getDistributionManagement().getSite(), t.getDistributionManagement().getSite(), false, c.getArtifactId() );
+ // copy( t.getDistributionManagement(), t.getDistributionManagement(), isChildMostSpecialized, c.getArtifactId() );
+ }
}
private static void copy( DistributionManagement source, DistributionManagement target, boolean isChild,
@@ -98,7 +103,7 @@
{
target.setSite( new Site() );
copySite( source.getSite(), target.getSite(), isChild, artifactId );
- }
+ }
}
private static void copyRepository( DeploymentRepository source, DeploymentRepository target )
@@ -144,11 +149,16 @@
{
target.setUrl( source.getUrl() );
}
+
else
{
target.setUrl( source.getUrl() + "/" + artifactId );
}
}
+ else
+ {
+ target.setUrl( target.getUrl() + "/" + artifactId );
+ }
}
}
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java?rev=757543&r1=757542&r2=757543&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java Mon Mar 23 21:06:00 2009
@@ -127,6 +127,10 @@
{
t.setUrl( p.getUrl() + t.getArtifactId() );
}
+ else if (t.getUrl() != null)
+ {
+ t.setUrl( t.getUrl() + "/" + t.getArtifactId() );
+ }
//Dependencies
List<Dependency> deps = new ArrayList<Dependency>();
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=757543&r1=757542&r2=757543&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 Mon Mar 23 21:06:00 2009
@@ -560,7 +560,7 @@
assertEquals( "http://parent.url/download", pom.getValue( "distributionManagement/downloadUrl" ) );
}
- /* FIXME: MNG-3846
+ /* FIXME: MNG-3846*/
public void testAppendArtifactIdOfParentAndChildToInheritedUrls()
throws Exception
{