Migrate remote JDK / Java tools and add Bzlmod support #45

meteorcloudy · 2021-11-10T13:54:30Z

Important changes in this PR:

Migrated remote JDK and java tools definitions from @bazel_tools//tools/jdk to rules_java.
Added support for detecting java home in local_java_repository rule so that we don't need Bazel to export DEFAULT_SYSTEM_JAVABASE
Added Bzlmod support to load remote JDK/ java tools dependencies and register toolchains.
Also added toolchain registration support in old fashion WORKSPACE way. However, the java tools are not loaded for now because it's not compatible with Bazel 4.2.1, it would feasible with Bazel 5.0.
Enabled CI tests for Bzlmod.

In Bzlmod, users automatically get all remote jdk dependencies and toolchains registered by depending on rules_java.
In old WORKSPACE way, users can do that by

load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")
rules_java_dependencies()
rules_java_toolchains()

If everyone migrate to this, we no longer need to append jdk.WORKSPACE as default workspace suffix.

After this, we only reference toolchain type targets under @bazel_tools//tools/jdk - @bazel_tools//tools/jdk:toolchain_type - @bazel_tools//tools/jdk:runtime_toolchain_type

meteorcloudy · 2021-11-10T13:54:44Z

FYI @Wyverald , to make Bzlmod support work, we need to export DEFAULT_SYSTEM_JAVABASE to module extension evaluation, can you help with that?

Update:

Hmm, looks like the evaluation env of bzl file in WORKSPACE also doesn't have DEFAULT_SYSTEM_JAVABASE, it's only available in WORKSPACE, maybe we can also only make it available in MODULE.bazel?

meteorcloudy · 2021-11-10T13:55:25Z

@comius This PR is a bit huge, it's better to review each commit. ;)

meteorcloudy · 2021-11-10T14:33:37Z

@comius Do we still need the federation stuff in the WORKSPACE file? I need to pass DEFAULT_SYSTEM_JAVABASE to rules_java_toolchains, and the federation repo seems to block me from doing that.

comius · 2021-11-10T19:15:53Z

Do we still need the federation stuff in the WORKSPACE file?

I think you should drop it if it's used anywhere. I don't think it serves any purpose.

java_tools_javac11_repos is not yet loaded because it breaks compatibility with Bazel 4.2.1`

meteorcloudy · 2021-11-11T15:02:49Z

@comius I re-organized the commits to make them easier for review, also updated the PR description. PTAL~

java/repositories.bzl

.bazelci/presubmit.yml

examples/hello-world/HelloWorld.java

.bazelrc

toolchains/local_java_repository.bzl

toolchains/BUILD

MODULE.bazel

java/repositories.bzl

comius · 2021-11-15T14:24:56Z

java/repositories.bzl

        ],
    )

-def remote_jdk8_repos():


Perhaps keep JDK8 remote repos. This is the only location where they are still defined.

And I was advertising on rules_appengine (which needs JDK8), this is the way to use it without installing JDK8 locally.

But we could also say we don't support JDK8 anymore.

Also, I was advertising that calling for example remote_jdk8_repos() from the WORKSPACE will have the JDK8 toolchain ready - defined and registered. Perhaps the code needs to be reorganised a bit to keep this true in the no-bzlmod world.

The user base that's using rules_java and calls in repositories.bzl, is probably really small, though. So I'm not sure, how much is worth spending time on this reorganisation + JDK8.

OK, I added remote_jdk8_repos back, also added toolchain registration in it, but I'm not invoking it by default in rules_java_dependencies. PTAL~.

java/repositories.bzl

toolchains/java_toolchain_alias.bzl

MODULE.bazel

java/repositories.bzl

toolchains/BUILD

examples/hello-world/HelloWorld.java

meteorcloudy · 2021-11-16T13:11:18Z

@comius When is the next release for rules_java?

comius · 2021-11-16T13:22:59Z

@comius When is the next release for rules_java?

I don't think they were ever released :)

And also copybara looks broken - I know it wasn't a year ago.

meteorcloudy · 2021-11-16T13:27:49Z

I don't think they were ever released :)

OK 😂, but can you tag a 4.1.0 or 5.0.0 version after merging this? So I don't have to cherry-pick those change into the Bazel Central Registry.

And also copybara looks broken - I know it wasn't a year ago.

Should I send the changes via internal CL?

Update: OK, I see, it's imported, will fix the presubmit issue.

comius · 2021-11-16T13:45:56Z

I don't think they were ever released :)

OK 😂, but can you tag a 4.1.0 or 5.0.0 version after merging this? So I don't have to cherry-pick those change into the Bazel Central Registry.

Of course. I'll tag it 5.0.0.

And also copybara looks broken - I know it wasn't a year ago.

Should I send the changes via internal CL?

Update: OK, I see, it's imported, will fix the presubmit issue.

Thanks!

meteorcloudy · 2021-11-23T10:15:36Z

Ping @comius for tagging a 5.0.0 version ;)

comius · 2021-11-23T10:46:54Z

Ping @comius for tagging a 5.0.0 version ;)

Sorry, done.

meteorcloudy · 2021-11-23T11:26:16Z

Thanks! 🎉

meteorcloudy added 3 commits November 10, 2021 13:44

Update remote jdk and java tools dependencies

637276e

Copy over files from @bazel_tools//tools/jdk

71621f3

Rewire toolchain targets

7a8910b

After this, we only reference toolchain type targets under @bazel_tools//tools/jdk - @bazel_tools//tools/jdk:toolchain_type - @bazel_tools//tools/jdk:runtime_toolchain_type

meteorcloudy requested review from comius and lberki as code owners November 10, 2021 13:54

google-cla bot added the cla: yes label Nov 10, 2021

meteorcloudy force-pushed the toolchains_bzlmod branch 2 times, most recently from 712b3b0 to d624bcd Compare November 10, 2021 15:11

meteorcloudy mentioned this pull request Nov 10, 2021

(WIP) Bzlmod: export DEFAULT_SYSTEM_JAVABASE to MODULE.bazel bazelbuild/bazel#14253

Closed

meteorcloudy force-pushed the toolchains_bzlmod branch from 8493437 to a38ab3a Compare November 10, 2021 15:53

meteorcloudy force-pushed the toolchains_bzlmod branch from b765185 to ea5e9bb Compare November 11, 2021 14:12

meteorcloudy added 5 commits November 11, 2021 15:42

Run buildifier

7f753bd

local_java_repository: support auto-detect java home

2b69d9c

Compelete rules_java_dependencies and rules_java_toolchains

fb38ac3

java_tools_javac11_repos is not yet loaded because it breaks compatibility with Bazel 4.2.1`

Add Bzlmod support

44879e7

Enable CI tests

512b226

meteorcloudy force-pushed the toolchains_bzlmod branch from 3cb80ea to 512b226 Compare November 11, 2021 14:50

Remove java_plugins_flag_alias

024e84f

brentleyjones reviewed Nov 11, 2021

View reviewed changes

java/repositories.bzl Show resolved Hide resolved

comius requested changes Nov 15, 2021

View reviewed changes

meteorcloudy added 2 commits November 15, 2021 18:03

Address review comments (part 1)

bd24ef7

Address review comments (part 2)

0337494

fmeum reviewed Nov 16, 2021

View reviewed changes

toolchains/java_toolchain_alias.bzl Show resolved Hide resolved

comius previously approved these changes Nov 16, 2021

View reviewed changes

MODULE.bazel Show resolved Hide resolved

java/repositories.bzl Outdated Show resolved Hide resolved

toolchains/BUILD Outdated Show resolved Hide resolved

toolchains/BUILD Outdated Show resolved Hide resolved

Address review comments (part 3)

d2d3b59

meteorcloudy dismissed comius’s stale review via d2d3b59 November 16, 2021 09:18

Small fixes

d69177c

comius previously approved these changes Nov 16, 2021

View reviewed changes

examples/hello-world/HelloWorld.java Outdated Show resolved Hide resolved

New line at HelloWorld.java

b4de2cc

meteorcloudy dismissed comius’s stale review via b4de2cc November 16, 2021 13:02

Rename hello world package

21e0453

meteorcloudy force-pushed the toolchains_bzlmod branch from 017f618 to 21e0453 Compare November 16, 2021 13:32

bazel-io merged commit 7a3c520 into bazelbuild:master Nov 16, 2021

meteorcloudy mentioned this pull request Mar 22, 2022

Adding rules_rust release artifacts to Google mirror bazelbuild/continuous-integration#1347

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate remote JDK / Java tools and add Bzlmod support #45

Migrate remote JDK / Java tools and add Bzlmod support #45

meteorcloudy commented Nov 10, 2021 •

edited

Loading

meteorcloudy commented Nov 10, 2021 •

edited

Loading

meteorcloudy commented Nov 10, 2021

meteorcloudy commented Nov 10, 2021

comius commented Nov 10, 2021 •

edited

Loading

meteorcloudy commented Nov 11, 2021

comius Nov 15, 2021

meteorcloudy Nov 16, 2021

meteorcloudy commented Nov 16, 2021

comius commented Nov 16, 2021

meteorcloudy commented Nov 16, 2021 •

edited

Loading

comius commented Nov 16, 2021

meteorcloudy commented Nov 23, 2021

comius commented Nov 23, 2021

meteorcloudy commented Nov 23, 2021

Migrate remote JDK / Java tools and add Bzlmod support #45

Migrate remote JDK / Java tools and add Bzlmod support #45

Conversation

meteorcloudy commented Nov 10, 2021 • edited Loading

meteorcloudy commented Nov 10, 2021 • edited Loading

meteorcloudy commented Nov 10, 2021

meteorcloudy commented Nov 10, 2021

comius commented Nov 10, 2021 • edited Loading

meteorcloudy commented Nov 11, 2021

comius Nov 15, 2021

Choose a reason for hiding this comment

meteorcloudy Nov 16, 2021

Choose a reason for hiding this comment

meteorcloudy commented Nov 16, 2021

comius commented Nov 16, 2021

meteorcloudy commented Nov 16, 2021 • edited Loading

comius commented Nov 16, 2021

meteorcloudy commented Nov 23, 2021

comius commented Nov 23, 2021

meteorcloudy commented Nov 23, 2021

meteorcloudy commented Nov 10, 2021 •

edited

Loading

meteorcloudy commented Nov 10, 2021 •

edited

Loading

comius commented Nov 10, 2021 •

edited

Loading

meteorcloudy commented Nov 16, 2021 •

edited

Loading