Merge branch 'stable-3.1'

* stable-3.1:
  ElasticContainer: Upgrade V7_5 to elasticsearch 7.5.1
  ElasticContainer: Upgrade V6_8 to elasticsearch 6.8.6
  Documentation: Update elasticsearch tests on macOS
  Add a right margin to the search bar
  Upgrade JGit to v5.6.0.201912101111-r
  polygerrit: Fix 'Unexpected trailing comma' lint errors

Change-Id: I10d1f9f58f8d27bb23e960f36f49f899cb879a1b

Documentation/dev-bazel.txt

@@ -342,8 +342,14 @@ The following values are currently supported for the group name:
 === Elasticsearch
 
 Successfully running the Elasticsearch tests requires Docker, and
-may require setting the local
-link:https://www.elastic.co/guide/en/elasticsearch/reference/current/vm-max-map-count.html[virtual memory,role=external,window=_blank].
+may require setting the local virtual memory on
+link:https://www.elastic.co/guide/en/elasticsearch/reference/current/vm-max-map-count.html[linux,role=external,window=_blank] and
+link:https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#_set_vm_max_map_count_to_at_least_262144[macOS,role=external,window=_blank].
+
+On macOS, if using link:https://docs.docker.com/docker-for-mac/[Docker Desktop,role=external,window=_blank],
+the effective memory value can be set in the Preferences, under the Advanced tab.
+The default value usually does not suffice and is causing premature container exits.
+That default is currently 2 GB and should be set to at least 5 (GB).
 
 If Docker is not available, the Elasticsearch tests will be skipped.
 Note that Bazel currently does not show

javatests/com/google/gerrit/elasticsearch/ElasticContainer.java

@@ -51,7 +51,7 @@ public class ElasticContainer extends ElasticsearchContainer {
       case V6_7:
         return "blacktop/elasticsearch:6.7.2";
       case V6_8:
-        return "blacktop/elasticsearch:6.8.5";
+        return "blacktop/elasticsearch:6.8.6";
       case V7_0:
         return "blacktop/elasticsearch:7.0.1";
       case V7_1:
@@ -63,7 +63,7 @@ public class ElasticContainer extends ElasticsearchContainer {
       case V7_4:
         return "blacktop/elasticsearch:7.4.2";
       case V7_5:
-        return "blacktop/elasticsearch:7.5.0";
+        return "blacktop/elasticsearch:7.5.1";
     }
     throw new IllegalStateException("No tests for version: " + version.name());
   }

polygerrit-ui/app/elements/core/gr-main-header/gr-main-header_test.html

@@ -398,4 +398,4 @@ limitations under the License.
       assert.equal(element._registerText, 'Sign up');
     });
   });
-      </script>
+      </script>

tools/nongoogle.bzl

@@ -102,8 +102,8 @@ def declare_nongoogle_deps():
     # and httpasyncclient as necessary.
     maven_jar(
         name = "elasticsearch-rest-client",
-        artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.5.0",
-        sha1 = "62535b6fc3a4e943e88e7640eac22e29f03a696d",
+        artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.5.1",
+        sha1 = "094c155906dc94146fc5adc344ea2c676d487cf2",
     )
 
     maven_jar(