Merge "lib/lucene: merge jars using a java_binary rule" into stable-2.16
diff --git a/BUILD b/BUILD
index 907441e..10162be 100644
--- a/BUILD
+++ b/BUILD
@@ -1,8 +1,8 @@
-package(default_visibility = ["//visibility:public"])
-
load("//tools/bzl:genrule2.bzl", "genrule2")
load("//tools/bzl:pkg_war.bzl", "pkg_war")
+package(default_visibility = ["//visibility:public"])
+
config_setting(
name = "java9",
values = {
diff --git a/Documentation/install.txt b/Documentation/install.txt
index b6a2954..2f00492 100644
--- a/Documentation/install.txt
+++ b/Documentation/install.txt
@@ -5,9 +5,9 @@
To run the Gerrit service, the following requirement must be met on the host:
-* JRE, version 1.8 http://www.oracle.com/technetwork/java/javase/downloads/index.html[Download]
+* JRE, versions 1.8 or 11 http://www.oracle.com/technetwork/java/javase/downloads/index.html[Download]
+
-Gerrit is not yet compatible with Java 9 or newer at this time.
+Gerrit is not yet compatible with Java 13 or newer at this time.
By default, Gerrit uses link:note-db.html[NoteDB] as the storage backend. (If
desired, you can _optionally_ use an external database such as MySQL or
diff --git a/polygerrit-ui/app/rules.bzl b/polygerrit-ui/app/rules.bzl
index 075e34a..98387a0 100644
--- a/polygerrit-ui/app/rules.bzl
+++ b/polygerrit-ui/app/rules.bzl
@@ -104,7 +104,7 @@
"for f in $(locations " + name + "_theme_sources); do cp $$f $$TMP/polygerrit_ui/styles/themes; done",
"for f in $(locations //lib/js:highlightjs_files); do cp $$f $$TMP/polygerrit_ui/bower_components/highlightjs/ ; done",
"unzip -qd $$TMP/polygerrit_ui/bower_components $(location @webcomponentsjs//:zipfile) webcomponentsjs/webcomponents-lite.js",
- "unzip -qd $$TMP/polygerrit_ui/bower_components $(location @font-roboto-local//:zipfile) font-roboto-local/fonts/\*/\*.ttf",
+ "unzip -qd $$TMP/polygerrit_ui/bower_components $(location @font-roboto-local//:zipfile) font-roboto-local/fonts/\\*/\\*.ttf",
"cd $$TMP",
"find . -exec touch -t 198001010000 '{}' ';'",
"zip -qr $$ROOT/$@ *",
