Merge pull request #146 from bazelbuild:rules_java_7.0.1

PiperOrigin-RevId: 574941437
Change-Id: Ia5bb7670bd70ce75dfab847f1456c82961cfdc27

MODULE.bazel

diff --git a/MODULE.bazel b/MODULE.bazel
index 7695cda..2e4dafa 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -1,6 +1,6 @@
 module(
     name = "rules_java",
-    version = "7.0.0",
+    version = "7.0.6",
     # Requires @bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type.
     bazel_compatibility = [">=6.4.0"],
     compatibility_level = 1,

java/defs.bzl

diff --git a/java/defs.bzl b/java/defs.bzl
index 75b4a36..c124871 100644
--- a/java/defs.bzl
+++ b/java/defs.bzl
@@ -18,7 +18,7 @@
 # Do not touch: This line marks the end of loads; needed for PR importing.
 
 _MIGRATION_TAG = "__JAVA_RULES_MIGRATION_DO_NOT_USE_WILL_BREAK__"
-version = "7.0.0"
+version = "7.0.6"
 
 def _add_tags(attrs):
     if "tags" in attrs and attrs["tags"] != None:

toolchains/BUILD

diff --git a/toolchains/BUILD b/toolchains/BUILD
index c504589..6d22bc5 100644
--- a/toolchains/BUILD
+++ b/toolchains/BUILD
@@ -257,11 +257,11 @@
     actual = ":toolchain",
 )
 
-RELEASES = (8, 9, 10, 11)
+RELEASES = (8, 9, 10, 11, 17, 21)
 
 [
     default_java_toolchain(
-        name = "toolchain_java%d" % release,
+        name = ("toolchain_java%d" if release <= 11 else "toolchain_jdk_%d") % release,
         configuration = DEFAULT_TOOLCHAIN_CONFIGURATION,
         source_version = "%s" % release,
         target_version = "%s" % release,
@@ -269,51 +269,6 @@
     for release in RELEASES
 ]
 
-# A toolchain that targets java 14.
-default_java_toolchain(
-    name = "toolchain_jdk_14",
-    configuration = dict(),
-    java_runtime = "//toolchains:remotejdk_14",
-    source_version = "14",
-    target_version = "14",
-)
-
-# A toolchain that targets java 15.
-default_java_toolchain(
-    name = "toolchain_jdk_15",
-    configuration = dict(),
-    java_runtime = "//toolchains:remotejdk_15",
-    source_version = "15",
-    target_version = "15",
-)
-
-# A toolchain that targets java 16.
-default_java_toolchain(
-    name = "toolchain_jdk_16",
-    configuration = dict(),
-    java_runtime = "//toolchains:remotejdk_16",
-    source_version = "16",
-    target_version = "16",
-)
-
-# A toolchain that targets java 17.
-default_java_toolchain(
-    name = "toolchain_jdk_17",
-    configuration = dict(),
-    java_runtime = "//toolchains:remotejdk_17",
-    source_version = "17",
-    target_version = "17",
-)
-
-# A toolchain that targets java 21.
-default_java_toolchain(
-    name = "toolchain_jdk_21",
-    configuration = dict(),
-    java_runtime = "//toolchains:remotejdk_21",
-    source_version = "21",
-    target_version = "21",
-)
-
 default_java_toolchain(
     name = "prebuilt_toolchain",
     configuration = PREBUILT_TOOLCHAIN_CONFIGURATION,