You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2010/09/28 13:50:57 UTC
svn commit: r1002124 - in /maven/release/trunk/maven-release-manager/src:
main/java/org/apache/maven/shared/release/phase/
test/java/org/apache/maven/shared/release/phase/
test/resources/projects/rewrite-for-release/basic-pom-with-scm-expression/
Author: brett
Date: Tue Sep 28 11:50:57 2010
New Revision: 1002124
URL: http://svn.apache.org/viewvc?rev=1002124&view=rev
Log:
[MRELEASE-128] don't rewrite the SCM element properties when creating the version for the tag
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-scm-expression/
- copied from r1002110, maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs/
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-scm-expression/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-scm-expression/pom.xml
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java?rev=1002124&r1=1002123&r2=1002124&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java Tue Sep 28 11:50:57 2010
@@ -96,7 +96,12 @@ public class RewritePomsForReleasePhase
boolean result = false;
if ( translator != null )
{
- Scm scm = project.getScm();
+ Scm scm = project.getOriginalModel().getScm();
+ if ( scm == null )
+ {
+ scm = project.getScm();
+ }
+
String tag = releaseDescriptor.getScmReleaseLabel();
String tagBase = releaseDescriptor.getScmTagBase();
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java?rev=1002124&r1=1002123&r2=1002124&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java Tue Sep 28 11:50:57 2010
@@ -196,6 +196,19 @@ public class RewritePomsForReleasePhaseT
assertTrue( comparePomFiles( reactorProjects ) );
}
+ public void testRewriteBasicPomWithScmExpression()
+ throws Exception
+ {
+
+ List reactorProjects = createReactorProjects( "basic-pom-with-scm-expression" );
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
+ mapNextVersion( config, "groupId:artifactId" );
+
+ phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
+
+ assertTrue( comparePomFiles( reactorProjects ) );
+ }
+
public void testRewriteBasicPomWithTagBase()
throws Exception
{
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-scm-expression/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-scm-expression/expected-pom.xml?rev=1002124&r1=1002110&r2=1002124&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-scm-expression/expected-pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-scm-expression/expected-pom.xml Tue Sep 28 11:50:57 2010
@@ -27,9 +27,7 @@
</prerequisites>
<scm>
- <connection>scm:cvs:pserver:anoncvs@localhost:/tmp/scm-repo:module</connection>
- <developerConnection>scm:cvs:ext:${username}@localhost:/tmp/scm-repo:module</developerConnection>
- <url>http://localhost/viewcvs.cgi/module</url>
- <tag>release-label</tag>
+ <connection>scm:svn:http://localhost/repo/tags/release-label</connection>
+ <developerConnection>scm:svn:https://${user.name}@localhost/repo/tags/release-label</developerConnection>
</scm>
-</project>
\ No newline at end of file
+</project>
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-scm-expression/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-scm-expression/pom.xml?rev=1002124&r1=1002110&r2=1002124&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-scm-expression/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-scm-expression/pom.xml Tue Sep 28 11:50:57 2010
@@ -27,8 +27,7 @@
</prerequisites>
<scm>
- <connection>scm:cvs:pserver:anoncvs@localhost:/tmp/scm-repo:module</connection>
- <developerConnection>scm:cvs:ext:${username}@localhost:/tmp/scm-repo:module</developerConnection>
- <url>http://localhost/viewcvs.cgi/module</url>
+ <connection>scm:svn:http://localhost/repo/trunk</connection>
+ <developerConnection>scm:svn:https://${user.name}@localhost/repo/trunk</developerConnection>
</scm>
-</project>
\ No newline at end of file
+</project>