Fix 3.3.0-SNAPSHOT build And fix the build tools to build against 3.3.0-SNAPSHOT. Change-Id: Ibe93bbae60efecb69a579710a2ca9aa89b9d22ff
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 5b70ccf..f269e80 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/pom.xml b/pom.xml index ad9286c..9cf36fd 100644 --- a/pom.xml +++ b/pom.xml
@@ -22,7 +22,7 @@ <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>
diff --git a/src/main/java/com/googlesource/gerrit/plugins/batch/BatchSubmitter.java b/src/main/java/com/googlesource/gerrit/plugins/batch/BatchSubmitter.java index a2729b7..55abffb 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/batch/BatchSubmitter.java +++ b/src/main/java/com/googlesource/gerrit/plugins/batch/BatchSubmitter.java
@@ -177,8 +177,7 @@ bu.setRefLogMessage("merged (batch submit)"); bu.addOp( psId.changeId(), - mergedByPushOpFactory.create( - requestScopePropagator, psId, submissionId, destination.branch(), sha1)); + mergedByPushOpFactory.create(psId, submissionId, destination.branch(), sha1)); bu.execute(); } }