Skip to content

Commit 4c5a185

Browse files
authoredMay 28, 2024
Merge pull request #332 from basil/tar
Migrate from Apache Commons Compress to Ant
2 parents e804c2f + f6f23eb commit 4c5a185

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed
 

‎src/main/java/org/jenkinsci/plugins/workflow/flow/StashManager.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
import jenkins.model.Jenkins;
5858
import jenkins.util.BuildListenerAdapter;
5959
import jenkins.util.VirtualFile;
60-
import org.apache.commons.compress.archivers.ArchiveEntry;
61-
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
60+
import org.apache.tools.tar.TarEntry;
61+
import org.apache.tools.tar.TarInputStream;
6262
import org.apache.commons.io.FileUtils;
6363
import org.apache.commons.io.IOUtils;
6464
import org.kohsuke.accmod.Restricted;
@@ -235,8 +235,8 @@ public static Map<String,Map<String,String>> stashesOf(@NonNull Run<?,?> build)
235235
result.put(n.substring(0, n.length() - SUFFIX.length()), unpacked);
236236
try (InputStream is = new FileInputStream(kid)) {
237237
InputStream wrapped = FilePath.TarCompression.GZIP.extract(is);
238-
TarArchiveInputStream archiveStream = new TarArchiveInputStream(wrapped);
239-
ArchiveEntry archiveEntry;
238+
TarInputStream archiveStream = new TarInputStream(wrapped);
239+
TarEntry archiveEntry;
240240
while ((archiveEntry = archiveStream.getNextEntry()) != null) {
241241
ByteArrayOutputStream baos = new ByteArrayOutputStream();
242242
IOUtils.copy(archiveStream, baos);

0 commit comments

Comments
 (0)