Unblock Bazel JDK 21 upgrade by patching RJE with upstream commit 5a78bc62

[jin]

Context: bazel-contrib/rules_jvm_external#895 (comment)

This updates RJE to unblock building Bazel itself with Java 21.

[jin]

On the presubmit failures: the distdir logic seems to have an issue with looking for ~override module deps here (or the MODULE.bazel.lock is missing info for overriden deps?): https://cs.opensource.google/bazel/bazel/+/master:src/tools/bzlmod/utils.bzl;l=56-74;drc=64644991518fdd9eea61f0620e10a831a8848455

required_repos contains rules_jvm_external~override, but the moduleDepGraph entry for rules_jvm_external doesn't have a repoSpec: https://gist.github.com/jin/e5eb27cce566049fa62b2ba76a4c1563

[fmeum]

@jin So called "non-registry overrides" have special handling. Could you add the patch as a file and then add it to the existing single_version_override here

bazel/MODULE.bazel

Line 41 in b9c0288

patches = ["//third_party:rules_jvm_external_6.0.patch"],

[fmeum]

The r_j_e patch doesn't look fully correct to me as it uses the Java compilation runtime, not the tool runtime configured via --tool_java_runtime_version. I will submit a follow-up PR upstream, the fix should be totally fine for use in Bazel though as-is.

[jin]

Thanks @fmeum, done.

[jin]

Failures look legit on the arm64 Windows build:

(08:25:20) ERROR: C:/b/vzvul6zu/external/rules_jvm_external~6.0~maven~maven/BUILD:190:11: Stamping the manifest of @@rules_jvm_external~6.0~maven~maven//:com_google_api_client_google_api_client failed: (Exit -1): java.exe failed: error executing StampJarManifest command (from target @@rules_jvm_external~6.0~maven~maven//:com_google_api_client_google_api_client)
--
  | cd /d C:/b/vzvul6zu/execroot/_main
  | external\rules_java~7.4.0~toolchains~remotejdk11_win_arm64\bin\java.exe -jar bazel-out/x64_windows-opt-exec-ST-fad1763555eb/bin/external/rules_jvm_external~6.0/private/tools/java/com/github/bazelbuild/rules_jvm_external/jar/AddJarManifestEntry_deploy.jar --source bazel-out/x64_windows-fastbuild/bin/external/rules_jvm_external~6.0~maven~maven/com/google/api-client/google-api-client/1.35.2/google-api-client-1.35.2.jar --output bazel-out/x64_windows-fastbuild/bin/external/rules_jvm_external~6.0~maven~maven/com/google/api-client/google-api-client/1.35.2/processed_google-api-client-1.35.2.jar --manifest-entry Target-Label:@maven//:com_google_api_client_google_api_client
  | # Configuration: 544d1f532d3db342230291feefabc683d3a3eba40daccacb30eaf2cf7817b8b3
  | # Execution platform: //:default_host_platform
  | Action failed to execute: java.io.IOException: ERROR: src/main/native/windows/process.cc(202): CreateProcessW("C:\b\vzvul6zu\execroot\_main\external\rules_java~7.4.0~toolchains~remotejdk11_win_arm64\bin\java.exe" -jar bazel-out/x64_windows-opt-exec-ST-fad1763555eb/bin/external/rules_jvm_external~6.0/private/tools/java/com/github/bazelbuild/rules_jvm_external/jar/AddJarManifestEntry_deploy.jar --source bazel-out/x64_windows-fastbuild/bin/external/rules_jvm_external~6.0~maven~maven/com/google/api-client/google-api-client/1.35.2/google-api-client-1.35.2.jar --output bazel-out/x64_windows-fastbuild/bin(...)): This version of %1 is not compatible with the version of Windows you're running. Check your computer's system information and then contact the software publisher.
  | (error: 216)
  | (08:25:20) ERROR: C:/b/vzvul6zu/external/rules_jvm_external~6.0~maven~maven/BUILD:508:11: Stamping the manifest of @@rules_jvm_external~6.0~maven~maven//:com_google_code_findbugs_jsr305 failed: (Exit -1): java.exe failed: error executing StampJarManifest command (from target @@rules_jvm_external~6.0~maven~maven//:com_google_code_findbugs_jsr305)
  | cd /d C:/b/vzvul6zu/execroot/_main
  | external\rules_java~7.4.0~toolchains~remotejdk11_win_arm64\bin\java.exe -jar bazel-out/x64_windows-opt-exec-ST-fad1763555eb/bin/external/rules_jvm_external~6.0/private/tools/java/com/github/bazelbuild/rules_jvm_external/jar/AddJarManifestEntry_deploy.jar --source bazel-out/x64_windows-fastbuild/bin/external/rules_jvm_external~6.0~maven~maven/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar --output bazel-out/x64_windows-fastbuild/bin/external/rules_jvm_external~6.0~maven~maven/com/google/code/findbugs/jsr305/3.0.2/processed_jsr305-3.0.2.jar --manifest-entry Target-Label:@maven//:com_google_code_findbugs_jsr305
  | # Configuration: 544d1f532d3db342230291feefabc683d3a3eba40daccacb30eaf2cf7817b8b3
  | # Execution platform: //:default_host_platform
  | Action failed to execute: java.io.IOException: ERROR: src/main/native/windows/process.cc(202): CreateProcessW("C:\b\vzvul6zu\execroot\_main\external\rules_java~7.4.0~toolchains~remotejdk11_win_arm64\bin\java.exe" -jar bazel-out/x64_windows-opt-exec-ST-fad1763555eb/bin/external/rules_jvm_external~6.0/private/tools/java/com/github/bazelbuild/rules_jvm_external/jar/AddJarManifestEntry_deploy.jar --source bazel-out/x64_windows-fastbuild/bin/external/rules_jvm_external~6.0~maven~maven/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar --output bazel-out/x64_windows-fastbuild/bin/external/rules_jvm_e(...)): This version of %1 is not compatible with the version of Windows you're running. Check your computer's system information and then contact the software publisher.
  | (error: 216)

[fmeum]

The Windows arm64 build cross-compiles on amd64 for arm64. It looks like the jvm_import rule selects a Java runtime for the target platform, not the exec platform. Could you check whether my r_j_e patch fixes that?

[fmeum]

Ah, nvm, I still got this wrong in r_j_e. The runtime toolchain is selected for the target configuration. Instead, we could wrap the AddJarManifestEntry jar into a java_binary and depend on that in the exec cfg. No need for toolchains. Sorry for the confusion :⁠-⁠)

Edit: Not at a computer right now, but I can submit a fix for the fix later.

[fmeum]

@jin It actually looks like r_j_e had this correct before bazel-contrib/rules_jvm_external#1058. AddJarManifestEntry was a java_binary and depended on in the exec configuration. Maybe Bazel was just missing a --tool_java_runtime_version?

[jin]

@fmeum dug into it a bit more - you're right, the original bazel patch just needed --tool_java_runtime_version=21, and the changes to RJE aren't necessary. Will revert.