opendev
/
gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15 

* stable-2.14:
  ElasticContainer: Test with versions 5.6.13 and 6.4.3
  Upgrade elasticsearch-rest-client to 6.4.3
  Bazel: Consume versions directly from lib:versions.bzl in skylib

Change-Id: I2264b3f077799c5a7b9467a3e33606b71c53f174
This commit is contained in:
David Pursehouse 2018-11-07 19:17:16 +09:00
parent bb61707214 bfeaf28f58
commit dd2182557b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
WORKSPACE
View File

@ -29,7 +29,7 @@ http_file(
urls = ["https://raw.githubusercontent.com/google/closure-compiler/775609aad61e14aef289ebec4bfc09ad88877f9e/contrib/externs/polymer-1.0.js"],
)
load("@bazel_skylib//:lib.bzl", "versions")
load("@bazel_skylib//lib:versions.bzl", "versions")
versions.check(minimum_bazel_version = "0.17.1")
@ -896,8 +896,8 @@ maven_jar(
# and httpasyncclient as necessary.
maven_jar(
name = "elasticsearch-rest-client",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.4.2",
sha1 = "a2baf2d4fdf03f31fbd39351a32bee25fcdfa1cf",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.4.3",
sha1 = "5c24325430971ba2fa4769eb446f026b7680d5e7",
)
JACKSON_VERSION = "2.9.7"

4
gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java
View File

@ -45,13 +45,13 @@ public class ElasticContainer<SELF extends ElasticContainer<SELF>> extends Gener
case V2_4:
return "elasticsearch:2.4.6-alpine";
case V5_6:
return "docker.elastic.co/elasticsearch/elasticsearch:5.6.12";
return "docker.elastic.co/elasticsearch/elasticsearch:5.6.13";
case V6_2:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.2.4";
case V6_3:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.3.2";
case V6_4:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.2";
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.3";
}
throw new IllegalStateException("No tests for version: " + version.name());
}