Author: maartenc
Date: Thu Jan 7 21:18:45 2010
New Revision: 897018
URL: http://svn.apache.org/viewvc?rev=897018&view=rev
Log:
Fixed junit classpath to make the tests run with Ant 1.8.0RC1
Modified:
ant/ivy/core/trunk/build.xml
ant/ivy/core/trunk/ivy.xml
Modified: ant/ivy/core/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/build.xml?rev=897018&r1=897017&r2=897018&view=diff
==============================================================================
--- ant/ivy/core/trunk/build.xml (original)
+++ ant/ivy/core/trunk/build.xml Thu Jan 7 21:18:45 2010
@@ -441,6 +441,8 @@
fork="true">
<classpath>
<path refid="test.classpath" />
+ <pathelement path="${ant.home}/lib/ant-nodeps.jar"/>
+ <pathelement path="${ant.home}/lib/ant-trax.jar"/>
</classpath>
<!-- pass the proxy properties to the forked junit process to
use correct proxy -->
Modified: ant/ivy/core/trunk/ivy.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/ivy.xml?rev=897018&r1=897017&r2=897018&view=diff
==============================================================================
--- ant/ivy/core/trunk/ivy.xml (original)
+++ ant/ivy/core/trunk/ivy.xml Thu Jan 7 21:18:45 2010
@@ -44,8 +44,6 @@
</publications>
<dependencies>
<dependency org="ant" name="ant" rev="1.6.2"
conf="default,ant->default"/>
- <dependency org="ant" name="ant-nodeps" rev="1.6.2" conf="default"/>
- <dependency org="ant" name="ant-trax" rev="1.6.2" conf="default"/>
<dependency org="commons-httpclient" name="commons-httpclient"
rev="3.0" conf="default,httpclient->runtime,master" />
<dependency org="oro" name="oro" rev="2.0.8"
conf="default,oro->default"/>
<dependency org="commons-vfs" name="commons-vfs" rev="1.0"
conf="default,vfs->default" />
@@ -55,7 +53,7 @@
<dependency org="junit" name="junit" rev="3.8.2"
conf="test->default" />
<dependency org="commons-lang" name="commons-lang"
rev="[1.0,3.0[" conf="test->default" />
<dependency org="org.apache.ant" name="ant-testutil"
rev="1.7.0" conf="test->default" transitive="false" />
- <dependency org="ant" name="ant-launcher" rev="1.6.2"
conf="test->default" transitive="false"/>
+ <dependency org="ant" name="ant-launcher" rev="1.6.2"
conf="test->default" transitive="false"/>
<!-- This dependency is necessary for having validation in
junit tests when running with JDK1.4 -->
<dependency org="xerces" name="xercesImpl" rev="2.6.2"
conf="test->default" />
