commit 491388d2cb6c666b7d0fe87ded534c9ac3da1faf
author Marco Miller <marco.miller@ericsson.com> Wed Mar 20 16:35:35 2019 -0400
committer Marco Miller <marco.miller@ericsson.com> Wed Mar 20 16:37:50 2019 -0400
tree c54e6d0890ff87d2ec01a05574eef79dbbfe079b
parent 20d562676cea6bc217379a0ac063b18aa00de38c
parent 5e9de8728eea1176789099140d7d384489ba8843

Merge branch 'stable-2.16'

* stable-2.16:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I3a2ae7c42a6ad3956d19fb39715b7aba5df8152d

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

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/HttpModule.java b/src/main/java/com/googlesource/gerrit/plugins/oauth/HttpModule.java
index c0e9cf1..4035a15 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/oauth/HttpModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/oauth/HttpModule.java
@@ -17,12 +17,12 @@
 import com.google.gerrit.extensions.annotations.Exports;
 import com.google.gerrit.extensions.annotations.PluginName;
 import com.google.gerrit.extensions.auth.oauth.OAuthServiceProvider;
-import com.google.gerrit.httpd.plugins.HttpPluginModule;
 import com.google.gerrit.server.config.PluginConfig;
 import com.google.gerrit.server.config.PluginConfigFactory;
 import com.google.inject.Inject;
+import com.google.inject.servlet.ServletModule;
 
-class HttpModule extends HttpPluginModule {
+class HttpModule extends ServletModule {
 
   private final PluginConfigFactory cfgFactory;
   private final String pluginName;