commit 3a8b754d6c2a0a3f6832fa37cd662f8f5f69dbea
author Paladox <thomasmulhall410@yahoo.com> Mon Mar 12 23:29:26 2018 +0000
committer Paladox <thomasmulhall410@yahoo.com> Mon Mar 12 23:29:30 2018 +0000
tree 3156b68b295ee3b6d34c2ecb67fc5c67ac1d518c
parent e0a62a8395dc72b2954b3254a855468caa84cd80
parent 9527c80d1bce35ed6534529c22c607862babbe51

Merge branch 'stable-2.15'

* stable-2.15:
  Update bazlets to the latest on stable-2.14 to use 2.14.7 release API
  Include canonicalWebURL in X-Origin-Url header in POST requests

Change-Id: I7860439ce6d92a7590586d559c2bb0be722ec8b5

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index dd7acd0..305cad2 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,26 +3,26 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "28d12c28df242b21855d4bebf8cca12b9ffcb900",
+    commit = "24f104a82d6458a9f7b3e7eef9278f721a9327be",
 )
 
 #Snapshot Plugin API
-#load(
-#    "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-#    "gerrit_api_maven_local",
-#)
-
-# Load snapshot Plugin API
-#gerrit_api_maven_local()
-
-# Release Plugin API
 load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
-    "gerrit_api",
+    "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
+    "gerrit_api_maven_local",
 )
 
+# Load snapshot Plugin API
+gerrit_api_maven_local()
+
+# Release Plugin API
+#load(
+#    "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
+#    "gerrit_api",
+#)
+
 # Load release Plugin API
-gerrit_api()
+#gerrit_api()
 
 load("//:external_plugin_deps.bzl", "external_plugin_deps")
 

src/main/java/com/googlesource/gerrit/plugins/webhooks/EventHandler.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/webhooks/EventHandler.java b/src/main/java/com/googlesource/gerrit/plugins/webhooks/EventHandler.java
index 1c36eeb..ca35e36 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/webhooks/EventHandler.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/webhooks/EventHandler.java
@@ -17,10 +17,10 @@
 import static com.googlesource.gerrit.plugins.webhooks.RemoteConfig.REMOTE;
 
 import com.google.common.base.Strings;
-import com.google.gerrit.common.EventListener;
 import com.google.gerrit.extensions.annotations.PluginName;
 import com.google.gerrit.server.config.PluginConfigFactory;
 import com.google.gerrit.server.events.Event;
+import com.google.gerrit.server.events.EventListener;
 import com.google.gerrit.server.events.ProjectEvent;
 import com.google.gerrit.server.project.NoSuchProjectException;
 import com.google.inject.Inject;

src/main/java/com/googlesource/gerrit/plugins/webhooks/Module.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/webhooks/Module.java b/src/main/java/com/googlesource/gerrit/plugins/webhooks/Module.java
index 6b84862..b70f0c4 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/webhooks/Module.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/webhooks/Module.java
@@ -17,9 +17,9 @@
 import static com.googlesource.gerrit.plugins.webhooks.DefaultHttpClientProvider.DEFAULT;
 import static com.googlesource.gerrit.plugins.webhooks.SslVerifyingHttpClientProvider.SSL_VERIFY;
 
-import com.google.gerrit.common.EventListener;
 import com.google.gerrit.extensions.config.FactoryModule;
 import com.google.gerrit.extensions.registration.DynamicSet;
+import com.google.gerrit.server.events.EventListener;
 import com.google.inject.Inject;
 import com.google.inject.Scopes;
 import com.google.inject.name.Names;