opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.16'

Browse Source 
* stable-2.16:
  ElasticV6QueryProjectsTest: Use V6_7
  Elasticsearch: Update elasticsearch-rest-client to 7.0.0

Change-Id: Ib138e90c2a5f01fb09fa4de023369d89da121a05
This commit is contained in:
Marco Miller
2019-04-17 13:43:14 -04:00
parent 053282a263 cc3cc72e6e
commit e46e61d0f1
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
WORKSPACE
View File

@@ -829,15 +829,15 @@ maven_jar(
# elasticsearch-rest-client explicitly depends on this version
maven_jar(
name = "httpasyncclient",
artifact = "org.apache.httpcomponents:httpasyncclient:4.1.2",
sha1 = "95aa3e6fb520191a0970a73cf09f62948ee614be",
artifact = "org.apache.httpcomponents:httpasyncclient:4.1.4",
sha1 = "f3a3240681faae3fa46b573a4c7e50cec9db0d86",
)
# elasticsearch-rest-client explicitly depends on this version
maven_jar(
name = "httpcore-nio",
artifact = "org.apache.httpcomponents:httpcore-nio:4.4.5",
sha1 = "f4be009e7505f6ceddf21e7960c759f413f15056",
artifact = "org.apache.httpcomponents:httpcore-nio:4.4.11",
sha1 = "7d0a97d01d39cff9aa3e6db81f21fddb2435f4e6",
)
# Test-only dependencies below.
@@ -1059,8 +1059,8 @@ maven_jar(
# and httpasyncclient as necessary.
maven_jar(
name = "elasticsearch-rest-client",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.7.1",
sha1 = "a00aa6cc593a464e4a890d1a226ded5c625659ab",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.0.0",
sha1 = "121d12f1c71f318be1a654e8a956e38d5b68e98a",
)
JACKSON_VERSION = "2.9.8"

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

@@ -51,7 +51,7 @@ public class ElasticContainer extends ElasticsearchContainer {
case V6_7:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.7.1";
case V7_0:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:7.0.0-rc2";
return "docker.elastic.co/elasticsearch/elasticsearch-oss:7.0.0";
}
throw new IllegalStateException("No tests for version: " + version.name());
}

2
javatests/com/google/gerrit/elasticsearch/ElasticV6QueryProjectsTest.java
View File

@@ -41,7 +41,7 @@ public class ElasticV6QueryProjectsTest extends AbstractQueryProjectsTest {
return;
}
container = ElasticContainer.createAndStart(ElasticVersion.V6_2);
container = ElasticContainer.createAndStart(ElasticVersion.V6_7);
nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
}