summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Miller <marco.miller@ericsson.com>2020-10-27 16:24:17 -0400
committerMarco Miller <marco.miller@ericsson.com>2020-10-27 16:24:17 -0400
commit410efd3ea9da000c81ae0df3781f62d57035f8c8 (patch)
treefe5fce1ff58deaf03fa63aebf825dfb0051d62e9
parent519b33950afb09eb8ac63263c0d75294f6f463de (diff)
parentb8e66f517c367217c92495c4eb51b3c68505c39c (diff)
Merge branch 'stable-2.16' into stable-3.0
* stable-2.16: Update git submodules Fix tests for stable-2.16 branch Remove generation for c.g.gwtexpui.* JavaDoc Fetch JGit JavaDoc from archive.eclipse.org Update git submodules Change-Id: I8cf99479382398812c8f37630e045bec131f97bc
-rw-r--r--lib/jgit/jgit.bzl2
-rw-r--r--polygerrit-ui/app/BUILD1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/jgit/jgit.bzl b/lib/jgit/jgit.bzl
index 7ebd2ca534..db0e1e153f 100644
--- a/lib/jgit/jgit.bzl
+++ b/lib/jgit/jgit.bzl
@@ -4,7 +4,7 @@ _JGIT_VERS = "5.3.7.202002110540-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]