moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Now that we require Java 1.6, we no longer need to include the STAX-API jar as JRE 1.6 has it build in

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1587605 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2014-04-15 15:19:30 +00:00
parent 91b6961a44
commit abd2638635
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.classpath
View File

@ -19,7 +19,6 @@
<classpathentry kind="lib" path="lib/commons-logging-1.1.3.jar"/> <classpathentry kind="lib" path="lib/commons-logging-1.1.3.jar"/>
<classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/> <classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
<classpathentry kind="lib" path="ooxml-lib/dom4j-1.6.1.jar"/> <classpathentry kind="lib" path="ooxml-lib/dom4j-1.6.1.jar"/>
<classpathentry kind="lib" path="ooxml-lib/stax-api-1.0.1.jar"/>
<classpathentry kind="lib" path="ooxml-lib/xmlbeans-2.3.0.jar"/> <classpathentry kind="lib" path="ooxml-lib/xmlbeans-2.3.0.jar"/>
<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/> <classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
<classpathentry kind="lib" path="lib/junit-4.11.jar"/> <classpathentry kind="lib" path="lib/junit-4.11.jar"/>

7
build.xml
View File

@ -40,7 +40,7 @@ under the License.
To build the documentation you will need to install forrest and set To build the documentation you will need to install forrest and set
the FORREST_HOME environment variable. Forrest 0.5.1 required. the FORREST_HOME environment variable. Forrest 0.5.1 required.
Since POI 3.5 you will need JDK 1.5 or newer to build POI. You currently need JDK 1.6 or newer to build POI.
Some people may find the tests hang when run through Ant. If this Some people may find the tests hang when run through Ant. If this
happens to you, try giving Ant some more memory when you run it, eg: happens to you, try giving Ant some more memory when you run it, eg:
@ -149,8 +149,6 @@ under the License.
<property name="ooxml.xmlbeans.jar" location="${ooxml.lib}/xmlbeans-2.3.0.jar"/> <property name="ooxml.xmlbeans.jar" location="${ooxml.lib}/xmlbeans-2.3.0.jar"/>
<property name="ooxml.xmlbeans.url" <property name="ooxml.xmlbeans.url"
value="${repository.m2}/maven2/org/apache/xmlbeans/xmlbeans/2.3.0/xmlbeans-2.3.0.jar"/> value="${repository.m2}/maven2/org/apache/xmlbeans/xmlbeans/2.3.0/xmlbeans-2.3.0.jar"/>
<property name="ooxml.jsr173.jar" location="${ooxml.lib}/stax-api-1.0.1.jar"/>
<property name="ooxml.jsr173.url" value="${repository.m2}/maven2/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
<!-- coverage libs --> <!-- coverage libs -->
<property name="jacoco.zip" location="${main.lib}/jacoco-0.6.5.201403032054.zip"/> <property name="jacoco.zip" location="${main.lib}/jacoco-0.6.5.201403032054.zip"/>
@ -1257,7 +1255,6 @@ under the License.
</zipfileset> </zipfileset>
<zipfileset dir="${ooxml.lib}" prefix="${zipdir}/ooxml-lib"> <zipfileset dir="${ooxml.lib}" prefix="${zipdir}/ooxml-lib">
<include name="dom4j-*.jar"/> <include name="dom4j-*.jar"/>
<include name="stax-api-*.jar"/>
<include name="xmlbeans-*.jar"/> <include name="xmlbeans-*.jar"/>
</zipfileset> </zipfileset>
<zipfileset dir="${dist.dir}" prefix="${zipdir}"> <zipfileset dir="${dist.dir}" prefix="${zipdir}">
@ -1286,7 +1283,6 @@ under the License.
</zipfileset> </zipfileset>
<tarfileset dir="${ooxml.lib}" prefix="${zipdir}/ooxml-lib"> <tarfileset dir="${ooxml.lib}" prefix="${zipdir}/ooxml-lib">
<include name="dom4j-*.jar"/> <include name="dom4j-*.jar"/>
<include name="stax-api-*.jar"/>
<include name="xmlbeans-*.jar"/> <include name="xmlbeans-*.jar"/>
</tarfileset> </tarfileset>
<tarfileset dir="${build.site}" prefix="${zipdir}/docs"/> <tarfileset dir="${build.site}" prefix="${zipdir}/docs"/>
@ -1419,7 +1415,6 @@ under the License.
<auxClasspath path="ooxml-lib/ooxml-encryption-1.1.jar" /> <auxClasspath path="ooxml-lib/ooxml-encryption-1.1.jar" />
<auxClasspath path="ooxml-lib/xmlbeans-2.3.0.jar" /> <auxClasspath path="ooxml-lib/xmlbeans-2.3.0.jar" />
<auxClasspath path="ooxml-lib/dom4j-1.6.1.jar" /> <auxClasspath path="ooxml-lib/dom4j-1.6.1.jar" />
<auxClasspath path="ooxml-lib/stax-api-1.0.1.jar" />
<auxClasspath path="lib/commons-codec-1.9.jar" /> <auxClasspath path="lib/commons-codec-1.9.jar" />
<auxClasspath path="lib/commons-logging-1.1.3.jar" /> <auxClasspath path="lib/commons-logging-1.1.3.jar" />
<auxClasspath path="lib/junit-4.11.jar" /> <auxClasspath path="lib/junit-4.11.jar" />