From 586d6e330825fbaa03c61eeca356d75d2fdc8c93 Mon Sep 17 00:00:00 2001
From: Luca Milanesio <luca.milanesio@gmail.com>
Date: Fri, 23 Oct 2020 00:32:48 +0100
Subject: Fetch JGit JavaDoc from archive.eclipse.org

Change-Id: I363ad0df632fdb25236b3d0a0c06fb15dbf8acf2
---
 lib/jgit/jgit.bzl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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.
 
-- 
cgit v1.2.3


From 54ce3d384d3553af286d63120f1b98bfdb838f65 Mon Sep 17 00:00:00 2001
From: Luca Milanesio <luca.milanesio@gmail.com>
Date: Fri, 23 Oct 2020 00:52:21 +0100
Subject: Remove generation for c.g.gwtexpui.* JavaDoc

The JavaDoc for com.google.gwtexpui.* cannot be generated
because the source files are not accessible anymore.

Failing to generate the JavaDocs caused the Gerrit build to
fail with 'No source files for package com.google.gwtexpui...'.

Change-Id: Ie36e650962636813d8f9f615e495a980b7280420
---
 gerrit-plugin-gwtui/BUILD | 4 ----
 1 file changed, 4 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",
 )
-- 
cgit v1.2.3


From 9fb356b2e3404e249133f2345d6603ea2ff8f023 Mon Sep 17 00:00:00 2001
From: Dmitrii Filippov <dmfilippov@google.com>
Date: Tue, 21 Apr 2020 14:36:41 +0200
Subject: Fix tests for stable-2.16 branch

Add the 'manual' tag to wct test_suite templates,
so it is excluded from bazel test //...

Change-Id: I73fdddc9c08eeaacff9401ea9531c95e6a782ced
(cherry picked from commit ae42cd00bdfa8a34e75c563b62f0151a561cc82b)
---
 polygerrit-ui/app/BUILD | 1 +
 1 file changed, 1 insertion(+)

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]
-- 
cgit v1.2.3