Bump rules_jvm_external to 5.1

shs96c · shs96c · commit 6ad7d3462d7d · 2023-03-22T10:24:08.000Z
diff --git a/WORKSPACE b/WORKSPACE
@@ -104,9 +104,9 @@ http_archive(
     patches = [
         "//java:rules_jvm_external_javadoc.patch",
     ],
-    sha256 = "b6a142dd4ac191d64c855463d4d3de30a7efd629cc65065a833865e34c261b74",
-    strip_prefix = "rules_jvm_external-cf8286d9b137ab36b89fc6654ce3e6fe48923778",
-    url = "https://github.com/bazelbuild/rules_jvm_external/archive/cf8286d9b137ab36b89fc6654ce3e6fe48923778.zip",
+    sha256 = "8c3b207722e5f97f1c83311582a6c11df99226e65e2471086e296561e57cc954",
+    strip_prefix = "rules_jvm_external-5.1",
+    url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/5.1/rules_jvm_external-5.1.tar.gz",
 )
 
 load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")
diff --git a/java/add_missing_dirs.patch b/java/add_missing_dirs.patch
diff --git a/java/maven_install.json b/java/maven_install.json
diff --git a/java/private/merge_jars.bzl b/java/private/merge_jars.bzl
@@ -27,7 +27,7 @@ merge_jars = rule(
         "_merge_jars": attr.label(
             executable = True,
             cfg = "exec",
-            default = "@rules_jvm_external//private/tools/java/rules/jvm/external/jar:MergeJars",
+            default = "@rules_jvm_external//private/tools/java/com/github/bazelbuild/rules_jvm_external/jar:MergeJars",
         ),
         "_java_toolchain": attr.label(
             default = "@bazel_tools//tools/jdk:current_java_toolchain",
diff --git a/java/private/module.bzl b/java/private/module.bzl
@@ -232,7 +232,7 @@ java_module = rule(
             default = "@bazel_tools//tools/jdk:current_java_toolchain",
         ),
         "_merge_jars": attr.label(
-            default = "@rules_jvm_external//private/tools/java/rules/jvm/external/jar:MergeJars",
+            default = "@rules_jvm_external//private/tools/java/com/github/bazelbuild/rules_jvm_external/jar:MergeJars",
             executable = True,
             cfg = "exec",
         ),
diff --git a/java/src/dev/selenium/tools/javadoc/BUILD.bazel b/java/src/dev/selenium/tools/javadoc/BUILD.bazel
@@ -13,6 +13,6 @@ java_binary(
     ],
     deps = [
         "//java/src/org/openqa/selenium/io",
-        "@rules_jvm_external//private/tools/java/rules/jvm/external/zip",
+        "@rules_jvm_external//private/tools/java/com/github/bazelbuild/rules_jvm_external/zip",
     ],
 )
diff --git a/java/src/dev/selenium/tools/javadoc/JavadocJarMaker.java b/java/src/dev/selenium/tools/javadoc/JavadocJarMaker.java
@@ -17,8 +17,8 @@
 
 package dev.selenium.tools.javadoc;
 
+import com.github.bazelbuild.rules_jvm_external.zip.StableZipEntry;
 import org.openqa.selenium.io.TemporaryFilesystem;
-import rules.jvm.external.zip.StableZipEntry;
 
 import javax.tools.DocumentationTool;
 import javax.tools.JavaFileObject;
diff --git a/java/src/dev/selenium/tools/modules/BUILD.bazel b/java/src/dev/selenium/tools/modules/BUILD.bazel
@@ -12,7 +12,7 @@ java_binary(
     visibility = ["//visibility:public"],
     deps = [
         "//java/src/org/openqa/selenium/io",
-        "@rules_jvm_external//private/tools/java/rules/jvm/external/zip",
+        "@rules_jvm_external//private/tools/java/com/github/bazelbuild/rules_jvm_external/zip",
         artifact("net.bytebuddy:byte-buddy"),
         artifact("com.github.javaparser:javaparser-core"),
     ],
diff --git a/java/src/dev/selenium/tools/modules/ModuleGenerator.java b/java/src/dev/selenium/tools/modules/ModuleGenerator.java
@@ -17,6 +17,7 @@
 
 package dev.selenium.tools.modules;
 
+import com.github.bazelbuild.rules_jvm_external.zip.StableZipEntry;
 import com.github.javaparser.JavaParser;
 import com.github.javaparser.ParseResult;
 import com.github.javaparser.ParserConfiguration;
@@ -40,7 +41,6 @@
 import net.bytebuddy.jar.asm.ModuleVisitor;
 import net.bytebuddy.jar.asm.Type;
 import org.openqa.selenium.io.TemporaryFilesystem;
-import rules.jvm.external.zip.StableZipEntry;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ java_binary(`
`13`	`13`	`],`
`14`	`14`	`deps = [`
`15`	`15`	`"//java/src/org/openqa/selenium/io",`
`16`		`- "@rules_jvm_external//private/tools/java/rules/jvm/external/zip",`
	`16`	`+ "@rules_jvm_external//private/tools/java/com/github/bazelbuild/rules_jvm_external/zip",`
`17`	`17`	`],`
`18`	`18`	`)`