Merge branch 'stable-3.1' into stable-3.2
* stable-3.1: Update git submodules Update git submodules Update git submodules Update git submodules Elasticsearch: Remove support for EOL 6.6 version ElasticContainer: Upgrade V7_8 to elasticsearch 7.8.1 ElasticContainer: Upgrade V6_8 to elasticsearch 6.8.11 Fix gr-hovercard-behavior under Firefox Add entries to .gitignore of stable-3.0 that exist on master Change-Id: I4c28a0671f3927b99f01639e80fc7bfbd3059213
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -19,6 +19,7 @@
|
||||
/.settings/org.eclipse.ltk.core.refactoring.prefs
|
||||
/.settings/org.eclipse.m2e.core.prefs
|
||||
/.settings/org.maven.ide.eclipse.prefs
|
||||
/.ts-out
|
||||
/.vscode
|
||||
/bazel-*
|
||||
/bin/
|
||||
@@ -46,3 +47,5 @@
|
||||
!/plugins/webhooks
|
||||
/test_site
|
||||
/tools/format
|
||||
/tools/node_tools
|
||||
/tools/polygerrit-updater
|
||||
|
||||
@@ -3256,9 +3256,10 @@ Defaults to 10000.
|
||||
When security is enabled in Elasticsearch, the username and password must be provided.
|
||||
Note that the same username and password are used for all servers.
|
||||
|
||||
For further information about Elasticsearch security, please refer to the documentation:
|
||||
|
||||
* link:https://www.elastic.co/guide/en/elastic-stack-overview/6.6/security-getting-started.html[Elasticsearch 6.6,role=external,window=_blank]
|
||||
For further information about Elasticsearch security, please refer to
|
||||
link:https://www.elastic.co/guide/en/elasticsearch/reference/current/security-getting-started.html[the documentation,role=external,window=_blank].
|
||||
This is the current documentation link. Select another Elasticsearch version
|
||||
from the dropdown menu available on that page if need be.
|
||||
|
||||
[[elasticsearch.username]]elasticsearch.username::
|
||||
+
|
||||
|
||||
@@ -18,7 +18,6 @@ import com.google.common.base.Joiner;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
public enum ElasticVersion {
|
||||
V6_6("6.6.*"),
|
||||
V6_7("6.7.*"),
|
||||
V6_8("6.8.*"),
|
||||
V7_0("7.0.*"),
|
||||
|
||||
@@ -38,12 +38,10 @@ public class ElasticContainer extends ElasticsearchContainer {
|
||||
|
||||
private static String getImageName(ElasticVersion version) {
|
||||
switch (version) {
|
||||
case V6_6:
|
||||
return "blacktop/elasticsearch:6.6.2";
|
||||
case V6_7:
|
||||
return "blacktop/elasticsearch:6.7.2";
|
||||
case V6_8:
|
||||
return "blacktop/elasticsearch:6.8.10";
|
||||
return "blacktop/elasticsearch:6.8.11";
|
||||
case V7_0:
|
||||
return "blacktop/elasticsearch:7.0.1";
|
||||
case V7_1:
|
||||
@@ -61,7 +59,7 @@ public class ElasticContainer extends ElasticsearchContainer {
|
||||
case V7_7:
|
||||
return "blacktop/elasticsearch:7.7.1";
|
||||
case V7_8:
|
||||
return "blacktop/elasticsearch:7.8.0";
|
||||
return "blacktop/elasticsearch:7.8.1";
|
||||
}
|
||||
throw new IllegalStateException("No tests for version: " + version.name());
|
||||
}
|
||||
|
||||
@@ -22,9 +22,6 @@ import org.junit.Test;
|
||||
public class ElasticVersionTest {
|
||||
@Test
|
||||
public void supportedVersion() throws Exception {
|
||||
assertThat(ElasticVersion.forVersion("6.6.0")).isEqualTo(ElasticVersion.V6_6);
|
||||
assertThat(ElasticVersion.forVersion("6.6.1")).isEqualTo(ElasticVersion.V6_6);
|
||||
|
||||
assertThat(ElasticVersion.forVersion("6.7.0")).isEqualTo(ElasticVersion.V6_7);
|
||||
assertThat(ElasticVersion.forVersion("6.7.1")).isEqualTo(ElasticVersion.V6_7);
|
||||
|
||||
@@ -73,7 +70,6 @@ public class ElasticVersionTest {
|
||||
|
||||
@Test
|
||||
public void atLeastMinorVersion() throws Exception {
|
||||
assertThat(ElasticVersion.V6_6.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse();
|
||||
assertThat(ElasticVersion.V6_7.isAtLeastMinorVersion(ElasticVersion.V6_7)).isTrue();
|
||||
assertThat(ElasticVersion.V6_8.isAtLeastMinorVersion(ElasticVersion.V6_8)).isTrue();
|
||||
assertThat(ElasticVersion.V7_0.isAtLeastMinorVersion(ElasticVersion.V6_7)).isFalse();
|
||||
@@ -89,7 +85,6 @@ public class ElasticVersionTest {
|
||||
|
||||
@Test
|
||||
public void version6OrLater() throws Exception {
|
||||
assertThat(ElasticVersion.V6_6.isV6OrLater()).isTrue();
|
||||
assertThat(ElasticVersion.V6_7.isV6OrLater()).isTrue();
|
||||
assertThat(ElasticVersion.V6_8.isV6OrLater()).isTrue();
|
||||
assertThat(ElasticVersion.V7_0.isV6OrLater()).isTrue();
|
||||
@@ -105,7 +100,6 @@ public class ElasticVersionTest {
|
||||
|
||||
@Test
|
||||
public void version7OrLater() throws Exception {
|
||||
assertThat(ElasticVersion.V6_6.isV7OrLater()).isFalse();
|
||||
assertThat(ElasticVersion.V6_7.isV7OrLater()).isFalse();
|
||||
assertThat(ElasticVersion.V6_8.isV7OrLater()).isFalse();
|
||||
assertThat(ElasticVersion.V7_0.isV7OrLater()).isTrue();
|
||||
|
||||
@@ -96,8 +96,8 @@ def declare_nongoogle_deps():
|
||||
# and httpasyncclient as necessary.
|
||||
maven_jar(
|
||||
name = "elasticsearch-rest-client",
|
||||
artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.8.0",
|
||||
sha1 = "ab28f6110bdc7d2ec886e1d6ff29a6c8ee30b883",
|
||||
artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.8.1",
|
||||
sha1 = "59feefe006a96a39f83b0dfb6780847e06c1d0a8",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
|
||||
Reference in New Issue
Block a user