commit dd26438b8971b1859d1ef06d3d58bdce40146c88
author Marco Miller <marco.miller@ericsson.com> Wed Mar 20 10:06:23 2019 -0400
committer Marco Miller <marco.miller@ericsson.com> Wed Mar 20 10:17:05 2019 -0400
tree 3af8c6b231aad3809773ceb31e208975483bd6ed
parent 0acee042fc51b56b9913938577f2a359d3bef2df
parent 64ad65266a40cf296a628ffd059b704d0350222f

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Extend ServletModule instead of HttpPluginModule

Change-Id: Ia4027639fe12e4043feed6cfe7fa78e0cf5556b4

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;