Author: maartenc
Date: Thu Apr 22 22:14:39 2010
New Revision: 937085
URL: http://svn.apache.org/viewvc?rev=937085&view=rev
Log:
Fixed junit tests when running with JDK 1,4
Modified:
ant/ivy/core/trunk/test/repositories/IVY-1179/repo/org/A/1.0/packager.xml
ant/ivy/core/trunk/test/repositories/IVY-1179/repo/org/B/1.0/packager.xml
Modified:
ant/ivy/core/trunk/test/repositories/IVY-1179/repo/org/A/1.0/packager.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1179/repo/org/A/1.0/packager.xml?rev=937085&r1=937084&r2=937085&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/repositories/IVY-1179/repo/org/A/1.0/packager.xml
(original)
+++ ant/ivy/core/trunk/test/repositories/IVY-1179/repo/org/A/1.0/packager.xml
Thu Apr 22 22:14:39 2010
@@ -18,17 +18,17 @@
-->
<packager-module version="1.0">
- <property name="name" value="${ivy.packager.module}"/>
- <property name="version" value="${ivy.packager.revision}"/>
- <property name="archive" value="${name}-${version}"/>
+ <property name="archive.name" value="${ivy.packager.module}"/>
+ <property name="archive.version" value="${ivy.packager.revision}"/>
+ <property name="archive" value="${archive.name}-${archive.version}"/>
<resource dest="extract" url="${packager.website.url}/dist/${archive}.zip"
sha1="c79d0b496dbb7f0d5affda645f3a0476f8999871">
- <include name="${archive}/${name}.jar"/>
+ <include name="${archive}/${archive.name}.jar"/>
</resource>
<build>
- <move file="extract/${archive}/${name}.jar" todir="artifacts/jars"/>
+ <move file="extract/${archive}/${archive.name}.jar"
todir="artifacts/jars"/>
</build>
</packager-module>
Modified:
ant/ivy/core/trunk/test/repositories/IVY-1179/repo/org/B/1.0/packager.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1179/repo/org/B/1.0/packager.xml?rev=937085&r1=937084&r2=937085&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/repositories/IVY-1179/repo/org/B/1.0/packager.xml
(original)
+++ ant/ivy/core/trunk/test/repositories/IVY-1179/repo/org/B/1.0/packager.xml
Thu Apr 22 22:14:39 2010
@@ -18,17 +18,17 @@
-->
<packager-module version="1.0">
- <property name="name" value="${ivy.packager.module}"/>
- <property name="version" value="${ivy.packager.revision}"/>
- <property name="archive" value="${name}-${version}"/>
+ <property name="archive.name" value="${ivy.packager.module}"/>
+ <property name="archive.version" value="${ivy.packager.revision}"/>
+ <property name="archive" value="${archive.name}-${archive.version}"/>
<resource dest="extract"
url="${packager.website.url}/dist/${archive}.tar.gz"
sha1="9cc9462ce72ad46d7dd6741d2cf97551ebec7df2">
- <include name="${archive}/${name}.jar"/>
+ <include name="${archive}/${archive.name}.jar"/>
</resource>
<build>
- <move file="extract/${archive}/${name}.jar" todir="artifacts/jars"/>
+ <move file="extract/${archive}/${archive.name}.jar"
todir="artifacts/jars"/>
</build>
</packager-module>
