Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Extend ServletModule instead of HttpPluginModule

Change-Id: Ib6a03e6f98bba3abf42df3d0c81d1ab882d8434e

src/main/java/com/ericsson/gerrit/plugins/eventslog/HttpModule.java

diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/HttpModule.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/HttpModule.java
index c1db514..b35d1dc 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/HttpModule.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/HttpModule.java
@@ -14,9 +14,9 @@
 
 package com.ericsson.gerrit.plugins.eventslog;
 
-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() {
     serve("/events/").with(EventsRestApiServlet.class);