Skip to content

Load rules from specific bzl files and add sh_test imports #1529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cheister merged 3 commits into from
Jan 22, 2026
Merged

Load rules from specific bzl files and add sh_test imports #1529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ded8f4d
bazel run //scripts:format
cheister Jan 21, 2026
bfbd883
Load rules from specific bzl files and add sh_test imports
cheister Jan 22, 2026
e80afeb
Prefer BUILD to BUILD.bazel when we can
cheister Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/bzlmod/java/src/com/github/rules_jvm_external/examples/bzlmod/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
3 changes: 2 additions & 1 deletion gradle.BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 3 additions & 1 deletion private/rules/coursier.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
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")
Expand Down
2 changes: 1 addition & 1 deletion private/rules/has_maven_deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@rules_java//java:defs.bzl", "JavaInfo")
load("@rules_java//java/common:java_info.bzl", "JavaInfo")

MavenInfo = provider(
fields = {
Expand Down
2 changes: 1 addition & 1 deletion private/rules/java_export.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
2 changes: 1 addition & 1 deletion private/rules/javadoc.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
2 changes: 1 addition & 1 deletion private/rules/jvm_import.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion private/rules/maven_bom_fragment.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")

Expand Down
3 changes: 2 additions & 1 deletion private/rules/maven_project_jar.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
2 changes: 1 addition & 1 deletion private/rules/pom_file.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
3 changes: 2 additions & 1 deletion private/tools/java/com/github/bazelbuild/rules_jvm_external/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
3 changes: 2 additions & 1 deletion private/tools/java/com/github/bazelbuild/rules_jvm_external/coursier/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
3 changes: 2 additions & 1 deletion private/tools/java/com/github/bazelbuild/rules_jvm_external/jar/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
3 changes: 2 additions & 1 deletion private/tools/java/com/github/bazelbuild/rules_jvm_external/javadoc/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
3 changes: 2 additions & 1 deletion private/tools/java/com/github/bazelbuild/rules_jvm_external/maven/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
2 changes: 1 addition & 1 deletion private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
19 changes: 11 additions & 8 deletions private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/cmd/AbstractMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ private static void writeLockFile(
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));
}
}
Expand All @@ -311,12 +311,12 @@ private static void writeDependencyIndex(ResolverConfig config, Set<DependencyIn
}
}


@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");
Expand All @@ -340,15 +340,17 @@ public static Map<String, Integer> calculateArtifactHash(Map<String, Object> ren
}
}

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) {
allInfos.get(art).put("repository", repo.getKey());
}
}

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());
}
Expand All @@ -360,7 +362,8 @@ public static Map<String, Integer> calculateArtifactHash(Map<String, Object> ren
}

@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)) {
Expand All @@ -372,8 +375,8 @@ private static int calculateFinalHash(String curr, Map<String, Map<String, Objec

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));
Expand Down
2 changes: 1 addition & 1 deletion private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/cmd/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
4 changes: 2 additions & 2 deletions private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/cmd/ResolverConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -189,7 +188,8 @@ public ResolverConfig(EventListener listener, String... args) throws IOException

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;
Expand Down
2 changes: 1 addition & 1 deletion private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/events/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
3 changes: 2 additions & 1 deletion ..._jvm_external/resolver/gradle/BUILD.bazel → .../rules_jvm_external/resolver/gradle/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
0 ...external/resolver/gradle/data/BUILD.bazel → ...s_jvm_external/resolver/gradle/data/BUILD
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ternal/resolver/gradle/models/BUILD.bazel → ...jvm_external/resolver/gradle/models/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ...ternal/resolver/gradle/plugin/BUILD.bazel → ...jvm_external/resolver/gradle/plugin/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")

Expand Down
2 changes: 1 addition & 1 deletion private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/lockfile/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
3 changes: 2 additions & 1 deletion private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/maven/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
2 changes: 1 addition & 1 deletion private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/netrc/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
2 changes: 1 addition & 1 deletion private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/remote/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
2 changes: 1 addition & 1 deletion private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/ui/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
2 changes: 1 addition & 1 deletion private/tools/java/com/github/bazelbuild/rules_jvm_external/zip/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
3 changes: 2 additions & 1 deletion scripts/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")

Expand Down
3 changes: 2 additions & 1 deletion tests/com/github/bazelbuild/rules_jvm_external/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
2 changes: 1 addition & 1 deletion tests/com/github/bazelbuild/rules_jvm_external/jar/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
2 changes: 1 addition & 1 deletion tests/com/github/bazelbuild/rules_jvm_external/javadoc/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
2 changes: 1 addition & 1 deletion tests/com/github/bazelbuild/rules_jvm_external/manifest/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion tests/com/github/bazelbuild/rules_jvm_external/maven/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
2 changes: 1 addition & 1 deletion tests/com/github/bazelbuild/rules_jvm_external/resolver/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
6 changes: 4 additions & 2 deletions tests/com/github/bazelbuild/rules_jvm_external/resolver/ResolverTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,10 +598,12 @@ public void shouldWarnOnMissingTransitiveDependencies() {
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
Expand Down
2 changes: 1 addition & 1 deletion ..._jvm_external/resolver/gradle/BUILD.bazel → .../rules_jvm_external/resolver/gradle/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
0 ...rnal/resolver/gradle/fixtures/BUILD.bazel → ...m_external/resolver/gradle/fixtures/BUILD
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/com/github/bazelbuild/rules_jvm_external/resolver/lockfile/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
15 changes: 9 additions & 6 deletions tests/com/github/bazelbuild/rules_jvm_external/resolver/lockfile/V3LockFileTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -34,7 +33,6 @@
import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;

import org.junit.Test;

public class V3LockFileTest {
Expand Down Expand Up @@ -221,12 +219,14 @@ public void shouldStillIncludeOtherFieldsWhenPackagesExcluded() {
@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<>();
Expand All @@ -238,7 +238,10 @@ public void testCalculateArtifactHashMatchesStoredHash() throws IOException {

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();
Expand Down
2 changes: 1 addition & 1 deletion tests/com/github/bazelbuild/rules_jvm_external/resolver/maven/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")

Expand Down
Loading