Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Bump Mina core to 2.0.16 and sshd to 1.4
  Switch to java 8
  Set version to 2.13.14-SNAPSHOT
  Elasticsearch: Update rest client and test container to 6.7.1
  Switch links in js.bzl to https
  Update bower to 1.8.8

Change-Id: I8d97532289423ad626d015056ac245fd6c95782a
This commit is contained in:
David Pursehouse
2019-04-09 17:23:15 +09:00
3 changed files with 5 additions and 5 deletions

View File

@@ -49,7 +49,7 @@ public class ElasticContainer extends ElasticsearchContainer {
case V6_6:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.6.2";
case V6_7:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.7.0";
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.7.1";
case V7_0:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:7.0.0-rc2";
}