commit f1c9c7898b8dc7a3b9fd77adafcd64d0dd39ea56
author Marco Miller <marco.miller@ericsson.com> Wed Mar 20 10:06:26 2019 -0400
committer Marco Miller <marco.miller@ericsson.com> Wed Mar 20 10:17:14 2019 -0400
tree 055f59fd5cce44aa6f5e06a5cbe40cb374a4cc78
parent e8af8f9ab1d5cab079c6db99a4ac351970dd0a07
parent 846f7152518942e543bbc0c357e4a2d661d0907d

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I6ea4697309e14b1bb2fb1729c043014d33fc30c2

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() {