Merge branch 'stable-3.6' into stable-3.7

* stable-3.6:
  Increase FetchOne coverage with unit tests
  Display the in-flight taskId when a runway conflict is detected
  Restore the fetching of all refs with empty delta
  Allow to filter out refs from the fetch-replication deltas
  Do not accumulate replication events with retrying tasks
  Add replication taskId during the execution of the fetch
  Allow FetchOne to retry the failed ref only

Change-Id: Ia13d007266eef97315d9a0961f3140e3bcdde9d5

example-setup/broker/Dockerfile

diff --git a/example-setup/broker/Dockerfile b/example-setup/broker/Dockerfile
index 566e839..acc34b9 100644
--- a/example-setup/broker/Dockerfile
+++ b/example-setup/broker/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritcodereview/gerrit:3.6.3-almalinux8
+FROM gerritcodereview/gerrit:3.7.2-almalinux8
 
 USER root
 

example-setup/http/Dockerfile

diff --git a/example-setup/http/Dockerfile b/example-setup/http/Dockerfile
index b966b5f..3a68b59 100644
--- a/example-setup/http/Dockerfile
+++ b/example-setup/http/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritcodereview/gerrit:3.6.3-almalinux8
+FROM gerritcodereview/gerrit:3.7.2-almalinux8
 
 USER root
 

src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/PullReplicationFilter.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/PullReplicationFilter.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/PullReplicationFilter.java
index 20122a7..7027239 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/PullReplicationFilter.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/PullReplicationFilter.java
@@ -140,7 +140,7 @@
     } catch (AuthException e) {
       RestApiServlet.replyError(
           httpRequest, httpResponse, SC_FORBIDDEN, e.getMessage(), e.caching(), e);
-    } catch (MalformedJsonException | JsonParseException e) {
+    } catch (MalformedJsonException | JsonParseException | IllegalArgumentException e) {
       logger.atFine().withCause(e).log("REST call failed on JSON parsing");
       RestApiServlet.replyError(
           httpRequest, httpResponse, SC_BAD_REQUEST, "Invalid json in request", e);