From: Dominik Stadler <centic@apache.org>
Date: Thu, 29 May 2014 09:16:29 +0000 (+0000)
Subject: Update to latest Ant 1.9.4 and add ant-launcher which is used in
X-Git-Tag: REL_3_11_BETA1~124
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=87d020c03ae18730cb52f1fe5d134e2eba81a140;p=poi.git

Update to latest Ant 1.9.4 and add ant-launcher which is used in
ExcelAnt tests to make it easier to run these tests in Eclipse

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1598226 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/.classpath b/.classpath
index 19c290b734..4c67b866a3 100644
--- a/.classpath
+++ b/.classpath
@@ -14,7 +14,8 @@
 	<classpathentry kind="src" path="src/excelant/java"/>
 	<classpathentry kind="src" path="src/excelant/testcases"/>
 	<classpathentry kind="src" path="src/excelant/resources"/>
-	<classpathentry kind="lib" path="lib/ant-1.8.2.jar"/>
+	<classpathentry kind="lib" path="lib/ant-1.9.4.jar" sourcepath="/home/dstadler/.m2/repository/org/apache/ant/ant/1.8.3/ant-1.8.3-sources.jar"/>
+	<classpathentry kind="lib" path="lib/ant-launcher-1.9.4.jar"/>
 	<classpathentry kind="lib" path="lib/commons-codec-1.9.jar"/>
 	<classpathentry kind="lib" path="lib/commons-logging-1.1.3.jar"/>
 	<classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
diff --git a/build.xml b/build.xml
index 15f6614add..c0a4540259 100644
--- a/build.xml
+++ b/build.xml
@@ -140,8 +140,10 @@ under the License.
     <property name="main.junit.url" value="${repository.m2}/maven2/junit/junit/4.11/junit-4.11.jar"/>
     <property name="main.hamcrest.jar" location="${main.lib}/hamcrest-core-1.3.jar"/>
     <property name="main.hamcrest.url" value="${repository.m2}/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
-    <property name="main.ant.jar" location="${main.lib}/ant-1.8.2.jar"/>
-    <property name="main.ant.url" value="${repository.m2}/maven2/org/apache/ant/ant/1.8.2/ant-1.8.2.jar"/>
+    <property name="main.ant.jar" location="${main.lib}/ant-1.9.4.jar"/>
+    <property name="main.ant.url" value="${repository.m2}/maven2/org/apache/ant/ant/1.9.4/ant-1.9.4.jar"/>
+    <property name="main.antlauncher.jar" location="${main.lib}/ant-launcher-1.9.4.jar"/>
+    <property name="main.antlauncher.url" value="${repository.m2}/maven2/org/apache/ant/ant-launcher/1.9.4/ant-launcher-1.9.4.jar"/>
 
     <!-- jars in the lib-ooxml directory, see the fetch-ooxml-jars target-->
     <property name="ooxml.dom4j.jar" location="${ooxml.lib}/dom4j-1.6.1.jar"/>
@@ -344,6 +346,7 @@ under the License.
                     <available file="${main.junit.jar}"/>
                     <available file="${main.hamcrest.jar}"/>
                     <available file="${main.ant.jar}"/>
+                    <available file="${main.antlauncher.jar}"/>
                     <available file="${asm.jar}"/>
                     <available file="${jacoco.zip}"/>
                     <available file="${rat.jar}"/>
@@ -380,6 +383,10 @@ under the License.
             <param name="sourcefile" value="${main.ant.url}"/>
             <param name="destfile" value="${main.ant.jar}"/>
         </antcall>
+        <antcall target="downloadfile">
+            <param name="sourcefile" value="${main.antlauncher.url}"/>
+            <param name="destfile" value="${main.antlauncher.jar}"/>
+        </antcall>
         <antcall target="downloadfile">
             <param name="sourcefile" value="${asm.url}"/>
             <param name="destfile" value="${asm.jar}"/>