Merge changes from topic "make-stable-2.16-green-again" into stable-2.16

* changes:
  Fix tests for stable-2.16 branch
  Remove generation for c.g.gwtexpui.* JavaDoc
  Fetch JGit JavaDoc from archive.eclipse.org

3 files changed, 2 insertions, 5 deletions

diff --git a/gerrit-plugin-gwtui/BUILD b/gerrit-plugin-gwtui/BUILD
index d9281c88f2..366cf82bce 100644
--- a/gerrit-plugin-gwtui/BUILD
+++ b/gerrit-plugin-gwtui/BUILD
@@ -78,10 +78,6 @@ java_doc(
     ],
     pkgs = [
         "com.google.gerrit.plugin",
-        "com.google.gwtexpui.clippy",
-        "com.google.gwtexpui.globalkey",
-        "com.google.gwtexpui.safehtml",
-        "com.google.gwtexpui.user",
     ],
     title = "Gerrit Review GWT Extension API Documentation",
 )
diff --git a/lib/jgit/jgit.bzl b/lib/jgit/jgit.bzl
index ed82c56269..997879edf1 100644
--- a/lib/jgit/jgit.bzl
+++ b/lib/jgit/jgit.bzl
@@ -4,7 +4,7 @@ _JGIT_VERS = "5.1.13.202002110435-r"
 
 _DOC_VERS = _JGIT_VERS  # Set to _JGIT_VERS unless using a snapshot
 
-JGIT_DOC_URL = "https://download.eclipse.org/jgit/site/" + _DOC_VERS + "/apidocs"
+JGIT_DOC_URL = "https://archive.eclipse.org/jgit/site/" + _DOC_VERS + "/apidocs"
 
 _JGIT_REPO = MAVEN_CENTRAL  # Leave here even if set to MAVEN_CENTRAL.
 
diff --git a/polygerrit-ui/app/BUILD b/polygerrit-ui/app/BUILD
index 17c45a4881..3a3c586970 100644
--- a/polygerrit-ui/app/BUILD
+++ b/polygerrit-ui/app/BUILD
@@ -133,6 +133,7 @@ DIRECTORIES = [
     tags = [
         # Should not run sandboxed.
         "local",
+        "manual",
         "template",
     ],
 ) for directory in DIRECTORIES]