Author: nbubna
Date: Mon May 10 19:17:45 2010
New Revision: 942859
URL: http://svn.apache.org/viewvc?rev=942859&view=rev
Log:
upgrade to velocity 1.6.4 and dom4j 1.6.1
Modified:
velocity/tools/trunk/build.properties
velocity/tools/trunk/download.xml
velocity/tools/trunk/examples.xml
velocity/tools/trunk/xdocs/changes.xml
Modified: velocity/tools/trunk/build.properties
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/build.properties?rev=942859&r1=942858&r2=942859&view=diff
==============================================================================
--- velocity/tools/trunk/build.properties (original)
+++ velocity/tools/trunk/build.properties Mon May 10 19:17:45 2010
@@ -138,14 +138,15 @@ jar.commons-digester.version= 1.8
jar.commons-lang.version= 2.2
jar.commons-logging.version= 1.1
jar.commons-validator.version= 1.3.1
-jar.dom4j.version= 1.1
+jar.dom4j.version= 1.6.1
+jar.jaxen.version= 1.1-beta-6
jar.oro.version= 2.0.8
jar.servletapi.version= 2.3
jar.sslext.version = 1.2-0
jar.struts-core.version = 1.3.8
jar.struts-taglib.version = 1.3.8
jar.struts-tiles.version = 1.3.8
-jar.velocity.version= 1.6.2
+jar.velocity.version= 1.6.4
# Jars to be downloaded for building documentation
#
@@ -180,6 +181,7 @@ commons-lang.jar=${lib.dir}/commons-lang
commons-logging.jar=${lib.dir}/commons-logging-${jar.commons-logging.version}.jar
commons-validator.jar=${lib.dir}/commons-validator-${jar.commons-validator.version}.jar
dom4j.jar=${lib.dir}/dom4j-${jar.dom4j.version}.jar
+jaxen.jar=${lib.dir}/jaxen-${jar.jaxen.version}.jar
servlet.jar=${lib.dir}/servletapi-${jar.servletapi.version}.jar
struts-core.jar=${lib.dir}/struts-core-${jar.struts-core.version}.jar
struts-taglib.jar=${lib.dir}/struts-taglib-${jar.struts-taglib.version}.jar
Modified: velocity/tools/trunk/download.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/download.xml?rev=942859&r1=942858&r2=942859&view=diff
==============================================================================
--- velocity/tools/trunk/download.xml (original)
+++ velocity/tools/trunk/download.xml Mon May 10 19:17:45 2010
@@ -61,6 +61,7 @@
<target name="docs-download"
depends="base-download"
description="Download dependencies needed to render VelocityTools
documentation from the central repository">
+ <antcall target="dom4j-download" />
<antcall target="velocity-dvsl-download" />
</target>
@@ -78,6 +79,7 @@
<!-- whitebox tests downloads -->
<target name="whitebox-test-download" depends="base-download">
<antcall target="junit-download"/>
+ <antcall target="jaxen-download" />
</target>
<!-- blackbox tests downloads -->
@@ -244,6 +246,13 @@
<antcall target="http-m2-download"/>
</target>
+ <target name="jaxen-download">
+ <property name="download.groupId" value="jaxen" />
+ <property name="download.artifactId" value="jaxen" />
+ <property name="download.version" value="${jar.jaxen.version}" />
+ <antcall target="http-m2-download"/>
+ </target>
+
<target name="oro-download">
<property name="download.groupId" value="oro" />
<property name="download.artifactId" value="oro" />
Modified: velocity/tools/trunk/examples.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/examples.xml?rev=942859&r1=942858&r2=942859&view=diff
==============================================================================
--- velocity/tools/trunk/examples.xml (original)
+++ velocity/tools/trunk/examples.xml Mon May 10 19:17:45 2010
@@ -70,6 +70,7 @@
</target>
<target name="showcase-dependencies" depends="simple-dependencies">
<copy todir="${lib}" file="${dom4j.jar}"/>
+ <copy todir="${lib}" file="${jaxen.jar}"/>
<copy todir="${lib}" file="${servlet.jar}"/>
</target>
Modified: velocity/tools/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/changes.xml?rev=942859&r1=942858&r2=942859&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/changes.xml (original)
+++ velocity/tools/trunk/xdocs/changes.xml Mon May 10 19:17:45 2010
@@ -28,6 +28,13 @@
<section name="VelocityTools Changes">
<p>This document tracks the changes in VelocityTools between releases.</p>
+ <subsection name="2.1-SNAPSHOT">
+ <p>This section describes changes after the 2.0 release.</p>
+ <ul>
+ <li>Upgraded to Dom4j 1.6.1 and Velocity Engine 1.6.4.</li>
+ </ul>
+ </subsection>
+
<subsection name="2.0">
<p>This section very briefly and generally describes changes after the
1.x series.</p>
<ul>
