From 71f14f5e128e82a57a7050db1eba43d049f5102d Mon Sep 17 00:00:00 2001 From: Sven Selberg Date: Fri, 6 Mar 2020 09:33:35 +0100 Subject: [PATCH 1/5] InitContainer: Do not copy if init is run from siteWar If init is run from siteWar it makes no sense to copy the file since source = destination. Change-Id: I2c7f287b32669537e009082ec6cab823021223d4 --- java/com/google/gerrit/pgm/init/InitContainer.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/java/com/google/gerrit/pgm/init/InitContainer.java b/java/com/google/gerrit/pgm/init/InitContainer.java index dea45a710a..0b19ca3b98 100644 --- a/java/com/google/gerrit/pgm/init/InitContainer.java +++ b/java/com/google/gerrit/pgm/init/InitContainer.java @@ -75,7 +75,11 @@ class InitContainer implements InitStep { final boolean copy; final Path siteWar = site.gerrit_war; 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 { copy = ui.yesno(true, "Copy %s to %s", myWar.getFileName(), siteWar); if (copy) { From 5194bc5f07e51797b5e0381e484ebd6edbd2877b Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 9 Mar 2020 15:33:46 +0100 Subject: [PATCH 2/5] Update jetty to 9.4.24.v20191120 9.4.19 fixes a problem with IPv6 Many more bug fixes in 9.4.15 - 9.4.24, see release notes https: //github.com/eclipse/jetty.project/releases/tag/jetty-9.4.15.v20190215 https: //github.com/eclipse/jetty.project/releases/tag/jetty-9.4.16.v20190411 https: //github.com/eclipse/jetty.project/releases/tag/jetty-9.4.17.v20190418 https: //github.com/eclipse/jetty.project/releases/tag/jetty-9.4.18.v20190429 https: //github.com/eclipse/jetty.project/releases/tag/jetty-9.4.19.v20190610 https: //github.com/eclipse/jetty.project/releases/tag/jetty-9.4.20.v20190813 https: //github.com/eclipse/jetty.project/releases/tag/jetty-9.4.21.v20190926 https: //github.com/eclipse/jetty.project/releases/tag/jetty-9.4.22.v20191022 https: //github.com/eclipse/jetty.project/releases/tag/jetty-9.4.23.v20191118 https: //github.com/eclipse/jetty.project/releases/tag/jetty-9.4.24.v20191120 Bug: Issue 12429 Change-Id: I584938a209bb3ba5d2ed6e5d74498410391f6ba1 --- WORKSPACE | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 760153e20f..ed18d5079e 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -892,60 +892,60 @@ maven_jar( sha1 = "75070c744a8e52a7d17b8b476468580309d5cd09", ) -JETTY_VERS = "9.4.14.v20181114" +JETTY_VERS = "9.4.24.v20191120" maven_jar( name = "jetty-servlet", artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VERS, - sha1 = "96f501462af425190ff7b63e387692c1aa3af2c8", + sha1 = "ca1803fde51b795c0a8346ca8bc6277d9d04d01d", ) maven_jar( name = "jetty-security", artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VERS, - sha1 = "6cbeb2fe9b3cc4f88a7ea040b8a0c4f703cd72ce", + sha1 = "9fa640d36c088cf55843900043d28aef830ade4d", ) maven_jar( name = "jetty-servlets", artifact = "org.eclipse.jetty:jetty-servlets:" + JETTY_VERS, - sha1 = "38cfc07b53e5d285bb2fca78bb2531565ed9c9e5", + sha1 = "b7bb7913d7583ee8d877f1c20feeb0905f342ad5", ) maven_jar( name = "jetty-server", artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VERS, - sha1 = "b36a3d52d78a1df6406f6fa236a6eeff48cbfef6", + sha1 = "7885cc3d5d7701a444acada7ab97f89846514875", ) maven_jar( name = "jetty-jmx", artifact = "org.eclipse.jetty:jetty-jmx:" + JETTY_VERS, - sha1 = "3e02463d2bff175a3231cd3dc26363eaf76a3b17", + sha1 = "22be18a055850a6cf3b0efd56c789c3929c87e98", ) maven_jar( name = "jetty-continuation", artifact = "org.eclipse.jetty:jetty-continuation:" + JETTY_VERS, - sha1 = "ac4981a61bcaf4e2538de6270300a870224a16b8", + sha1 = "69125cf74b07f1b9d60b5c94da47cb04c098f654", ) maven_jar( name = "jetty-http", artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VERS, - sha1 = "6d0c8ac42e9894ae7b5032438eb4579c2a47f4fe", + sha1 = "d3f0b0fb016ef8d35ffb199d928ffbcbfa121c86", ) maven_jar( name = "jetty-io", artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VERS, - sha1 = "a8c6a705ddb9f83a75777d89b0be59fcef3f7637", + sha1 = "dcb6d4d505ef74898e3a64a38c40195c01e97119", ) maven_jar( name = "jetty-util", artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VERS, - sha1 = "5bb3d7a38f7ea54138336591d89dd5867b806c02", + sha1 = "3095acb088f4ff9e3fd9aedf98db73e3c18ea849", ) maven_jar( From 39c8c066d698e2706255620872f0541e60a37a18 Mon Sep 17 00:00:00 2001 From: Marco Miller Date: Mon, 9 Mar 2020 14:34:06 -0400 Subject: [PATCH 3/5] ElasticContainer: Upgrade V7_6 to elasticsearch 7.6.1 Upgrade elasticsearch-rest-client to 7.6.1, accordingly. Change-Id: I7567688469aa75bcda3514b2963d3a8f0b86976a --- .../com/google/gerrit/elasticsearch/ElasticContainer.java | 2 +- tools/nongoogle.bzl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java index 98d723f7db..96041a14aa 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java @@ -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()); } diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl index ba073c2f62..52de650d5d 100644 --- a/tools/nongoogle.bzl +++ b/tools/nongoogle.bzl @@ -94,8 +94,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( From ab4fc5d3d9be63457436bae7e9d7f45159d033fd Mon Sep 17 00:00:00 2001 From: Marco Miller Date: Mon, 9 Mar 2020 14:56:39 -0400 Subject: [PATCH 4/5] Upgrade testcontainers to 1.13.0 Change-Id: I982ac3ba0382f9b99c8f9ebb7efd5eb09d6d4582 --- tools/nongoogle.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl index 52de650d5d..effc5fc35f 100644 --- a/tools/nongoogle.bzl +++ b/tools/nongoogle.bzl @@ -162,18 +162,18 @@ def declare_nongoogle_deps(): sha1 = "3e83394258ae2089be7219b971ec21a8288528ad", ) - 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( From 3c20bcae1bb9f89608a9fe2188bf0c082307c83a Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 10 Mar 2020 10:37:40 +0900 Subject: [PATCH 5/5] Update JGit to latest revision on stable-5.6 Includes the following commits: 241557137 - Silence API errors introduced by 093fbbd1 1d41be7c5 - Bump Bazel version to 2.2.0 093fbbd11 - Expose FileStoreAttributes.setBackground() 30fb4808f - Update reftable storage repo layout 6f268f8ce - Cygwin expects forward slashes for commands to be run via sh.exe 14a157dff - Make Logger instances final 5a6b6eee3 - Move array designators from the variable to the type abb461533 - Revert "Prepend hostname to subsection used to store file timestamp resolution" fdabbe67e - SimilarityRenameDetector: Fix inconsistent indentation 6a72f2943 - Use indexOf(char) and lastIndexOf(char) rather than String versions 064834d35 - Reorder modifiers to follow Java Language Specification 2d1acae6d - GitmoduleEntry: Remove redundant import of class from same package 9be93b799 - Remove redundant "static" qualifier from enum declarations bc98a597f - Update API problem filter 2899483e9 - Prepare 5.6.2-SNAPSHOT builds Change-Id: Id21dde0d03af957bfa71bc9b9a74d01c24e97144 --- modules/jgit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/jgit b/modules/jgit index 1b44f0e4a6..2415571370 160000 --- a/modules/jgit +++ b/modules/jgit @@ -1 +1 @@ -Subproject commit 1b44f0e4a6fac409a83cfb61a1022af7fefd1b0c +Subproject commit 241557137070d680cf730ba1633df5e4c4266a1d