Google GitGoogle Git
Sign in
pigweed/third_party/github/bazelbuild/rules_jvm_external/82e529ab064dc583a61892c8fc92b8ff0f70ded6^!/.
commit
82e529ab064dc583a61892c8fc92b8ff0f70ded6
[log]
author
cheister <cheister@squareup.com>
Wed Jan 21 19:39:52 2026 -0800
committer
GitHub <noreply@github.com>
Wed Jan 21 19:39:52 2026 -0800
tree
c744b751c0caa3b1423bc4e9313d717363c6ebc2
parent
50b20118912cc255a27465c5e23f354c592fc0b4 [diff]
Load rules from specific bzl files and add sh_test imports (#1529)

* bazel run //scripts:format

* Load rules from specific bzl files and add sh_test imports

* Prefer BUILD to BUILD.bazel when we can
diff --git a/examples/bzlmod/java/src/com/github/rules_jvm_external/examples/bzlmod/BUILD b/examples/bzlmod/java/src/com/github/rules_jvm_external/examples/bzlmod/BUILD
index 640002f..d756431 100644
--- a/examples/bzlmod/java/src/com/github/rules_jvm_external/examples/bzlmod/BUILD
+++ b/examples/bzlmod/java/src/com/github/rules_jvm_external/examples/bzlmod/BUILD

@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "java_binary")
+load("@rules_java//java:java_binary.bzl", "java_binary")
 load("@rules_jvm_external//:defs.bzl", "artifact")
 
 java_binary(

diff --git a/gradle.BUILD.bazel b/gradle.BUILD.bazel
index bfd27a1..ff30660 100644
--- a/gradle.BUILD.bazel
+++ b/gradle.BUILD.bazel

@@ -1,4 +1,5 @@
-load("@rules_java//java:defs.bzl", "java_import", "java_library")
+load("@rules_java//java:java_import.bzl", "java_import")
+load("@rules_java//java:java_library.bzl", "java_library")
 
 java_library(
     name = "gradle",

diff --git a/private/rules/coursier.bzl b/private/rules/coursier.bzl
index 762da09..2a494d2 100644
--- a/private/rules/coursier.bzl
+++ b/private/rules/coursier.bzl

@@ -42,7 +42,9 @@
 load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
 load("@package_metadata//rules:package_metadata.bzl", "package_metadata")
 load("@rules_license//rules:package_info.bzl", "package_info")
-load("@rules_java//java:defs.bzl", "java_binary", "java_library", "java_plugin")
+load("@rules_java//java:java_binary.bzl", "java_binary")
+load("@rules_java//java:java_library.bzl", "java_library")
+load("@rules_java//java:java_plugin.bzl", "java_plugin")
 load("@rules_jvm_external//private/rules:pin_dependencies.bzl", "pin_dependencies")
 load("@rules_jvm_external//private/rules:jvm_import.bzl", "jvm_import")
 load("@rules_shell//shell:sh_binary.bzl", "sh_binary")

diff --git a/private/rules/has_maven_deps.bzl b/private/rules/has_maven_deps.bzl
index 3246ab9..8af6e09 100644
--- a/private/rules/has_maven_deps.bzl
+++ b/private/rules/has_maven_deps.bzl

@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "JavaInfo")
+load("@rules_java//java/common:java_info.bzl", "JavaInfo")
 
 MavenInfo = provider(
     fields = {

diff --git a/private/rules/java_export.bzl b/private/rules/java_export.bzl
index 648a4c1..4fcd6f2 100644
--- a/private/rules/java_export.bzl
+++ b/private/rules/java_export.bzl

@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_java//java:java_library.bzl", "java_library")
 load("//:specs.bzl", "parse", _json = "json")
 load(":javadoc.bzl", "javadoc")
 load(":maven_bom_fragment.bzl", "maven_bom_fragment")

diff --git a/private/rules/javadoc.bzl b/private/rules/javadoc.bzl
index cad7629..7041264 100644
--- a/private/rules/javadoc.bzl
+++ b/private/rules/javadoc.bzl

@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "JavaInfo")
+load("@rules_java//java/common:java_info.bzl", "JavaInfo")
 load(":maven_project_jar.bzl", "DEFAULT_EXCLUDED_WORKSPACES")
 
 _JavadocInfo = provider(

diff --git a/private/rules/jvm_import.bzl b/private/rules/jvm_import.bzl
index 0fbbd10..aff1a46 100644
--- a/private/rules/jvm_import.bzl
+++ b/private/rules/jvm_import.bzl

@@ -7,7 +7,7 @@
 # [0]: https://github.com/square/bazel_maven_repository/pull/48
 # [1]: https://github.com/bazelbuild/bazel/issues/4549
 
-load("@rules_java//java:defs.bzl", "JavaInfo")
+load("@rules_java//java/common:java_info.bzl", "JavaInfo")
 load("@rules_license//rules:providers.bzl", "PackageInfo")
 load("//private/lib:coordinates.bzl", "to_external_form", "to_purl", "unpack_coordinates")
 load("//private/lib:urls.bzl", "scheme_and_host")

diff --git a/private/rules/maven_bom_fragment.bzl b/private/rules/maven_bom_fragment.bzl
index 18425ef..3e83820 100644
--- a/private/rules/maven_bom_fragment.bzl
+++ b/private/rules/maven_bom_fragment.bzl

@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "JavaInfo")
+load("@rules_java//java/common:java_info.bzl", "JavaInfo")
 load(":has_maven_deps.bzl", "MavenInfo", "has_maven_deps")
 load(":maven_utils.bzl", "process_label_keyed_exclusions")
 

diff --git a/private/rules/maven_project_jar.bzl b/private/rules/maven_project_jar.bzl
index 0e56f89..d648b3f 100644
--- a/private/rules/maven_project_jar.bzl
+++ b/private/rules/maven_project_jar.bzl

@@ -1,5 +1,6 @@
 load("@bazel_skylib//lib:new_sets.bzl", "sets")
-load("@rules_java//java:defs.bzl", "JavaInfo", "java_common")
+load("@rules_java//java/common:java_common.bzl", "java_common")
+load("@rules_java//java/common:java_info.bzl", "JavaInfo")
 load("@rules_license//rules:providers.bzl", "PackageInfo")
 load("//private/lib:bzlmod.bzl", "get_module_name_of_owner_of_repo")
 load("//private/lib:coordinates.bzl", "to_external_form", "to_purl", "unpack_coordinates")

diff --git a/private/rules/pom_file.bzl b/private/rules/pom_file.bzl
index 480ccb9..90f92d5 100644
--- a/private/rules/pom_file.bzl
+++ b/private/rules/pom_file.bzl

@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "JavaInfo")
+load("@rules_java//java/common:java_info.bzl", "JavaInfo")
 load(":has_maven_deps.bzl", "MavenInfo", "calculate_artifact_jars", "has_maven_deps")
 load(
     ":maven_utils.bzl",

diff --git a/private/tools/java/com/github/bazelbuild/rules_jvm_external/BUILD b/private/tools/java/com/github/bazelbuild/rules_jvm_external/BUILD
index 55d6481..f179474 100644
--- a/private/tools/java/com/github/bazelbuild/rules_jvm_external/BUILD
+++ b/private/tools/java/com/github/bazelbuild/rules_jvm_external/BUILD

@@ -1,4 +1,5 @@
-load("@rules_java//java:defs.bzl", "java_binary", "java_library")
+load("@rules_java//java:java_binary.bzl", "java_binary")
+load("@rules_java//java:java_library.bzl", "java_library")
 
 java_library(
     name = "rules_jvm_external",

diff --git a/private/tools/java/com/github/bazelbuild/rules_jvm_external/coursier/BUILD b/private/tools/java/com/github/bazelbuild/rules_jvm_external/coursier/BUILD
index bae4b48..1ff90d2 100644
--- a/private/tools/java/com/github/bazelbuild/rules_jvm_external/coursier/BUILD
+++ b/private/tools/java/com/github/bazelbuild/rules_jvm_external/coursier/BUILD

@@ -1,4 +1,5 @@
-load("@rules_java//java:defs.bzl", "java_binary", "java_library")
+load("@rules_java//java:java_binary.bzl", "java_binary")
+load("@rules_java//java:java_library.bzl", "java_library")
 load("//private/rules:artifact.bzl", "artifact")
 
 java_library(

diff --git a/private/tools/java/com/github/bazelbuild/rules_jvm_external/jar/BUILD b/private/tools/java/com/github/bazelbuild/rules_jvm_external/jar/BUILD
index ec8106f..c131bb2 100644
--- a/private/tools/java/com/github/bazelbuild/rules_jvm_external/jar/BUILD
+++ b/private/tools/java/com/github/bazelbuild/rules_jvm_external/jar/BUILD

@@ -1,4 +1,5 @@
-load("@rules_java//java:defs.bzl", "java_binary", "java_library")
+load("@rules_java//java:java_binary.bzl", "java_binary")
+load("@rules_java//java:java_library.bzl", "java_library")
 load("@rules_jvm_external//:defs.bzl", "artifact")
 
 java_binary(

diff --git a/private/tools/java/com/github/bazelbuild/rules_jvm_external/javadoc/BUILD b/private/tools/java/com/github/bazelbuild/rules_jvm_external/javadoc/BUILD
index a375195..26fffd7 100644
--- a/private/tools/java/com/github/bazelbuild/rules_jvm_external/javadoc/BUILD
+++ b/private/tools/java/com/github/bazelbuild/rules_jvm_external/javadoc/BUILD

@@ -1,4 +1,5 @@
-load("@rules_java//java:defs.bzl", "java_binary", "java_library")
+load("@rules_java//java:java_binary.bzl", "java_binary")
+load("@rules_java//java:java_library.bzl", "java_library")
 
 java_library(
     name = "javadoc_lib",

diff --git a/private/tools/java/com/github/bazelbuild/rules_jvm_external/maven/BUILD b/private/tools/java/com/github/bazelbuild/rules_jvm_external/maven/BUILD
index 6896fd0..f8ad94b 100644
--- a/private/tools/java/com/github/bazelbuild/rules_jvm_external/maven/BUILD
+++ b/private/tools/java/com/github/bazelbuild/rules_jvm_external/maven/BUILD

@@ -1,4 +1,5 @@
-load("@rules_java//java:defs.bzl", "java_binary", "java_library")
+load("@rules_java//java:java_binary.bzl", "java_binary")
+load("@rules_java//java:java_library.bzl", "java_library")
 load("@rules_jvm_external//:defs.bzl", "artifact")
 
 java_binary(

diff --git a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/BUILD b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/BUILD
index 2b8deea..450dfed 100644
--- a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/BUILD
+++ b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/BUILD

@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_java//java:java_library.bzl", "java_library")
 load("//private/rules:artifact.bzl", "artifact")
 
 java_library(

diff --git a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/cmd/AbstractMain.java b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/cmd/AbstractMain.java
index a68ab9b..d33cacd 100644
--- a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/cmd/AbstractMain.java
+++ b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/cmd/AbstractMain.java

@@ -288,7 +288,7 @@
         new GsonBuilder().setPrettyPrinting().serializeNulls().create().toJson(toReturn) + "\n";
 
     try (OutputStream os = output == null ? System.out : Files.newOutputStream(output);
-         BufferedOutputStream bos = new BufferedOutputStream(os)) {
+        BufferedOutputStream bos = new BufferedOutputStream(os)) {
       bos.write(converted.getBytes(UTF_8));
     }
   }
@@ -311,12 +311,12 @@
     }
   }
 
-
   @SuppressWarnings("unchecked")
   public static Map<String, Integer> calculateArtifactHash(Map<String, Object> rendered) {
     Map<String, Map<String, Object>> allInfos = new LinkedHashMap<>();
 
-    Map<String, Map<String, Object>> artifacts = sortMapRecursively((Map<?, ?>) rendered.get("artifacts"));
+    Map<String, Map<String, Object>> artifacts =
+        sortMapRecursively((Map<?, ?>) rendered.get("artifacts"));
     for (Map.Entry<String, Map<String, Object>> dep : artifacts.entrySet()) {
       Map<String, Object> depInfo = dep.getValue();
       Map<String, String> shasums = (Map<String, String>) depInfo.get("shasums");
@@ -340,7 +340,8 @@
       }
     }
 
-    Map<String, Iterable<String>> repositories = sortMapRecursively((Map<?, ?>) rendered.get("repositories"));
+    Map<String, Iterable<String>> repositories =
+        sortMapRecursively((Map<?, ?>) rendered.get("repositories"));
     for (Map.Entry<String, Iterable<String>> repo : repositories.entrySet()) {
       Iterable<String> repoArtifacts = repo.getValue();
       for (String art : repoArtifacts) {
@@ -348,7 +349,8 @@
       }
     }
 
-    Map<String, Set<String>> dependencies = sortMapRecursively((Map<?, ?>) rendered.get("dependencies"));
+    Map<String, Set<String>> dependencies =
+        sortMapRecursively((Map<?, ?>) rendered.get("dependencies"));
     for (Map.Entry<String, Set<String>> dep : dependencies.entrySet()) {
       allInfos.get(dep.getKey()).put("dependencies", dep.getValue());
     }
@@ -360,7 +362,8 @@
   }
 
   @SuppressWarnings("unchecked")
-  private static int calculateFinalHash(String curr, Map<String, Map<String, Object>> allInfos, Map<String, Integer> finalHash) {
+  private static int calculateFinalHash(
+      String curr, Map<String, Map<String, Object>> allInfos, Map<String, Integer> finalHash) {
     StarlarkRepr repr = new StarlarkRepr();
 
     if (finalHash.containsKey(curr)) {
@@ -372,8 +375,8 @@
 
     finalHash.put(curr, repr.repr(allInfos.get(curr)).hashCode());
 
-
-    Set<String> deps = (Set<String>) allInfos.get(curr).getOrDefault("dependencies", Collections.emptySet());
+    Set<String> deps =
+        (Set<String>) allInfos.get(curr).getOrDefault("dependencies", Collections.emptySet());
     Map<String, Integer> hashedDeps = new TreeMap<>();
     for (String dep : deps) {
       hashedDeps.put(dep, calculateFinalHash(dep, allInfos, finalHash));

diff --git a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/cmd/BUILD b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/cmd/BUILD
index a73f513..a9689fe 100644
--- a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/cmd/BUILD
+++ b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/cmd/BUILD

@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_java//java:java_library.bzl", "java_library")
 load("@rules_jvm_external//:defs.bzl", "artifact")
 
 java_library(

diff --git a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/cmd/ResolverConfig.java b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/cmd/ResolverConfig.java
index beffed2..5ec6f70 100644
--- a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/cmd/ResolverConfig.java
+++ b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/cmd/ResolverConfig.java

@@ -25,7 +25,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -189,7 +188,8 @@
 
     if (inputHashPath != null) {
       String rawJson = Files.readString(inputHashPath);
-      Map<String, Integer> json = new Gson().fromJson(rawJson, new TypeToken<Map<String, Integer>>() {}.getType());
+      Map<String, Integer> json =
+          new Gson().fromJson(rawJson, new TypeToken<Map<String, Integer>>() {}.getType());
       this.inputHash = new TreeMap<>(json);
     } else {
       this.inputHash = null;

diff --git a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/events/BUILD b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/events/BUILD
index a786dc3..56cb4e1 100644
--- a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/events/BUILD
+++ b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/events/BUILD

@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_java//java:java_library.bzl", "java_library")
 
 java_library(
     name = "events",

diff --git a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/BUILD.bazel b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/BUILD
similarity index 95%
rename from private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/BUILD.bazel
rename to private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/BUILD
index 12e3650..f5a0c51 100644
--- a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/BUILD.bazel
+++ b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/BUILD

@@ -1,4 +1,5 @@
-load("@rules_java//java:defs.bzl", "java_binary", "java_library")
+load("@rules_java//java:java_binary.bzl", "java_binary")
+load("@rules_java//java:java_library.bzl", "java_library")
 load("@rules_jvm_external//:defs.bzl", "artifact")
 
 java_library(

diff --git a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/data/BUILD.bazel b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/data/BUILD
similarity index 100%
rename from private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/data/BUILD.bazel
rename to private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/data/BUILD

diff --git a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/models/BUILD.bazel b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/models/BUILD
similarity index 84%
rename from private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/models/BUILD.bazel
rename to private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/models/BUILD
index 456be4a..76bc6e4 100644
--- a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/models/BUILD.bazel
+++ b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/models/BUILD

@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_java//java:java_library.bzl", "java_library")
 
 java_library(
     name = "models",

diff --git a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/plugin/BUILD.bazel b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/plugin/BUILD
similarity index 94%
rename from private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/plugin/BUILD.bazel
rename to private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/plugin/BUILD
index 7b5f396..9ed1e6f 100644
--- a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/plugin/BUILD.bazel
+++ b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/plugin/BUILD

@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_java//java:java_library.bzl", "java_library")
 load("@rules_java//java:java_single_jar.bzl", "java_single_jar")
 load("@rules_jvm_external//:defs.bzl", "artifact")
 

diff --git a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/lockfile/BUILD b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/lockfile/BUILD
index 52ce5b7..53dc9ba 100644
--- a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/lockfile/BUILD
+++ b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/lockfile/BUILD

@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_java//java:java_library.bzl", "java_library")
 load("//private/rules:artifact.bzl", "artifact")
 
 java_library(

diff --git a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/maven/BUILD b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/maven/BUILD
index d23974a..7690132 100644
--- a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/maven/BUILD
+++ b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/maven/BUILD

@@ -1,4 +1,5 @@
-load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_java//java:java_binary.bzl", "java_binary")
+load("@rules_java//java:java_library.bzl", "java_library")
 load("@rules_jvm_external//:defs.bzl", "artifact")
 
 java_library(

diff --git a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/netrc/BUILD b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/netrc/BUILD
index 28b86f0..e01c423 100644
--- a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/netrc/BUILD
+++ b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/netrc/BUILD

@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_java//java:java_library.bzl", "java_library")
 load("@rules_jvm_external//:defs.bzl", "artifact")
 
 java_library(

diff --git a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/remote/BUILD b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/remote/BUILD
index f8b6a86..7f038ea 100644
--- a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/remote/BUILD
+++ b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/remote/BUILD

@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_java//java:java_library.bzl", "java_library")
 load("@rules_jvm_external//:defs.bzl", "artifact")
 
 java_library(

diff --git a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/ui/BUILD b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/ui/BUILD
index f686ad6..3641776 100644
--- a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/ui/BUILD
+++ b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/ui/BUILD

@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_java//java:java_library.bzl", "java_library")
 load("@rules_jvm_external//:defs.bzl", "artifact")
 
 java_library(

diff --git a/private/tools/java/com/github/bazelbuild/rules_jvm_external/zip/BUILD b/private/tools/java/com/github/bazelbuild/rules_jvm_external/zip/BUILD
index a9af408..4b1ec99 100644
--- a/private/tools/java/com/github/bazelbuild/rules_jvm_external/zip/BUILD
+++ b/private/tools/java/com/github/bazelbuild/rules_jvm_external/zip/BUILD

@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_java//java:java_library.bzl", "java_library")
 
 java_library(
     name = "zip",

diff --git a/scripts/BUILD b/scripts/BUILD
index bb26c86..2adec90 100644
--- a/scripts/BUILD
+++ b/scripts/BUILD

@@ -1,4 +1,5 @@
-load("@rules_java//java:defs.bzl", "java_binary")
+load("@rules_java//java:java_binary.bzl", "java_binary")
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 load("//private:versions.bzl", "COURSIER_CLI_HTTP_FILE_NAME")
 load("//private/rules:artifact.bzl", "artifact")
 

diff --git a/tests/com/github/bazelbuild/rules_jvm_external/BUILD b/tests/com/github/bazelbuild/rules_jvm_external/BUILD
index 175f63c..64a06d3 100644
--- a/tests/com/github/bazelbuild/rules_jvm_external/BUILD
+++ b/tests/com/github/bazelbuild/rules_jvm_external/BUILD

@@ -1,4 +1,5 @@
-load("@rules_java//java:defs.bzl", "java_library", "java_test")
+load("@rules_java//java:java_library.bzl", "java_library")
+load("@rules_java//java:java_test.bzl", "java_test")
 load("//:defs.bzl", "artifact")
 
 java_test(

diff --git a/tests/com/github/bazelbuild/rules_jvm_external/jar/BUILD b/tests/com/github/bazelbuild/rules_jvm_external/jar/BUILD
index d7d1242..a2b1345 100644
--- a/tests/com/github/bazelbuild/rules_jvm_external/jar/BUILD
+++ b/tests/com/github/bazelbuild/rules_jvm_external/jar/BUILD

@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "java_test")
+load("@rules_java//java:java_test.bzl", "java_test")
 load("//:defs.bzl", "artifact")
 
 java_test(

diff --git a/tests/com/github/bazelbuild/rules_jvm_external/javadoc/BUILD b/tests/com/github/bazelbuild/rules_jvm_external/javadoc/BUILD
index f7c648f..17238af 100644
--- a/tests/com/github/bazelbuild/rules_jvm_external/javadoc/BUILD
+++ b/tests/com/github/bazelbuild/rules_jvm_external/javadoc/BUILD

@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "java_test")
+load("@rules_java//java:java_test.bzl", "java_test")
 load("//:defs.bzl", "artifact")
 
 java_test(

diff --git a/tests/com/github/bazelbuild/rules_jvm_external/manifest/BUILD b/tests/com/github/bazelbuild/rules_jvm_external/manifest/BUILD
index 90249a4..d3e4cd9 100644
--- a/tests/com/github/bazelbuild/rules_jvm_external/manifest/BUILD
+++ b/tests/com/github/bazelbuild/rules_jvm_external/manifest/BUILD

@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "java_binary")
+load("@rules_java//java:java_binary.bzl", "java_binary")
 
 java_binary(
     name = "Print",

diff --git a/tests/com/github/bazelbuild/rules_jvm_external/maven/BUILD b/tests/com/github/bazelbuild/rules_jvm_external/maven/BUILD
index dde9470..858d6dc 100644
--- a/tests/com/github/bazelbuild/rules_jvm_external/maven/BUILD
+++ b/tests/com/github/bazelbuild/rules_jvm_external/maven/BUILD

@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "java_test")
+load("@rules_java//java:java_test.bzl", "java_test")
 load("//:defs.bzl", "artifact")
 
 java_test(

diff --git a/tests/com/github/bazelbuild/rules_jvm_external/resolver/BUILD b/tests/com/github/bazelbuild/rules_jvm_external/resolver/BUILD
index 65a11ff..35418c7 100644
--- a/tests/com/github/bazelbuild/rules_jvm_external/resolver/BUILD
+++ b/tests/com/github/bazelbuild/rules_jvm_external/resolver/BUILD

@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_java//java:java_library.bzl", "java_library")
 load("//:defs.bzl", "artifact")
 
 java_library(

diff --git a/tests/com/github/bazelbuild/rules_jvm_external/resolver/ResolverTestBase.java b/tests/com/github/bazelbuild/rules_jvm_external/resolver/ResolverTestBase.java
index ce117e4..db55e00 100644
--- a/tests/com/github/bazelbuild/rules_jvm_external/resolver/ResolverTestBase.java
+++ b/tests/com/github/bazelbuild/rules_jvm_external/resolver/ResolverTestBase.java

@@ -598,10 +598,12 @@
         resolver.resolve(prepareRequestFor(repo.toUri(), present)).getResolution();
     assertEquals(Set.of(present, missing), resolution.nodes());
 
-    logEvents.stream()
+    if (!logEvents.stream()
         .filter(e -> e.toString().contains("The POM for " + missing.setExtension("pom")))
         .findFirst()
-        .orElseThrow(() -> new AssertionError("Cannot find expected log message"));
+        .isPresent()) {
+      throw new AssertionError("Cannot find expected log message");
+    }
   }
 
   @Test

diff --git a/tests/com/github/bazelbuild/rules_jvm_external/resolver/gradle/BUILD.bazel b/tests/com/github/bazelbuild/rules_jvm_external/resolver/gradle/BUILD
similarity index 97%
rename from tests/com/github/bazelbuild/rules_jvm_external/resolver/gradle/BUILD.bazel
rename to tests/com/github/bazelbuild/rules_jvm_external/resolver/gradle/BUILD
index e2b5136..ba998bf 100644
--- a/tests/com/github/bazelbuild/rules_jvm_external/resolver/gradle/BUILD.bazel
+++ b/tests/com/github/bazelbuild/rules_jvm_external/resolver/gradle/BUILD

@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "java_test")
+load("@rules_java//java:java_test.bzl", "java_test")
 load("@rules_jvm_external//:defs.bzl", "artifact")
 
 java_test(

diff --git a/tests/com/github/bazelbuild/rules_jvm_external/resolver/gradle/fixtures/BUILD.bazel b/tests/com/github/bazelbuild/rules_jvm_external/resolver/gradle/fixtures/BUILD
similarity index 100%
rename from tests/com/github/bazelbuild/rules_jvm_external/resolver/gradle/fixtures/BUILD.bazel
rename to tests/com/github/bazelbuild/rules_jvm_external/resolver/gradle/fixtures/BUILD

diff --git a/tests/com/github/bazelbuild/rules_jvm_external/resolver/lockfile/BUILD b/tests/com/github/bazelbuild/rules_jvm_external/resolver/lockfile/BUILD
index 1d31f94..38601bf 100644
--- a/tests/com/github/bazelbuild/rules_jvm_external/resolver/lockfile/BUILD
+++ b/tests/com/github/bazelbuild/rules_jvm_external/resolver/lockfile/BUILD

@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "java_test")
+load("@rules_java//java:java_test.bzl", "java_test")
 load("//:defs.bzl", "artifact")
 
 java_test(

diff --git a/tests/com/github/bazelbuild/rules_jvm_external/resolver/lockfile/V3LockFileTest.java b/tests/com/github/bazelbuild/rules_jvm_external/resolver/lockfile/V3LockFileTest.java
index 211299f..0dd390d 100644
--- a/tests/com/github/bazelbuild/rules_jvm_external/resolver/lockfile/V3LockFileTest.java
+++ b/tests/com/github/bazelbuild/rules_jvm_external/resolver/lockfile/V3LockFileTest.java

@@ -25,7 +25,6 @@
 import com.github.bazelbuild.rules_jvm_external.resolver.cmd.AbstractMain;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-
 import java.io.IOException;
 import java.net.URI;
 import java.util.HashMap;
@@ -34,7 +33,6 @@
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
-
 import org.junit.Test;
 
 public class V3LockFileTest {
@@ -221,12 +219,14 @@
   @Test
   @SuppressWarnings("unchecked")
   public void testCalculateArtifactHashMatchesStoredHash() throws IOException {
-    String lockFileContent = new String(
-        getClass().getClassLoader().getResourceAsStream("maven_install.json").readAllBytes());
+    String lockFileContent =
+        new String(
+            getClass().getClassLoader().getResourceAsStream("maven_install.json").readAllBytes());
 
     Gson gson = new GsonBuilder().create();
     Map<String, Object> lockFileData = gson.fromJson(lockFileContent, Map.class);
-    Map<String, Double> storedHash = (Map<String, Double>) lockFileData.get("__RESOLVED_ARTIFACTS_HASH");
+    Map<String, Double> storedHash =
+        (Map<String, Double>) lockFileData.get("__RESOLVED_ARTIFACTS_HASH");
 
     Map<String, Object> dependencies = (Map<String, Object>) lockFileData.remove("dependencies");
     Map<String, Set<String>> convertedDeps = new TreeMap<>();
@@ -238,7 +238,10 @@
 
     Map<String, Integer> calculatedHash = AbstractMain.calculateArtifactHash(lockFileData);
 
-    assertEquals("Hash mismatch: calculated hash does not match stored hash", storedHash.size(), calculatedHash.size());
+    assertEquals(
+        "Hash mismatch: calculated hash does not match stored hash",
+        storedHash.size(),
+        calculatedHash.size());
 
     for (Map.Entry<String, Double> entry : storedHash.entrySet()) {
       String key = entry.getKey();

diff --git a/tests/com/github/bazelbuild/rules_jvm_external/resolver/maven/BUILD b/tests/com/github/bazelbuild/rules_jvm_external/resolver/maven/BUILD
index f8fdf7a..698b049 100644
--- a/tests/com/github/bazelbuild/rules_jvm_external/resolver/maven/BUILD
+++ b/tests/com/github/bazelbuild/rules_jvm_external/resolver/maven/BUILD

@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "java_test")
+load("@rules_java//java:java_test.bzl", "java_test")
 load("//:defs.bzl", "artifact")
 
 java_test(

diff --git a/tests/integration/BUILD b/tests/integration/BUILD
index 10709ae..7b917f2 100644
--- a/tests/integration/BUILD
+++ b/tests/integration/BUILD

@@ -1,5 +1,5 @@
 load("@aspect_bazel_lib//lib:diff_test.bzl", "diff_test")
-load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_java//java:java_library.bzl", "java_library")
 load("//:defs.bzl", "artifact")
 load(":is_bzlmod_enabled.bzl", "is_bzlmod_enabled")
 

diff --git a/tests/integration/duplicates_in_java_export/BUILD b/tests/integration/duplicates_in_java_export/BUILD
index 778166f..3f6fb87 100644
--- a/tests/integration/duplicates_in_java_export/BUILD
+++ b/tests/integration/duplicates_in_java_export/BUILD

@@ -1,4 +1,7 @@
-load("@rules_java//java:defs.bzl", "java_library", "java_test")
+load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library")
+load("@protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_java//java:java_library.bzl", "java_library")
+load("@rules_java//java:java_test.bzl", "java_test")
 load("//:defs.bzl", "artifact", "java_export")
 
 java_test(

diff --git a/tests/integration/java_export/BUILD b/tests/integration/java_export/BUILD
index c5f224b..11650d3 100644
--- a/tests/integration/java_export/BUILD
+++ b/tests/integration/java_export/BUILD

@@ -1,5 +1,10 @@
 load("@aspect_bazel_lib//lib:diff_test.bzl", "diff_test")
-load("@rules_java//java:defs.bzl", "java_binary", "java_library")
+load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library")
+load("@protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_java//java:java_binary.bzl", "java_binary")
+load("@rules_java//java:java_library.bzl", "java_library")
+load("@rules_java//java:java_test.bzl", "java_test")
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 load("//:defs.bzl", "artifact", "java_export", "maven_export")
 load("//private/rules:maven_project_jar.bzl", "maven_project_jar")
 
@@ -164,7 +169,7 @@
     name = "example_proto",
     srcs = ["example.proto"],
     deps = [
-        # It's important that we pull our dep from `@com_google_protobuf`
+        # It's important that we pull our dep from `@protobuf`
         "@protobuf//:wrappers_proto",
     ],
 )

diff --git a/tests/integration/kt_jvm_export/BUILD b/tests/integration/kt_jvm_export/BUILD
index 6fa02f5..d9c473b 100644
--- a/tests/integration/kt_jvm_export/BUILD
+++ b/tests/integration/kt_jvm_export/BUILD

@@ -1,3 +1,4 @@
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 load("//:kt_defs.bzl", "kt_jvm_export")
 
 kt_jvm_export(

diff --git a/tests/integration/override_targets/BUILD b/tests/integration/override_targets/BUILD
index 337031d..2ad81b1 100644
--- a/tests/integration/override_targets/BUILD
+++ b/tests/integration/override_targets/BUILD

@@ -2,7 +2,8 @@
 load("@bazel_skylib//rules:build_test.bzl", "build_test")
 load("@bazel_skylib//rules:diff_test.bzl", "diff_test")
 load("@rules_android//android:rules.bzl", "aar_import")
-load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_java//java:java_library.bzl", "java_library")
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 load("//tests/integration:is_bzlmod_enabled.bzl", "is_bzlmod_enabled")
 
 aar_import(

diff --git a/tests/integration/override_targets/module/BUILD b/tests/integration/override_targets/module/BUILD
index 8f0ce24..b355bac 100644
--- a/tests/integration/override_targets/module/BUILD
+++ b/tests/integration/override_targets/module/BUILD

@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_java//java:java_library.bzl", "java_library")
 
 java_library(
     name = "okio_override",

diff --git a/tests/integration/plugin_targets/BUILD b/tests/integration/plugin_targets/BUILD
index 0e815c6..5b3c86c 100644
--- a/tests/integration/plugin_targets/BUILD
+++ b/tests/integration/plugin_targets/BUILD

@@ -1,5 +1,6 @@
 load("@bazel_skylib//rules:build_test.bzl", "build_test")
-load("@rules_java//java:defs.bzl", "java_binary", "java_library")
+load("@rules_java//java:java_binary.bzl", "java_binary")
+load("@rules_java//java:java_library.bzl", "java_library")
 load("//:defs.bzl", "artifact", "java_plugin_artifact")
 
 java_library(

diff --git a/tests/integration/pom_file/BUILD b/tests/integration/pom_file/BUILD
index c5629c7..e7a48f8 100644
--- a/tests/integration/pom_file/BUILD
+++ b/tests/integration/pom_file/BUILD

@@ -1,5 +1,5 @@
 load("@aspect_bazel_lib//lib:diff_test.bzl", "diff_test")
-load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_java//java:java_library.bzl", "java_library")
 load("//:defs.bzl", "artifact", "java_export")
 
 java_export(

diff --git a/tests/unit/aar_import/aar_import_test.bzl b/tests/unit/aar_import/aar_import_test.bzl
index b38d524..3bd93b4 100644
--- a/tests/unit/aar_import/aar_import_test.bzl
+++ b/tests/unit/aar_import/aar_import_test.bzl

@@ -1,5 +1,5 @@
 load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts")
-load("@rules_java//java:defs.bzl", "JavaInfo")
+load("@rules_java//java/common:java_info.bzl", "JavaInfo")
 
 def _does_aar_import_have_srcjar_impl(ctx):
     env = analysistest.begin(ctx)

diff --git a/tests/unit/exports/exports_test.bzl b/tests/unit/exports/exports_test.bzl
index 41d180f..20df330 100644
--- a/tests/unit/exports/exports_test.bzl
+++ b/tests/unit/exports/exports_test.bzl

@@ -1,7 +1,8 @@
 """Unit tests for exports."""
 
 load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts")
-load("@rules_java//java:defs.bzl", "JavaInfo", "java_library")
+load("@rules_java//java:java_library.bzl", "java_library")
+load("@rules_java//java/common:java_info.bzl", "JavaInfo")
 load("//private/rules:has_maven_deps.bzl", "MavenInfo", "has_maven_deps")
 load("//private/rules:maven_project_jar.bzl", "maven_project_jar")
 

diff --git a/tests/unit/javadocs/BUILD b/tests/unit/javadocs/BUILD
index d567a30..f3c1e92 100644
--- a/tests/unit/javadocs/BUILD
+++ b/tests/unit/javadocs/BUILD

@@ -1,4 +1,4 @@
-load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_java//java:java_library.bzl", "java_library")
 load("//:defs.bzl", "java_export")
 
 alias(

diff --git a/tests/unit/jvm_import/BUILD b/tests/unit/jvm_import/BUILD
index 6b0abc4..2eaff1e 100644
--- a/tests/unit/jvm_import/BUILD
+++ b/tests/unit/jvm_import/BUILD

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 load("@bazel_skylib//rules:build_test.bzl", "build_test")
-load("@rules_java//java:defs.bzl", "java_import")
+load("@rules_java//java:java_import.bzl", "java_import")
 load(":jvm_import_test.bzl", "jvm_import_test_suite")
 
 java_import(

diff --git a/tests/unit/maven_info_provider/maven_info_test.bzl b/tests/unit/maven_info_provider/maven_info_test.bzl
index 62e57ee..7678353 100644
--- a/tests/unit/maven_info_provider/maven_info_test.bzl
+++ b/tests/unit/maven_info_provider/maven_info_test.bzl

@@ -1,7 +1,7 @@
 """Unit tests for java_export MavenInfo behavior."""
 
 load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts")
-load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_java//java:java_library.bzl", "java_library")
 load("//private/rules:has_maven_deps.bzl", "MavenInfo", "has_maven_deps")
 
 def _maven_info_test_impl(ctx):