Author: bentmann
Date: Sat Mar 21 15:47:19 2009
New Revision: 756959
URL: http://svn.apache.org/viewvc?rev=756959&view=rev
Log:
o Fixed SCM processing
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ScmProcessor.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
maven/components/trunk/maven-project/src/test/resources-project-builder/complete-model/pom.xml
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ScmProcessor.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ScmProcessor.java?rev=756959&r1=756958&r2=756959&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ScmProcessor.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ScmProcessor.java
Sat Mar 21 15:47:19 2009
@@ -35,9 +35,10 @@
t.setScm( new Scm() );
}
- copy( ((p != null) ? p.getScm() : null), c.getScm(), t.getScm(),
c.getArtifactId());
+ copyUrl( ((p != null) ? p.getScm() : null), c.getScm(), t.getScm(),
c.getArtifactId());
copyConnection( ((p != null) ? p.getScm() : null), c.getScm(),
t.getScm(), c.getArtifactId());
copyDeveloperConnection( ((p != null) ? p.getScm() : null),
c.getScm(), t.getScm(), c.getArtifactId());
+ copyTag( ( ( p != null ) ? p.getScm() : null ), c.getScm(), t.getScm()
);
/*
if(c.getLicenses().isEmpty() && p != null)
{
@@ -66,7 +67,7 @@
*/
}
- private static void copy(Scm p, Scm c, Scm t, String artifactId )
+ private static void copyUrl(Scm p, Scm c, Scm t, String artifactId )
{
if(c != null && c.getUrl() != null)
{
@@ -110,4 +111,17 @@
t.setDeveloperConnection( t.getDeveloperConnection() + "/" +
artifactId );
}
}
+
+ private static void copyTag( Scm p, Scm c, Scm t )
+ {
+ if ( c != null && c.getTag() != null )
+ {
+ t.setTag( c.getTag() );
+ }
+ else if ( p != null && p.getTag() != null )
+ {
+ t.setTag( p.getTag() );
+ }
+ }
+
}
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=756959&r1=756958&r2=756959&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
Sat Mar 21 15:47:19 2009
@@ -985,11 +985,35 @@
assertEquals( "project-org", pom.getValue( "organization/name" ) );
assertEquals( "http://project-org.url/";, pom.getValue(
"organization/url" ) );
- assertEquals( 1, ((List<?>)pom.getValue( "licenses" )).size() );
+ assertEquals( 1, ( (List<?>) pom.getValue( "licenses" ) ).size() );
assertEquals( "project-license", pom.getValue( "licenses[1]/name" ) );
assertEquals( "http://project.url/license";, pom.getValue(
"licenses[1]/url" ) );
assertEquals( "repo", pom.getValue( "licenses[1]/distribution" ) );
assertEquals( "free", pom.getValue( "licenses[1]/comments" ) );
+
+ /* FIXME
+ assertEquals( 1, ((List<?>)pom.getValue( "developers" )).size() );
+
+ assertEquals( 1, ((List<?>)pom.getValue( "contributors" )).size() );
+ //*/
+
+ assertEquals( 1, ( (List<?>) pom.getValue( "mailingLists" ) ).size() );
+ assertEquals( "project-mailing-list", pom.getValue(
"mailingLists[1]/name" ) );
+ assertEquals( "subscribe@", pom.getValue( "mailingLists[1]/subscribe"
) );
+ assertEquals( "unsubscribe@", pom.getValue(
"mailingLists[1]/unsubscribe" ) );
+ assertEquals( "post@", pom.getValue( "mailingLists[1]/post" ) );
+ assertEquals( "mail-archive", pom.getValue( "mailingLists[1]/archive"
) );
+ assertEquals( 1, ( (List<?>) pom.getValue(
"mailingLists[1]/otherArchives" ) ).size() );
+ assertEquals( "other-archive", pom.getValue(
"mailingLists[1]/otherArchives[1]" ) );
+
+ /* FIXME
+ assertEquals( "2.0.1", pom.getValue( "prerequisites/maven" ) );
+ //*/
+
+ assertEquals( "http://project.url/trunk";, pom.getValue( "scm/url" ) );
+ assertEquals( "http://project.url/scm";, pom.getValue( "scm/connection"
) );
+ assertEquals( "https://project.url/scm";, pom.getValue(
"scm/developerConnection" ) );
+ assertEquals( "TAG", pom.getValue( "scm/tag" ) );
}
Modified:
maven/components/trunk/maven-project/src/test/resources-project-builder/complete-model/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/complete-model/pom.xml?rev=756959&r1=756958&r2=756959&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources-project-builder/complete-model/pom.xml
(original)
+++
maven/components/trunk/maven-project/src/test/resources-project-builder/complete-model/pom.xml
Sat Mar 21 15:47:19 2009
@@ -99,7 +99,7 @@
<url>http://project.url/trunk</url>
<connection>http://project.url/scm</connection>
<developerConnection>https://project.url/scm</developerConnection>
- <tag>HEAD</tag>
+ <tag>TAG</tag>
</scm>
<issueManagement>
<system>issues</system>
