This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 2f960676277 Upgrade Commons-compress to version 1.25.0 (#12015)
2f960676277 is described below
commit 2f96067627717ab6084b9ac4e337b87d928f933d
Author: Andrea Cosentino <[email protected]>
AuthorDate: Thu Nov 16 14:01:58 2023 +0100
Upgrade Commons-compress to version 1.25.0 (#12015)
Signed-off-by: Andrea Cosentino <[email protected]>
---
.../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 2a16cf79796..512f7911966 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
@@ -33,7 +33,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;
@@ -241,7 +240,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 5f516cce023..b2a1e28f906 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -93,7 +93,7 @@
<commons-codec-version>1.16.0</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-csv-version>1.10.0</commons-csv-version>
<commons-cli-version>1.4</commons-cli-version>
<commons-dbcp-version>1.4</commons-dbcp-version>