* Allow to start tests with old Xerces jar-file to trigger issues we saw with missing methods in this XML parser. This is only active if the location of the jar-file is provided via ant property "-Dadditionaljar=lib/xercesImpl-2.6.1.jar"

* Also remove dom4j from downloaded libs to fully get rid of it in build-environments

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1618610 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2014-08-18 13:59:01 +00:00
parent 6a20e827d2
commit 70f4e1d885
1 changed files with 15 additions and 1 deletions

View File

@ -161,6 +161,10 @@ under the License.
<property name="asm.jar" location="${main.lib}/asm-all-5.0.3.jar"/> <property name="asm.jar" location="${main.lib}/asm-all-5.0.3.jar"/>
<property name="asm.url" value="${repository.m2}/maven2/org/ow2/asm/asm-all/5.0.3/asm-all-5.0.3.jar"/> <property name="asm.url" value="${repository.m2}/maven2/org/ow2/asm/asm-all/5.0.3/asm-all-5.0.3.jar"/>
<!-- for testing with older Xerces implementation -->
<property name="xerces.jar" location="${main.lib}/xercesImpl-2.6.1.jar"/>
<property name="xerces.url" value="${repository.m2}/maven2/xerces/xercesImpl/2.6.1//xercesImpl-2.6.1.jar"/>
<!-- license checks --> <!-- license checks -->
<property name="rat.jar" location="${main.lib}/apache-rat-0.10.jar"/> <property name="rat.jar" location="${main.lib}/apache-rat-0.10.jar"/>
<property name="rat.url" value="${repository.m2}/maven2/org/apache/rat/apache-rat/0.10/apache-rat-0.10.jar"/> <property name="rat.url" value="${repository.m2}/maven2/org/apache/rat/apache-rat/0.10/apache-rat-0.10.jar"/>
@ -231,6 +235,7 @@ under the License.
<path refid="main.classpath"/> <path refid="main.classpath"/>
<pathelement location="${main.output.dir}"/> <pathelement location="${main.output.dir}"/>
<pathelement location="${main.output.test.dir}"/> <pathelement location="${main.output.test.dir}"/>
<pathelement location="${additionaljar}"/>
</path> </path>
<path id="test.scratchpad.classpath"> <path id="test.scratchpad.classpath">
@ -238,6 +243,7 @@ under the License.
<pathelement location="${main.output.test.dir}"/> <pathelement location="${main.output.test.dir}"/>
<pathelement location="${scratchpad.output.dir}"/> <pathelement location="${scratchpad.output.dir}"/>
<pathelement location="${scratchpad.output.test.dir}"/> <pathelement location="${scratchpad.output.test.dir}"/>
<pathelement location="${additionaljar}"/>
</path> </path>
<path id="test.ooxml.classpath"> <path id="test.ooxml.classpath">
@ -245,6 +251,7 @@ under the License.
<pathelement location="${ooxml.output.dir}"/> <pathelement location="${ooxml.output.dir}"/>
<pathelement location="${ooxml.output.test.dir}"/> <pathelement location="${ooxml.output.test.dir}"/>
<pathelement location="${main.output.test.dir}"/> <pathelement location="${main.output.test.dir}"/>
<pathelement location="${additionaljar}"/>
</path> </path>
<path id="ooxml-lite.classpath"> <path id="ooxml-lite.classpath">
@ -277,6 +284,7 @@ under the License.
<pathelement location="${excelant.output.dir}"/> <pathelement location="${excelant.output.dir}"/>
<pathelement location="${excelant.output.test.dir}"/> <pathelement location="${excelant.output.test.dir}"/>
<pathelement location="${main.output.test.dir}"/> <pathelement location="${main.output.test.dir}"/>
<pathelement location="${additionaljar}"/>
</path> </path>
<path id="lib.jacoco"> <path id="lib.jacoco">
@ -349,6 +357,7 @@ under the License.
<include name="jacoco-0.6*"/> <include name="jacoco-0.6*"/>
<include name="log4j-1.2.13*"/> <include name="log4j-1.2.13*"/>
<include name="org.jacoco.*-0.6.*"/> <include name="org.jacoco.*-0.6.*"/>
<include name="dom4j*"/>
</fileset> </fileset>
</delete> </delete>
@ -365,6 +374,7 @@ under the License.
<available file="${asm.jar}"/> <available file="${asm.jar}"/>
<available file="${jacoco.zip}"/> <available file="${jacoco.zip}"/>
<available file="${rat.jar}"/> <available file="${rat.jar}"/>
<available file="${xerces.jar}"/>
</and> </and>
<isset property="disconnected"/> <isset property="disconnected"/>
</or> </or>
@ -415,6 +425,10 @@ under the License.
<include name="lib/*.jar"/> <include name="lib/*.jar"/>
</patternset> </patternset>
</unzip> </unzip>
<antcall target="downloadfile">
<param name="sourcefile" value="${xerces.url}"/>
<param name="destfile" value="${xerces.jar}"/>
</antcall>
<antcall target="downloadfile"> <antcall target="downloadfile">
<param name="sourcefile" value="${rat.url}"/> <param name="sourcefile" value="${rat.url}"/>
<param name="destfile" value="${rat.jar}"/> <param name="destfile" value="${rat.jar}"/>