Respect rules_java as the source of truth for java toolchains (second try)#18558
Closed
meteorcloudy wants to merge 5 commits intobazelbuild:masterfrom
Closed
Respect rules_java as the source of truth for java toolchains (second try)#18558meteorcloudy wants to merge 5 commits intobazelbuild:masterfrom
meteorcloudy wants to merge 5 commits intobazelbuild:masterfrom
Conversation
4f7629b to
f55459f
Compare
2c1f5b7 to
857fe5d
Compare
This reverts commit d51c75f.
4f97edd to
0894e0a
Compare
copybara-service bot
pushed a commit
to bazelbuild/rules_java
that referenced
this pull request
Jun 5, 2023
Accepting additional args for local_java_repository This is required so that we can add repo_mapping attribute for `local_jdk` so that we can redirect rules_java to rules_java_builtin in bazelbuild/bazel#18558 to resolve the breakages for downstream projects. END_PUBLIC PiperOrigin-RevId: 537840788 Change-Id: I10df4474df4864101ee702705340626ebda07f4f
This is only for making it easier to setup integration tests.
… prefix Enable shared repo for testing for rules_java_builtin Mock rules_java_builtin Also clear workspace prefix Fix bugs Fix android tests Fix more tests More test fixes Fix blackbox tests More fixes Mock more files for rules_java
0894e0a to
91114cb
Compare
amishra-u
pushed a commit
to amishra-u/bazel
that referenced
this pull request
Jun 7, 2023
… try) Rolling forward bazelbuild@975866a (which was rollbacked at bazelbuild@d51c75f) with fixes. - Introduce a `rules_java_builtin` repo in WORKSPACE prefix to avoid conflict with user defined rules_java. - `@bazel_tools//tools/jdk/*.bzl` loads from `rules_java_builtin` through repo-mappings. - `@local_jdk` was overridden in `jdk.WORKSPACE` to add repo_mapping for `rules_java`. - `jdk.WORKSPACE` explicitly loads from `rules_java_builtin` for JDK definitions and java toolchain definitions. - Allow using `__SKIP_WORKSPACE_PREFIX__` and `__SKIP_WORKSPACE_SUFFIX__` in WORKSPACE comment. - Fixed many tests by adjusting the WORKSPACE file content. - Re-export more symbols from `@bazel_tools` to be backward-compatible. Fixes bazelbuild#18551 Related: - bazelbuild#18373 - bazelbuild/rules_java#110 - bazelbuild#18423 Closes bazelbuild#18558. PiperOrigin-RevId: 538483417 Change-Id: I5223eec2c4b10131fc8c5b342237385ff2f56413
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
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.
Rolling forward 975866a (which was rollbacked at d51c75f) with fixes.
rules_java_builtinrepo in WORKSPACE prefix to avoid conflict with user defined rules_java.@bazel_tools//tools/jdk/*.bzlloads fromrules_java_builtinthrough repo-mappings.@local_jdkwas overridden injdk.WORKSPACEto add repo_mapping forrules_java.jdk.WORKSPACEexplicitly loads fromrules_java_builtinfor JDK definitions and java toolchain definitions.__SKIP_WORKSPACE_PREFIX__and__SKIP_WORKSPACE_SUFFIX__in WORKSPACE comment.@bazel_toolsto be backward-compatible.Fixes #18551
Related: