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

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

GitOrigin-RevId: a542810d425309e8356ebc77752266b41f6006f4

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 /

services/git-bridge/pom.xml

@@ -16,24 +16,24 @@
         <fmt.plugin.version>2.23</fmt.plugin.version>
         <junit.version>4.13.2</junit.version>
         <jmock.junit4.version>2.8.4</jmock.junit4.version>
-        <jetty.servlet.version>9.4.56.v20240826</jetty.servlet.version>
+        <jetty.servlet.version>9.4.57.v20241219</jetty.servlet.version>
         <gson.version>2.9.0</gson.version>
         <async.http.client.version>3.0.1</async.http.client.version>
         <jgit.version>6.6.1.202309021850-r</jgit.version>
         <sqlite.jdbc.version>3.41.2.2</sqlite.jdbc.version>
         <joda.time.version>2.9.9</joda.time.version>
-        <google.oauth.client.version>1.34.1</google.oauth.client.version>
+        <google.oauth.client.version>1.37.0</google.oauth.client.version>
         <google.http.client.version>1.23.0</google.http.client.version>
-        <commons.lang3.version>3.12.0</commons.lang3.version>
-        <logback.classic.version>1.2.3</logback.classic.version>
+        <commons.lang3.version>3.17.0</commons.lang3.version>
+        <logback.classic.version>1.2.13</logback.classic.version>
         <mockserver.version>5.12.0</mockserver.version>
         <mockito.version>5.12.0</mockito.version>
-        <aws.java.sdk.version>1.11.274</aws.java.sdk.version>
+        <aws.java.sdk.version>1.12.780</aws.java.sdk.version>
         <jakarta.xml.bind.api.version>${jaxb.runtime.version}</jakarta.xml.bind.api.version>
         <jaxb.runtime.version>2.3.2</jaxb.runtime.version>
         <httpclient.version>4.5.14</httpclient.version>
-        <commons.io.version>2.10.0</commons.io.version>
-        <commons.compress.version>1.24.0</commons.compress.version>
+        <commons.io.version>2.18.0</commons.io.version>
+        <commons.compress.version>1.27.1</commons.compress.version>
         <simpleclient.version>0.10.0</simpleclient.version>
         <bouncycastle.crypto.version>1.70</bouncycastle.crypto.version>
     </properties>
@@ -206,7 +206,7 @@
         <!-- https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk -->
         <dependency>
             <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk</artifactId>
+            <artifactId>aws-java-sdk-s3</artifactId>
             <version>${aws.java.sdk.version}</version>
         </dependency>
         <!-- API, java.xml.bind module -->

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);