This is an automated email from the ASF dual-hosted git repository. bodewig pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ant-antlibs-compress.git
commit 7c466bbbd83703d53274eb16e03525ad1eb4a897 Author: Stefan Bodewig <[email protected]> AuthorDate: Fri Jul 17 06:44:42 2026 +0200 bump common compress dependency --- changes.xml | 3 ++- docs/index.html | 2 +- ivy.xml | 3 ++- src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java | 14 ++++---------- src/main/org/apache/ant/compress/taskdefs/Deflate.java | 4 +++- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/changes.xml b/changes.xml index 3c1bac7..38fcd04 100644 --- a/changes.xml +++ b/changes.xml @@ -40,7 +40,8 @@ <release version="1.6.0" date="unreleased"> <action type="update" breaks-bwc="true"> The Apache Compress Antlib now requires Apache Commons - Compress 1.16 or later for DEFLATE64 and Zstandard support. + Compress 1.26.0 or later for DEFLATE64 and Zstandard support + as well as fixes for several vulnerabilities. </action> <action type="update" breaks-bwc="true"> Requires Ant 1.10.x and Java 8 now. diff --git a/docs/index.html b/docs/index.html index 536554e..52a6c5a 100644 --- a/docs/index.html +++ b/docs/index.html @@ -129,7 +129,7 @@ <h3>Installing and Using</h3> <p>This Antlib requires Apache Ant 1.10.13 or higher, Apache - Commons Compress 1.16 or higher and Java8 or higher.</p> + Commons Compress 1.26.0 or higher and Java8 or higher.</p> <p>In order to use LZMA, XZ or most of the 7z support the <a href="https://tukaani.org/xz/java.html";>XZ for Java</a> diff --git a/ivy.xml b/ivy.xml index 1aab494..7f0d267 100644 --- a/ivy.xml +++ b/ivy.xml @@ -56,7 +56,8 @@ e:classifier="ivy"/> </publications> <dependencies> - <dependency org="org.apache.commons" name="commons-compress" rev="1.16" conf="default"/> + <dependency org="org.apache.commons" name="commons-compress" rev="1.26.0" conf="default"/> + <dependency org="commons-codec" name="commons-codec" rev="1.22.0" conf="default"/> <dependency org="org.tukaani" name="xz" rev="1.12" conf="default"/> <dependency org="org.brotli" name="dec" rev="0.1.2" conf="default"/> <dependency org="com.github.luben" name="zstd-jni" rev="1.5.7-11" conf="default"/> diff --git a/src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java b/src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java index 6dcbbb7..6f389b3 100644 --- a/src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java +++ b/src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java @@ -637,16 +637,10 @@ protected ResourceFlags getFlags(Resource r) throws ZipException { new ZipExtraField[extra == null ? 0 : extra.length]; if (extra != null && extra.length > 0) { for (int i = 0; i < extra.length; i++) { - try { - ex[i] = ExtraFieldUtils - .createExtraField(new ZipShort(extra[i] - .getHeaderId() - .getValue())); - } catch (InstantiationException e) { - throw new BuildException(e); - } catch (IllegalAccessException e) { - throw new BuildException(e); - } + ex[i] = ExtraFieldUtils + .createExtraField(new ZipShort(extra[i] + .getHeaderId() + .getValue())); byte[] b = extra[i].getCentralDirectoryData(); ex[i].parseFromCentralDirectoryData(b, 0, b.length); b = extra[i].getLocalFileDataData(); diff --git a/src/main/org/apache/ant/compress/taskdefs/Deflate.java b/src/main/org/apache/ant/compress/taskdefs/Deflate.java index 0f44fae..17d347b 100644 --- a/src/main/org/apache/ant/compress/taskdefs/Deflate.java +++ b/src/main/org/apache/ant/compress/taskdefs/Deflate.java @@ -50,7 +50,9 @@ public CommonsCompressCompressorResource wrap(Resource dest) { public CompressorOutputStream getCompressorStream(OutputStream stream) throws IOException { DeflateParameters params = new DeflateParameters(); - params.setCompressionLevel(level); + if (level != Deflater.DEFAULT_COMPRESSION) { + params.setCompressionLevel(level); + } params.setWithZlibHeader(zlibHeader); return new DeflateCompressorOutputStream(stream, params); }
