commit 3ec47c72ae6bce119eb9e0f1c448454d7fcc7b19
author Kaushik Lingarkar <kaushik.lingarkar@linaro.org> Fri Jul 07 16:29:16 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 07 16:29:16 2023 +0000
tree 66307bc41e167030bad61e8f80352b6932ffd279
parent 7e83929b0e4b613808d808acf46b8a71968cd750
parent 47ef2fa0a951112b97f14c614729f15510d4634d

Merge "Fix Flogger issues flagged by error prone" into stable-3.5

src/main/resources/Documentation/build.md

diff --git a/src/main/resources/Documentation/build.md b/src/main/resources/Documentation/build.md
index acb8d85..b2a31c1 100644
--- a/src/main/resources/Documentation/build.md
+++ b/src/main/resources/Documentation/build.md
@@ -20,7 +20,7 @@
 git clone https://gerrit.googlesource.com/modules/index-elasticsearch
 cd gerrit/plugins
 ln -s ../../index-elasticsearch index-elasticsearch
-ln -sf ../../external_plugin_deps.bzl .
+ln -sf ../../index-elasticsearch/external_plugin_deps.bzl .
 ```
 
 From the Gerrit source tree issue the command `bazelisk build plugins/index-elasticsearch`.

src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java

diff --git a/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java b/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java
index 4fddc72..86b1bac 100644
--- a/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java
+++ b/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java
@@ -33,7 +33,7 @@
       container.start();
     } catch (ContainerLaunchException e) {
       logger.atSevere().log(
-          "Failed to launch elastic container. Logs from container :\n" + container.getLogs());
+          "Failed to launch elastic container. Logs from container :\n%s", container.getLogs());
       throw e;
     }
     return container;