commit f3a6bb76b929fdd4614346c0e75fad147d4e13a7
author Marco Miller <marco.miller@ericsson.com> Wed Mar 20 10:06:11 2019 -0400
committer Marco Miller <marco.miller@ericsson.com> Wed Mar 20 10:16:41 2019 -0400
tree db19dc7aa2d1763bcdc6e142a058ca3a990bf68a
parent 5b3541bb43570529bbe6b2e9f0e9dd743994bd26
parent a76cd72ed206dcc58cfcc46e6c1674a1757a82a0

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I740fa5c794dcb74d831a3fae9ef240c191006acd

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 4d63379..70bba0d 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