Fix errors against latest Gerrit core The core change [1] which enables invocation of lifecycle listeners modified the method signature of parseCommandLine(). Due to which the build for the tip version of batch plugin fails. [1] I84670dcabf9f3638185563c7ff92201e7489601a Change-Id: If2602b0138966f0bf8b38ff951a302aa2d8f183f
diff --git a/src/main/java/com/googlesource/gerrit/plugins/batch/ssh/ListCommand.java b/src/main/java/com/googlesource/gerrit/plugins/batch/ssh/ListCommand.java index 6f78ecb..42edd43 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/batch/ssh/ListCommand.java +++ b/src/main/java/com/googlesource/gerrit/plugins/batch/ssh/ListCommand.java
@@ -15,6 +15,7 @@ package com.googlesource.gerrit.plugins.batch.ssh; import com.google.gerrit.server.AccessPath; +import com.google.gerrit.server.DynamicOptions; import com.google.gerrit.sshd.BaseCommand; import com.google.gerrit.sshd.CommandMetaData; import com.google.inject.Inject; @@ -37,8 +38,11 @@ new CommandRunnable() { @Override public void run() throws Exception { - parseCommandLine(impl); - impl.display(out); + try (DynamicOptions pluginOptions = + new DynamicOptions(ListCommand.this, injector, dynamicBeans)) { + parseCommandLine(impl, pluginOptions); + impl.display(out); + } } }, AccessPath.SSH_COMMAND);
diff --git a/src/main/java/com/googlesource/gerrit/plugins/batch/ssh/MergeChangeCommand.java b/src/main/java/com/googlesource/gerrit/plugins/batch/ssh/MergeChangeCommand.java index 10d8b65..fd982af 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/batch/ssh/MergeChangeCommand.java +++ b/src/main/java/com/googlesource/gerrit/plugins/batch/ssh/MergeChangeCommand.java
@@ -88,7 +88,6 @@ @Override public void run() throws Exception { - parseCommandLine(); Batch batch = new Batch(user.getAccountId()); String err = null; try {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/batch/ssh/SubmitCommand.java b/src/main/java/com/googlesource/gerrit/plugins/batch/ssh/SubmitCommand.java index a753c36..e9a477b 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/batch/ssh/SubmitCommand.java +++ b/src/main/java/com/googlesource/gerrit/plugins/batch/ssh/SubmitCommand.java
@@ -39,7 +39,6 @@ @Override public void run() throws Exception { - parseCommandLine(); try { Batch batch = impl.submit(batchId); out.write((OutputFormat.JSON.newGson().toJson(batch) + "\n").getBytes(ENC));