Merge branch 'stable-2.15' into stable-2.16
* stable-2.15: Elasticsearch: Support and use v6.6.0 for testing Adds <noscript> to PolyGerritIndexHtml.soy Change-Id: I93e6121d3fbb97d3f6598131148d50c73db19704
This commit is contained in:
commit
22d300fc28
|
@ -3052,6 +3052,7 @@ For further information about Elasticsearch security, please refer to the docume
|
|||
* link:https://www.elastic.co/guide/en/elastic-stack-overview/6.3/security-getting-started.html[Elasticsearch 6.3]
|
||||
* link:https://www.elastic.co/guide/en/elastic-stack-overview/6.4/security-getting-started.html[Elasticsearch 6.4]
|
||||
* link:https://www.elastic.co/guide/en/elastic-stack-overview/6.5/security-getting-started.html[Elasticsearch 6.5]
|
||||
* link:https://www.elastic.co/guide/en/elastic-stack-overview/6.6/security-getting-started.html[Elasticsearch 6.6]
|
||||
|
||||
[[elasticsearch.username]]elasticsearch.username::
|
||||
+
|
||||
|
|
|
@ -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.4",
|
||||
sha1 = "552175b06e34df96f114d1c8aaa908e535c8f1be",
|
||||
artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.6.0",
|
||||
sha1 = "f0ce1ea819fedde731511b440b025e4fb5a2f5f7",
|
||||
)
|
||||
|
||||
JACKSON_VERSION = "2.9.8"
|
||||
|
|
|
@ -23,6 +23,7 @@ public enum ElasticVersion {
|
|||
V6_3("6.3.*"),
|
||||
V6_4("6.4.*"),
|
||||
V6_5("6.5.*"),
|
||||
V6_6("6.6.*"),
|
||||
V7_0("7.0.*");
|
||||
|
||||
private final String version;
|
||||
|
|
|
@ -32,7 +32,7 @@ public class ElasticReindexIT extends AbstractReindexTests {
|
|||
|
||||
@ConfigSuite.Config
|
||||
public static Config elasticsearchV6() {
|
||||
return getConfig(ElasticVersion.V6_5);
|
||||
return getConfig(ElasticVersion.V6_6);
|
||||
}
|
||||
|
||||
@ConfigSuite.Config
|
||||
|
|
|
@ -31,7 +31,7 @@ public class ElasticIndexIT extends AbstractIndexTests {
|
|||
|
||||
@ConfigSuite.Config
|
||||
public static Config elasticsearchV6() {
|
||||
return getConfig(ElasticVersion.V6_5);
|
||||
return getConfig(ElasticVersion.V6_6);
|
||||
}
|
||||
|
||||
@ConfigSuite.Config
|
||||
|
|
|
@ -46,6 +46,8 @@ public class ElasticContainer extends ElasticsearchContainer {
|
|||
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.3";
|
||||
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.0";
|
||||
case V7_0:
|
||||
return "docker.elastic.co/elasticsearch/elasticsearch-oss:7.0.0-alpha2";
|
||||
}
|
||||
|
|
|
@ -41,7 +41,7 @@ public class ElasticV6QueryAccountsTest extends AbstractQueryAccountsTest {
|
|||
return;
|
||||
}
|
||||
|
||||
container = ElasticContainer.createAndStart(ElasticVersion.V6_5);
|
||||
container = ElasticContainer.createAndStart(ElasticVersion.V6_6);
|
||||
nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
|
||||
}
|
||||
|
||||
|
|
|
@ -41,7 +41,7 @@ public class ElasticV6QueryChangesTest extends AbstractQueryChangesTest {
|
|||
return;
|
||||
}
|
||||
|
||||
container = ElasticContainer.createAndStart(ElasticVersion.V6_5);
|
||||
container = ElasticContainer.createAndStart(ElasticVersion.V6_6);
|
||||
nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
|
||||
}
|
||||
|
||||
|
|
|
@ -41,7 +41,7 @@ public class ElasticV6QueryGroupsTest extends AbstractQueryGroupsTest {
|
|||
return;
|
||||
}
|
||||
|
||||
container = ElasticContainer.createAndStart(ElasticVersion.V6_5);
|
||||
container = ElasticContainer.createAndStart(ElasticVersion.V6_6);
|
||||
nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
|
||||
}
|
||||
|
||||
|
|
|
@ -40,6 +40,9 @@ public class ElasticVersionTest {
|
|||
assertThat(ElasticVersion.forVersion("6.5.0")).isEqualTo(ElasticVersion.V6_5);
|
||||
assertThat(ElasticVersion.forVersion("6.5.1")).isEqualTo(ElasticVersion.V6_5);
|
||||
|
||||
assertThat(ElasticVersion.forVersion("6.6.0")).isEqualTo(ElasticVersion.V6_6);
|
||||
assertThat(ElasticVersion.forVersion("6.6.1")).isEqualTo(ElasticVersion.V6_6);
|
||||
|
||||
assertThat(ElasticVersion.forVersion("7.0.0")).isEqualTo(ElasticVersion.V7_0);
|
||||
assertThat(ElasticVersion.forVersion("7.0.1")).isEqualTo(ElasticVersion.V7_0);
|
||||
}
|
||||
|
@ -59,6 +62,7 @@ public class ElasticVersionTest {
|
|||
assertThat(ElasticVersion.V6_3.isV6OrLater()).isTrue();
|
||||
assertThat(ElasticVersion.V6_4.isV6OrLater()).isTrue();
|
||||
assertThat(ElasticVersion.V6_5.isV6OrLater()).isTrue();
|
||||
assertThat(ElasticVersion.V6_6.isV6OrLater()).isTrue();
|
||||
assertThat(ElasticVersion.V7_0.isV6OrLater()).isTrue();
|
||||
}
|
||||
|
||||
|
@ -69,6 +73,7 @@ public class ElasticVersionTest {
|
|||
assertThat(ElasticVersion.V6_3.isV7OrLater()).isFalse();
|
||||
assertThat(ElasticVersion.V6_4.isV7OrLater()).isFalse();
|
||||
assertThat(ElasticVersion.V6_5.isV7OrLater()).isFalse();
|
||||
assertThat(ElasticVersion.V6_6.isV7OrLater()).isFalse();
|
||||
assertThat(ElasticVersion.V7_0.isV7OrLater()).isTrue();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -33,6 +33,10 @@
|
|||
<meta name="referrer" content="never">{\n}
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">{\n}
|
||||
|
||||
<noscript>
|
||||
To use PolyGerrit, please enable JavaScript in your browser settings, and then refresh this page.
|
||||
</noscript>
|
||||
|
||||
<script>
|
||||
window.CLOSURE_NO_DEPS = true;
|
||||
{if $canonicalPath != ''}window.CANONICAL_PATH = '{$canonicalPath}';{/if}
|
||||
|
|
Loading…
Reference in New Issue