commit 90147ec11fa73983a39f16dd29b5a6940b0be306
author Marco Miller <marco.miller@ericsson.com> Wed Mar 20 12:10:37 2019 -0400
committer Marco Miller <marco.miller@ericsson.com> Wed Mar 20 12:16:10 2019 -0400
tree 377cbd932b5e1f004f5534cb0f3dd7624e3985a8
parent 338e681921364c5addfec0228f70c115ab1266c0
parent f1c9c7898b8dc7a3b9fd77adafcd64d0dd39ea56

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I418271fde7d6d8699e1a92578c57180831b44646

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

diff --git a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/HttpModule.java b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/HttpModule.java
index 47196c3..80d86e2 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/HttpModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/HttpModule.java
@@ -17,9 +17,9 @@
 import com.google.gerrit.extensions.registration.DynamicSet;
 import com.google.gerrit.extensions.webui.GwtPlugin;
 import com.google.gerrit.extensions.webui.WebUiPlugin;
-import com.google.gerrit.httpd.plugins.HttpPluginModule;
+import com.google.inject.servlet.ServletModule;
 
-class HttpModule extends HttpPluginModule {
+class HttpModule extends ServletModule {
 
   @Override
   protected void configureServlets() {