From f6f23ebe353032befa782732e5d2540bdcbfa2f9 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sat, 25 May 2024 09:10:50 -0700 Subject: [PATCH] Migrate from Apache Commons Compress to Ant --- .../org/jenkinsci/plugins/workflow/flow/StashManager.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/flow/StashManager.java b/src/main/java/org/jenkinsci/plugins/workflow/flow/StashManager.java index 996175df..408e4c70 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/flow/StashManager.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/flow/StashManager.java @@ -57,8 +57,8 @@ import jenkins.model.Jenkins; import jenkins.util.BuildListenerAdapter; import jenkins.util.VirtualFile; -import org.apache.commons.compress.archivers.ArchiveEntry; -import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; +import org.apache.tools.tar.TarEntry; +import org.apache.tools.tar.TarInputStream; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.kohsuke.accmod.Restricted; @@ -235,8 +235,8 @@ public static Map> stashesOf(@NonNull Run build) result.put(n.substring(0, n.length() - SUFFIX.length()), unpacked); try (InputStream is = new FileInputStream(kid)) { InputStream wrapped = FilePath.TarCompression.GZIP.extract(is); - TarArchiveInputStream archiveStream = new TarArchiveInputStream(wrapped); - ArchiveEntry archiveEntry; + TarInputStream archiveStream = new TarInputStream(wrapped); + TarEntry archiveEntry; while ((archiveEntry = archiveStream.getNextEntry()) != null) { ByteArrayOutputStream baos = new ByteArrayOutputStream(); IOUtils.copy(archiveStream, baos);