commit b9eb0430421f574c6398d6df0c31698a40f77af9
author Marco Miller <marco.miller@ericsson.com> Fri Sep 11 16:26:44 2020 -0400
committer Marco Miller <marco.miller@ericsson.com> Fri Sep 11 16:26:51 2020 -0400
tree 0ea551f2a61f41f33640a202757a0d626a888330
parent f79596caf771c35705e72dca307850b33606a305
parent 6fe9ce4b50bc9c61664aa5d9d949168b97805a8c

Merge branch 'stable-3.2'

* stable-3.2:
  Bump Bazel version to 3.5.0

Change-Id: Id6707caabd300a7c02f412a494cfc17e2355423c

BUILD

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",

WORKSPACE

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")
 

pom.xml

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>

src/main/java/com/googlesource/gerrit/plugins/batch/BatchSubmitter.java

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();
     }
   }