diff --git a/services/git-bridge/Dockerfile b/services/git-bridge/Dockerfile index 0d8b1e43e5..58572ae8b9 100644 --- a/services/git-bridge/Dockerfile +++ b/services/git-bridge/Dockerfile @@ -29,11 +29,6 @@ RUN apk add --update --no-cache bash git sqlite procps htop net-tools jemalloc u ENV LD_PRELOAD=/usr/lib/libjemalloc.so.2 -# Install Google Cloud Profiler agent -RUN mkdir -p /opt/cprof && \ - wget -q -O- https://storage.googleapis.com/cloud-profiler/java/latest/profiler_java_agent.tar.gz \ - | tar xzv -C /opt/cprof - RUN adduser -D node COPY --from=builder /git-bridge.jar / diff --git a/services/git-bridge/pom.xml b/services/git-bridge/pom.xml index 623f8f1229..7b2c5b8e55 100644 --- a/services/git-bridge/pom.xml +++ b/services/git-bridge/pom.xml @@ -16,24 +16,24 @@ 2.23 4.13.2 2.8.4 - 9.4.56.v20240826 + 9.4.57.v20241219 2.9.0 3.0.1 6.6.1.202309021850-r 3.41.2.2 2.9.9 - 1.34.1 + 1.37.0 1.23.0 - 3.12.0 - 1.2.3 + 3.17.0 + 1.2.13 5.12.0 5.12.0 - 1.11.274 + 1.12.780 ${jaxb.runtime.version} 2.3.2 4.5.14 - 2.10.0 - 1.24.0 + 2.18.0 + 1.27.1 0.10.0 1.70 @@ -206,7 +206,7 @@ com.amazonaws - aws-java-sdk + aws-java-sdk-s3 ${aws.java.sdk.version} diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/util/Tar.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/util/Tar.java index 878adde27d..512babf9c7 100644 --- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/util/Tar.java +++ b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/util/Tar.java @@ -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);