Merge branch 'stable-3.0'

* stable-3.0: Fix creating comments on Firefox ESF Error Prone: Enable DateFormatConstant at ERROR severity Bazel: Stop unsigning jgit libraries Bazel: Rename jgit:server rule to jgit:jgit Bazel: Remove special handling of jgit source dependency Synchronize protobuf with version used in rules_closure Update rules_closure to latest version Upgrade elasticsearch-rest-client to 7.1.1 Change-Id: I567a6f07349be60eb09af885fd37ee71172386ff
2019-06-06 20:59:42 +09:00
parent 377ab81305 bc230a0ed1
commit 55b036de8b
25 changed files with 18 additions and 56 deletions
--- a/16
+++ b/16
@@ -49,9 +49,9 @@ http_archive(

 http_archive(
    name = "io_bazel_rules_closure",
-    sha256 = "bdb00831682cd0923df36e19b01619b8230896d582f16304a937d8dc8270b1b6",
-    strip_prefix = "rules_closure-ad75d7cc1cff0e845cd83683881915d995bd75b2",
-    urls = ["https://github.com/bazelbuild/rules_closure/archive/ad75d7cc1cff0e845cd83683881915d995bd75b2.tar.gz"],
+    sha256 = "75c58680af5f7b938ce9fe2abe8ecd9d24c698d160c0b71a945bd100fa77632b",
+    strip_prefix = "rules_closure-10cb1a78bd6cc8927eb39c2644c0369934f4aed6",
+    urls = ["https://github.com/bazelbuild/rules_closure/archive/10cb1a78bd6cc8927eb39c2644c0369934f4aed6.tar.gz"],
 )

 # File is specific to Polymer and copied from the Closure Github -- should be
@@ -218,12 +218,6 @@ maven_jar(
    sha1 = "f645ed69d595b24d4cf8b3fbb64cc505bede8829",
 )

-maven_jar(
-    name = "protobuf",
-    artifact = "com.google.protobuf:protobuf-java:3.7.1",
-    sha1 = "0bce1b6dc9e4531169542ab37a1c8641bcaa8afb",
-)
-
 load("//lib:guava.bzl", "GUAVA_BIN_SHA1", "GUAVA_VERSION")

 maven_jar(
@@ -1071,8 +1065,8 @@ maven_jar(
 # and httpasyncclient as necessary.
 maven_jar(
    name = "elasticsearch-rest-client",
-    artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.1.0",
-    sha1 = "93e8e8b96121069d1d6a6f94d29e7aebd3327301",
+    artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.1.1",
+    sha1 = "ca04d8012f92cac561be343b931ec73302b2ff3e",
 )

 maven_jar(
--- a/java/com/google/gerrit/common/BUILD
+++ b/java/com/google/gerrit/common/BUILD
@@ -22,7 +22,6 @@ java_library(
        "//java/com/google/gerrit/extensions:api",
        "//java/com/google/gerrit/prettify:server",
        "//java/com/google/gerrit/reviewdb:server",
-        "//java/org/eclipse/jgit:server",
        "//lib:guava",
        "//lib:servlet-api-3_1",
        "//lib/auto:auto-value",
--- a/java/com/google/gerrit/httpd/BUILD
+++ b/java/com/google/gerrit/httpd/BUILD
@@ -27,7 +27,6 @@ java_library(
        "//java/com/google/gerrit/server/util/time",
        "//java/com/google/gerrit/util/cli",
        "//java/com/google/gerrit/util/http",
-        "//java/org/eclipse/jgit:server",
        "//lib:args4j",
        "//lib:gson",
        "//lib:guava",
--- a/java/com/google/gerrit/jgit/BUILD
+++ b/java/com/google/gerrit/jgit/BUILD
@@ -1,5 +1,5 @@
 java_library(
-    name = "server",
+    name = "jgit",
    srcs = [
        "diff/ReplaceEdit.java",
    ],
--- a/java/com/google/gerrit/jgit/diff/ReplaceEdit.java
+++ b/java/com/google/gerrit/jgit/diff/ReplaceEdit.java
@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package org.eclipse.jgit.diff;
+package com.google.gerrit.jgit.diff;

 import java.util.List;
+import org.eclipse.jgit.diff.Edit;

 public class ReplaceEdit extends Edit {
  private List<Edit> internalEdit;
--- a/java/com/google/gerrit/metrics/BUILD
+++ b/java/com/google/gerrit/metrics/BUILD
@@ -6,7 +6,6 @@ java_library(
        "//java/com/google/gerrit/common:server",
        "//java/com/google/gerrit/extensions:api",
        "//java/com/google/gerrit/lifecycle",
-        "//java/org/eclipse/jgit:server",
        "//lib:guava",
        "//lib/flogger:api",
        "//lib/guice",
--- a/java/com/google/gerrit/prettify/BUILD
+++ b/java/com/google/gerrit/prettify/BUILD
@@ -4,7 +4,6 @@ java_library(
    visibility = ["//visibility:public"],
    deps = [
        "//java/com/google/gerrit/reviewdb:server",
-        "//java/org/eclipse/jgit:server",
        "//lib:guava",
        "//lib/jgit/org.eclipse.jgit:jgit",
    ],
--- a/java/com/google/gerrit/server/BUILD
+++ b/java/com/google/gerrit/server/BUILD
@@ -39,6 +39,7 @@ java_library(
        "//java/com/google/gerrit/index",
        "//java/com/google/gerrit/index:query_exception",
        "//java/com/google/gerrit/index/project",
+        "//java/com/google/gerrit/jgit",
        "//java/com/google/gerrit/json",
        "//java/com/google/gerrit/lifecycle",
        "//java/com/google/gerrit/mail",
@@ -54,7 +55,6 @@ java_library(
        "//java/com/google/gerrit/util/cli",
        "//java/com/google/gerrit/util/ssl",
        "//java/org/apache/commons/net",
-        "//java/org/eclipse/jgit:server",
        "//lib:args4j",
        "//lib:autolink",
        "//lib:automaton",
--- a/java/com/google/gerrit/server/audit/BUILD
+++ b/java/com/google/gerrit/server/audit/BUILD
@@ -22,7 +22,6 @@ java_library(
        "//java/com/google/gerrit/util/cli",
        "//java/com/google/gerrit/util/ssl",
        "//java/org/apache/commons/net",
-        "//java/org/eclipse/jgit:server",
        "//lib:args4j",
        "//lib:autolink",
        "//lib:automaton",
--- a/java/com/google/gerrit/server/patch/IntraLineDiff.java
+++ b/java/com/google/gerrit/server/patch/IntraLineDiff.java
@@ -21,6 +21,7 @@ import static com.google.gerrit.server.ioutil.BasicSerialization.writeVarInt32;
 import static java.util.stream.Collectors.toList;

 import com.google.common.collect.ImmutableList;
+import com.google.gerrit.jgit.diff.ReplaceEdit;
 import com.google.gerrit.reviewdb.client.CodedEnum;
 import java.io.IOException;
 import java.io.InputStream;
@@ -32,7 +33,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import org.eclipse.jgit.diff.Edit;
-import org.eclipse.jgit.diff.ReplaceEdit;

 public class IntraLineDiff implements Serializable {
  static final long serialVersionUID = IntraLineDiffKey.serialVersionUID;
--- a/java/com/google/gerrit/server/patch/IntraLineLoader.java
+++ b/java/com/google/gerrit/server/patch/IntraLineLoader.java
@@ -19,6 +19,7 @@ import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.flogger.FluentLogger;
+import com.google.gerrit.jgit.diff.ReplaceEdit;
 import com.google.gerrit.server.config.ConfigUtil;
 import com.google.gerrit.server.config.GerritServerConfig;
 import com.google.inject.Inject;
@@ -34,7 +35,6 @@ import java.util.concurrent.TimeoutException;
 import java.util.regex.Pattern;
 import org.eclipse.jgit.diff.Edit;
 import org.eclipse.jgit.diff.MyersDiff;
-import org.eclipse.jgit.diff.ReplaceEdit;
 import org.eclipse.jgit.lib.Config;

 class IntraLineLoader implements Callable<IntraLineDiff> {
--- a/java/com/google/gerrit/server/restapi/BUILD
+++ b/java/com/google/gerrit/server/restapi/BUILD
@@ -14,6 +14,7 @@ java_library(
        "//java/com/google/gerrit/index",
        "//java/com/google/gerrit/index:query_exception",
        "//java/com/google/gerrit/index/project",
+        "//java/com/google/gerrit/jgit",
        "//java/com/google/gerrit/json",
        "//java/com/google/gerrit/mail",
        "//java/com/google/gerrit/metrics",
@@ -24,7 +25,6 @@ java_library(
        "//java/com/google/gerrit/server/logging",
        "//java/com/google/gerrit/server/util/time",
        "//java/com/google/gerrit/util/cli",
-        "//java/org/eclipse/jgit:server",
        "//lib:args4j",
        "//lib:blame-cache",
        "//lib:gson",
--- a/java/com/google/gerrit/server/restapi/change/GetDiff.java
+++ b/java/com/google/gerrit/server/restapi/change/GetDiff.java
@@ -40,6 +40,7 @@ import com.google.gerrit.extensions.restapi.ResourceConflictException;
 import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
 import com.google.gerrit.extensions.restapi.Response;
 import com.google.gerrit.extensions.restapi.RestReadView;
+import com.google.gerrit.jgit.diff.ReplaceEdit;
 import com.google.gerrit.prettify.common.SparseFileContent;
 import com.google.gerrit.reviewdb.client.Patch;
 import com.google.gerrit.reviewdb.client.PatchSet;
@@ -62,7 +63,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import org.eclipse.jgit.diff.Edit;
-import org.eclipse.jgit.diff.ReplaceEdit;
 import org.kohsuke.args4j.CmdLineException;
 import org.kohsuke.args4j.CmdLineParser;
 import org.kohsuke.args4j.NamedOptionDef;
--- a/java/com/google/gerrit/server/schema/BUILD
+++ b/java/com/google/gerrit/server/schema/BUILD
@@ -16,7 +16,6 @@ java_library(
        "//java/com/google/gerrit/reviewdb:server",
        "//java/com/google/gerrit/server",
        "//java/com/google/gerrit/server/util/time",
-        "//java/org/eclipse/jgit:server",
        "//lib:guava",
        "//lib/auto:auto-value",
        "//lib/auto:auto-value-annotations",
--- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
@@ -53,7 +53,7 @@ public class ElasticContainer extends ElasticsearchContainer {
      case V7_0:
        return "docker.elastic.co/elasticsearch/elasticsearch-oss:7.0.1";
      case V7_1:
-        return "docker.elastic.co/elasticsearch/elasticsearch-oss:7.1.0";
+        return "docker.elastic.co/elasticsearch/elasticsearch-oss:7.1.1";
    }
    throw new IllegalStateException("No tests for version: " + version.name());
  }
--- a/javatests/com/google/gerrit/mail/BUILD
+++ b/javatests/com/google/gerrit/mail/BUILD
@@ -21,7 +21,6 @@ junit_tests(
        "//java/com/google/gerrit/server",
        "//java/com/google/gerrit/server/project/testing:project-test-util",
        "//java/com/google/gerrit/testing:gerrit-test-util",
-        "//java/org/eclipse/jgit:server",
        "//lib:gson",
        "//lib:guava-retrying",
        "//lib/commons:codec",
--- a/javatests/com/google/gerrit/server/BUILD
+++ b/javatests/com/google/gerrit/server/BUILD
@@ -43,6 +43,7 @@ junit_tests(
        "//java/com/google/gerrit/git",
        "//java/com/google/gerrit/index",
        "//java/com/google/gerrit/index:query_exception",
+        "//java/com/google/gerrit/jgit",
        "//java/com/google/gerrit/lifecycle",
        "//java/com/google/gerrit/mail",
        "//java/com/google/gerrit/metrics",
@@ -63,7 +64,6 @@ junit_tests(
        "//java/com/google/gerrit/testing:assertable-executor",
        "//java/com/google/gerrit/testing:gerrit-test-util",
        "//java/com/google/gerrit/truth",
-        "//java/org/eclipse/jgit:server",
        "//lib:gson",
        "//lib:guava",
        "//lib:guava-retrying",
--- a/javatests/com/google/gerrit/server/patch/IntraLineLoaderTest.java
+++ b/javatests/com/google/gerrit/server/patch/IntraLineLoaderTest.java
@@ -20,10 +20,10 @@ import static java.nio.charset.StandardCharsets.UTF_8;

 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.gerrit.jgit.diff.ReplaceEdit;
 import java.util.List;
 import org.eclipse.jgit.diff.Edit;
 import org.eclipse.jgit.diff.EditList;
-import org.eclipse.jgit.diff.ReplaceEdit;
 import org.junit.Test;

 public class IntraLineLoaderTest {
--- a/javatests/com/google/gerrit/server/util/git/BUILD
+++ b/javatests/com/google/gerrit/server/util/git/BUILD
@@ -12,7 +12,6 @@ junit_tests(
        "//java/com/google/gerrit/server/util/git",
        "//java/com/google/gerrit/testing:gerrit-test-util",
        "//java/com/google/gerrit/truth",
-        "//java/org/eclipse/jgit:server",
        "//lib:gson",
        "//lib:guava",
        "//lib:guava-retrying",
--- a/lib/BUILD
+++ b/lib/BUILD
@@ -37,7 +37,7 @@ java_library(
    name = "protobuf",
    data = ["//lib:LICENSE-protobuf"],
    visibility = ["//visibility:public"],
-    exports = ["@protobuf//jar"],
+    exports = ["@com_google_protobuf//:protobuf_java"],
 )

 java_library(
--- a/lib/jgit/jgit.bzl
+++ b/lib/jgit/jgit.bzl
@@ -41,15 +41,12 @@ def jgit_maven_repos():
        artifact = "org.eclipse.jgit:org.eclipse.jgit:" + _JGIT_VERS,
        repository = _JGIT_REPO,
        sha1 = "dba85014483315fa426259bc1b8ccda9373a624b",
-        src_sha1 = "b2ddc76c39d81df716948a00d26faa35e11a0ddf",
-        unsign = True,
    )
    maven_jar(
        name = "jgit-servlet",
        artifact = "org.eclipse.jgit:org.eclipse.jgit.http.server:" + _JGIT_VERS,
        repository = _JGIT_REPO,
        sha1 = "3287341fca859340a00b51cb5dd3b78b8e532b39",
-        unsign = True,
    )
    maven_jar(
        name = "jgit-archive",
@@ -62,7 +59,6 @@ def jgit_maven_repos():
        artifact = "org.eclipse.jgit:org.eclipse.jgit.junit:" + _JGIT_VERS,
        repository = _JGIT_REPO,
        sha1 = "3d9ba7e610d6ab5d08dcb1e4ba448b592a34de77",
-        unsign = True,
    )

 def jgit_dep(name):
@@ -70,7 +66,6 @@ def jgit_dep(name):
        "@jgit-archive//jar": "@jgit//org.eclipse.jgit.archive:jgit-archive",
        "@jgit-junit//jar": "@jgit//org.eclipse.jgit.junit:junit",
        "@jgit-lib//jar": "@jgit//org.eclipse.jgit:jgit",
-        "@jgit-lib//jar:src": "@jgit//org.eclipse.jgit:libjgit-src.jar",
        "@jgit-servlet//jar": "@jgit//org.eclipse.jgit.http.server:jgit-servlet",
    }

--- a/lib/jgit/org.eclipse.jgit/BUILD
+++ b/lib/jgit/org.eclipse.jgit/BUILD
@@ -11,12 +11,6 @@ java_library(
    ],
 )

-alias(
-    name = "jgit-source",
-    actual = jgit_dep("@jgit-lib//jar:src"),
-    visibility = ["//visibility:public"],
-)
-
 java_library(
    name = "javaewah",
    data = ["//lib:LICENSE-Apache2.0"],
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -38,6 +38,7 @@ java_package_configuration(
        "-Xep:CannotMockFinalClass:ERROR",
        "-Xep:ClassCanBeStatic:ERROR",
        "-Xep:ClassNewInstance:ERROR",
+        "-Xep:DateFormatConstant:ERROR",
        "-Xep:DefaultCharset:ERROR",
        "-Xep:DoubleCheckedLocking:ERROR",
        "-Xep:ElementsCountedInLoop:ERROR",
--- a/tools/bzl/maven_jar.bzl
+++ b/tools/bzl/maven_jar.bzl
@@ -159,8 +159,6 @@ def _maven_jar_impl(ctx):
    args = [python, script, "-o", binjar_path, "-u", binurl]
    if ctx.attr.sha1:
        args.extend(["-v", sha1])
-    if ctx.attr.unsign:
-        args.append("--unsign")
    for x in ctx.attr.exclude:
        args.extend(["-x", x])

--- a/tools/download_file.py
+++ b/tools/download_file.py
@@ -81,7 +81,6 @@ opts.add_option('-u', help='URL to download')
 opts.add_option('-v', help='expected content SHA-1')
 opts.add_option('-x', action='append', help='file to delete from ZIP')
 opts.add_option('--exclude_java_sources', action='store_true')
-opts.add_option('--unsign', action='store_true')
 args, _ = opts.parse_args()

 root_dir = args.o
@@ -140,18 +139,6 @@ if args.exclude_java_sources:
        print('error opening %s: %s' % (cache_ent, err), file=stderr)
        exit(1)

-if args.unsign:
-    try:
-        with ZipFile(cache_ent, 'r') as zf:
-            for n in zf.namelist():
-                if (n.endswith('.RSA')
-                   or n.endswith('.SF')
-                   or n.endswith('.LIST')):
-                    exclude.append(n)
-    except (BadZipfile, LargeZipFile) as err:
-        print('error opening %s: %s' % (cache_ent, err), file=stderr)
-        exit(1)
-
 safe_mkdirs(path.dirname(args.o))
 if exclude:
    try: