diff --git a/services/git-bridge/pom.xml b/services/git-bridge/pom.xml index 89b4ff3a9a..f03a161d3c 100644 --- a/services/git-bridge/pom.xml +++ b/services/git-bridge/pom.xml @@ -59,9 +59,14 @@ test - org.eclipse.jetty.aggregate - jetty-all - 9.2.6.v20141205 + org.eclipse.jetty + jetty-servlet + 9.3.9.v20160517 + + + org.eclipse.jetty + jetty-server + 9.3.9.v20160517 com.google.code.gson diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/server/FileServlet.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/server/FileServlet.java index bd2e0f9744..ff27def93d 100644 --- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/server/FileServlet.java +++ b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/server/FileServlet.java @@ -28,7 +28,7 @@ public class FileServlet extends ResourceHandler { public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { String method = baseRequest.getMethod(); if (method.equals("GET")) { - HttpURI uri = baseRequest.getUri(); + HttpURI uri = baseRequest.getHttpURI(); Log.info(method + " <- " + uri); MultiMap multimap = new MultiMap(); uri.decodeQueryTo(multimap); diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/server/PostbackHandler.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/server/PostbackHandler.java index d684a2932f..6949df193f 100644 --- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/server/PostbackHandler.java +++ b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/server/PostbackHandler.java @@ -38,7 +38,7 @@ public class PostbackHandler extends AbstractHandler { } String projectName = parts[1]; String postbackKey = parts[2]; - Log.info(baseRequest.getMethod() + " <- " + baseRequest.getUri()); + Log.info(baseRequest.getMethod() + " <- " + baseRequest.getHttpURI()); PostbackContents postbackContents = new PostbackContents(bridgeAPI, projectName, postbackKey, contents); JsonObject body = new JsonObject(); diff --git a/services/git-bridge/writelatex-git-bridge.iml b/services/git-bridge/writelatex-git-bridge.iml index a95c551acc..52547c660c 100644 --- a/services/git-bridge/writelatex-git-bridge.iml +++ b/services/git-bridge/writelatex-git-bridge.iml @@ -17,9 +17,13 @@ - - + + + + + +