Skip to content
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

Jump to bottom

Update rules_java 7.1.0 / java_tools 13.1.0 #20045

Closed
wants to merge 1 commit into from
Closed

Update rules_java 7.1.0 / java_tools 13.1.0 #20045

wants to merge 1 commit into from

Conversation

hvadehra
Copy link
Member

@hvadehra hvadehra commented Nov 3, 2023 •
edited by keertk
Loading

@hvadehra hvadehra force-pushed the p20044 branch 3 times, most recently from bc49353 to b0ec360 Compare November 3, 2023 15:57
@iancha1992 iancha1992 mentioned this pull request Nov 3, 2023
Closed
@keertk keertk changed the title [temp] Update rules_java / java_tools Update rules_java 7.1.0 / java_tools 13.1.0 Nov 7, 2023
@keertk keertk marked this pull request as ready for review November 7, 2023 15:44
@github-actions github-actions bot added the awaiting-review PR is awaiting review from an assigned reviewer label Nov 7, 2023
@keertk keertk added the team-Rules-Java Issues for Java rules label Nov 7, 2023
@keertk
Copy link
Member

keertk commented Nov 7, 2023

@bazel-io fork 7.0.0

@bazel-io bazel-io mentioned this pull request Nov 7, 2023
Closed
@keertk keertk self-requested a review November 7, 2023 16:33
@keertk keertk added awaiting-PR-merge PR has been approved by a reviewer and is ready to be merge internally and removed awaiting-review PR is awaiting review from an assigned reviewer labels Nov 7, 2023
@hvadehra
Copy link
Member Author

hvadehra commented Nov 8, 2023 •
edited
Loading

Fixed merge conflicts.

cc @keertk after c1f2aff distdir_deps.bzl is deleted and in the future we'll have to make updates to workspace_deps.bzl

@hvadehra
Copy link
Member Author

hvadehra commented Nov 8, 2023

Unfortunately, this means when we fork this for bazel 7.0.0, we'll need to manually port back the changes to distdir_deps.bzl. Sigh.

Unless of course, c1f2aff is also being picked into 7.0.0 @meteorcloudy ?

@meteorcloudy
Copy link
Member

Yes, c1f2aff will also be cherry picked to 7.0.0. I'll do it now!

@meteorcloudy
Copy link
Member

Please wait for #20097 before cherry-picking this one.

@copybara-service copybara-service bot closed this in 38b2911 Nov 8, 2023
@github-actions github-actions bot removed the awaiting-PR-merge PR has been approved by a reviewer and is ready to be merge internally label Nov 8, 2023
keertk added a commit that referenced this pull request Nov 8, 2023
@keertk
Update rules_java 7.1.0 / java_tools 13.1.0
5ba3ce0 
bazelbuild/java_tools#83

Closes #20045.

PiperOrigin-RevId: 580458259
Change-Id: I9b0b4ca8c16110d380e2a268e1fb4fe9c2b89032
@keertk keertk mentioned this pull request Nov 8, 2023
Merged
keertk added a commit that referenced this pull request Nov 8, 2023
@keertk
[7.0.0] Update rules_java 7.1.0 / java_tools 13.1.0 (#20106)
ab0da80 
PR: #20045
Commit:
38b2911
@hvadehra hvadehra deleted the p20044 branch November 13, 2023 08:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@keertk keertk keertk approved these changes

Assignees
No one assigned
Labels
team-Rules-Java Issues for Java rules
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hvadehra @keertk @meteorcloudy