You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2006/02/08 19:09:19 UTC
svn commit: r376017 - in /maven/maven-1/plugins/trunk/scm: plugin.jelly
plugin.properties xdocs/changes.xml xdocs/properties.xml
Author: ltheussl
Date: Wed Feb 8 10:09:17 2006
New Revision: 376017
URL: http://svn.apache.org/viewcvs?rev=376017&view=rev
Log:
PR: MPSCM-77
Make it possible to check changes made by prepare-release before they are checked in and tagged.
New property maven.scm.testmode.
Modified:
maven/maven-1/plugins/trunk/scm/plugin.jelly
maven/maven-1/plugins/trunk/scm/plugin.properties
maven/maven-1/plugins/trunk/scm/xdocs/changes.xml
maven/maven-1/plugins/trunk/scm/xdocs/properties.xml
Modified: maven/maven-1/plugins/trunk/scm/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/plugin.jelly?rev=376017&r1=376016&r2=376017&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/scm/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/scm/plugin.jelly Wed Feb 8 10:09:17 2006
@@ -329,12 +329,25 @@
<c:release-version version="${version_name}" />
</j:if>
- <ant:echo>Committing descriptors</ant:echo>
- <!-- No tag here - in this context it means the branch to commit to, and we want whatever this checkout current is on -->
- <scm:checkin url="${scmConnection}" workingDirectory="${basedir}" includes="project.xml,xdocs/changes.xml" message="[maven-scm-plugin] prepare release ${version_name}" username="${maven.scm.username}" password="${maven.scm.password}" />
+ <j:choose>
+ <j:when test="${maven.scm.testmode == 'true'}">
+ <ant:echo> </ant:echo>
+ <ant:echo> WARNING: maven.scm.testmode is set to 'true'</ant:echo>
+ <ant:echo> Changes made above will NOT be committed and tagging the project will be skipped! </ant:echo>
+ <ant:echo> Please check project.xml and xdocs/changes.xml</ant:echo>
+ <ant:echo> Then either re-run scm:prepare-release with maven.scm.testmode=false</ant:echo>
+ <ant:echo> or manually commit the files and tag the source tree:</ant:echo>
+ <ant:echo> maven scm:tag -Dmaven.scm.svn.tag=${tag_name} -Dmaven.scm.url=${scmConnection}</ant:echo>
+ </j:when>
+ <j:otherwise>
+ <ant:echo>Committing descriptors</ant:echo>
+ <!-- No tag here - in this context it means the branch to commit to, and we want whatever this checkout current is on -->
+ <scm:checkin url="${scmConnection}" workingDirectory="${basedir}" includes="project.xml,xdocs/changes.xml" message="[maven-scm-plugin] prepare release ${version_name}" username="${maven.scm.username}" password="${maven.scm.password}" />
+ <ant:echo>Tagging source tree</ant:echo>
+ <scm:tag url="${scmConnection}" workingDirectory="${basedir}" tag="${tag_name}" tagBase="${maven.scm.svn.tag.base}" username="${maven.scm.username}" password="${maven.scm.password}" />
+ </j:otherwise>
+ </j:choose>
- <ant:echo>Tagging source tree</ant:echo>
- <scm:tag url="${scmConnection}" workingDirectory="${basedir}" tag="${tag_name}" tagBase="${maven.scm.svn.tag.base}" username="${maven.scm.username}" password="${maven.scm.password}" />
</goal>
<goal name="scm:create-patch" description="Create a patch file for changes single last SCM update" prereqs="scm:find-connection">
Modified: maven/maven-1/plugins/trunk/scm/plugin.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/plugin.properties?rev=376017&r1=376016&r2=376017&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/scm/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/scm/plugin.properties Wed Feb 8 10:09:17 2006
@@ -56,3 +56,6 @@
maven.scm.patch.file=patch.txt
# The working directory for patching
maven.scm.patch.dir=${maven.build.dir}/scm/patch
+
+# test mode for scm:prepare-release: if true, skip committing and tagging
+maven.scm.testmode=false
Modified: maven/maven-1/plugins/trunk/scm/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/xdocs/changes.xml?rev=376017&r1=376016&r2=376017&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/scm/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/scm/xdocs/changes.xml Wed Feb 8 10:09:17 2006
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.6-SNAPSHOT" date="in SVN">
+ <action dev="ltheussl" type="update" issue="MPSCM-77">Make it possible to check changes made by prepare-release before they are checked in and tagged. New property <code>maven.scm.testmode</code>.</action>
<action dev="ltheussl" type="update" issue="MPSCM-68">Update to maven-scm 1.0-beta-2.</action>
<action dev="ltheussl" type="fix" issue="MPSCM-65" due-to="Phil Steitz">When pom.repository.connection ends with '/' checkout fails.</action>
<action dev="ltheussl" type="fix" issue="MPSCM-57">Re-add changes.xml file to display announcements.</action>
Modified: maven/maven-1/plugins/trunk/scm/xdocs/properties.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/xdocs/properties.xml?rev=376017&r1=376016&r2=376017&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/scm/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/scm/xdocs/properties.xml Wed Feb 8 10:09:17 2006
@@ -165,8 +165,19 @@
</p>
</td>
</tr>
-
-
+ <tr>
+ <td>maven.scm.testmode</td>
+ <td>Yes</td>
+ <td>
+ <p>
+ When <code>true</code>, the <code>scm:prepare-release</code> goal
+ only updates the files <code>project.xml</code> and
+ <code>xdocs/changes.xml</code> but does not commit the changes.
+ Also the tagging of the source tree will be skipped.
+ Default value is <code>false</code>.
+ </p>
+ </td>
+ </tr>
</table>
</subsection>
<subsection name="Subversion Specific Settings">