commit c736b63a1f8f19a2d6355b6999f03aeb145a9b9f
author Marco Miller <marco.miller@ericsson.com> Wed Mar 20 10:06:27 2019 -0400
committer Marco Miller <marco.miller@ericsson.com> Wed Mar 20 10:17:17 2019 -0400
tree 0665e4816dd859f91d5f02fa72e2b14ac087311a
parent 6c749f6e9a269211adbd9df60986d86068a62cc7
parent ebe6452d2350c5ed05bc7ce2dba2b38275fe199d

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Extend ServletModule instead of HttpPluginModule

Change-Id: Iac0a6617b28507a3be977808c1e44653b78b50a5

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

diff --git a/src/main/java/com/googlesource/gerrit/plugins/verifystatus/HttpModule.java b/src/main/java/com/googlesource/gerrit/plugins/verifystatus/HttpModule.java
index 8ea70ca..d0959e0 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/verifystatus/HttpModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/verifystatus/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() {
     DynamicSet.bind(binder(), WebUiPlugin.class).toInstance(new GwtPlugin("verifystatus"));