diff options
| author | David North <dnorth@apache.org> | 2016-07-30 08:54:50 +0000 |
|---|---|---|
| committer | David North <dnorth@apache.org> | 2016-07-30 08:54:50 +0000 |
| commit | 0890a7f7030a76abc896dbb00ab98954dbd5e383 (patch) | |
| tree | dbb03ea258a375e0ce7e3d2954ce56fcba3d7fa7 /build.xml | |
| parent | 753699e48a311e4f01efcf1f1b3d159f53984ac9 (diff) | |
| download | poi-0890a7f7030a76abc896dbb00ab98954dbd5e383.tar.gz poi-0890a7f7030a76abc896dbb00ab98954dbd5e383.zip | |
Move commons collections 4 dependency to main
https://bz.apache.org/bugzilla/show_bug.cgi?id=59734
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1754602 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -169,6 +169,9 @@ under the License. <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"/> + <property name="main.commons-collections4.jar" location="${ooxml.lib}/commons-collections4-4.1.jar"/> + <property name="main.commons-collections4.url" + value="${repository.m2}/maven2/org/apache/commons/commons-collections4/4.1/commons-collections4-4.1.jar"/> <!-- xml signature libs --> <property name="dsig.xmlsec.jar" location="${compile.lib}/xmlsec-2.0.6.jar"/> @@ -184,9 +187,6 @@ under the License. <property name="ooxml.curvesapi.jar" location="${ooxml.lib}/curvesapi-1.04.jar"/> <property name="ooxml.curvesapi.url" value="${repository.m2}/maven2/com/github/virtuald/curvesapi/1.04/curvesapi-1.04.jar"/> - <property name="ooxml.commons-collections4.jar" location="${ooxml.lib}/commons-collections4-4.1.jar"/> - <property name="ooxml.commons-collections4.url" - value="${repository.m2}/maven2/org/apache/commons/commons-collections4/4.1/commons-collections4-4.1.jar"/> <property name="ooxml.xmlbeans23.jar" location="${ooxml.lib}/xmlbeans-2.3.0.jar"/> <property name="ooxml.xmlbeans23.url" value="${repository.m2}/maven2/org/apache/xmlbeans/xmlbeans/2.3.0/xmlbeans-2.3.0.jar"/> @@ -313,6 +313,7 @@ under the License. <pathelement location="${main.log4j.jar}"/> <pathelement location="${main.junit.jar}"/> <pathelement location="${main.hamcrest.jar}"/> + <pathelement location="${main.commons-collections4.jar}"/> </path> <path id="scratchpad.classpath"> @@ -329,7 +330,6 @@ under the License. <path id="ooxml.classpath"> <pathelement location="${ooxml.curvesapi.jar}"/> - <pathelement location="${ooxml.commons-collections4.jar}"/> <pathelement location="${ooxml.xmlbeans26.jar}"/> <pathelement location="${ooxml.xsds.jar}"/> <path refid="main.classpath"/> @@ -591,6 +591,7 @@ under the License. <available file="${dsig.bouncycastle-pkix.jar}"/> <available file="${dsig.xmlsec.jar}"/> <available file="${dsig.sl4j-api.jar}"/> + <available file="${main.commons-collections4.jar}"/> </and> <isset property="disconnected"/> </or> @@ -609,6 +610,7 @@ under the License. <downloadfile src="${main.antlauncher.url}" dest="${main.antlauncher.jar}"/> <downloadfile src="${asm.url}" dest="${asm.jar}"/> <downloadfile src="${jacoco.url}" dest="${jacoco.zip}"/> + <downloadfile src="${main.commons-collections4.url}" dest="${main.commons-collections4.jar}"/> <unzip src="${jacoco.zip}" dest="."> <patternset> <include name="lib/*.jar"/> @@ -627,7 +629,6 @@ under the License. <or> <and> <available file="${ooxml.curvesapi.jar}"/> - <available file="${ooxml.commons-collections4.jar}"/> <available file="${ooxml.xmlbeans23.jar}"/> <available file="${ooxml.xmlbeans26.jar}"/> </and> @@ -638,7 +639,6 @@ under the License. <target name="fetch-ooxml-jars" depends="check-ooxml-jars" unless="ooxml.jars.present"> <mkdir dir="${ooxml.lib}"/> <downloadfile src="${ooxml.curvesapi.url}" dest="${ooxml.curvesapi.jar}"/> - <downloadfile src="${ooxml.commons-collections4.url}" dest="${ooxml.commons-collections4.jar}"/> <downloadfile src="${ooxml.xmlbeans23.url}" dest="${ooxml.xmlbeans23.jar}.orig"/> <downloadfile src="${ooxml.xmlbeans26.url}" dest="${ooxml.xmlbeans26.jar}.orig"/> <!-- remove piccolo parser, so we don't use unsafe calls to it instead of using jaxp --> |