Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PR: MPSCM-77

Browse Source 
Make it possible to check changes made by prepare-release before they are checked in and tagged.
New property maven.scm.testmode.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@376017 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
ltheussl 2006-02-08 18:09:17 +00:00
parent 472b1f8e35
commit 861a524503
4 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scm/plugin.jelly
View File

@ -329,12 +329,25 @@
<c:release-version version="${version_name}" /> <c:release-version version="${version_name}" />
</j:if> </j:if>
<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> <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 --> <!-- 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}" /> <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> <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}" /> <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>
</goal> </goal>
<goal name="scm:create-patch" description="Create a patch file for changes single last SCM update" prereqs="scm:find-connection"> <goal name="scm:create-patch" description="Create a patch file for changes single last SCM update" prereqs="scm:find-connection">

3
scm/plugin.properties
View File

@ -56,3 +56,6 @@ maven.scm.message=
maven.scm.patch.file=patch.txt maven.scm.patch.file=patch.txt
# The working directory for patching # The working directory for patching
maven.scm.patch.dir=${maven.build.dir}/scm/patch 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

1
scm/xdocs/changes.xml
View File

@ -25,6 +25,7 @@
</properties> </properties>
<body> <body>
<release version="1.6-SNAPSHOT" date="in SVN"> <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="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-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> <action dev="ltheussl" type="fix" issue="MPSCM-57">Re-add changes.xml file to display announcements.</action>

15
scm/xdocs/properties.xml
View File

@ -165,8 +165,19 @@
</p> </p>
</td> </td>
</tr> </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> </table>
</subsection> </subsection>
<subsection name="Subversion Specific Settings"> <subsection name="Subversion Specific Settings">