diff options
| author | PJ Fanning <fanningpj@apache.org> | 2018-01-11 12:17:46 +0000 |
|---|---|---|
| committer | PJ Fanning <fanningpj@apache.org> | 2018-01-11 12:17:46 +0000 |
| commit | eaaeb4b6dddabd8cb427b594cbb976b90b46348d (patch) | |
| tree | fcfdfee78a6a1f28a4ce7c31e7489c0c6a4d58ad | |
| parent | 5d596f6fc5076f36f03c0bdcc80e8cf886ed9ff3 (diff) | |
| download | poi-eaaeb4b6dddabd8cb427b594cbb976b90b46348d.tar.gz poi-eaaeb4b6dddabd8cb427b594cbb976b90b46348d.zip | |
Remove use of xmlbeans 2.3.0 in build to simplify our build dependencies
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1820868 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | build.xml | 13 |
1 files changed, 3 insertions, 10 deletions
@@ -189,9 +189,6 @@ under the License. <property name="ooxml.curvesapi.jar" location="${ooxml.lib}/curvesapi-1.05.jar"/> <property name="ooxml.curvesapi.url" value="${repository.m2}/maven2/com/github/virtuald/curvesapi/1.05/curvesapi-1.05.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"/> <property name="ooxml.xmlbeans26.jar" location="${ooxml.lib}/xmlbeans-2.6.0.jar"/> <property name="ooxml.xmlbeans26.url" value="${repository.m2}/maven2/org/apache/xmlbeans/xmlbeans/2.6.0/xmlbeans-2.6.0.jar"/> @@ -596,6 +593,7 @@ under the License. <include name="ooxml-security-1.0.jar"/> <include name="curvesapi-1.03.jar"/> <include name="curvesapi-1.04.jar"/> + <include name="xmlbeans-2.3.0.jar"/> </fileset> <fileset dir="${compile.lib}"> <include name="xercesImpl-*.jar"/> @@ -678,7 +676,6 @@ under the License. <or> <and> <available file="${ooxml.curvesapi.jar}"/> - <available file="${ooxml.xmlbeans23.jar}"/> <available file="${ooxml.xmlbeans26.jar}"/> </and> <isset property="disconnected"/> @@ -688,12 +685,8 @@ 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.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 --> - <zip destfile="${ooxml.xmlbeans23.jar}"> - <zipfileset src="${ooxml.xmlbeans23.jar}.orig" excludes="org/apache/xmlbeans/impl/piccolo/**"/> - </zip> <zip destfile="${ooxml.xmlbeans26.jar}"> <zipfileset src="${ooxml.xmlbeans26.jar}.orig" excludes="org/apache/xmlbeans/impl/piccolo/**"/> </zip> @@ -802,7 +795,7 @@ under the License. <taskdef name="xmlbean" classname="org.apache.xmlbeans.impl.tool.XMLBean" - classpath="${ooxml.xmlbeans23.jar}.orig"/> + classpath="${ooxml.xmlbeans26.jar}.orig"/> <property name="xmlbean.xsds.dir" location="build/xmlbean-xsds"/> <property name="xmlbean.sources.dir" location="build/xmlbean-sources"/> @@ -833,7 +826,7 @@ under the License. nopvr="@{nopvr}" > <classpath> - <path location="${ooxml.xmlbeans23.jar}.orig"/> + <path location="${ooxml.xmlbeans26.jar}.orig"/> </classpath> </xmlbean> |