diff options
| author | Dominik Stadler <centic@apache.org> | 2014-10-12 20:07:11 +0000 |
|---|---|---|
| committer | Dominik Stadler <centic@apache.org> | 2014-10-12 20:07:11 +0000 |
| commit | 74630e3dcb5ea358a20e2d9bb40a95c607a70278 (patch) | |
| tree | a25a9ce221b204a21c4bd9b7de569487756af6cb | |
| parent | ee2471a5a9ee19bba371a0ff43ff2a2aac43791c (diff) | |
| download | poi-74630e3dcb5ea358a20e2d9bb40a95c607a70278.tar.gz poi-74630e3dcb5ea358a20e2d9bb40a95c607a70278.zip | |
Fix detecting missing downloaded and compiled OOXML jars, remove older versions of apache-rat correctly
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1631249 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | build.xml | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -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> |