commit 5f432c3278bfe70300ac342edb43c07272d9bc52
author Marco Miller <marco.miller@ericsson.com> Wed Mar 20 12:10:28 2019 -0400
committer Marco Miller <marco.miller@ericsson.com> Wed Mar 20 12:15:45 2019 -0400
tree a25dc704019d5df02056de897f3c3df349ccea59
parent 252e1a027975f9d7732eedd78f11d91c5558a9be
parent cce0ccb31ccd49dd2c7c36bdc3a85fb744ce7b68

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I006658576bafa384d88538a16ca5ab0151beff80

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

diff --git a/src/main/java/com/googlesource/gerrit/plugins/emoticons/HttpModule.java b/src/main/java/com/googlesource/gerrit/plugins/emoticons/HttpModule.java
index 3737710..df906d1 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/emoticons/HttpModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/emoticons/HttpModule.java
@@ -18,9 +18,9 @@
 import com.google.gerrit.extensions.webui.GwtPlugin;
 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.servlet.ServletModule;
 
-public class HttpModule extends HttpPluginModule {
+public class HttpModule extends ServletModule {
   @Override
   protected void configureServlets() {
     DynamicSet.bind(binder(), WebUiPlugin.class).toInstance(new GwtPlugin("emoticons"));