opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-3.0' into stable-3.1

Browse Source 
* stable-3.0:
  Upgrade testcontainers to 1.13.0
  ElasticContainer: Upgrade V7_6 to elasticsearch 7.6.1
  Update jetty to 9.4.24.v20191120

Change-Id: I3026e9fc709d03b232424ca8dd203c2528000f08
This commit is contained in:
David Pursehouse 2020-03-10 10:35:39 +09:00
commit 4edd2c7ab1
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
WORKSPACE
View File

@ -877,54 +877,54 @@ maven_jar(
sha1 = "7e060dd5b19431e6d198e91ff670644372f60fbd",
)
JETTY_VERS = "9.4.18.v20190429"
JETTY_VERS = "9.4.24.v20191120"
maven_jar(
name = "jetty-servlet",
artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VERS,
sha1 = "290f7a88f351950d51ebc9fb4a794752c62d7de5",
sha1 = "ca1803fde51b795c0a8346ca8bc6277d9d04d01d",
)
maven_jar(
name = "jetty-security",
artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VERS,
sha1 = "01aceff3608ca1b223bfd275a497797cfe675ef4",
sha1 = "9fa640d36c088cf55843900043d28aef830ade4d",
)
maven_jar(
name = "jetty-server",
artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VERS,
sha1 = "b76ef50e04635f11d4d43bc6ccb7c4482a8384f0",
sha1 = "7885cc3d5d7701a444acada7ab97f89846514875",
)
maven_jar(
name = "jetty-jmx",
artifact = "org.eclipse.jetty:jetty-jmx:" + JETTY_VERS,
sha1 = "f4c2654db1a55f0780acdfcee8bb98550f56ca70",
sha1 = "22be18a055850a6cf3b0efd56c789c3929c87e98",
)
maven_jar(
name = "jetty-continuation",
artifact = "org.eclipse.jetty:jetty-continuation:" + JETTY_VERS,
sha1 = "3c421a3be5be5805e32b1a7f9c6046526524181d",
sha1 = "69125cf74b07f1b9d60b5c94da47cb04c098f654",
)
maven_jar(
name = "jetty-http",
artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VERS,
sha1 = "c2e73db2db5c369326b717da71b6587b3da11e0e",
sha1 = "d3f0b0fb016ef8d35ffb199d928ffbcbfa121c86",
)
maven_jar(
name = "jetty-io",
artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VERS,
sha1 = "844af5efe58ab23fd0166a796efef123f4cb06b0",
sha1 = "dcb6d4d505ef74898e3a64a38c40195c01e97119",
)
maven_jar(
name = "jetty-util",
artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VERS,
sha1 = "13e6148bfda7ae511f69ae7e5e3ea898bc9b0e33",
sha1 = "3095acb088f4ff9e3fd9aedf98db73e3c18ea849",
)
maven_jar(

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

@ -67,7 +67,7 @@ public class ElasticContainer extends ElasticsearchContainer {
case V7_5:
return "blacktop/elasticsearch:7.5.2";
case V7_6:
return "blacktop/elasticsearch:7.6.0";
return "blacktop/elasticsearch:7.6.1";
}
throw new IllegalStateException("No tests for version: " + version.name());
}

10
tools/nongoogle.bzl
View File

@ -102,8 +102,8 @@ def declare_nongoogle_deps():
# and httpasyncclient as necessary.
maven_jar(
name = "elasticsearch-rest-client",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.6.0",
sha1 = "3d56c1fca22af1aab5a1b23698ae9ec6f71db1a2",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.6.1",
sha1 = "6fb9f72e9d86a8c503f26f28fa7271f4ac065709",
)
maven_jar(
@ -126,18 +126,18 @@ def declare_nongoogle_deps():
sha1 = "dc13ae4faca6df981fc7aeb5a522d9db446d5d50",
)
TESTCONTAINERS_VERSION = "1.12.5"
TESTCONTAINERS_VERSION = "1.13.0"
maven_jar(
name = "testcontainers",
artifact = "org.testcontainers:testcontainers:" + TESTCONTAINERS_VERSION,
sha1 = "ca8a8dfbd3b194fb6c541e3bad858898865ce069",
sha1 = "c92d1094d2b227e881f66bf09872c46d91ce9ac5",
)
maven_jar(
name = "testcontainers-elasticsearch",
artifact = "org.testcontainers:elasticsearch:" + TESTCONTAINERS_VERSION,
sha1 = "d88f79c83e7057edd23d33621c36d6267b9c4e96",
sha1 = "09353bd960b3f0d26ba7652ae57bb4ac46d043a2",
)
maven_jar(