Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I690ab553b01e84895c396d8c93afbec746be5a84
This commit is contained in:
David Pursehouse
2019-10-26 10:48:34 +09:00
2 changed files with 3 additions and 3 deletions

View File

@@ -1143,8 +1143,8 @@ maven_jar(
# and httpasyncclient as necessary.
maven_jar(
name = "elasticsearch-rest-client",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.4.0",
sha1 = "481fedd31088ec6ba79a2aeffec3eccae4c0772b",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.4.1",
sha1 = "b4e00ab47019103d69b6c9dcfdcbd3bfda00f86e",
)
maven_jar(

View File

@@ -61,7 +61,7 @@ public class ElasticContainer extends ElasticsearchContainer {
case V7_3:
return "blacktop/elasticsearch:7.3.2";
case V7_4:
return "blacktop/elasticsearch:7.4.0";
return "blacktop/elasticsearch:7.4.1";
}
throw new IllegalStateException("No tests for version: " + version.name());
}