Merge branch 'stable-3.3'
* stable-3.3:
Bazel: Fix source jar fetching with provided classifier
Don't mention MacOS specific Java installations
Remove documentation for unlimited strength JCE policy files
Update git submodules
gr-search-bar: Autosuggest before/after
Fix long range comment selection on Firefox
Add is:merge operator to search bar autocompletion
Decorate the number line element of a blank side
Update git submodules
Change --gr-formatted-text-prose-max-width from 80ch to 120ch
Change-Id: I2476b96008151e6fd539178d978d8200e39e5e52
diff --git a/Documentation/dev-bazel.txt b/Documentation/dev-bazel.txt
index 9d29980..8197550 100644
--- a/Documentation/dev-bazel.txt
+++ b/Documentation/dev-bazel.txt
@@ -41,14 +41,8 @@
[[java]]
=== Java
-==== MacOS
-
-On MacOS, ensure that "Java for MacOS X 10.5 Update 4" (or higher) is installed
-and that `JAVA_HOME` is set to the
-link:install.html#Requirements[required Java version].
-
-Java installations can typically be found in
-"/System/Library/Frameworks/JavaVM.framework/Versions".
+Ensure that the link:install.html#Requirements[required Java version]
+is installed and that `JAVA_HOME` is set to it.
To check the installed version of Java, open a terminal window and run:
diff --git a/Documentation/install.txt b/Documentation/install.txt
index 94a576c..6e1a9bd 100644
--- a/Documentation/install.txt
+++ b/Documentation/install.txt
@@ -10,39 +10,6 @@
+
Gerrit is not yet compatible with Java 13 or newer at this time.
-[[cryptography]]
-== Configure Java for Strong Cryptography
-
-Support for extra strength cryptographic ciphers: _AES128CTR_, _AES256CTR_,
-_ARCFOUR256_, and _ARCFOUR128_ can be enabled by downloading the _Java
-Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files_
-from Oracle and installing them into your JRE.
-
-[NOTE]
-Installing JCE extensions is optional and export restrictions may apply.
-
-. Download the unlimited strength JCE policy files.
-+
-- link:http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html[JDK7 JCE policy files,role=external,window=_blank]
-- link:http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html[JDK8 JCE policy files,role=external,window=_blank]
-. Uncompress and extract the downloaded file.
-+
-The downloaded file contains the following files:
-+
-[cols="2"]
-|===
-|README.txt
-|Information about JCE and installation guide
-
-|local_policy.jar
-|Unlimited strength local policy file
-
-|US_export_policy.jar
-|Unlimited strength US export policy file
-|===
-. Install the unlimited strength policy JAR files by following instructions
-found in `README.txt`.
-
[[download]]
== Download Gerrit
diff --git a/polygerrit-ui/app/elements/change/gr-message/gr-message_html.ts b/polygerrit-ui/app/elements/change/gr-message/gr-message_html.ts
index 8d03e32..c018443 100644
--- a/polygerrit-ui/app/elements/change/gr-message/gr-message_html.ts
+++ b/polygerrit-ui/app/elements/change/gr-message/gr-message_html.ts
@@ -61,7 +61,7 @@
font-weight: var(--font-weight-bold);
}
.message {
- --gr-formatted-text-prose-max-width: 80ch;
+ --gr-formatted-text-prose-max-width: 120ch;
}
.collapsed .message {
max-width: none;
diff --git a/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar.ts b/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar.ts
index 97d5271..32e0083 100644
--- a/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar.ts
+++ b/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar.ts
@@ -40,10 +40,12 @@
// Possible static search options for auto complete, without negations.
const SEARCH_OPERATORS: ReadonlyArray<string> = [
'added:',
+ 'after:',
'age:',
'age:1week', // Give an example age
'assignee:',
'author:',
+ 'before:',
'branch:',
'bug:',
'cc:',
@@ -77,6 +79,7 @@
'is:assigned',
'is:closed',
'is:ignored',
+ 'is:merge',
'is:merged',
'is:open',
'is:owner',
@@ -88,6 +91,8 @@
'is:watched',
'is:wip',
'label:',
+ 'mergedafter:',
+ 'mergedbefore:',
'message:',
'onlyexts:',
'onlyextensions:',
diff --git a/tools/bzl/maven_jar.bzl b/tools/bzl/maven_jar.bzl
index 15b1797..d96ffc2 100644
--- a/tools/bzl/maven_jar.bzl
+++ b/tools/bzl/maven_jar.bzl
@@ -60,7 +60,7 @@
if len(parts) == 3:
group_id, artifact_id, version = parts
elif len(parts) == 4:
- group_id, artifact_id, version, packaging = parts
+ group_id, artifact_id, version, classifier = parts
elif len(parts) == 5:
group_id, artifact_id, version, packaging, classifier = parts
else:
@@ -158,7 +158,10 @@
srcjar = None
if ctx.attr.src_sha1 or ctx.attr.attach_source:
srcjar = jar + "-src.jar"
- srcurl = url + "-sources.jar"
+ srcurl = url
+ if coordinates.classifier != None:
+ srcurl = url.replace("-" + coordinates.classifier, "")
+ srcurl += "-sources.jar"
srcjar_path = ctx.path("jar/" + srcjar)
args = [python, script, "-o", srcjar_path, "-u", srcurl]
if ctx.attr.src_sha1:
