You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2007/03/12 11:38:37 UTC
svn commit: r517165 - in /maven/maven-1/plugins/trunk: artifact/
artifact/xdocs/ jar/ jar/xdocs/ jxr/ jxr/xdocs/ multiproject/
multiproject/xdocs/ tasklist/ tasklist/xdocs/ xdoc/ xdoc/xdocs/
Author: ltheussl
Date: Mon Mar 12 03:38:31 2007
New Revision: 517165
URL: http://svn.apache.org/viewvc?view=rev&rev=517165
Log:
Upgrade to released velocity 1.5
Modified:
maven/maven-1/plugins/trunk/artifact/project.xml
maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml
maven/maven-1/plugins/trunk/jar/project.xml
maven/maven-1/plugins/trunk/jar/xdocs/changes.xml
maven/maven-1/plugins/trunk/jxr/project.xml
maven/maven-1/plugins/trunk/jxr/xdocs/changes.xml
maven/maven-1/plugins/trunk/multiproject/project.xml
maven/maven-1/plugins/trunk/multiproject/xdocs/changes.xml
maven/maven-1/plugins/trunk/tasklist/project.xml
maven/maven-1/plugins/trunk/tasklist/xdocs/changes.xml
maven/maven-1/plugins/trunk/xdoc/project.xml
maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/artifact/project.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/artifact/project.xml?view=diff&rev=517165&r1=517164&r2=517165
==============================================================================
--- maven/maven-1/plugins/trunk/artifact/project.xml (original)
+++ maven/maven-1/plugins/trunk/artifact/project.xml Mon Mar 12 03:38:31 2007
@@ -190,12 +190,9 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.5-20060721.044818</version>
- <properties>
- <comment>Waiting for a release of velocity 1.5, this SNAPSHOT fixes the issue VELOCITY-193.</comment>
- </properties>
+ <version>1.5</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
Modified: maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml?view=diff&rev=517165&r1=517164&r2=517165
==============================================================================
--- maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml Mon Mar 12 03:38:31 2007
@@ -30,7 +30,7 @@
<action dev="aheritier" type="update" issue="MAVEN-1796">Upgrade commons-jexl to version 1.1</action>
<action dev="aheritier" type="update" issue="MAVEN-1789">Change the default repository to http://repo1.maven.org/maven/ for dependencies url in the manifest.</action>
<action dev="ltheussl" type="fix" issue="MPARTIFACT-72">Creating an upload-bundle for a plugin without any java code does not work.</action>
- <action dev="aheritier" type="update">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]").</action>
+ <action dev="ltheussl" type="update">Update to velocity 1.5.</action>
<action dev="ltheussl" type="update">Update jelly dependency to match the ones in maven 1.1 core.</action>
<action dev="ltheussl" type="update" issue="MPARTIFACT-67">Include javadocs in created upload bundle.</action>
<action dev="aheritier" type="fix" issue="MPARTIFACT-71">"reject HostKey" error : Due to the upgrade of wagon, artifacts can't be deployed with scp and sftp protocols.</action>
Modified: maven/maven-1/plugins/trunk/jar/project.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/jar/project.xml?view=diff&rev=517165&r1=517164&r2=517165
==============================================================================
--- maven/maven-1/plugins/trunk/jar/project.xml (original)
+++ maven/maven-1/plugins/trunk/jar/project.xml Mon Mar 12 03:38:31 2007
@@ -74,12 +74,9 @@
</properties>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.5-20060721.044818</version>
- <properties>
- <comment>Waiting for a release of velocity 1.5, this SNAPSHOT fixes the issue VELOCITY-193.</comment>
- </properties>
+ <version>1.5</version>
</dependency>
</dependencies>
<build>
Modified: maven/maven-1/plugins/trunk/jar/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/jar/xdocs/changes.xml?view=diff&rev=517165&r1=517164&r2=517165
==============================================================================
--- maven/maven-1/plugins/trunk/jar/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/jar/xdocs/changes.xml Mon Mar 12 03:38:31 2007
@@ -26,7 +26,7 @@
<body>
<release version="1.9-SNAPSHOT" date="In SVN">
<action dev="aheritier" type="update" issue="MAVEN-1789">Change the default repository to http://repo1.maven.org/maven/ for dependencies url in the manifest.</action>
- <action dev="aheritier" type="update">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]").</action>
+ <action dev="ltheussl" type="update">Update to velocity 1.5.</action>
</release>
<release version="1.8" date="2006-04-26">
<action dev="ltheussl" type="add" issue="MPJAR-19">Add tests for jar manifest creation.</action>
Modified: maven/maven-1/plugins/trunk/jxr/project.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/jxr/project.xml?view=diff&rev=517165&r1=517164&r2=517165
==============================================================================
--- maven/maven-1/plugins/trunk/jxr/project.xml (original)
+++ maven/maven-1/plugins/trunk/jxr/project.xml Mon Mar 12 03:38:31 2007
@@ -75,11 +75,16 @@
</properties>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.5-20060721.044818</version>
+ <version>1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.0</version>
<properties>
- <comment>Waiting for a release of velocity 1.5, this SNAPSHOT fixes the issue VELOCITY-193.</comment>
+ <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
Modified: maven/maven-1/plugins/trunk/jxr/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/jxr/xdocs/changes.xml?view=diff&rev=517165&r1=517164&r2=517165
==============================================================================
--- maven/maven-1/plugins/trunk/jxr/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/jxr/xdocs/changes.xml Mon Mar 12 03:38:31 2007
@@ -26,7 +26,7 @@
<body>
<release version="1.6-SNAPSHOT" date="In SVN">
<action dev="aheritier" type="update" issue="MAVEN-1803">Upgrade plexus-utils to version 1.0.5</action>
- <action dev="aheritier" type="update">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]").</action>
+ <action dev="ltheussl" type="update">Update to velocity 1.5.</action>
</release>
<release version="1.5" date="2006-02-24">
<action dev="ltheussl" type="fix" issue="MPJXR-3">Use
Modified: maven/maven-1/plugins/trunk/multiproject/project.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/multiproject/project.xml?view=diff&rev=517165&r1=517164&r2=517165
==============================================================================
--- maven/maven-1/plugins/trunk/multiproject/project.xml (original)
+++ maven/maven-1/plugins/trunk/multiproject/project.xml Mon Mar 12 03:38:31 2007
@@ -115,12 +115,9 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.5-20060721.044818</version>
- <properties>
- <comment>Waiting for a release of velocity 1.5, this SNAPSHOT fixes the issue VELOCITY-193.</comment>
- </properties>
+ <version>1.5</version>
</dependency>
<dependency>
<groupId>maven</groupId>
Modified: maven/maven-1/plugins/trunk/multiproject/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/multiproject/xdocs/changes.xml?view=diff&rev=517165&r1=517164&r2=517165
==============================================================================
--- maven/maven-1/plugins/trunk/multiproject/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/multiproject/xdocs/changes.xml Mon Mar 12 03:38:31 2007
@@ -26,7 +26,7 @@
<body>
<release version="1.6-SNAPSHOT" date="in SVN">
<action dev="aheritier" type="update" issue="MAVEN-1755">Upgrade maven-model to version 3.0.2.</action>
- <action dev="aheritier" type="update">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]").</action>
+ <action dev="ltheussl" type="update">Update to velocity 1.5.</action>
<action dev="ltheussl" type="fix" issue="MPMULTIPROJECT-68" due-to="Shinobu Kawai">Only register the dependency convergence report if there are child projects.</action>
<action dev="ltheussl" type="fix" issue="MPMULTIPROJECT-67" due-to="Shinobu Kawai">maven-multiproject-plugin:deregister does not work.</action>
</release>
Modified: maven/maven-1/plugins/trunk/tasklist/project.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/tasklist/project.xml?view=diff&rev=517165&r1=517164&r2=517165
==============================================================================
--- maven/maven-1/plugins/trunk/tasklist/project.xml (original)
+++ maven/maven-1/plugins/trunk/tasklist/project.xml Mon Mar 12 03:38:31 2007
@@ -119,12 +119,9 @@
<url>http://jakarta.apache.org/commons/jelly/</url>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.5-20060721.044818</version>
- <properties>
- <comment>Waiting for a release of velocity 1.5, this SNAPSHOT fixes the issue VELOCITY-193.</comment>
- </properties>
+ <version>1.5</version>
</dependency>
<dependency>
<groupId>vdoclet</groupId>
Modified: maven/maven-1/plugins/trunk/tasklist/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/tasklist/xdocs/changes.xml?view=diff&rev=517165&r1=517164&r2=517165
==============================================================================
--- maven/maven-1/plugins/trunk/tasklist/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/tasklist/xdocs/changes.xml Mon Mar 12 03:38:31 2007
@@ -27,7 +27,7 @@
</properties>
<body>
<release version="2.5-SNAPSHOT" date="In SVN">
- <action dev="aheritier" type="update">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]").</action>
+ <action dev="ltheussl" type="update">Update to velocity 1.5.</action>
<action dev="ltheussl" type="update">Update jelly dependency to match the ones in maven 1.1 core.</action>
</release>
<release version="2.4" date="2005-06-15">
Modified: maven/maven-1/plugins/trunk/xdoc/project.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/xdoc/project.xml?view=diff&rev=517165&r1=517164&r2=517165
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/project.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/project.xml Mon Mar 12 03:38:31 2007
@@ -262,12 +262,9 @@
</properties>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.5-20060721.044818</version>
- <properties>
- <comment>Waiting for a release of velocity 1.5, this SNAPSHOT fixes the issue VELOCITY-193.</comment>
- </properties>
+ <version>1.5</version>
</dependency>
<dependency>
<groupId>velocity-dvsl</groupId>
Modified: maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml?view=diff&rev=517165&r1=517164&r2=517165
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml Mon Mar 12 03:38:31 2007
@@ -37,7 +37,7 @@
<action dev="aheritier" type="update" issue="MAVEN-1755">Upgrade maven-model to version 3.0.2.</action>
<action dev="dennisl" type="fix" issue="MPXDOC-198">Wrong margin around organization/name when no organization/logo is present.</action>
<action dev="ltheussl" type="fix" issue="MPXDOC-197">Report fails if there is no connection element in repository.</action>
- <action dev="aheritier" type="update">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]").</action>
+ <action dev="ltheussl" type="update">Update to velocity 1.5.</action>
<action dev="ltheussl" type="update">Update dom4j and jelly dependencies to match the ones in maven 1.1 core.</action>
<action dev="aheritier" type="update">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.</action>
</release>