Author: centic
Date: Sun Oct 12 20:07:11 2014
New Revision: 1631249
URL: http://svn.apache.org/r1631249
Log:
Fix detecting missing downloaded and compiled OOXML jars, remove older versions
of apache-rat correctly
Modified:
poi/trunk/build.xml
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1631249&r1=1631248&r2=1631249&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Sun Oct 12 20:07:11 2014
@@ -391,7 +391,7 @@ under the License.
<include name="log4j-1.2.13*"/>
<include name="org.jacoco.*-0.6.*"/>
<include name="dom4j*"/>
- <include name="rat-0.10*"/>
+ <include name="apache-rat-0.10*"/>
</fileset>
</delete>
@@ -495,7 +495,6 @@ under the License.
<and>
<available file="${ooxml.xmlbeans23.jar}"/>
<available file="${ooxml.xmlbeans26.jar}"/>
- <available file="${ooxml.xsds.jar}"/>
</and>
<isset property="disconnected"/>
</or>
@@ -518,6 +517,7 @@ under the License.
<or>
<and>
<available file="${ooxml.lib}/${ooxml.xsds.izip.1}"/>
+ <available file="${ooxml.lib}/${ooxml.xsds.izip.2}"/>
</and>
<isset property="disconnected"/>
</or>
@@ -554,7 +554,10 @@ under the License.
<target name="check-compiled-ooxml-xsds" depends="fetch-ooxml-xsds">
<condition property="ooxml-compiled-xsds.present">
<or>
- <available file="${ooxml.xsds.jar}"/>
+ <and>
+ <available file="${ooxml.xsds.jar}"/>
+ <available file="${ooxml.encryption.jar}"/>
+ </and>
<isset property="disconnected"/>
</or>
</condition>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
