diff --git a/scm/project.xml b/scm/project.xml index 2771d448..35ce52f6 100644 --- a/scm/project.xml +++ b/scm/project.xml @@ -23,7 +23,7 @@ 3 maven-scm-plugin Maven Source Control Management Plugin - 1.6.1-SNAPSHOT + 1.6.1 A plugin for SCM tasks. SCM Plugin for Maven. @@ -67,6 +67,11 @@ 1.6 MAVEN_SCM_1_6 + + 1.6.1 + 1.6.1 + MAVEN_SCM_1_6_1 + diff --git a/scm/xdocs/changes.xml b/scm/xdocs/changes.xml index 48793d7b..f939c516 100644 --- a/scm/xdocs/changes.xml +++ b/scm/xdocs/changes.xml @@ -18,100 +18,100 @@ * limitations under the License. */ --> - - - Changes - Brett Porter - - - - The prepare-release goal should fail if project.xml can't be edited (e.g. read only). - SCM Parse Connection output is wrong / misleading. - scm:prepare-release does not commit modified changes.xml. - Upgrade plexus-utils to version 1.0.5 - Upgrade plexus-container-default and plexus-component-api to version 1.0-alpha-15 and replace classworlds by plexus-classworlds 1.2-alpha-5 - 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. - - + + + Changes + Brett Porter + + + + The prepare-release goal should fail if project.xml can't be edited (e.g. read only). + SCM Parse Connection output is wrong / misleading. + scm:prepare-release does not commit modified changes.xml. + Upgrade plexus-utils to version 1.0.5 + Upgrade plexus-container-default and plexus-component-api to version 1.0-alpha-15 and replace classworlds by plexus-classworlds 1.2-alpha-5 + 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. + + The encoding of the project.xml file is not preserved after doing release:transform. - - Handle poms with a namespace. - Handle non-jar dependencies. + + Handle poms with a namespace. + Handle non-jar dependencies. Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : -
    -
  • maven v1.0-rc2 -> v1.0.2
    • -
  • dom4j v1.4-dev-8 -> v1.4
    • -
  • commons-jelly v1.0-beta-4 -> v1.0
    • -
  • xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2
    • -
- +
    +
  • maven v1.0-rc2 -> v1.0.2
    • +
  • dom4j v1.4-dev-8 -> v1.4
    • +
  • commons-jelly v1.0-beta-4 -> v1.0
    • +
  • xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2
    • +
+ 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. - - New scm:checkin goal. - - - - Add Starteam support, plus scm:add, scm:status, scm:checkin. - - - Exception while executing SCM command. - v1.5 is not compatible with 1.4.1. - Avoid use of jelly empty operator. - NullPointerException when setting checkout dir. - Skip prompt for tag. - Clarify "module" notation as used for CVS in regards to Subversion. - Implement status check. - Incorporate a released version of Maven SCM. - scm:bootstrap fails on SVN project requiring username/password. - scm:cvs-update-project uses developer connection. - Update documentation after latest changes. - Var delim not always ":" (on CVSNT "|"). - Support starting and ending revision in diff bean/tag. - Add the ability to pass a username and password to the Subversion provider. + + Update to maven-scm 1.0-beta-2. + When pom.repository.connection ends with '/' checkout fails. + Re-add changes.xml file to display announcements. + + New scm:checkin goal. + + + + Add Starteam support, plus scm:add, scm:status, scm:checkin. + + + Exception while executing SCM command. + v1.5 is not compatible with 1.4.1. + Avoid use of jelly empty operator. + NullPointerException when setting checkout dir. + Skip prompt for tag. + Clarify "module" notation as used for CVS in regards to Subversion. + Implement status check. + Incorporate a released version of Maven SCM. + scm:bootstrap fails on SVN project requiring username/password. + scm:cvs-update-project uses developer connection. + Update documentation after latest changes. + Var delim not always ":" (on CVSNT "|"). + Support starting and ending revision in diff bean/tag. + Add the ability to pass a username and password to the Subversion provider. Check out into maven.scm.checkout.dirrather than a subdirectory of it. - - Use maven.scm.bootstrap.pom.dir. - Add support for subversion. - Rewritten to utilise the Maven SCM library. - Ignore whitespace when creating a patch. - Ignore POM if the scm root is specified in command line. - - - Trim goals after prompting from the user. - Add scm:cvs-create-patch goal to help in creating patches. + + Use maven.scm.bootstrap.pom.dir. + Add support for subversion. + Rewritten to utilise the Maven SCM library. + Ignore whitespace when creating a patch. + Ignore POM if the scm root is specified in command line. + + + Trim goals after prompting from the user. + Add scm:cvs-create-patch goal to help in creating patches. Set default maven.scm.methodto cvs - - - - Add minimal support for SVN to allow cruisecontrol plugin to work. - Add scm:cvs-tag-project goal. - - - - Don't use -C - Mac OS X doesn't recognise it. - Catch exceptions to make sure files don't get moved permanently. - Update POM using dom4j instead of JSL - no more formatting issues. - Support :local: CVS paths - Update changes.xml version and release date on prepare. - Use developerConnection first, then standard connection when parsing connection from POM. - - - Apply MAVEN-834. Support for scm delimiters other than ':' - Turn off pretty printing to fix MAVEN-769 - random spaces added to project.xml. - Add new versions to bottom of list instead of top to follow convention. - - - Initial creation - support for CVS. - - + + + + Add minimal support for SVN to allow cruisecontrol plugin to work. + Add scm:cvs-tag-project goal. + + + + Don't use -C - Mac OS X doesn't recognise it. + Catch exceptions to make sure files don't get moved permanently. + Update POM using dom4j instead of JSL - no more formatting issues. + Support :local: CVS paths + Update changes.xml version and release date on prepare. + Use developerConnection first, then standard connection when parsing connection from POM. + + + Apply MAVEN-834. Support for scm delimiters other than ':' + Turn off pretty printing to fix MAVEN-769 - random spaces added to project.xml. + Add new versions to bottom of list instead of top to follow convention. + + + Initial creation - support for CVS. + +