You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2024/03/29 09:56:41 UTC
(camel) 03/03: Upgrade Commons-compress to version 1.25.0 (#12015)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f1a6fc04286adb40d473534fa30ba61f5a418cff
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Nov 16 14:01:58 2023 +0100
Upgrade Commons-compress to version 1.25.0 (#12015)
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../camel/processor/aggregate/tarfile/TarAggregationStrategy.java | 3 +--
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/components/camel-tarfile/src/main/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategy.java b/components/camel-tarfile/src/main/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategy.java
index 76710b322dd..10f0e6b68da 100644
--- a/components/camel-tarfile/src/main/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategy.java
+++ b/components/camel-tarfile/src/main/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategy.java
@@ -34,7 +34,6 @@ import org.apache.camel.component.file.GenericFileMessage;
import org.apache.camel.component.file.GenericFileOperationFailedException;
import org.apache.camel.spi.Synchronization;
import org.apache.camel.util.FileUtil;
-import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.archivers.ArchiveException;
import org.apache.commons.compress.archivers.ArchiveStreamFactory;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
@@ -242,7 +241,7 @@ public class TarAggregationStrategy implements AggregationStrategy {
private void copyExistingEntries(TarArchiveInputStream tin, TarArchiveOutputStream tos) throws IOException {
// copy the existing entries
- ArchiveEntry nextEntry;
+ TarArchiveEntry nextEntry;
while ((nextEntry = tin.getNextEntry()) != null) {
tos.putArchiveEntry(nextEntry);
IOUtils.copy(tin, tos);
diff --git a/parent/pom.xml b/parent/pom.xml
index ad515a94329..427a74141a7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -111,7 +111,7 @@
<commons-codec-version>1.15</commons-codec-version>
<commons-collections-version>3.2.2</commons-collections-version>
<commons-collections4-version>4.4</commons-collections4-version>
- <commons-compress-version>1.24.0</commons-compress-version>
+ <commons-compress-version>1.25.0</commons-compress-version>
<commons-configuration-version>1.9</commons-configuration-version>
<commons-configuration2-version>2.8.0</commons-configuration2-version>
<commons-csv-version>1.8</commons-csv-version>