Merge branch 'stable-3.6' into stable-3.7
* stable-3.6:
Allow update head with Fetch replication global capability
Revert "Reuse Gerrit code for head update"
Fix pull-replication update head with Gerrit replica
Ignore all broken tests on Gerrit replica
Add indirect commons-lang3 dependency
Do not provide response body when apply-object is successful
Do not record fetch replication metrics when all refs are excluded from fetch task
Change-Id: I7941a6a35a3308f835bb315c8dd8aa3f1607994b
diff --git a/example-setup/broker/Dockerfile b/example-setup/broker/Dockerfile
index b79470c..67eecd9 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
diff --git a/example-setup/http/Dockerfile b/example-setup/http/Dockerfile
index 77fed72..afadb4f 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
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 e54d408..2df6b0c 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
@@ -144,7 +144,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);