From 431f6407b30b3db597ce825df3277bc171142cb5 Mon Sep 17 00:00:00 2001 From: ltheussl Date: Mon, 12 Mar 2007 10:38:31 +0000 Subject: [PATCH] Upgrade to released velocity 1.5 git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@517165 13f79535-47bb-0310-9956-ffa450edef68 --- artifact/project.xml | 7 ++----- artifact/xdocs/changes.xml | 2 +- jar/project.xml | 7 ++----- jar/xdocs/changes.xml | 2 +- jxr/project.xml | 11 ++++++++--- jxr/xdocs/changes.xml | 2 +- multiproject/project.xml | 7 ++----- multiproject/xdocs/changes.xml | 2 +- tasklist/project.xml | 7 ++----- tasklist/xdocs/changes.xml | 2 +- xdoc/project.xml | 7 ++----- xdoc/xdocs/changes.xml | 2 +- 12 files changed, 24 insertions(+), 34 deletions(-) diff --git a/artifact/project.xml b/artifact/project.xml index fac15495..110b28e9 100644 --- a/artifact/project.xml +++ b/artifact/project.xml @@ -190,12 +190,9 @@ 1.0 - maven + org.apache.velocity velocity - 1.5-20060721.044818 - - Waiting for a release of velocity 1.5, this SNAPSHOT fixes the issue VELOCITY-193. - + 1.5 org.apache.maven.wagon diff --git a/artifact/xdocs/changes.xml b/artifact/xdocs/changes.xml index e230e2f6..3db21dbd 100644 --- a/artifact/xdocs/changes.xml +++ b/artifact/xdocs/changes.xml @@ -30,7 +30,7 @@ Upgrade commons-jexl to version 1.1 Change the default repository to http://repo1.maven.org/maven/ for dependencies url in the manifest. Creating an upload-bundle for a plugin without any java code does not work. - Use a custom build of velocity (1.5-20060721.044818) to wait for a release of velocity 1.5 which will fix the issue VELOCITY-193 (The horrible error : "log4j:ERROR Attempted to append to closed appender named [null]"). + Update to velocity 1.5. Update jelly dependency to match the ones in maven 1.1 core. Include javadocs in created upload bundle. "reject HostKey" error : Due to the upgrade of wagon, artifacts can't be deployed with scp and sftp protocols. diff --git a/jar/project.xml b/jar/project.xml index 799c35a2..f19af6fc 100644 --- a/jar/project.xml +++ b/jar/project.xml @@ -74,12 +74,9 @@ - maven + org.apache.velocity velocity - 1.5-20060721.044818 - - Waiting for a release of velocity 1.5, this SNAPSHOT fixes the issue VELOCITY-193. - + 1.5 diff --git a/jar/xdocs/changes.xml b/jar/xdocs/changes.xml index 75d7818c..474bf482 100644 --- a/jar/xdocs/changes.xml +++ b/jar/xdocs/changes.xml @@ -26,7 +26,7 @@ Change the default repository to http://repo1.maven.org/maven/ for dependencies url in the manifest. - Use a custom build of velocity (1.5-20060721.044818) to wait for a release of velocity 1.5 which will fix the issue VELOCITY-193 (The horrible error : "log4j:ERROR Attempted to append to closed appender named [null]"). + Update to velocity 1.5. Add tests for jar manifest creation. diff --git a/jxr/project.xml b/jxr/project.xml index f478ed94..ff3f87ea 100644 --- a/jxr/project.xml +++ b/jxr/project.xml @@ -75,11 +75,16 @@ - maven + org.apache.velocity velocity - 1.5-20060721.044818 + 1.5 + + + commons-lang + commons-lang + 2.0 - Waiting for a release of velocity 1.5, this SNAPSHOT fixes the issue VELOCITY-193. + This library is already loaded by maven's core. Be careful to use the same version number as in the core. diff --git a/jxr/xdocs/changes.xml b/jxr/xdocs/changes.xml index b9eafc5f..3cb045d3 100644 --- a/jxr/xdocs/changes.xml +++ b/jxr/xdocs/changes.xml @@ -26,7 +26,7 @@ Upgrade plexus-utils to version 1.0.5 - Use a custom build of velocity (1.5-20060721.044818) to wait for a release of velocity 1.5 which will fix the issue VELOCITY-193 (The horrible error : "log4j:ERROR Attempted to append to closed appender named [null]"). + Update to velocity 1.5. Use diff --git a/multiproject/project.xml b/multiproject/project.xml index 93c3145c..12ded1f1 100644 --- a/multiproject/project.xml +++ b/multiproject/project.xml @@ -115,12 +115,9 @@ 1.0 - maven + org.apache.velocity velocity - 1.5-20060721.044818 - - Waiting for a release of velocity 1.5, this SNAPSHOT fixes the issue VELOCITY-193. - + 1.5 maven diff --git a/multiproject/xdocs/changes.xml b/multiproject/xdocs/changes.xml index 13b6f117..ca00b15a 100644 --- a/multiproject/xdocs/changes.xml +++ b/multiproject/xdocs/changes.xml @@ -26,7 +26,7 @@ Upgrade maven-model to version 3.0.2. - Use a custom build of velocity (1.5-20060721.044818) to wait for a release of velocity 1.5 which will fix the issue VELOCITY-193 (The horrible error : "log4j:ERROR Attempted to append to closed appender named [null]"). + Update to velocity 1.5. Only register the dependency convergence report if there are child projects. maven-multiproject-plugin:deregister does not work. diff --git a/tasklist/project.xml b/tasklist/project.xml index a0f01efd..3eac0759 100644 --- a/tasklist/project.xml +++ b/tasklist/project.xml @@ -119,12 +119,9 @@ http://jakarta.apache.org/commons/jelly/ - maven + org.apache.velocity velocity - 1.5-20060721.044818 - - Waiting for a release of velocity 1.5, this SNAPSHOT fixes the issue VELOCITY-193. - + 1.5 vdoclet diff --git a/tasklist/xdocs/changes.xml b/tasklist/xdocs/changes.xml index ef0d5d9c..4fbeb668 100644 --- a/tasklist/xdocs/changes.xml +++ b/tasklist/xdocs/changes.xml @@ -27,7 +27,7 @@ - Use a custom build of velocity (1.5-20060721.044818) to wait for a release of velocity 1.5 which will fix the issue VELOCITY-193 (The horrible error : "log4j:ERROR Attempted to append to closed appender named [null]"). + Update to velocity 1.5. Update jelly dependency to match the ones in maven 1.1 core. diff --git a/xdoc/project.xml b/xdoc/project.xml index 2c04dda1..0cbca6d1 100644 --- a/xdoc/project.xml +++ b/xdoc/project.xml @@ -262,12 +262,9 @@ - maven + org.apache.velocity velocity - 1.5-20060721.044818 - - Waiting for a release of velocity 1.5, this SNAPSHOT fixes the issue VELOCITY-193. - + 1.5 velocity-dvsl diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml index d51b938c..59316916 100644 --- a/xdoc/xdocs/changes.xml +++ b/xdoc/xdocs/changes.xml @@ -37,7 +37,7 @@ Upgrade maven-model to version 3.0.2. Wrong margin around organization/name when no organization/logo is present. Report fails if there is no connection element in repository. - Use a custom build of velocity (1.5-20060721.044818) to wait for a release of velocity 1.5 which will fix the issue VELOCITY-193 (The horrible error : "log4j:ERROR Attempted to append to closed appender named [null]"). + Update to velocity 1.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.