opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-3.1'

Browse Source 
* stable-3.1:
  Update JGit to latest revision on stable-5.6
  Upgrade testcontainers to 1.13.0
  ElasticContainer: Upgrade V7_6 to elasticsearch 7.6.1
  Update jetty to 9.4.24.v20191120
  InitContainer: Do not copy if init is run from siteWar

Change-Id: I6f6eb48e5400914747a07fca38cd190ae45a5f6a
This commit is contained in:
David Pursehouse 2020-03-10 18:50:02 +09:00
commit e54bde6177
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java/com/google/gerrit/pgm/init/InitContainer.java
View File

@ -75,7 +75,11 @@ class InitContainer implements InitStep {
final boolean copy; final boolean copy;
final Path siteWar = site.gerrit_war; final Path siteWar = site.gerrit_war;
if (Files.exists(siteWar)) { if (Files.exists(siteWar)) {
copy = ui.yesno(true, "Upgrade %s", siteWar); if (Files.isSameFile(siteWar, myWar)) {
copy = false;
} else {
copy = ui.yesno(true, "Upgrade %s", siteWar);
}
} else { } else {
copy = ui.yesno(true, "Copy %s to %s", myWar.getFileName(), siteWar); copy = ui.yesno(true, "Copy %s to %s", myWar.getFileName(), siteWar);
if (copy) { if (copy) {

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

@ -67,7 +67,7 @@ public class ElasticContainer extends ElasticsearchContainer {
case V7_5: case V7_5:
return "blacktop/elasticsearch:7.5.2"; return "blacktop/elasticsearch:7.5.2";
case V7_6: case V7_6:
return "blacktop/elasticsearch:7.6.0"; return "blacktop/elasticsearch:7.6.1";
} }
throw new IllegalStateException("No tests for version: " + version.name()); 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. # and httpasyncclient as necessary.
maven_jar( maven_jar(
name = "elasticsearch-rest-client", name = "elasticsearch-rest-client",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.6.0", artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.6.1",
sha1 = "3d56c1fca22af1aab5a1b23698ae9ec6f71db1a2", sha1 = "6fb9f72e9d86a8c503f26f28fa7271f4ac065709",
) )
maven_jar( maven_jar(
@ -126,18 +126,18 @@ def declare_nongoogle_deps():
sha1 = "dc13ae4faca6df981fc7aeb5a522d9db446d5d50", sha1 = "dc13ae4faca6df981fc7aeb5a522d9db446d5d50",
) )
TESTCONTAINERS_VERSION = "1.12.5" TESTCONTAINERS_VERSION = "1.13.0"
maven_jar( maven_jar(
name = "testcontainers", name = "testcontainers",
artifact = "org.testcontainers:testcontainers:" + TESTCONTAINERS_VERSION, artifact = "org.testcontainers:testcontainers:" + TESTCONTAINERS_VERSION,
sha1 = "ca8a8dfbd3b194fb6c541e3bad858898865ce069", sha1 = "c92d1094d2b227e881f66bf09872c46d91ce9ac5",
) )
maven_jar( maven_jar(
name = "testcontainers-elasticsearch", name = "testcontainers-elasticsearch",
artifact = "org.testcontainers:elasticsearch:" + TESTCONTAINERS_VERSION, artifact = "org.testcontainers:elasticsearch:" + TESTCONTAINERS_VERSION,
sha1 = "d88f79c83e7057edd23d33621c36d6267b9c4e96", sha1 = "09353bd960b3f0d26ba7652ae57bb4ac46d043a2",
) )
maven_jar( maven_jar(