diff options
| author | Andreas Beeker <kiwiwings@apache.org> | 2018-06-22 21:25:00 +0000 |
|---|---|---|
| committer | Andreas Beeker <kiwiwings@apache.org> | 2018-06-22 21:25:00 +0000 |
| commit | d193426a1dfba15641b3ff60c9eaf87d7cdd379d (patch) | |
| tree | 337a80499c7ac0b27c67eefe4fc8173fe044adab /build.xml | |
| parent | 5bb9ab0609aba63cd16c6ae6edc1fe2797e02c78 (diff) | |
| download | poi-d193426a1dfba15641b3ff60c9eaf87d7cdd379d.tar.gz poi-d193426a1dfba15641b3ff60c9eaf87d7cdd379d.zip | |
#59268 - Work on providing an updated version of XMLBeans
(imported from https://github.com/apache/poi/pull/113)
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1834165 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 20 |
1 files changed, 8 insertions, 12 deletions
@@ -199,9 +199,9 @@ 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.xmlbeans.jar" location="${ooxml.lib}/xmlbeans-2.6.0.jar"/> + <property name="ooxml.xmlbeans.jar" location="${ooxml.lib}/xmlbeans-3.0.0.jar"/> <property name="ooxml.xmlbeans.url" - value="${repository.m2}/maven2/org/apache/xmlbeans/xmlbeans/2.6.0/xmlbeans-2.6.0.jar"/> + value="https://repository.apache.org/content/repositories/staging/org/apache/xmlbeans/xmlbeans/3.0.0/xmlbeans-3.0.0.jar"/> <property name="ooxml.commons-compress.jar" location="${main.lib}/commons-compress-1.17.jar"/> <property name="ooxml.commons-compress.url" value="${repository.m2}/maven2/org/apache/commons/commons-compress/1.17/commons-compress-1.17.jar"/> @@ -624,7 +624,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*"/> + <include name="xmlbeans-2.*.jar*"/> </fileset> <fileset dir="${compile.lib}"> <include name="xercesImpl-*.jar"/> @@ -729,12 +729,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"> @@ -840,7 +836,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"/> @@ -871,7 +867,7 @@ under the License. nopvr="@{nopvr}" > <classpath> - <path location="${ooxml.xmlbeans.jar}.orig"/> + <path location="${ooxml.xmlbeans.jar}"/> </classpath> </xmlbean> @@ -1954,8 +1950,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-3.0.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"/> |