From d2df2ed2ffdb11bf961552c0b3b3273a831246c6 Mon Sep 17 00:00:00 2001 From: ltheussl Date: Tue, 31 Oct 2006 14:55:34 +0000 Subject: [PATCH] PR: MPSCM-86 scm:prepare-release does not commit modified changes.xml. Use ${maven.docs.src} instead of hard-coded xdocs/changes.xml. git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@469508 13f79535-47bb-0310-9956-ffa450edef68 --- scm/plugin.jelly | 5 +++-- scm/xdocs/changes.xml | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scm/plugin.jelly b/scm/plugin.jelly index 4f8fd56d..2f6d4066 100644 --- a/scm/plugin.jelly +++ b/scm/plugin.jelly @@ -329,13 +329,14 @@ + 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 + Please check project.xml and ${changesXmlSourceDir}/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.tag=${tag_name} -Dmaven.scm.url=${scmConnection} @@ -343,7 +344,7 @@ Committing descriptors - + Tagging source tree diff --git a/scm/xdocs/changes.xml b/scm/xdocs/changes.xml index 6abe2dcc..f2d2cf5c 100644 --- a/scm/xdocs/changes.xml +++ b/scm/xdocs/changes.xml @@ -24,6 +24,7 @@ + scm:prepare-release does not commit modified changes.xml. Update dom4j and jelly dependencies to match the ones in maven 1.1 core. Update dependencies to unify them between plugins. The following dependencies are updated : commons-jelly-tags-interaction v1.0 to v1.1, jaxen v1.0-FCS-full to 1.1-beta-9. Add the dependency to jline for commons-jelly-tags-interaction v1.1. Upgrade to commons-io 1.2.