From: Nick Burch <nick@apache.org>
Date: Tue, 15 Apr 2014 16:29:05 +0000 (+0000)
Subject: More stax jar removal for Java 6
X-Git-Tag: REL_3_11_BETA1~192
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9cc498fa5c9d4d2cf4e86b98bb3ddda108cdb887;p=poi.git

More stax jar removal for Java 6

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

diff --git a/build.xml b/build.xml
index df9bfc2794..15f6614add 100644
--- a/build.xml
+++ b/build.xml
@@ -214,7 +214,6 @@ under the License.
     </path>
 
     <path id="ooxml.classpath">
-        <pathelement location="${ooxml.jsr173.jar}"/>
         <pathelement location="${ooxml.dom4j.jar}"/>
         <pathelement location="${ooxml.xmlbeans.jar}"/>
         <pathelement location="${ooxml.xsds.jar}"/>
@@ -245,7 +244,6 @@ under the License.
     </path>
 
     <path id="ooxml-lite.classpath">
-        <pathelement location="${ooxml.jsr173.jar}"/>
         <pathelement location="${ooxml.dom4j.jar}"/>
         <pathelement location="${ooxml.xmlbeans.jar}"/>
         <pathelement location="build/ooxml-xsds-lite"/> <!-- instead of ooxml-xsds.jar use the filtered classes-->
@@ -407,7 +405,6 @@ under the License.
                 <and>
                     <available file="${ooxml.dom4j.jar}"/>
                     <available file="${ooxml.xmlbeans.jar}"/>
-                    <available file="${ooxml.jsr173.jar}"/>
                     <available file="${ooxml.xsds.jar}"/>
                 </and>
                 <isset property="disconnected"/>
@@ -424,10 +421,6 @@ under the License.
             <param name="sourcefile" value="${ooxml.xmlbeans.url}"/>
             <param name="destfile" value="${ooxml.xmlbeans.jar}"/>
         </antcall>
-        <antcall target="downloadfile">
-            <param name="sourcefile" value="${ooxml.jsr173.url}"/>
-            <param name="destfile" value="${ooxml.jsr173.jar}"/>
-        </antcall>
     </target>
 
     <target name="check-ooxml-xsds">
@@ -472,7 +465,7 @@ under the License.
 
         <taskdef name="xmlbean"
                  classname="org.apache.xmlbeans.impl.tool.XMLBean"
-                 classpath="${ooxml.xmlbeans.jar}:${ooxml.jsr173.jar}"/>
+                 classpath="${ooxml.xmlbeans.jar}"/>
 
         <!-- We need a fair amount of memory to compile the xml schema, -->
         <!--  but limit it in case it goes wrong! -->
@@ -511,7 +504,7 @@ under the License.
             description="Compiles the OOXML encryption xsd files into XmlBeans">
         <taskdef name="xmlbean"
                  classname="org.apache.xmlbeans.impl.tool.XMLBean"
-                 classpath="${ooxml.xmlbeans.jar}:${ooxml.jsr173.jar}"/>
+                 classpath="${ooxml.xmlbeans.jar}"/>
 
         <!-- We need a fair amount of memory to compile the xml schema, -->
         <!--  but limit it in case it goes wrong! -->