Merge pull request #62 from browserup/dependabot/gradle/org.eclipse.jetty-jetty-server-9.4.18.v20190429

Bump jetty-server from 7.6.16.v20140903 to 9.4.18.v20190429

Author: dpowell

browserup-proxy-core/build.gradle

@@ -83,9 +83,9 @@ dependencies {
     testImplementation 'org.apache.logging.log4j:log4j-api:2.11.2'
     testImplementation 'org.apache.logging.log4j:log4j-core:2.11.2'
     testImplementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.2'
-    testImplementation 'org.eclipse.jetty:jetty-server:7.6.16.v20140903'
-    testImplementation 'org.eclipse.jetty:jetty-servlet:7.6.16.v20140903'
-    testImplementation 'org.eclipse.jetty:jetty-servlets:7.6.16.v20140903'
+    testImplementation 'org.eclipse.jetty:jetty-server:9.4.18.v20190429'
+    testImplementation 'org.eclipse.jetty:jetty-servlet:9.4.18.v20190429'
+    testImplementation 'org.eclipse.jetty:jetty-servlets:9.4.18.v20190429'
     testImplementation 'org.hamcrest:hamcrest:2.1'    
     testImplementation 'org.hamcrest:hamcrest-library:2.1'
     testImplementation ('org.mock-server:mockserver-netty:5.5.4') {

browserup-proxy-dist/build.gradle

@@ -70,8 +70,8 @@ dependencies {
     implementation 'org.apache.logging.log4j:log4j-api:2.11.2'
     implementation 'org.apache.logging.log4j:log4j-core:2.11.2'
     implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.2'
-    implementation 'org.eclipse.jetty:jetty-server:7.3.0.v20110203'
-    implementation 'org.eclipse.jetty:jetty-servlet:7.3.0.v20110203'
+    implementation 'org.eclipse.jetty:jetty-server:9.4.18.v20190429'
+    implementation 'org.eclipse.jetty:jetty-servlet:9.4.18.v20190429'
     implementation 'org.javassist:javassist:3.25.0-GA'
 }
 

browserup-proxy-rest/build.gradle

@@ -66,8 +66,8 @@ dependencies {
     implementation 'com.google.sitebricks:sitebricks:0.8.11'
     implementation 'io.netty:netty-all:4.1.36.Final'
     implementation 'net.sf.jopt-simple:jopt-simple:5.0.4'
-    implementation 'org.eclipse.jetty:jetty-server:7.3.0.v20110203'
-    implementation 'org.eclipse.jetty:jetty-servlet:7.3.0.v20110203'
+    implementation 'org.eclipse.jetty:jetty-server:9.4.18.v20190429'
+    implementation 'org.eclipse.jetty:jetty-servlet:9.4.18.v20190429'
     implementation 'org.slf4j:jcl-over-slf4j:1.7.26'
     implementation 'org.apache.commons:commons-lang3:3.9'
 

browserup-proxy-rest/src/main/java/com/browserup/bup/proxy/guice/JettyServerProvider.java

@@ -4,13 +4,18 @@
 
 package com.browserup.bup.proxy.guice;
 
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
+import java.util.EnumSet;
+
+import javax.servlet.DispatcherType;
+
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import com.google.inject.name.Named;
 import com.google.inject.servlet.GuiceFilter;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
+
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.DefaultServlet;
 import org.eclipse.jetty.servlet.ServletContextHandler;
@@ -26,7 +31,7 @@ public JettyServerProvider(@Named("port") int port, @Named("address") String add
         ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
         context.setContextPath("/");
 
-        context.addFilter(GuiceFilter.class, "/*", 0);
+        context.addFilter(GuiceFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST));
         context.addServlet(DefaultServlet.class, "/");
 
         server.setHandler(context);

browserup-proxy-rest/src/test/groovy/com/browserup/bup/proxy/rest/WithRunningProxyRestTest.groovy

@@ -15,11 +15,11 @@ import com.google.inject.Injector
 import com.google.inject.servlet.GuiceServletContextListener
 import com.google.sitebricks.SitebricksModule
 import groovyx.net.http.HTTPBuilder
+import groovyx.net.http.Method
 import org.apache.http.HttpHeaders
 import org.apache.http.HttpStatus
 import org.awaitility.Awaitility
 import org.awaitility.Duration
-import org.eclipse.jetty.http.HttpMethods
 import org.eclipse.jetty.server.Server
 import org.eclipse.jetty.servlet.ServletContextHandler
 import org.junit.After
@@ -144,7 +144,7 @@ class WithRunningProxyRestTest {
 
     protected void mockTargetServerResponse(String url, String responseBody, Delay delay=Delay.milliseconds(0)) {
         targetMockedServer.when(request()
-                .withMethod(HttpMethods.GET)
+                .withMethod(Method.GET.toString())
                 .withPath("/${url}"),
                 Times.exactly(1))
                 .respond(response()