Merge pull request #332 from basil/tar

Migrate from Apache Commons Compress to Ant
jenkinsci · May 28, 2024 · 4c5a185 · 4c5a185
2 parents e804c2f + f6f23eb
commit 4c5a185
Showing 1 changed file with 4 additions and 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
@@ -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<String,Map<String,String>> 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);