Merge branch 'stable-3.2' into stable-3.3 * stable-3.2: Upgrade bazlets to latest stable-3.2 to build with 3.2.5.1 API Upgrade bazlets to latest stable-3.1 to build with 3.1.10 API Change-Id: I45825e6099fbc3f5ea947a7413df3364e0def70e
diff --git a/BUILD b/BUILD index f364456..61e1f54 100644 --- a/BUILD +++ b/BUILD
@@ -50,7 +50,7 @@ srcs = glob(["src/main/java/**/*.java"]), manifest_entries = [ "Gerrit-PluginName: batch", - "Gerrit-ApiVersion: 3.0.0", + "Gerrit-ApiVersion: 3.3.0-SNAPSHOT", "Implementation-Title: Batch Plugin", "Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/batch", "Gerrit-Module: com.googlesource.gerrit.plugins.batch.Module",
diff --git a/WORKSPACE b/WORKSPACE index b5de99e..890dfbe 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -12,7 +12,11 @@ "gerrit_api", ) -gerrit_api() +# Load release Plugin API +#gerrit_api() + +# Load snapshot Plugin API +gerrit_api(version = "3.3.0-SNAPSHOT") load("//:external_plugin_deps.bzl", "external_plugin_deps")
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl index d574618..3a5ab10 100644 --- a/external_plugin_deps.bzl +++ b/external_plugin_deps.bzl
@@ -1,16 +1,16 @@ load("//tools/bzl:maven_jar.bzl", "maven_jar") def external_plugin_deps(): - AUTO_VALUE_VERSION = "1.7" + AUTO_VALUE_VERSION = "1.7.4" maven_jar( name = "auto-value", artifact = "com.google.auto.value:auto-value:" + AUTO_VALUE_VERSION, - sha1 = "fe8387764ed19460eda4f106849c664f51c07121", + sha1 = "6b126cb218af768339e4d6e95a9b0ae41f74e73d", ) maven_jar( name = "auto-value-annotations", artifact = "com.google.auto.value:auto-value-annotations:" + AUTO_VALUE_VERSION, - sha1 = "5be124948ebdc7807df68207f35a0f23ce427f29", + sha1 = "eff48ed53995db2dadf0456426cc1f8700136f86", )
diff --git a/pom.xml b/pom.xml index ad9286c..c66f0cd 100644 --- a/pom.xml +++ b/pom.xml
@@ -22,13 +22,13 @@ <groupId>com.googlesource.gerrit.plugins.batch</groupId> <artifactId>batch</artifactId> <packaging>jar</packaging> - <version>3.2.0</version> + <version>3.3.0-SNAPSHOT</version> <name>batch</name> <properties> <Gerrit-ApiType>plugin</Gerrit-ApiType> <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion> - <auto-value.version>1.7</auto-value.version> + <auto-value.version>1.7.4</auto-value.version> </properties> <build>