commit 8059e53e4a065da101b83dd2b22d052cad75b1ff
author Marco Miller <marco.miller@ericsson.com> Wed Mar 20 10:06:21 2019 -0400
committer Marco Miller <marco.miller@ericsson.com> Wed Mar 20 10:16:59 2019 -0400
tree 88402a0ff62817af91ac74edcf03405f6502be96
parent c24e3c4e59523b92c94fd02e9213cd39a803af0f
parent ce0c9c1f711f9ea5e17deef0bf08dcac0996c0b0

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I2e44de3f946dbc7f9c65516e3d5571bafd77dab6

src/main/java/com/googlesource/gerrit/plugins/javamelody/HttpModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/javamelody/HttpModule.java b/src/main/java/com/googlesource/gerrit/plugins/javamelody/HttpModule.java
index 1982a9a..bf1d2e5 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/javamelody/HttpModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/javamelody/HttpModule.java
@@ -16,10 +16,10 @@
 
 import com.google.gerrit.extensions.registration.DynamicSet;
 import com.google.gerrit.httpd.AllRequestFilter;
-import com.google.gerrit.httpd.plugins.HttpPluginModule;
 import com.google.inject.Scopes;
+import com.google.inject.servlet.ServletModule;
 
-public class HttpModule extends HttpPluginModule {
+public class HttpModule extends ServletModule {
   @Override
   protected void configureServlets() {
     DynamicSet.bind(binder(), AllRequestFilter.class)