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

@@ -1105,8 +1105,8 @@ maven_jar(
# and httpasyncclient as necessary.
maven_jar(
name = "elasticsearch-rest-client",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.7.0",
sha1 = "032bf7044d1d5664ebdbfd6f2601027c806565ce",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.7.1",
sha1 = "a00aa6cc593a464e4a890d1a226ded5c625659ab",
)
JACKSON_VERSION = "2.9.8"

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";
}

View File

@@ -1,11 +1,11 @@
NPM_VERSIONS = {
"bower": "1.8.2",
"bower": "1.8.8",
"crisper": "2.0.2",
"polymer-bundler": "4.0.2",
}
NPM_SHA1S = {
"bower": "adf53529c8d4af02ef24fb8d5341c1419d33e2f7",
"bower": "82544be34a33aeae7efb8bdf9905247b2cffa985",
"crisper": "7183c58cea33632fb036c91cefd1b43e390d22a2",
"polymer-bundler": "6b296b6099ab5a0e93ca914cbe93e753f2395910",
}