Author: fanningpj
Date: Sun Jun 10 16:39:24 2018
New Revision: 1833287
URL: http://svn.apache.org/viewvc?rev=1833287&view=rev
Log:
update property names in build.xml
Modified:
poi/trunk/build.xml
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1833287&r1=1833286&r2=1833287&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Sun Jun 10 16:39:24 2018
@@ -199,8 +199,8 @@ 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.xmlbeans26.jar"
location="${ooxml.lib}/xmlbeans-2.6.0.jar"/>
- <property name="ooxml.xmlbeans26.url"
+ <property name="ooxml.xmlbeans.jar"
location="${ooxml.lib}/xmlbeans-2.6.0.jar"/>
+ <property name="ooxml.xmlbeans.url"
value="${repository.m2}/maven2/org/apache/xmlbeans/xmlbeans/2.6.0/xmlbeans-2.6.0.jar"/>
<property name="ooxml.commons-compress.jar"
location="${main.lib}/commons-compress-1.17.jar"/>
<property name="ooxml.commons-compress.url"
@@ -356,7 +356,7 @@ under the License.
<path id="ooxml.classpath">
<pathelement location="${ooxml.curvesapi.jar}"/>
- <pathelement location="${ooxml.xmlbeans26.jar}"/>
+ <pathelement location="${ooxml.xmlbeans.jar}"/>
<pathelement location="${ooxml.commons-compress.jar}"/>
<pathelement location="${ooxml.xsds.jar}"/>
<path refid="main.classpath"/>
@@ -406,7 +406,7 @@ under the License.
<path id="ooxml-lite.classpath">
<pathelement location="${ooxml.curvesapi.jar}"/>
- <pathelement location="${ooxml.xmlbeans26.jar}"/>
+ <pathelement location="${ooxml.xmlbeans.jar}"/>
<pathelement location="${ooxml.commons-compress.jar}"/>
<pathelement location="${ooxml.lite.output.dir}"/> <!-- instead of
ooxml-xsds.jar use the filtered classes-->
<path refid="main.classpath"/>
@@ -718,7 +718,7 @@ under the License.
<or>
<and>
<available file="${ooxml.curvesapi.jar}"/>
- <available file="${ooxml.xmlbeans26.jar}"/>
+ <available file="${ooxml.xmlbeans.jar}"/>
<available file="${ooxml.commons-compress.jar}"/>
</and>
<isset property="disconnected"/>
@@ -728,11 +728,11 @@ 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.xmlbeans26.url}"
dest="${ooxml.xmlbeans26.jar}.orig"/>
+ <downloadfile src="${ooxml.xmlbeans.url}"
dest="${ooxml.xmlbeans.jar}.orig"/>
<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.xmlbeans26.jar}">
- <zipfileset src="${ooxml.xmlbeans26.jar}.orig"
excludes="org/apache/xmlbeans/impl/piccolo/**"/>
+ <zip destfile="${ooxml.xmlbeans.jar}">
+ <zipfileset src="${ooxml.xmlbeans.jar}.orig"
excludes="org/apache/xmlbeans/impl/piccolo/**"/>
</zip>
</target>
<target name="check-svn-jars">
@@ -839,7 +839,7 @@ under the License.
<taskdef name="xmlbean"
classname="org.apache.xmlbeans.impl.tool.XMLBean"
- classpath="${ooxml.xmlbeans26.jar}.orig"/>
+ classpath="${ooxml.xmlbeans.jar}.orig"/>
<property name="xmlbean.xsds.dir" location="build/xmlbean-xsds"/>
<property name="xmlbean.sources.dir"
location="build/xmlbean-sources"/>
@@ -870,7 +870,7 @@ under the License.
nopvr="@{nopvr}"
>
<classpath>
- <path location="${ooxml.xmlbeans26.jar}.orig"/>
+ <path location="${ooxml.xmlbeans.jar}.orig"/>
</classpath>
</xmlbean>
@@ -2209,7 +2209,7 @@ under the License.
<auxClasspath path="${ooxml.xsds.jar}" />
<auxClasspath path="${ooxml.security.jar}" />
<auxClasspath path="${ooxml.curvesapi.jar}" />
- <auxClasspath path="${ooxml.xmlbeans26.jar}" />
+ <auxClasspath path="${ooxml.xmlbeans.jar}" />
<auxClasspath path="${ooxml.commons-compress.jar}" />
<auxClasspath path="${main.commons-collections4.jar}" />
<auxClasspath path="${main.commons-math3.jar}" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
