opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.16' into stable-3.0

Browse Source 
* stable-2.16:
  ElasticContainer: Upgrade V6_8 to elasticsearch 6.8.5
  Documentation: Mention bazelisk alternative beside bazel

Change-Id: I1674af3ac505bcf5e85a36daf6c96b31dff9c7c2
This commit is contained in:
Marco Miller
2019-11-22 16:50:05 -05:00
parent 69c2f377cd e3dae4e4e7
commit d12c6e4f1b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/dev-bazel.txt
View File

@@ -9,7 +9,8 @@ To build Gerrit from source, you need:
* A JDK for Java 8|9|10|11|... * A JDK for Java 8|9|10|11|...
* Python 2 or 3 * Python 2 or 3
* Node.js * Node.js
* link:https://docs.bazel.build/versions/master/install.html[Bazel] * link:https://docs.bazel.build/versions/master/install.html[Bazel] directly
or through link:https://github.com/bazelbuild/bazelisk[Bazelisk]
* Maven * Maven
* zip, unzip * zip, unzip
* gcc * gcc

2
javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
View File

@@ -51,7 +51,7 @@ public class ElasticContainer extends ElasticsearchContainer {
case V6_7: case V6_7:
return "blacktop/elasticsearch:6.7.2"; return "blacktop/elasticsearch:6.7.2";
case V6_8: case V6_8:
return "blacktop/elasticsearch:6.8.4"; return "blacktop/elasticsearch:6.8.5";
case V7_0: case V7_0:
return "blacktop/elasticsearch:7.0.1"; return "blacktop/elasticsearch:7.0.1";
case V7_1: case V7_1: