Ensure root module artifacts and boms take precedence with warnings#1373
Merged
shs96c merged 7 commits intobazel-contrib:masterfrom Jun 23, 2025
Merged
Ensure root module artifacts and boms take precedence with warnings#1373shs96c merged 7 commits intobazel-contrib:masterfrom
shs96c merged 7 commits intobazel-contrib:masterfrom
Conversation
Collaborator
|
Feels like this change should have a test or two. Was there a situation where you non-root artifacts taking precedence? |
eb8537c to
a91983e
Compare
This will also issue a warning if a dependency appears in multiple non-root modules and not in the root module, since that's a cause of conflicts in the final resolution. As part of this work, I've made sure that the `artifacts` and `boms` are consistently stored as `structs` rather than a mix of `strings` and `structs`
5f9c392 to
acf226e
Compare
cheister
approved these changes
Jun 20, 2025
* master: Update maven-metadata.xml when publishing locally (bazel-contrib#1369) Add support for gradle resolver (bazel-contrib#1357) Prepare for 6.8 release (bazel-contrib#1380)
shs96c
added a commit
to jin/rules_jvm_external
that referenced
this pull request
Jul 4, 2025
* master: (39 commits) Fix resolution of Android/AAR artifacts with Gradle resolver (bazel-contrib#1395) fail_if_repin_required is now True by default and minor improvement to failure message (bazel-contrib#1397) Housekeeping before we release 6.8 (bazel-contrib#1384) Add dll, dylib and so types to maven package mappings (bazel-contrib#1392) [bzlmod] Allow suppressing warning about multiple contributing modules. (bazel-contrib#1393) Use the artifact default values when adding them to a struct and add tests for coursier artifacts that have empty versions provided by BOMs and don't inlcude them in outdated (bazel-contrib#1390) Allow package exclusions and inclusions in javadocs (bazel-contrib#1293) Document well-known issues with `bzlmod` (bazel-contrib#1388) Begin documenting the gradle resolver (bazel-contrib#1389) Run gradle regression tests in CI (bazel-contrib#1385) Modify maven_export to allow exporting zip archives (bazel-contrib#1368) Allow root module's override tags to take precedence over the overridees from transitive deps. (bazel-contrib#1381) Ensure root module artifacts and boms take precedence with warnings (bazel-contrib#1373) Update maven-metadata.xml when publishing locally (bazel-contrib#1369) Add support for gradle resolver (bazel-contrib#1357) Prepare for 6.8 release (bazel-contrib#1380) Remove the Windows `kt_jvm_export` example (bazel-contrib#1383) Avoid spurious warnings about poorly formatted artifact coordinates (bazel-contrib#1374) Flip `fail_if_repin_required` to `True` by default (bazel-contrib#1371) Allow the same coordinate to be overridden in different repos (bazel-contrib#1378) ...
honnix
reviewed
Jul 14, 2025
|
|
||
| repo["additional_coursier_options"] = repo.get("additional_coursier_options", []) + getattr(install, "additional_coursier_options", []) | ||
| # For list attributes, concatenate but avoid duplicates (root items first) | ||
| for list_attr in ["repositories", "excluded_artifacts", "additional_netrc_lines", "additional_coursier_options"]: |
Contributor
There was a problem hiding this comment.
What is the reason deduplicating things in additional_coursier_options? There could be intentionally repeated options, for example --bom, passed on to coursier.
|
This only mentions the root module, but shouldn't artifacts in non-root modules also take precedence over the modules they depend on? Basically BFS with the first found using that search taking precedence. e.g. if C depends on B which depends on A, then I'd expect B's declarations to override A's even if root module C doesn't have the explicit artifacts/BOMs declared. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This will also issue a warning if a dependency appears in multiple non-root modules and not in the root module, since that's a cause of conflicts in the final resolution.
As part of this work, I've made sure that the
artifactsandbomsare consistently stored asstructsrather than a mix ofstringsandstructs