Adapt for 3.10 - Bump Bazel version to 7.0.0 - Bump test docker gerrit image to 3.10.0 Impact: events plugin build with Gerrit v3.10 Risk-Scope: events plugin Change-Id: Ib84a8f10218e29f4444fb0217cf22c50fcc00ad2
diff --git a/.bazelversion b/.bazelversion index 91e4a9f..bce07d3 100644 --- a/.bazelversion +++ b/.bazelversion
@@ -1 +1,2 @@ -6.3.2 +7.0.0 +
diff --git a/WORKSPACE b/WORKSPACE index 2b9c99a..89fc44a 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -3,7 +3,7 @@ load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "f930de7dc62e319c82d2afc8f10efd1290fd62b8", + commit = "cc68cb5ffdab500e36674cb7558911b180ea61c3", ) load(
diff --git a/src/main/java/com/googlesource/gerrit/plugins/events/FileSystemEventBroker.java b/src/main/java/com/googlesource/gerrit/plugins/events/FileSystemEventBroker.java index 180e5cb..b55c975 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/events/FileSystemEventBroker.java +++ b/src/main/java/com/googlesource/gerrit/plugins/events/FileSystemEventBroker.java
@@ -259,7 +259,8 @@ return l.getClass().getName().startsWith("com.google.gerrit.sshd.commands.StreamEvents"); } - protected void readAndParseCfg(String pluginName, GerritServerConfigProvider configProvider) { + private void readAndParseCfg( + String pluginName, GerritServerConfigProvider configProvider) { PluginConfig cfg = PluginConfig.createFromGerritConfig(pluginName, configProvider.loadConfig()); for (String filter : cfg.getStringList(KEY_FILTER)) { String pieces[] = filter.split(" ");
diff --git a/test/docker/gerrit/Dockerfile b/test/docker/gerrit/Dockerfile index 5eac5b7..f066c70 100755 --- a/test/docker/gerrit/Dockerfile +++ b/test/docker/gerrit/Dockerfile
@@ -1,4 +1,4 @@ -FROM gerritcodereview/gerrit:3.9.1-ubuntu22 +FROM gerritcodereview/gerrit:3.10.0-ubuntu22 ENV GERRIT_SITE /var/gerrit COPY artifacts/plugins/ $GERRIT_SITE/plugins/