Merge branch 'stable-3.1'

* stable-3.1:
  Update highlight.js
  Add "Page ..." next to back and forward arrows
  Fix the size of the commit message box
  Bazel: Fix issues flagged by buildifier
  Document that gerrit supports JDK 11
  lib/lucene: merge jars using a java_binary rule

Change-Id: I9807d05de588e8437310ade18e2e5e9c84d2fe27

lib/lucene/BUILD

@@ -1,17 +1,28 @@
-load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_java//java:defs.bzl", "java_binary", "java_import", "java_library")
 load("//tools/bzl:maven.bzl", "merge_maven_jars")
 
 package(default_visibility = ["//visibility:public"])
 
-# core and backward-codecs both provide
-# META-INF/services/org.apache.lucene.codecs.Codec, so they must be merged.
-merge_maven_jars(
-    name = "lucene-core-and-backward-codecs",
-    srcs = [
+# Merge jars so
+# META-INF/services/org.apache.lucene.codecs.Codec
+# contains the union of both Codec collections.
+java_binary(
+    name = "lucene-core-and-backward-codecs-merged",
+    data = ["//lib:LICENSE-Apache2.0"],
+    main_class = "NotImportant",
+    runtime_deps = [
+        # in case of conflict, we want the implementation of backwards-codecs
+        # first.
         "@backward-codecs//jar",
         "@lucene-core//jar",
     ],
-    data = ["//lib:LICENSE-Apache2.0"],
+)
+
+java_import(
+    name = "lucene-core-and-backward-codecs",
+    jars = [
+        ":lucene-core-and-backward-codecs-merged_deploy.jar",
+    ],
 )
 
 java_library(