Merge branch 'stable-3.1'

* stable-3.1:
  Update git submodules
  Update git submodules
  OperatingSystemMXBeanFactory: Add a default constructor
  Remove unnecessary @SuppressWarnings("restriction")
  Set version to 2.16.19-SNAPSHOT
  Set version to 2.16.18
  Update git submodules
  Update git submodules
  Update git submodules
  Update git submodules
  Add mirror for downloading Bazel rules.
  Update git submodules
  Upgrade JGit to v5.6.1.202002131546-r-19-ga79c5b1f1
  Upgrade gwtjsonrpc to 1.12
  CommitValidators: Use ImmutableList.Builder instead of ImmutableList.of
  Update git submodules
  Update git submodules
  Update git submodules
  Always verify PolyGerrit if bazel related files are changed
  Always run all tests, if bazel-related files are changed
  Fix implementation plan link in Contributing page
  Add test that verifies 'visibleto' predicate for group
  Make cache disk stat metric computation optional
  ReceiveCommits: Log "update failed" at severe level
  Revert "Insert Change-Id at start of trailers"
  Revert "commit-msg: Remove obsolete comments"
  Remove obsolete UpgradeFrom2_0_x init step
  Update git submodules
  Update git submodules
  Add coverageRangeChanged to notify all related listeners
  Improve documentation of change refs
  Notify all coverage listeners when coverage data is available
  Remove duplicate test method removeAnonymousRead
  ChangeQueryBuilder: Use ChangeIsVisibleToPredicate.Factory
  ChangeQueryProcessor: Use ChangeIsVisibleToPredicate.Factory
  Make the build pipeline fail if cannot post Checks feedback
  Switch to using no-AOP guice distribution
  Bazel: Use canonical_id for artifacts cached by http_file
  Fix for Memory leak in gr-plugin-endpoints
  Documentation: Clarify how to log e2e http details
  Make legacy version of the commit-msg hook available
  Don't inject CurrentUser to ChangeIsVisibleToPredicate
  HttpLogoutServlet: Test redirections with canonicalWebUrl set
  commit-msg: Remove obsolete comments
  Upgrade testcontainers to 1.14.0
  Bump asm to version 7.2
  Upgrade guice to 4.2.3
  PostReview: Avoid multiple notifications for existing reviewers
  ChangeApi: Remove deprecated getEdit method
  ChangeApi: Remove useless @Deprecated annotation in NotImplemented
  Plugin API: Remove deprecated draft workflow methods
  ErrorProne: Enable ObjectToString check at ERROR severity
  Project: Add implementation of toString
  Allow HTTP {listen,canonicalWeb}Url in tests
  Account: Add implementation of toString
  LegacyChangeNoteWrite: Remove unused newIdent method
  Update git submodules
  PolyGerrit: Document commit-container extension endpoint
  e2e-tests: Make all current scenario names unique
  e2e-tests: Make http request name unique
  e2e-tests: Fix CloneUsingBothProtocols wait times
  e2e-tests: Create/delete ReplayRecordsFromFeeder project
  e2e-tests: Unhardcode ReplayRecordsFromFeeder data
  e2e-tests: Stabilize the ReplayRecordsFromFeeder scenario
  Remove obsolete FindBugs configuration
  Elasticsearch: Remove support for EOL 6.x versions
  REST: Allow to create annotated tag with only CREATE_TAG
  Upgrade recommended version of buildifier to 2.2.1
  Bump Bazel version to 3.0.0
  CreateRefControl: Pass CurrentUser to Reachable

Change-Id: I0d30560b4ee78393ef6f25166999529c88341273

java/com/google/gerrit/acceptance/AbstractDaemonTest.java

@@ -20,9 +20,13 @@ import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 import static com.google.common.truth.Truth8.assertThat;
 import static com.google.common.truth.TruthJUnit.assume;
+import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.allow;
+import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.block;
 import static com.google.gerrit.entities.Patch.COMMIT_MSG;
 import static com.google.gerrit.entities.Patch.MERGE_LIST;
 import static com.google.gerrit.extensions.api.changes.SubmittedTogetherOption.NON_VISIBLE_CHANGES;
+import static com.google.gerrit.server.group.SystemGroupBackend.ANONYMOUS_USERS;
+import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS;
 import static com.google.gerrit.server.project.ProjectCache.illegalState;
 import static com.google.gerrit.server.project.testing.TestLabels.label;
 import static com.google.gerrit.server.project.testing.TestLabels.value;
@@ -42,6 +46,7 @@ import com.google.common.primitives.Chars;
 import com.google.gerrit.acceptance.AcceptanceTestRequestScope.Context;
 import com.google.gerrit.acceptance.PushOneCommit.Result;
 import com.google.gerrit.acceptance.testsuite.account.TestSshKeys;
+import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
 import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations;
 import com.google.gerrit.common.Nullable;
 import com.google.gerrit.common.data.AccessSection;
@@ -299,6 +304,7 @@ public abstract class AbstractDaemonTest {
   @Inject private ProjectIndexCollection projectIndexes;
   @Inject private RequestScopeOperations requestScopeOperations;
   @Inject private SitePaths sitePaths;
+  @Inject private ProjectOperations projectOperations;
 
   private ProjectResetter resetter;
   private List<Repository> toClose;
@@ -414,6 +420,9 @@ public abstract class AbstractDaemonTest {
       baseConfig.setString("sshd", null, "listenAddress", "off");
     }
 
+    baseConfig.unset("gerrit", null, "canonicalWebUrl");
+    baseConfig.unset("httpd", null, "listenUrl");
+
     baseConfig.setInt("index", null, "batchThreads", -1);
 
     baseConfig.setInt("receive", null, "changeUpdateThreads", 4);
@@ -987,6 +996,16 @@ public abstract class AbstractDaemonTest {
     }
   }
 
+  protected void blockAnonymousRead() throws Exception {
+    String allRefs = RefNames.REFS + "*";
+    projectOperations
+        .project(project)
+        .forUpdate()
+        .add(block(Permission.READ).ref(allRefs).group(ANONYMOUS_USERS))
+        .add(allow(Permission.READ).ref(allRefs).group(REGISTERED_USERS))
+        .update();
+  }
+
   protected PushOneCommit.Result pushTo(String ref) throws Exception {
     PushOneCommit push = pushFactory.create(admin.newIdent(), testRepo);
     return push.to(ref);

java/com/google/gerrit/acceptance/GerritServer.java

@@ -468,9 +468,13 @@ public class GerritServer implements AutoCloseable {
   private static void mergeTestConfig(Config cfg) {
     String forceEphemeralPort = String.format("%s:0", getLocalHost().getHostName());
     String url = "http://" + forceEphemeralPort + "/";
-    cfg.setString("gerrit", null, "canonicalWebUrl", url);
-    cfg.setString("httpd", null, "listenUrl", url);
 
+    if (cfg.getString("gerrit", null, "canonicalWebUrl") == null) {
+      cfg.setString("gerrit", null, "canonicalWebUrl", url);
+    }
+    if (cfg.getString("httpd", null, "listenUrl") == null) {
+      cfg.setString("httpd", null, "listenUrl", url);
+    }
     if (cfg.getString("sshd", null, "listenAddress") == null) {
       cfg.setString("sshd", null, "listenAddress", forceEphemeralPort);
     }