update property names in build.xml

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1833287 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2018-06-10 16:39:24 +00:00
parent e908117b0b
commit 4c4c7d92ae
1 changed files with 11 additions and 11 deletions

View File

@ -199,8 +199,8 @@ under the License.
<property name="ooxml.curvesapi.jar" location="${ooxml.lib}/curvesapi-1.05.jar"/> <property name="ooxml.curvesapi.jar" location="${ooxml.lib}/curvesapi-1.05.jar"/>
<property name="ooxml.curvesapi.url" <property name="ooxml.curvesapi.url"
value="${repository.m2}/maven2/com/github/virtuald/curvesapi/1.05/curvesapi-1.05.jar"/> 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.xmlbeans.jar" location="${ooxml.lib}/xmlbeans-2.6.0.jar"/>
<property name="ooxml.xmlbeans26.url" <property name="ooxml.xmlbeans.url"
value="${repository.m2}/maven2/org/apache/xmlbeans/xmlbeans/2.6.0/xmlbeans-2.6.0.jar"/> 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.jar" location="${main.lib}/commons-compress-1.17.jar"/>
<property name="ooxml.commons-compress.url" <property name="ooxml.commons-compress.url"
@ -356,7 +356,7 @@ under the License.
<path id="ooxml.classpath"> <path id="ooxml.classpath">
<pathelement location="${ooxml.curvesapi.jar}"/> <pathelement location="${ooxml.curvesapi.jar}"/>
<pathelement location="${ooxml.xmlbeans26.jar}"/> <pathelement location="${ooxml.xmlbeans.jar}"/>
<pathelement location="${ooxml.commons-compress.jar}"/> <pathelement location="${ooxml.commons-compress.jar}"/>
<pathelement location="${ooxml.xsds.jar}"/> <pathelement location="${ooxml.xsds.jar}"/>
<path refid="main.classpath"/> <path refid="main.classpath"/>
@ -406,7 +406,7 @@ under the License.
<path id="ooxml-lite.classpath"> <path id="ooxml-lite.classpath">
<pathelement location="${ooxml.curvesapi.jar}"/> <pathelement location="${ooxml.curvesapi.jar}"/>
<pathelement location="${ooxml.xmlbeans26.jar}"/> <pathelement location="${ooxml.xmlbeans.jar}"/>
<pathelement location="${ooxml.commons-compress.jar}"/> <pathelement location="${ooxml.commons-compress.jar}"/>
<pathelement location="${ooxml.lite.output.dir}"/> <!-- instead of ooxml-xsds.jar use the filtered classes--> <pathelement location="${ooxml.lite.output.dir}"/> <!-- instead of ooxml-xsds.jar use the filtered classes-->
<path refid="main.classpath"/> <path refid="main.classpath"/>
@ -718,7 +718,7 @@ under the License.
<or> <or>
<and> <and>
<available file="${ooxml.curvesapi.jar}"/> <available file="${ooxml.curvesapi.jar}"/>
<available file="${ooxml.xmlbeans26.jar}"/> <available file="${ooxml.xmlbeans.jar}"/>
<available file="${ooxml.commons-compress.jar}"/> <available file="${ooxml.commons-compress.jar}"/>
</and> </and>
<isset property="disconnected"/> <isset property="disconnected"/>
@ -728,11 +728,11 @@ under the License.
<target name="fetch-ooxml-jars" depends="check-ooxml-jars" unless="ooxml.jars.present"> <target name="fetch-ooxml-jars" depends="check-ooxml-jars" unless="ooxml.jars.present">
<mkdir dir="${ooxml.lib}"/> <mkdir dir="${ooxml.lib}"/>
<downloadfile src="${ooxml.curvesapi.url}" dest="${ooxml.curvesapi.jar}"/> <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}"/> <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 --> <!-- remove piccolo parser, so we don't use unsafe calls to it instead of using jaxp -->
<zip destfile="${ooxml.xmlbeans26.jar}"> <zip destfile="${ooxml.xmlbeans.jar}">
<zipfileset src="${ooxml.xmlbeans26.jar}.orig" excludes="org/apache/xmlbeans/impl/piccolo/**"/> <zipfileset src="${ooxml.xmlbeans.jar}.orig" excludes="org/apache/xmlbeans/impl/piccolo/**"/>
</zip> </zip>
</target> </target>
<target name="check-svn-jars"> <target name="check-svn-jars">
@ -839,7 +839,7 @@ under the License.
<taskdef name="xmlbean" <taskdef name="xmlbean"
classname="org.apache.xmlbeans.impl.tool.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.xsds.dir" location="build/xmlbean-xsds"/>
<property name="xmlbean.sources.dir" location="build/xmlbean-sources"/> <property name="xmlbean.sources.dir" location="build/xmlbean-sources"/>
@ -870,7 +870,7 @@ under the License.
nopvr="@{nopvr}" nopvr="@{nopvr}"
> >
<classpath> <classpath>
<path location="${ooxml.xmlbeans26.jar}.orig"/> <path location="${ooxml.xmlbeans.jar}.orig"/>
</classpath> </classpath>
</xmlbean> </xmlbean>
@ -2209,7 +2209,7 @@ under the License.
<auxClasspath path="${ooxml.xsds.jar}" /> <auxClasspath path="${ooxml.xsds.jar}" />
<auxClasspath path="${ooxml.security.jar}" /> <auxClasspath path="${ooxml.security.jar}" />
<auxClasspath path="${ooxml.curvesapi.jar}" /> <auxClasspath path="${ooxml.curvesapi.jar}" />
<auxClasspath path="${ooxml.xmlbeans26.jar}" /> <auxClasspath path="${ooxml.xmlbeans.jar}" />
<auxClasspath path="${ooxml.commons-compress.jar}" /> <auxClasspath path="${ooxml.commons-compress.jar}" />
<auxClasspath path="${main.commons-collections4.jar}" /> <auxClasspath path="${main.commons-collections4.jar}" />
<auxClasspath path="${main.commons-math3.jar}" /> <auxClasspath path="${main.commons-math3.jar}" />