From 7e9c6755d6ed7e6ff76a9907134a1fb94ca5089e Mon Sep 17 00:00:00 2001 From: Marco Miller Date: Thu, 21 Nov 2019 22:18:59 -0500 Subject: [PATCH 1/2] Documentation: Mention bazelisk alternative beside bazel Change-Id: I55d3d197f9fb5f6df2ff583df5690546278de021 --- Documentation/dev-bazel.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/dev-bazel.txt b/Documentation/dev-bazel.txt index 2bc356ad34..644dad3ed9 100644 --- a/Documentation/dev-bazel.txt +++ b/Documentation/dev-bazel.txt @@ -9,7 +9,8 @@ To build Gerrit from source, you need: * A JDK for Java 8|9|10|11|... * Python 2 or 3 * Node.js -* link:https://www.bazel.io/versions/master/docs/install.html[Bazel] +* link:https://www.bazel.io/versions/master/docs/install.html[Bazel] directly +or through link:https://github.com/bazelbuild/bazelisk[Bazelisk] * Maven * zip, unzip * gcc From e3dae4e4e796d6a0c76aeb4ba726d9cb734adfc0 Mon Sep 17 00:00:00 2001 From: Marco Miller Date: Fri, 22 Nov 2019 09:56:23 -0500 Subject: [PATCH 2/2] ElasticContainer: Upgrade V6_8 to elasticsearch 6.8.5 Change-Id: Ibb8552b468ada0cf227de339a1ce9860b5c932e6 --- javatests/com/google/gerrit/elasticsearch/ElasticContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java index 73e7ecacb1..c15f1a770d 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java @@ -51,7 +51,7 @@ public class ElasticContainer extends ElasticsearchContainer { case V6_7: return "blacktop/elasticsearch:6.7.2"; case V6_8: - return "blacktop/elasticsearch:6.8.4"; + return "blacktop/elasticsearch:6.8.5"; case V7_0: return "blacktop/elasticsearch:7.0.1"; case V7_1: