[build] Upgrade rules_jvm_external to 4.2

AutomatedTester · AutomatedTester · commit 1dd9854ea943 · 2022-01-27T21:43:33.000Z
diff --git a/WORKSPACE b/WORKSPACE
@@ -79,6 +79,9 @@ rules_proto_dependencies()
 
 rules_proto_toolchains()
 
+RULES_JVM_EXTERNAL_TAG = "4.2"
+RULES_JVM_EXTERNAL_SHA = "cd1a77b7b02e8e008439ca76fd34f5b07aecb8c752961f9640dea15e9e5ba1ca"
+
 http_archive(
     name = "rules_jvm_external",
     patch_args = [
@@ -88,9 +91,9 @@ http_archive(
         "//java:rules_jvm_external_javadoc.patch",
         "//java:rules_jvm_external_visibility.patch",
     ],
-    sha256 = "f36441aa876c4f6427bfb2d1f2d723b48e9d930b62662bf723ddfb8fc80f0140",
-    strip_prefix = "rules_jvm_external-4.1",
-    url = "https://github.com/bazelbuild/rules_jvm_external/archive/4.1.zip",
+    sha256 = RULES_JVM_EXTERNAL_SHA,
+    strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG,
+    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG,
 )
 
 load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")
diff --git a/java/rules_jvm_external_javadoc.patch b/java/rules_jvm_external_javadoc.patch
@@ -1,11 +1,11 @@
 diff --git a/private/rules/javadoc.bzl b/private/rules/javadoc.bzl
-index 8f02bcc..1dbeee8 100644
+index 9b90570..c9b6f09 100644
 --- a/private/rules/javadoc.bzl
 +++ b/private/rules/javadoc.bzl
-@@ -11,10 +11,43 @@ def generate_javadoc(ctx, javadoc, source_jars, classpath, output):
+@@ -12,10 +12,43 @@ def generate_javadoc(ctx, javadoc, source_jars, classpath, javadocopts, output):
          arguments = [args],
      )
- 
+
 +def _get_prefix_strings(third_party_prefixes):
 +    path_prefixes = []
 +    for prefix in third_party_prefixes:
@@ -44,12 +44,12 @@ index 8f02bcc..1dbeee8 100644
 +        for jar in dep_srcs:
 +            if not _path_match(jar, path_prefixes):
 +                sources.append(jar)
- 
+
      jar_file = ctx.actions.declare_file("%s.jar" % ctx.attr.name)
- 
-@@ -34,13 +67,23 @@ javadoc = rule(
+
+@@ -41,13 +74,23 @@ javadoc = rule(
              doc = """The java libraries to generate javadocs for.
- 
+
            The source jars of each dep will be used to generate the javadocs.
 -          Currently docs for transitive dependencies are not generated.
 +          By default docs for transitive dependencies are not generated.
@@ -69,6 +69,6 @@ index 8f02bcc..1dbeee8 100644
 +            including any javadocs for third party packages the code may depend on.""",
 +            default = ["@maven//"],
 +        ),
-         "_javadoc": attr.label(
-             default = "//private/tools/java/rules/jvm/external/javadoc",
-             cfg = "host",
+         "javadocopts": attr.string_list(
+             doc = """javadoc options.
+             Note sources and classpath are derived from the deps. Any additional
diff --git a/java/rules_jvm_external_visibility.patch b/java/rules_jvm_external_visibility.patch
@@ -1,25 +1,3 @@
-diff --git a/private/rules/has_maven_deps.bzl b/private/rules/has_maven_deps.bzl
-index 10e439c..85d183f 100644
---- a/private/rules/has_maven_deps.bzl
-+++ b/private/rules/has_maven_deps.bzl
-@@ -34,7 +34,7 @@ _EMPTY_INFO = MavenInfo(
- _MAVEN_PREFIX = "maven_coordinates="
- _STOP_TAGS = ["maven:compile-only", "no-maven"]
- 
--def _read_coordinates(tags):
-+def read_coordinates(tags):
-     coordinates = []
-     for stop_tag in _STOP_TAGS:
-         if stop_tag in tags:
-@@ -119,7 +119,7 @@ def _has_maven_deps_impl(target, ctx):
-     for attr in _ASPECT_ATTRS:
-         all_deps.extend(getattr(ctx.rule.attr, attr, []))
- 
--    coordinates = _read_coordinates(ctx.rule.attr.tags)
-+    coordinates = read_coordinates(ctx.rule.attr.tags)
-     label_to_javainfo = {target.label: target[JavaInfo]}
- 
-     gathered = _gathered(
 diff --git a/private/rules/pom_file.bzl b/private/rules/pom_file.bzl
 index b549275..f91f6fe 100644
 --- a/private/rules/pom_file.bzl
@@ -31,9 +9,9 @@ index b549275..f91f6fe 100644
 +    if len(parts) == 5:
 +        # Assume groupId:artifactId:type:classifier:version
 +        return (parts[0], parts[1], parts[4], parts[2], parts[3])
- 
+
      fail("Unparsed: %s" % coords)
- 
+
 diff --git a/private/tools/java/rules/jvm/external/zip/BUILD b/private/tools/java/rules/jvm/external/zip/BUILD
 index 58778d6..6bf4fd2 100644
 --- a/private/tools/java/rules/jvm/external/zip/BUILD
