Author: centic
Date: Tue Feb 20 21:09:48 2024
New Revision: 1915909
URL: http://svn.apache.org/viewvc?rev=1915909&view=rev
Log:
Fix Ant-build after upgrade of commons-compress
Commons-lang3 is now required as dependency of commons-compress
Modified:
poi/trunk/build.xml
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveThresholdInputStream.java
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1915909&r1=1915908&r2=1915909&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Tue Feb 20 21:09:48 2024
@@ -334,6 +334,7 @@ under the License.
<dependency prefix="ooxml.curvesapi"
artifact="com.github.virtuald:curvesapi:1.08" usage="ooxml"/>
<dependency prefix="ooxml.xmlbeans"
artifact="org.apache.xmlbeans:xmlbeans:5.2.0" usage="ooxml"/>
<dependency prefix="ooxml.commons-compress"
artifact="org.apache.commons:commons-compress:1.26.0" usage="ooxml"/>
+ <dependency prefix="ooxml.commons-lang3"
artifact="org.apache.commons:commons-lang3:3.12.0" usage="ooxml"/>
<!-- jars in the ooxml-test-lib directory, see the fetch-ooxml-jars
target-->
<dependency prefix="ooxml.test.reflections"
artifact="org.reflections:reflections:0.10.2" usage="ooxml-tests"/>
@@ -458,6 +459,7 @@ under the License.
<pathelement location="${ooxml.curvesapi.jar}"/>
<pathelement location="${ooxml.xmlbeans.jar}"/>
<pathelement location="${ooxml.commons-compress.jar}"/>
+ <pathelement location="${ooxml.commons-lang3.jar}"/>
<path refid="main.classpath"/>
<pathelement location="${main.output.dir}"/>
<pathelement location="${ooxml.test.guava.jar}"/>
@@ -825,6 +827,7 @@ under the License.
<available file="${ooxml.curvesapi.jar}"/>
<available file="${ooxml.xmlbeans.jar}"/>
<available file="${ooxml.commons-compress.jar}"/>
+ <available file="${ooxml.commons-lang3.jar}"/>
<available file="${ooxml.test.reflections.jar}"/>
<available file="${ooxml.test.guava.jar}"/>
<available file="${ooxml.test.javassist.jar}"/>
@@ -867,6 +870,7 @@ under the License.
<downloadfile src="${ooxml.curvesapi.url}"
dest="${ooxml.curvesapi.jar}"/>
<downloadfile src="${ooxml.xmlbeans.url}"
dest="${ooxml.xmlbeans.jar}"/>
<downloadfile src="${ooxml.commons-compress.url}"
dest="${ooxml.commons-compress.jar}"/>
+ <downloadfile src="${ooxml.commons-lang3.url}"
dest="${ooxml.commons-lang3.jar}"/>
<downloadfile src="${ooxml.test.reflections.url}"
dest="${ooxml.test.reflections.jar}"/>
<downloadfile src="${ooxml.test.guava.url}"
dest="${ooxml.test.guava.jar}"/>
<downloadfile src="${ooxml.test.javassist.url}"
dest="${ooxml.test.javassist.jar}"/>
@@ -2566,7 +2570,6 @@ under the License.
<dependency prefix="spotbugs.jaxen" artifact="jaxen:jaxen:1.2.0"
usage="${spotbugs.lib}"/>
<dependency prefix="spotbugs.bcel"
artifact="org.apache.bcel:bcel:6.5.0" usage="${spotbugs.lib}"/>
<dependency prefix="spotbugs.slf4j-api"
artifact="org.slf4j:slf4j-api:2.0.0" usage="${spotbugs.lib}"/>
- <dependency prefix="spotbugs.commons-lang3"
artifact="org.apache.commons:commons-lang3:3.12.0" usage="${spotbugs.lib}"/>
<dependency prefix="spotbugs.commons-text"
artifact="org.apache.commons:commons-text:1.11.0" usage="${spotbugs.lib}"/>
<dependency prefix="spotbugs.commons-codec"
artifact="commons-codec:commons-codec:1.16.1" usage="${spotbugs.lib}"/>
<dependency prefix="spotbugs.commons-logging"
artifact="commons-logging:commons-logging:1.2" usage="${spotbugs.lib}"/>
@@ -2587,7 +2590,6 @@ under the License.
<downloadfile src="${spotbugs.jaxen.url}"
dest="${spotbugs.jaxen.jar}"/>
<downloadfile src="${spotbugs.bcel.url}" dest="${spotbugs.bcel.jar}"/>
<downloadfile src="${spotbugs.slf4j-api.url}"
dest="${spotbugs.slf4j-api.jar}"/>
- <downloadfile src="${spotbugs.commons-lang3.url}"
dest="${spotbugs.commons-lang3.jar}"/>
<downloadfile src="${spotbugs.commons-text.url}"
dest="${spotbugs.commons-text.jar}"/>
<downloadfile src="${spotbugs.commons-codec.url}"
dest="${spotbugs.commons-codec.jar}"/>
<downloadfile src="${spotbugs.commons-logging.url}"
dest="${spotbugs.commons-logging.jar}"/>
@@ -2646,6 +2648,7 @@ under the License.
<auxClasspath path="${ooxml.curvesapi.jar}" />
<auxClasspath path="${ooxml.xmlbeans.jar}" />
<auxClasspath path="${ooxml.commons-compress.jar}" />
+ <auxClasspath path="${ooxml.commons-lang3.jar}" />
<auxClasspath path="${main.commons-collections4.jar}" />
<auxClasspath path="${main.commons-math3.jar}" />
<auxClasspath path="${main.commons-io.jar}" />
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveThresholdInputStream.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveThresholdInputStream.java?rev=1915909&r1=1915908&r2=1915909&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveThresholdInputStream.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveThresholdInputStream.java
Tue Feb 20 21:09:48 2024
@@ -147,7 +147,7 @@ public class ZipArchiveThresholdInputStr
}
try {
- entry = ((ZipArchiveInputStream) in).getNextZipEntry();
+ entry = ((ZipArchiveInputStream) in).getNextEntry();
if (guardState && entry != null) {
if (++entryCount > MAX_FILE_COUNT) {
throw new IOException(String.format(Locale.ROOT,
MAX_FILE_COUNT_MSG, MAX_FILE_COUNT));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
