Merge "Merge branch 'stable-3.4' into stable-3.5" into stable-3.5

BUILD

diff --git a/BUILD b/BUILD
index 5975b31..2ee0faa 100644
--- a/BUILD
+++ b/BUILD
@@ -21,7 +21,7 @@
     resources = glob(["src/main/resources/**/*"]),
     deps = [
       "@jgroups//jar",
-      "@global-refdb//jar",
+      "@global-refdb//jar:neverlink",
     ],
 )
 

external_plugin_deps.bzl

diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 74c8f13..da477e6 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -15,6 +15,6 @@
 
     maven_jar(
         name = "global-refdb",
-        artifact = "com.gerritforge:global-refdb:3.4.8",
-        sha1 = "a05e1684c0b02867c203e3f55efe62ced2c0fe61",
+        artifact = "com.gerritforge:global-refdb:3.5.4",
+        sha1 = "6f96965d4cedd8b01b1fd9047d8c443c752bd675",
     )