[7.0.0] Fix JVM repository rules with Bzlmod #20088
Merged
Conversation
This file contains 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
* Lets the `http_jar` and `jvm_{maven_}import_external` rules load from `@rules_java` as resolved within `@bazel_tools` rather than the calling module extension's repository.
* Uses the user-provided apparent repository name in `jvm_maven_import_external` to generate a target name for the jar that makes the shorthand `@my_import` form work with Bzlmod.
* Ensure that Bazel loads the `http_jar` rule with the full repo mapping for `bazel_tools` so that it sees `rules_java`, while still loading `http_archive` with a trivial repo mapping to prevent a cycle during module repo creation. This requires introducing a new key type for `BzlLoadFunction`.
Closes #19997.
PiperOrigin-RevId: 579002601
Change-Id: I94c85e9759d0913384b10b9bbd0d0cb960cdd89a
github-actions
bot
added
awaiting-review
keertk
approved these changes
Nov 7, 2023
github-actions
bot
removed
the
awaiting-review
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
http_jarandjvm_{maven_}import_externalrules load from@rules_javaas resolved within@bazel_toolsrather than the calling module extension's repository.jvm_maven_import_externalto generate a target name for the jar that makes the shorthand@my_importform work with Bzlmod.http_jarrule with the full repo mapping forbazel_toolsso that it seesrules_java, while still loadinghttp_archivewith a trivial repo mapping to prevent a cycle during module repo creation. This requires introducing a new key type forBzlLoadFunction.Closes #19997.
PiperOrigin-RevId: 579002601
Change-Id: I94c85e9759d0913384b10b9bbd0d0cb960cdd89a