diff options
| author | PJ Fanning <fanningpj@apache.org> | 2018-06-10 17:19:54 +0000 |
|---|---|---|
| committer | PJ Fanning <fanningpj@apache.org> | 2018-06-10 17:19:54 +0000 |
| commit | c8dab9d0d3351d81b390219208fa31d2a1d6bb2c (patch) | |
| tree | 38951e276eb37bde9a56b1de8582c1cc24675b35 | |
| parent | 5fe4a0d6edefe7e3f17a5f37210a9b0245fbb075 (diff) | |
| download | poi-c8dab9d0d3351d81b390219208fa31d2a1d6bb2c.tar.gz poi-c8dab9d0d3351d81b390219208fa31d2a1d6bb2c.zip | |
remove unnecessary xmlbeans jar manipulation
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1833288 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | build.xml | 14 |
1 files changed, 5 insertions, 9 deletions
@@ -728,12 +728,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.xmlbeans.url}" dest="${ooxml.xmlbeans.jar}.orig"/> + <downloadfile src="${ooxml.xmlbeans.url}" dest="${ooxml.xmlbeans.jar}"/> <downloadfile src="${ooxml.commons-compress.url}" dest="${ooxml.commons-compress.jar}"/> - <!-- remove piccolo parser, so we don't use unsafe calls to it instead of using jaxp --> - <zip destfile="${ooxml.xmlbeans.jar}"> - <zipfileset src="${ooxml.xmlbeans.jar}.orig" excludes="org/apache/xmlbeans/impl/piccolo/**"/> - </zip> </target> <target name="check-svn-jars"> <condition property="svn.jars.present"> @@ -839,7 +835,7 @@ under the License. <taskdef name="xmlbean" classname="org.apache.xmlbeans.impl.tool.XMLBean" - classpath="${ooxml.xmlbeans.jar}.orig"/> + classpath="${ooxml.xmlbeans.jar}"/> <property name="xmlbean.xsds.dir" location="build/xmlbean-xsds"/> <property name="xmlbean.sources.dir" location="build/xmlbean-sources"/> @@ -870,7 +866,7 @@ under the License. nopvr="@{nopvr}" > <classpath> - <path location="${ooxml.xmlbeans.jar}.orig"/> + <path location="${ooxml.xmlbeans.jar}"/> </classpath> </xmlbean> @@ -1953,8 +1949,8 @@ under the License. <globmapper from="*" to="${zipdir}/lib/*"/> </mappedresources> <mappedresources cache="true"> - <fileset dir="${ooxml.lib}" includes="xmlbeans-2.6.0.jar.orig,curvesapi-*.jar"/> - <regexpmapper from="^(.*\.jar)(\.orig)?$$" to="${zipdir}/ooxml-lib/\1"/> + <fileset dir="${ooxml.lib}" includes="xmlbeans-2.6.0.jar,curvesapi-*.jar"/> + <regexpmapper from="^(.*\.jar)?$$" to="${zipdir}/ooxml-lib/\1"/> </mappedresources> <mappedresources cache="true"> <fileset dir="${dist.dir}/maven" includes="**/*.jar" excludes="**/*-javadoc.jar,**/*-sources.jar"/> |