commit 4675874becfd4f77089b10b02bca285538b9c487
author hvadehra <hvd@google.com> Thu Oct 19 19:45:25 2023 +0200
committer GitHub <noreply@github.com> Thu Oct 19 19:45:25 2023 +0200
tree 396b78896d18e5e1ba1fb6c27209374604322a72
parent 0685c291165480c11bebbf626509c62e66d1ef64
parent c9bd7204a28a06201d6cc0d4647d5e7d147c4f33

Merge branch 'master' into rules_java_7.0.1

MODULE.bazel

diff --git a/MODULE.bazel b/MODULE.bazel
index 071144e..04f5ecd 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -1,6 +1,7 @@
 module(
     name = "rules_java",
     version = "7.0.6",
+    # Requires @bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type.
     compatibility_level = 1,
     bazel_compatibility = [">=6.4.0"],
 )

toolchains/default_java_toolchain.bzl

diff --git a/toolchains/default_java_toolchain.bzl b/toolchains/default_java_toolchain.bzl
index 8e28187..b6a6526 100644
--- a/toolchains/default_java_toolchain.bzl
+++ b/toolchains/default_java_toolchain.bzl
@@ -86,7 +86,7 @@
     singlejar = [Label("//toolchains:singlejar")],
     # Code to enumerate target JVM boot classpath uses host JVM. Because
     # java_runtime-s are involved, its implementation is in @bazel_tools.
-    bootclasspath = [Label("@bazel_tools//tools/jdk:platformclasspath")],
+    bootclasspath = [Label("//toolchains:platformclasspath")],
     source_version = "8",
     target_version = "8",
     reduced_classpath_incompatible_processors = [