Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade elasticsearch-rest-client to 6.5.1

Change-Id: I57d998de50909f2780115b822f53c0d1884df730
This commit is contained in:
David Pursehouse
2018-11-27 15:49:51 +09:00
2 changed files with 3 additions and 3 deletions

View File

@@ -1091,8 +1091,8 @@ maven_jar(
# and httpasyncclient as necessary.
maven_jar(
name = "elasticsearch-rest-client",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.5.0",
sha1 = "241436d27cf65b84d17126dc7b6b947e8e2c173c",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.5.1",
sha1 = "d87892e24ef361b9fff5435246b0f0b8f4561fe8",
)
JACKSON_VERSION = "2.9.7"

View File

@@ -53,7 +53,7 @@ public class ElasticContainer<SELF extends ElasticContainer<SELF>> extends Gener
case V6_4:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.3";
case V6_5:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.5.0";
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.5.1";
}
throw new IllegalStateException("No tests for version: " + version.name());
}