Merge branch 'stable-2.16'

* stable-2.16: Bump Mina core to 2.0.16 and sshd to 1.4 Switch to java 8 Set version to 2.13.14-SNAPSHOT Elasticsearch: Update rest client and test container to 6.7.1 Increase autocomplete limit for repo inheritance in access page to 50 Switch links in js.bzl to https Update bower to 1.8.8 Update git submodules Upgrade protobuf-java to 3.7.1 polygerrit_plugin: Demote compilation level to whitespace only CherryPickChange: Avoid new line at end of conflicting files list Switch links in js.bzl to https PolyGerrit: Suppress JSC_REFERENCE_BEFORE_DECLARE error ElasticContainer: Use version 7.0.0-rc2 for V7_0 tests Bazel: Avoid using tools in action inputs Update rules_closure to latest version Update git submodules Update git submodules Update git submodules Update git submodules Update git submodules Change-Id: Idc5d0b4d384d62d56cebe6b1ec6f755e9a05eb2c
2019-04-10 08:15:10 +09:00
parent 5f1740b1b2 179767cdf9
commit 0b428489cb
8 changed files with 92 additions and 16 deletions
--- a/28
+++ b/28
@@ -14,9 +14,23 @@ http_archive(

 http_archive(
    name = "io_bazel_rules_closure",
-    sha256 = "ddce3b3a3909f99b28b25071c40b7fec7e2e1d1d1a4b2e933f3082aa99517105",
-    strip_prefix = "rules_closure-316e6133888bfc39fb860a4f1a31cfcbae485aef",
-    urls = ["https://github.com/bazelbuild/rules_closure/archive/316e6133888bfc39fb860a4f1a31cfcbae485aef.tar.gz"],
+    sha256 = "34abd9170fdbfdfc6f3b63f2c18cee3cbcb2ddbd5e3c97324add0aa7809ed875",
+    strip_prefix = "rules_closure-9d543facf886631e4ed379996e60ce3533188adc",
+    urls = ["https://github.com/bazelbuild/rules_closure/archive/9d543facf886631e4ed379996e60ce3533188adc.tar.gz"],
+)
+
+# Transitive dependency of rules_closure and protobuf
+http_archive(
+    name = "net_zlib",
+    build_file = "//:lib/zlib/BUILD",
+    sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1",
+    strip_prefix = "zlib-1.2.11",
+    urls = ["https://zlib.net/zlib-1.2.11.tar.gz"],
+)
+
+bind(
+    name = "zlib",
+    actual = "@net_zlib//:zlib",
 )

 # File is specific to Polymer and copied from the Closure Github -- should be
@@ -178,8 +192,8 @@ maven_jar(

 maven_jar(
    name = "protobuf",
-    artifact = "com.google.protobuf:protobuf-java:3.6.1",
-    sha1 = "0d06d46ecfd92ec6d0f3b423b4cd81cb38d8b924",
+    artifact = "com.google.protobuf:protobuf-java:3.7.1",
+    sha1 = "0bce1b6dc9e4531169542ab37a1c8641bcaa8afb",
 )

 load("//lib:guava.bzl", "GUAVA_BIN_SHA1", "GUAVA_VERSION")
@@ -1045,8 +1059,8 @@ maven_jar(
 # and httpasyncclient as necessary.
 maven_jar(
    name = "elasticsearch-rest-client",
-    artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.7.0",
-    sha1 = "032bf7044d1d5664ebdbfd6f2601027c806565ce",
+    artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.7.1",
+    sha1 = "a00aa6cc593a464e4a890d1a226ded5c625659ab",
 )

 JACKSON_VERSION = "2.9.8"
--- a/java/com/google/gerrit/server/restapi/change/CherryPickChange.java
+++ b/java/com/google/gerrit/server/restapi/change/CherryPickChange.java
@@ -382,10 +382,10 @@ public class CherryPickChange {
    stringBuilder.append(".");

    if (!cherryPickCommit.getFilesWithGitConflicts().isEmpty()) {
-      stringBuilder.append("\n\nThe following files contain Git conflicts:\n");
+      stringBuilder.append("\n\nThe following files contain Git conflicts:");
      cherryPickCommit.getFilesWithGitConflicts().stream()
          .sorted()
-          .forEach(filePath -> stringBuilder.append("* ").append(filePath).append("\n"));
+          .forEach(filePath -> stringBuilder.append("\n* ").append(filePath));
    }

    return stringBuilder.toString();
--- a/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java
@@ -577,8 +577,7 @@ public class RevisionIT extends AbstractDaemonTest {
            "Patch Set 1: Cherry Picked from branch master.\n\n"
                + "The following files contain Git conflicts:\n"
                + "* "
-                + PushOneCommit.FILE_NAME
-                + "\n");
+                + PushOneCommit.FILE_NAME);
  }

  @Test
--- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
@@ -49,9 +49,9 @@ public class ElasticContainer extends ElasticsearchContainer {
      case V6_6:
        return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.6.2";
      case V6_7:
-        return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.7.0";
+        return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.7.1";
      case V7_0:
-        return "docker.elastic.co/elasticsearch/elasticsearch-oss:7.0.0-rc1";
+        return "docker.elastic.co/elasticsearch/elasticsearch-oss:7.0.0-rc2";
    }
    throw new IllegalStateException("No tests for version: " + version.name());
  }
--- a/lib/js/npm.bzl
+++ b/lib/js/npm.bzl
@@ -1,11 +1,11 @@
 NPM_VERSIONS = {
-    "bower": "1.8.2",
+    "bower": "1.8.8",
    "crisper": "2.0.2",
    "polymer-bundler": "4.0.2",
 }

 NPM_SHA1S = {
-    "bower": "adf53529c8d4af02ef24fb8d5341c1419d33e2f7",
+    "bower": "82544be34a33aeae7efb8bdf9905247b2cffa985",
    "crisper": "7183c58cea33632fb036c91cefd1b43e390d22a2",
    "polymer-bundler": "6b296b6099ab5a0e93ca914cbe93e753f2395910",
 }
--- a/lib/zlib/BUILD
+++ b/lib/zlib/BUILD
@@ -0,0 +1,60 @@
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])  # BSD/MIT-like license (for zlib)
+
+_ZLIB_HEADERS = [
+    "crc32.h",
+    "deflate.h",
+    "gzguts.h",
+    "inffast.h",
+    "inffixed.h",
+    "inflate.h",
+    "inftrees.h",
+    "trees.h",
+    "zconf.h",
+    "zlib.h",
+    "zutil.h",
+]
+
+_ZLIB_PREFIXED_HEADERS = ["zlib/include/" + hdr for hdr in _ZLIB_HEADERS]
+
+# In order to limit the damage from the `includes` propagation
+# via `:zlib`, copy the public headers to a subdirectory and
+# expose those.
+genrule(
+    name = "copy_public_headers",
+    srcs = _ZLIB_HEADERS,
+    outs = _ZLIB_PREFIXED_HEADERS,
+    cmd = "cp $(SRCS) $(@D)/zlib/include/",
+    visibility = ["//visibility:private"],
+)
+
+cc_library(
+    name = "zlib",
+    srcs = [
+        "adler32.c",
+        "compress.c",
+        "crc32.c",
+        "deflate.c",
+        "gzclose.c",
+        "gzlib.c",
+        "gzread.c",
+        "gzwrite.c",
+        "infback.c",
+        "inffast.c",
+        "inflate.c",
+        "inftrees.c",
+        "trees.c",
+        "uncompr.c",
+        "zutil.c",
+        # Include the un-prefixed headers in srcs to work
+        # around the fact that zlib isn't consistent in its
+        # choice of <> or "" delimiter when including itself.
+    ] + _ZLIB_HEADERS,
+    hdrs = _ZLIB_PREFIXED_HEADERS,
+    copts = [
+        "-Wno-unused-variable",
+        "-Wno-implicit-function-declaration",
+    ],
+    includes = ["zlib/include/"],
+)
--- a/polygerrit-ui/app/rules.bzl
+++ b/polygerrit-ui/app/rules.bzl
@@ -22,6 +22,8 @@ def polygerrit_bundle(name, srcs, outs, app):
        deps = [name + "_closure_lib"],
    )

+    # TODO(davido): Remove JSC_REFERENCE_BEFORE_DECLARE when this is fixed upstream:
+    # https://github.com/Polymer/polymer-resin/issues/7
    closure_js_library(
        name = name + "_closure_lib",
        srcs = [appName + ".js"],
@@ -30,6 +32,7 @@ def polygerrit_bundle(name, srcs, outs, app):
        # and remove this supression
        suppress = [
            "JSC_JSDOC_MISSING_TYPE_WARNING",
+            "JSC_REFERENCE_BEFORE_DECLARE",
            "JSC_UNNECESSARY_ESCAPE",
            "JSC_UNUSED_LOCAL_ASSIGNMENT",
        ],
--- a/tools/bzl/js.bzl
+++ b/tools/bzl/js.bzl
@@ -472,7 +472,7 @@ def polygerrit_plugin(name, app, srcs = [], deps = [], externs = [], assets = No

    closure_js_binary(
        name = name + "_bin",
-        compilation_level = "SIMPLE",
+        compilation_level = "WHITESPACE_ONLY",
        defs = [
            "--polymer_version=1",
            "--language_out=ECMASCRIPT6",