diff --git a/scm/plugin.jelly b/scm/plugin.jelly index 9f26327f..0fd625b6 100644 --- a/scm/plugin.jelly +++ b/scm/plugin.jelly @@ -329,12 +329,25 @@ - Committing descriptors - - + + + + WARNING: maven.scm.testmode is set to 'true' + Changes made above will NOT be committed and tagging the project will be skipped! + Please check project.xml and xdocs/changes.xml + Then either re-run scm:prepare-release with maven.scm.testmode=false + or manually commit the files and tag the source tree: + maven scm:tag -Dmaven.scm.svn.tag=${tag_name} -Dmaven.scm.url=${scmConnection} + + + Committing descriptors + + + Tagging source tree + + + - Tagging source tree - diff --git a/scm/plugin.properties b/scm/plugin.properties index f5b53426..387cd850 100644 --- a/scm/plugin.properties +++ b/scm/plugin.properties @@ -56,3 +56,6 @@ maven.scm.message= 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 diff --git a/scm/xdocs/changes.xml b/scm/xdocs/changes.xml index 83b7ec65..94572c8f 100644 --- a/scm/xdocs/changes.xml +++ b/scm/xdocs/changes.xml @@ -25,6 +25,7 @@ + Make it possible to check changes made by prepare-release before they are checked in and tagged. New property maven.scm.testmode. Update to maven-scm 1.0-beta-2. When pom.repository.connection ends with '/' checkout fails. Re-add changes.xml file to display announcements. diff --git a/scm/xdocs/properties.xml b/scm/xdocs/properties.xml index 80232017..09ab1ff4 100644 --- a/scm/xdocs/properties.xml +++ b/scm/xdocs/properties.xml @@ -165,8 +165,19 @@

- - + + maven.scm.testmode + Yes + +

+ When true, the scm:prepare-release goal + only updates the files project.xml and + xdocs/changes.xml but does not commit the changes. + Also the tagging of the source tree will be skipped. + Default value is false. +

+ +