opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15' into stable-2.16

Browse Source 
* stable-2.15:
  Update elasticsearch-rest-client to 7.4.2
  ElasticContainer: Use 6.8.4 image for V6_8 tests

Change-Id: I8f76f205123bed5bd96cdfa5e339eee93dfab44a
This commit is contained in:
Marco Miller
2019-11-01 11:49:05 -04:00
parent 831125f484 e212914cd5
commit ebe25fbae9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WORKSPACE
View File

@@ -1112,8 +1112,8 @@ maven_jar(
# and httpasyncclient as necessary.
maven_jar(
name = "elasticsearch-rest-client",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.4.1",
sha1 = "b4e00ab47019103d69b6c9dcfdcbd3bfda00f86e",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.4.2",
sha1 = "f48725523c0b3402f869214433602f8d3f4c737c",
)
maven_jar(

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

@@ -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.2";
return "blacktop/elasticsearch:6.8.4";
case V7_0:
return "blacktop/elasticsearch:7.0.1";
case V7_1:
@@ -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.1";
return "blacktop/elasticsearch:7.4.2";
}
throw new IllegalStateException("No tests for version: " + version.name());
}