Merge pull request #6744 from overleaf/msm-update-async-http-client-vuln

[git-bridge] Bump `async-http-client` and `mockserver-netty`

GitOrigin-RevId: bcea12a01f3bbae6567b9f54567a1187e5a763f3

services/git-bridge/pom.xml

@@ -94,7 +94,7 @@
         <dependency>
             <groupId>org.asynchttpclient</groupId>
             <artifactId>async-http-client</artifactId>
-            <version>2.3.0</version>
+            <version>2.12.3</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.eclipse.jgit/org.eclipse.jgit -->
         <dependency>
@@ -160,9 +160,16 @@
         <dependency>
             <groupId>org.mock-server</groupId>
             <artifactId>mockserver-netty</artifactId>
-            <version>5.3.0</version>
+            <version>5.12.0</version>
             <scope>test</scope>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.mock-server/mockserver-junit-rule -->
+        <dependency>
+          <groupId>org.mock-server</groupId>
+          <artifactId>mockserver-junit-rule</artifactId>
+          <version>5.12.0</version>
+          <scope>test</scope>
+        </dependency>
         <!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
         <dependency>
             <groupId>org.mockito</groupId>

services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/data/model/ResourceFetcherTest.java

@@ -5,7 +5,7 @@ import org.jmock.Mockery;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.mockserver.client.server.MockServerClient;
+import org.mockserver.client.MockServerClient;
 import org.mockserver.junit.MockServerRule;
 import uk.ac.ic.wlgitbridge.bridge.db.DBStore;
 import uk.ac.ic.wlgitbridge.bridge.repo.FSGitRepoStore;