Merge branch 'stable-2.16'
* stable-2.16:
ResourceHelper: Simplify implementations
Change-Id: I61e374ed84031c6f3b4ccea16008f8498a1aa302
diff --git a/WORKSPACE b/WORKSPACE
index dcd96b9..ce1f5ce 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,27 +3,27 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "c827ba79413585ab9dfc1bbd0d7f609eedd6aa80",
+ commit = "f3b3eecf061193e8909298bc9c35027df3bf9d44",
#local_path = "/home/<user>/projects/bazlets"
)
# 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")
diff --git a/pom.xml b/pom.xml
index f0ed5d7..4d88a1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<groupId>com.cisco.gerrit.plugins</groupId>
<artifactId>slack-integration</artifactId>
<packaging>jar</packaging>
- <version>2.16.6</version>
+ <version>3.0-SNAPSHOT</version>
<name>Slack Integration Plugin</name>
<properties>