commit 04d51ffe7cdc6705d0476d0dca99ef93a03b55c2
author Marco Miller <marco.miller@ericsson.com> Wed Mar 20 12:10:35 2019 -0400
committer Marco Miller <marco.miller@ericsson.com> Wed Mar 20 12:16:04 2019 -0400
tree 4713cb52bc2b4d9ab2333a6e088e6519ffff48d8
parent 06beb814004afe157a2c19355c125b789a95fbf4
parent 053de5b30ccfe81ff1d09b8b079d6add84f11ab6

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I963a882687e855181a69ecbebe80fd991363cdc6

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

diff --git a/src/main/java/com/googlesource/gerrit/plugins/readonly/HttpModule.java b/src/main/java/com/googlesource/gerrit/plugins/readonly/HttpModule.java
index be76f40..f27273d 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/readonly/HttpModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/readonly/HttpModule.java
@@ -16,10 +16,10 @@
 
 import com.google.gerrit.extensions.registration.DynamicSet;
 import com.google.gerrit.httpd.AllRequestFilter;
-import com.google.gerrit.httpd.plugins.HttpPluginModule;
 import com.google.inject.Scopes;
+import com.google.inject.servlet.ServletModule;
 
-public class HttpModule extends HttpPluginModule {
+public class HttpModule extends ServletModule {
   @Override
   protected void configureServlets() {
     DynamicSet.bind(binder(), AllRequestFilter.class).to(ReadOnly.class).in(Scopes.SINGLETON);