opendev/gerrit
Code Issues Proposed changes

Merge changes I95b95a0c,I584af100 into stable-2.15

Browse Source 
* changes:
  WORKSPACE: Update testcontainers to version 1.10.7
  ElasticContainer: Update the 6.6 version to latest
This commit is contained in:
Alice Kober-Sotzek
2019-03-19 12:40:42 +00:00
committed by Gerrit Code Review
parent e5fd935adc 671ace6102
commit 671bbd23c6
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
WORKSPACE
View File

@@ -896,8 +896,8 @@ maven_jar(
# and httpasyncclient as necessary.
maven_jar(
name = "elasticsearch-rest-client",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.6.1",
sha1 = "dc1c9284ffca28cd169fae2776c3956e90b76c00",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.6.2",
sha1 = "2c429141e488091c358aa43b1e6873d457464c5d",
)
JACKSON_VERSION = "2.9.8"
@@ -908,18 +908,18 @@ maven_jar(
sha1 = "0f5a654e4675769c716e5b387830d19b501ca191",
)
TESTCONTAINERS_VERSION = "1.10.6"
TESTCONTAINERS_VERSION = "1.10.7"
maven_jar(
name = "testcontainers",
artifact = "org.testcontainers:testcontainers:" + TESTCONTAINERS_VERSION,
sha1 = "435c94ec099e229e62295cec4feec91c192aa764",
sha1 = "e7575fedfd010ca1ad80c8c9bf971a8057b1ff8a",
)
maven_jar(
name = "testcontainers-elasticsearch",
artifact = "org.testcontainers:elasticsearch:" + TESTCONTAINERS_VERSION,
sha1 = "143a88bd8f5c5a917e5bac5a728bb6a7fc54a50c",
sha1 = "1ee43ebd81aea1f29bf60a56643bad80c134f998",
)
maven_jar(

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

@@ -47,7 +47,7 @@ public class ElasticContainer extends ElasticsearchContainer {
case V6_5:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.5.4";
case V6_6:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.6.1";
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.6.2";
case V7_0:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:7.0.0-beta1";
}