Merge branch 'stable-3.10'
90c511c Adapt for 3.10
f007d82 Merge branch 'stable-3.9' into stable-3.10
cf3c348 Merge branch 'stable-3.5' into stable-3.9
bf7319f test: Update to latest stable Alpine release (3.19)
56378c8 Update to 3.9.1
Change-Id: Ic8573b0172d5f64e06dc9d024f73a2fc271609a4
diff --git a/.bazelrc b/.bazelrc
index fb8e4d1..6b31bc8 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,7 +1,7 @@
-build --java_language_version=11
-build --java_runtime_version=remotejdk_11
-build --tool_java_language_version=11
-build --tool_java_runtime_version=remotejdk_11
+build --java_language_version=17
+build --java_runtime_version=remotejdk_17
+build --tool_java_language_version=17
+build --tool_java_runtime_version=remotejdk_17
build --workspace_status_command="python3 ./tools/workspace_status.py"
build --repository_cache=~/.gerritcodereview/bazel-cache/repository
diff --git a/.bazelversion b/.bazelversion
index 6abaeb2..bce07d3 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1,2 @@
-6.2.0
+7.0.0
+
diff --git a/WORKSPACE b/WORKSPACE
index 24eb6c1..89fc44a 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "e977766e5670dca125c502c37339e9f3da9b329b",
+ 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/src/main/java/com/googlesource/gerrit/plugins/events/SshModule.java b/src/main/java/com/googlesource/gerrit/plugins/events/SshModule.java
index ee7f167..77d5138 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/events/SshModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/events/SshModule.java
@@ -14,9 +14,16 @@
package com.googlesource.gerrit.plugins.events;
+import com.google.gerrit.extensions.annotations.PluginName;
import com.google.gerrit.sshd.PluginCommandModule;
+import com.google.inject.Inject;
public class SshModule extends PluginCommandModule {
+ @Inject
+ SshModule(@PluginName String pluginName) {
+ super(pluginName);
+ }
+
@Override
protected void configureCommands() {
command(StreamEvents.class);
diff --git a/test/docker/gerrit/Dockerfile b/test/docker/gerrit/Dockerfile
index 5eeb044..f066c70 100755
--- a/test/docker/gerrit/Dockerfile
+++ b/test/docker/gerrit/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritcodereview/gerrit:3.8.3-ubuntu22
+FROM gerritcodereview/gerrit:3.10.0-ubuntu22
ENV GERRIT_SITE /var/gerrit
COPY artifacts/plugins/ $GERRIT_SITE/plugins/
diff --git a/test/docker/run_tests/Dockerfile b/test/docker/run_tests/Dockerfile
index 6e8e825..286fea2 100755
--- a/test/docker/run_tests/Dockerfile
+++ b/test/docker/run_tests/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.19
ARG UID=1000
ARG GID=1000
