Correctly merge BOMs from non-root modules (#1518)
* Correctly merge BOMs from non-root modules
When merging BOMs from non-root modules, the code was incorrectly using
`bazel_dep_to_non_root_artifacts` (the regular dependencies map) instead
of `non_root_bazel_dep_to_boms` (the BOMs map). This caused all non-root
module artifacts to be treated as BOMs
* Repin lock files. `bazel test //...` now passes
* Update more lock files
diff --git a/examples/bzlmod/maven_install.json b/examples/bzlmod/maven_install.json
index 1357913..5220245 100644
--- a/examples/bzlmod/maven_install.json
+++ b/examples/bzlmod/maven_install.json
@@ -1,7 +1,7 @@
{
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
- "__INPUT_ARTIFACTS_HASH": 1563368834,
- "__RESOLVED_ARTIFACTS_HASH": -144767737,
+ "__INPUT_ARTIFACTS_HASH": 882700655,
+ "__RESOLVED_ARTIFACTS_HASH": -1576018610,
"artifacts": {
"com.beust:jcommander": {
"shasums": {
@@ -326,10 +326,10 @@
},
"org.checkerframework:checker-qual": {
"shasums": {
- "jar": "2f9f245bf68e4259d610894f2406dc1f6363dc639302bd566e8272e4f4541172",
- "sources": "8308220bbdd4e12b49fa06a91de685faf9cc1a376464478c80845be3e87b7d4f"
+ "jar": "ff10785ac2a357ec5de9c293cb982a2cbb605c0309ea4cc1cb9b9bc6dbe7f3cb",
+ "sources": "fd99a45195ed893803624d1030387056a96601013f5e61ccabd79abb4ddfa876"
},
- "version": "3.41.0"
+ "version": "3.12.0"
},
"org.reactivestreams:reactive-streams": {
"shasums": {
@@ -1132,7 +1132,6 @@
"org.checkerframework.checker.initialization.qual",
"org.checkerframework.checker.interning.qual",
"org.checkerframework.checker.lock.qual",
- "org.checkerframework.checker.mustcall.qual",
"org.checkerframework.checker.nullness.qual",
"org.checkerframework.checker.optional.qual",
"org.checkerframework.checker.propkey.qual",
diff --git a/examples/java-export/maven_install.json b/examples/java-export/maven_install.json
index 548bb99..6258a16 100644
--- a/examples/java-export/maven_install.json
+++ b/examples/java-export/maven_install.json
@@ -1,6 +1,6 @@
{
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
- "__INPUT_ARTIFACTS_HASH": 908270220,
+ "__INPUT_ARTIFACTS_HASH": 686997265,
"__RESOLVED_ARTIFACTS_HASH": -8035072,
"conflict_resolution": {
"com.google.guava:guava:29.0-jre": "com.google.guava:guava:33.0.0-jre"
diff --git a/maven_install.json b/maven_install.json
index 8042b3c..803f517 100644
--- a/maven_install.json
+++ b/maven_install.json
@@ -1,7 +1,10 @@
{
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
- "__INPUT_ARTIFACTS_HASH": -647997795,
- "__RESOLVED_ARTIFACTS_HASH": 1828317327,
+ "__INPUT_ARTIFACTS_HASH": 1827703030,
+ "__RESOLVED_ARTIFACTS_HASH": -1607032127,
+ "conflict_resolution": {
+ "com.google.errorprone:error_prone_annotations:2.23.0": "com.google.errorprone:error_prone_annotations:2.41.0"
+ },
"artifacts": {
"com.google.code.findbugs:jsr305": {
"shasums": {
@@ -17,9 +20,9 @@
},
"com.google.errorprone:error_prone_annotations": {
"shasums": {
- "jar": "ec6f39f068b6ff9ac323c68e28b9299f8c0a80ca512dccb1d4a70f40ac3ec054"
+ "jar": "a56e782b5b50811ac204073a355a21d915a2107fce13ec711331ad036f660fcc"
},
- "version": "2.23.0"
+ "version": "2.41.0"
},
"com.google.guava:failureaccess": {
"shasums": {
@@ -41,9 +44,9 @@
},
"com.google.j2objc:j2objc-annotations": {
"shasums": {
- "jar": "f02a95fa1a5e95edb3ed859fd0fb7df709d121a35290eff8b74dce2ab7f4d6ed"
+ "jar": "84d3a150518485f8140ea99b8a985656749629f6433c92b80c75b36aba3b099b"
},
- "version": "2.8"
+ "version": "3.1"
},
"com.google.protobuf:protobuf-java": {
"shasums": {
diff --git a/private/extensions/maven.bzl b/private/extensions/maven.bzl
index 3236888..1001a60 100644
--- a/private/extensions/maven.bzl
+++ b/private/extensions/maven.bzl
@@ -602,13 +602,13 @@
merged_repo["boms"] = _deduplicate_artifacts_with_root_priority(
repo_name,
root_boms,
- bazel_dep_to_non_root_artifacts,
+ non_root_bazel_dep_to_boms,
repin_env_var,
rje_verbose_env_var,
)
else:
merged_repo["artifacts"] = _deduplicate_non_root_artifacts(bazel_dep_to_non_root_artifacts, True)
- merged_repo["boms"] = _deduplicate_non_root_artifacts(bazel_dep_to_non_root_artifacts, True)
+ merged_repo["boms"] = _deduplicate_non_root_artifacts(non_root_bazel_dep_to_boms, True)
# For list attributes, concatenate but avoid duplicates (root items first)
for list_attr in ["repositories", "excluded_artifacts", "additional_netrc_lines", "additional_coursier_options"]:
diff --git a/tests/custom_maven_install/multiple_lock_files_install.json b/tests/custom_maven_install/multiple_lock_files_install.json
index 6825e7e..3a698d6 100644
--- a/tests/custom_maven_install/multiple_lock_files_install.json
+++ b/tests/custom_maven_install/multiple_lock_files_install.json
@@ -1,6 +1,6 @@
{
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
- "__INPUT_ARTIFACTS_HASH": -575359670,
+ "__INPUT_ARTIFACTS_HASH": -965689370,
"__RESOLVED_ARTIFACTS_HASH": -746459257,
"artifacts": {
"com.google.code.gson:gson": {
diff --git a/tests/custom_maven_install/root_wins_install.json b/tests/custom_maven_install/root_wins_install.json
index 1d8b8ae..a5997f4 100644
--- a/tests/custom_maven_install/root_wins_install.json
+++ b/tests/custom_maven_install/root_wins_install.json
@@ -1,6 +1,6 @@
{
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
- "__INPUT_ARTIFACTS_HASH": 1721865497,
+ "__INPUT_ARTIFACTS_HASH": -935842665,
"__RESOLVED_ARTIFACTS_HASH": -1272363274,
"artifacts": {
"io.netty:netty-buffer": {
