[7.0.0] Update rules_java 7.1.0 / java_tools 13.1.0 (bazelbuild#20106)

PR: bazelbuild#20045 Commit: bazelbuild@38b2911
comius · Nov 8, 2023 · ab0da80 · ab0da80
1 parent 35e5704
commit ab0da80
Show file tree

Hide file tree

Showing 7 changed files with 284 additions and 283 deletions.
diff --git a/BUILD b/BUILD
@@ -307,6 +307,7 @@ default_java_toolchain(
 
 default_java_toolchain(
     name = "bazel_rbe_java_toolchain",
+    bootclasspath = ["@bazel_tools//tools/jdk:platformclasspath"],
     source_version = "11",
     target_version = "11",
 )
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -24,7 +24,7 @@ bazel_dep(name = "zstd-jni", version = "1.5.2-3.bcr.1")
 bazel_dep(name = "blake3", version = "1.3.3.bcr.1")
 bazel_dep(name = "zlib", version = "1.3")
 bazel_dep(name = "rules_cc", version = "0.0.9")
-bazel_dep(name = "rules_java", version = "7.0.6")
+bazel_dep(name = "rules_java", version = "7.1.0")
 bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
 bazel_dep(name = "rules_jvm_external", version = "5.2")
 bazel_dep(name = "rules_python", version = "0.24.0")

diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/src/MODULE.tools b/src/MODULE.tools
@@ -5,7 +5,7 @@
 module(name = "bazel_tools")
 
 bazel_dep(name = "rules_cc", version = "0.0.9")
-bazel_dep(name = "rules_java", version = "7.0.6")
+bazel_dep(name = "rules_java", version = "7.1.0")
 bazel_dep(name = "rules_license", version = "0.0.3")
 bazel_dep(name = "rules_proto", version = "4.0.0")
 bazel_dep(name = "rules_python", version = "0.4.0")

diff --git a/src/test/shell/bazel/bazel_java_test_defaults.sh b/src/test/shell/bazel/bazel_java_test_defaults.sh
@@ -243,7 +243,7 @@ EOF
 function test_executable_java_binary_compiles_for_platform_without_cc_toolchain() {
   cat > MODULE.bazel <<'EOF'
 # This version should always be at most as high as the version in MODULE.tools.
-bazel_dep(name = "rules_java", version = "6.3.1")
+bazel_dep(name = "rules_java", version = "7.1.0")
 java_toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains")
 use_repo(java_toolchains, "remotejdk17_linux")
 register_toolchains(

diff --git a/src/test/tools/bzlmod/MODULE.bazel.lock b/src/test/tools/bzlmod/MODULE.bazel.lock
diff --git a/workspace_deps.bzl b/workspace_deps.bzl
@@ -25,9 +25,9 @@ WORKSPACE_REPOS = {
         "strip_prefix": "rules_cc-0.0.9",
     },
     "rules_java": {
-        "archive": "rules_java-7.0.6.tar.gz",
-        "sha256": "e81e9deaae0d9d99ef3dd5f6c1b32338447fe16d5564155531ea4eb7ef38854b",
-        "urls": ["https://github.com/bazelbuild/rules_java/releases/download/7.0.6/rules_java-7.0.6.tar.gz"],
+        "archive": "rules_java-7.1.0.tar.gz",
+        "sha256": "a37a4e5f63ab82716e5dd6aeef988ed8461c7a00b8e936272262899f587cd4e1",
+        "urls": ["https://github.com/bazelbuild/rules_java/releases/download/7.1.0/rules_java-7.1.0.tar.gz"],
     },
     # Used in src/test/java/com/google/devtools/build/lib/blackbox/framework/blackbox.WORKSAPCE
     "rules_proto": {