commit fac4e6a4132c782386f4f342958d314f3bb34435
author Marco Miller <marco.miller@ericsson.com> Wed Mar 20 16:35:30 2019 -0400
committer Marco Miller <marco.miller@ericsson.com> Wed Mar 20 16:37:36 2019 -0400
tree a25dc704019d5df02056de897f3c3df349ccea59
parent 2b9378ae15eff47f9a816c18391d283471462618
parent 5f432c3278bfe70300ac342edb43c07272d9bc52

Merge branch 'stable-2.16'

* stable-2.16:
  Extend ServletModule instead of HttpPluginModule

Change-Id: Ic8a1f8822ddc026447455f1d717d983bfb2c3ec8

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"));