Merge branch 'stable-3.4' into stable-3.5
* stable-3.4:
Do not include global-refdb library in high-availability
Bump global-refdb to v3.4.8
Fix issue with incorrect import for Nullable annotation
Cache the resolution of allowed listeners
Bump Gerrit to v3.4.5
Allow unrestricted listeners to be called for forwarded events
Change-Id: Iec5639618cb4313052d63fbd0eeca1401d1fcb11
diff --git a/src/test/docker/gerrit/Dockerfile b/src/test/docker/gerrit/Dockerfile
index 602c04d..820be4c 100644
--- a/src/test/docker/gerrit/Dockerfile
+++ b/src/test/docker/gerrit/Dockerfile
@@ -1,6 +1,6 @@
-FROM gerritcodereview/gerrit:3.4.5
+FROM gerritcodereview/gerrit:3.5.0-rc2
-ENV GERRIT_BRANCH=stable-3.4
+ENV GERRIT_BRANCH=stable-3.5
ENV GERRIT_CI_URL=https://gerrit-ci.gerritforge.com/job
@@ -11,7 +11,7 @@
USER gerrit
ADD --chown=gerrit:gerrit $GERRIT_CI_URL/plugin-javamelody-bazel-master-$GERRIT_BRANCH/lastSuccessfulBuild/artifact/bazel-bin/plugins/javamelody/javamelody.jar /var/gerrit/plugins/javamelody.jar
-ADD --chown=gerrit:gerrit $GERRIT_CI_URL/plugin-high-availability-bazel-$GERRIT_BRANCH/lastSuccessfulBuild/artifact/bazel-bin/plugins/high-availability/high-availability.jar /var/gerrit/plugins/high-availability.jar
+ADD --chown=gerrit:gerrit $GERRIT_CI_URL/plugin-high-availability-bazel-master-$GERRIT_BRANCH/lastSuccessfulBuild/artifact/bazel-bin/plugins/high-availability/high-availability.jar /var/gerrit/plugins/high-availability.jar
USER root
