alois/Verso
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #23551 from overleaf/msm-git-bridge-update-deps

Browse Source 
[git-bridge] Upgrade dependencies, use aws-s3 lib

GitOrigin-RevId: a542810d425309e8356ebc77752266b41f6006f4
This commit is contained in:
Miguel Serrano
2025-02-12 13:07:48 +01:00
committed by Copybot
parent dfb7ab3433
commit 1a5db4b385
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/util/Tar.java
+3 -2
View File
@@ -5,6 +5,7 @@ import java.io.*;
import java.nio.file.Path;
import java.nio.file.Paths;
import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
@@ -147,7 +148,7 @@ public class Tar {
throws IOException {
Preconditions.checkArgument(dir.isDirectory());
String name = base.relativize(Paths.get(dir.getAbsolutePath())).toString();
ArchiveEntry entry = tout.createArchiveEntry(dir, name);
TarArchiveEntry entry = tout.createArchiveEntry(dir, name);
tout.putArchiveEntry(entry);
tout.closeArchiveEntry();
for (File f : dir.listFiles()) {
@@ -160,7 +161,7 @@ public class Tar {
Preconditions.checkArgument(file.isFile(), "given file" + " is not file: %s", file);
checkFileSize(file.length());
String name = base.relativize(Paths.get(file.getAbsolutePath())).toString();
ArchiveEntry entry = tout.createArchiveEntry(file, name);
TarArchiveEntry entry = tout.createArchiveEntry(file, name);
tout.putArchiveEntry(entry);
try (InputStream in = new FileInputStream(file)) {
IOUtils.copy(in, tout);