Merge branch 'stable-2.15'
* stable-2.15:
Extend ServletModule instead of HttpPluginModule
Upgrade bazlets to latest stable-2.15 to build with 2.15.12 API
Upgrade bazlets to latest stable-2.14 to build with 2.14.19 API
Upgrade bazlets to latest stable-2.15
Upgrade bazlets to latest stable-2.14
Update bazlets to fix build with bazel 0.23
Update bazlets to fix build with bazel 0.23
Upgrade bazlets to latest stable-2.15 to build with 2.15.11 API
Upgrade bazlets to latest stable-2.15 to build with 2.15.10 API
Automatically format BUILD file with buildifier lint mode
Upgrade bazlets to latest stable-2.15 to build with 2.15.9 API
Upgrade bazlets to latest stable-2.15 to build with 2.15.8 API
Upgrade bazlets to latest stable-2.14 to build with 2.14.18 API
Bazel: Include eclipse-out directory in .bazelignore
Add explanatory comment to empty BUILD file(s)
Change-Id: Ic9d891f41c28edd857d78bf4472756b7a84244de
diff --git a/.bazelignore b/.bazelignore
new file mode 100644
index 0000000..30f1613
--- /dev/null
+++ b/.bazelignore
@@ -0,0 +1 @@
+eclipse-out
diff --git a/WORKSPACE b/WORKSPACE
index 6758bff..62acae9 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "b54eaed487d37188120da6933b97c571519954ca",
+ commit = "f4fcc606a6afa8ce27a013bcf62e495a5ec2505c",
#local_path = "/home/<user>/projects/bazlets",
)
diff --git a/src/main/java/com/googlesource/gerrit/plugins/importer/HttpModule.java b/src/main/java/com/googlesource/gerrit/plugins/importer/HttpModule.java
index 79fe837..c4f7c15 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/importer/HttpModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/importer/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)
diff --git a/tools/bzl/BUILD b/tools/bzl/BUILD
index e69de29..c5ed0b7 100644
--- a/tools/bzl/BUILD
+++ b/tools/bzl/BUILD
@@ -0,0 +1 @@
+# Empty file required by Bazel
diff --git a/tools/eclipse/BUILD b/tools/eclipse/BUILD
index abc0526..8dace8c 100644
--- a/tools/eclipse/BUILD
+++ b/tools/eclipse/BUILD
@@ -1,9 +1,9 @@
+load("//tools/bzl:classpath.bzl", "classpath_collector")
load(
"//tools/bzl:plugin.bzl",
"GWT_PLUGIN_DEPS",
"PLUGIN_DEPS",
)
-load("//tools/bzl:classpath.bzl", "classpath_collector")
classpath_collector(
name = "main_classpath_collect",
