commit 841368da5ec5d5c9f437b90f5f4926f658087563
author Marco Miller <marco.miller@ericsson.com> Wed Mar 20 12:10:25 2019 -0400
committer Marco Miller <marco.miller@ericsson.com> Wed Mar 20 12:15:41 2019 -0400
tree 60698abe645c9ce8baadddd494562891b31111b0
parent 35b1d17823444e43924a059ff846e1372bde7932
parent f3a6bb76b929fdd4614346c0e75fad147d4e13a7

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I9a93e6f3aa37918eb1e45b62c064e169d0c3503e

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

diff --git a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/HttpModule.java b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/HttpModule.java
index 8feca79..8cf1874 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/HttpModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/HttpModule.java
@@ -17,10 +17,10 @@
 import com.google.gerrit.extensions.registration.DynamicSet;
 import com.google.gerrit.extensions.webui.JavaScriptPlugin;
 import com.google.gerrit.extensions.webui.WebUiPlugin;
-import com.google.gerrit.httpd.plugins.HttpPluginModule;
 import com.google.inject.Inject;
+import com.google.inject.servlet.ServletModule;
 
-public class HttpModule extends HttpPluginModule {
+public class HttpModule extends ServletModule {
   private final Configuration cfg;
 
   @Inject