[9.1.0] Update MODULE.bazel and .bazelversion for 9.1.0 (#28375)

Along with cherry-picks to fix the build:

* 58822ce
* f0ec350
* 92de49c
* 7c2c3b1
* 8a3eb60
* 0e14ff0

---------

Co-authored-by: pcloudy <[email protected]>
Co-authored-by: hvd <[email protected]>

Author: 3 people

.bazelci/postsubmit.yml

@@ -300,8 +300,6 @@ tasks:
       - "--config=remote"
       - "--remote_executor=grpcs://remotebuildexecution.googleapis.com"
       - "--jobs=200"
-      - "--experimental_remote_cache_async"
-      - "--experimental_remote_merkle_tree_cache"
       - "--remote_download_minimal"
       - "--experimental_output_paths=strip"
     build_targets:
@@ -312,8 +310,6 @@ tasks:
       - "--config=remote"
       - "--remote_executor=grpcs://remotebuildexecution.googleapis.com"
       - "--jobs=200"
-      - "--experimental_remote_cache_async"
-      - "--experimental_remote_merkle_tree_cache"
       - "--remote_download_minimal"
       - "--experimental_output_paths=strip"
     test_targets:

.bazelci/presubmit.yml

@@ -308,8 +308,6 @@ tasks:
       - "--config=remote"
       - "--remote_executor=grpcs://remotebuildexecution.googleapis.com"
       - "--jobs=200"
-      - "--experimental_remote_cache_async"
-      - "--experimental_remote_merkle_tree_cache"
       - "--remote_download_minimal"
       - "--experimental_output_paths=strip"
     build_targets:
@@ -320,8 +318,6 @@ tasks:
       - "--config=remote"
       - "--remote_executor=grpcs://remotebuildexecution.googleapis.com"
       - "--jobs=200"
-      - "--experimental_remote_cache_async"
-      - "--experimental_remote_merkle_tree_cache"
       - "--remote_download_minimal"
       - "--experimental_output_paths=strip"
     test_targets:

.bazelrc

@@ -35,6 +35,9 @@ common --downloader_config=bazel_downloader.cfg
 # Add BCR module mirrors
 common --module_mirrors=https://bcr.cloudflaremirrors.com
 
+# Some integration tests need the PATH environment variable set.
+common --test_env=PATH
+
 # Suppress warnings from external repos, we have no direct control on them anyway.
 common:linux --per_file_copt=external/.*@-w
 common:linux --host_per_file_copt=external/.*@-w

.bazelversion

@@ -1 +1 @@
-8.4.2
+9.0.0

MODULE.bazel

@@ -5,7 +5,7 @@
 
 module(
     name = "bazel",
-    version = "9.0.0",
+    version = "9.1.0",
     repo_name = "io_bazel",
 )
 
@@ -26,7 +26,7 @@ bazel_dep(name = "platforms", version = "1.0.0")
 bazel_dep(name = "protobuf", version = "33.4", repo_name = "com_google_protobuf")
 bazel_dep(name = "re2", version = "2025-11-05.bcr.1")
 bazel_dep(name = "rules_graalvm", version = "0.11.1")
-bazel_dep(name = "rules_java", version = "9.0.3")
+bazel_dep(name = "rules_java", version = "9.1.0")
 bazel_dep(name = "rules_jvm_external", version = "6.6")
 bazel_dep(name = "rules_license", version = "1.0.0")
 bazel_dep(name = "rules_pkg", version = "1.1.0")
@@ -57,6 +57,7 @@ bazel_dep(name = "buildozer", version = "8.2.1", repo_name = None)  # Keep in sy
 bazel_dep(name = "rules_swift", version = "3.3.0")  # with repo_name = None, version drops to 2.4.0
 bazel_dep(name = "rules_apple", version = "4.3.1", repo_name = None)
 bazel_dep(name = "google_benchmark", version = "1.9.4", repo_name = None)
+bazel_dep(name = "onetbb", version = "2022.2.0", repo_name = None)
 
 # bazel_dep overrides
 single_version_override(
@@ -74,6 +75,7 @@ single_version_override(
         "//third_party:rules_graalvm_fix.patch",
         "//third_party:rules_graalvm_unicode.patch",
         "//third_party:rules_graalvm_load_fix.patch",
+        "//third_party:rules_graalvm_bazel9_fixes.patch",
     ],
 )
 

MODULE.bazel.lock

@@ -33,7 +33,7 @@ use_repo(buildozer_binary, "buildozer_binary")
 # Dependencies used to auto-load removed symbols and rules from Bazel (due to Starlarkification)
 # See also:  --incompatible_autoload_externally, AutoloadSymbols
 bazel_dep(name = "protobuf", version = "33.4", repo_name = "com_google_protobuf")
-bazel_dep(name = "rules_java", version = "9.0.3")
+bazel_dep(name = "rules_java", version = "9.1.0")
 bazel_dep(name = "rules_cc", version = "0.2.14")
 bazel_dep(name = "rules_python", version = "1.7.0")
 bazel_dep(name = "rules_shell", version = "0.6.1")

src/MODULE.tools

@@ -636,7 +636,7 @@ std::vector<BlazercOption> OptionProcessor::GetBlazercOptions(
   // Provide terminal options as least important options.
   // LINT.IfChange
   std::string terminal_rc_source = "client";
-  // LINT.ThenChange(src/main/java/com/google/devtools/common/options/GlobalRcUtils.java)
+  // LINT.ThenChange(//src/main/java/com/google/devtools/common/options/GlobalRcUtils.java)
   result.push_back({terminal_rc_source, "common",
                     "--isatty=" + blaze_util::ToString(IsStandardTerminal())});
   result.push_back(
@@ -678,7 +678,7 @@ std::vector<std::string> OptionProcessor::GetBlazercAndEnvCommandArgs(
   // LINT.IfChange
   result.push_back("--rc_source=client");
   rcfile_index["client"] = 0;
-  // LINT.ThenChange(src/main/java/com/google/devtools/common/options/GlobalRcUtils.java)
+  // LINT.ThenChange(//src/main/java/com/google/devtools/common/options/GlobalRcUtils.java)
   int cur_index = 1;
   for (const auto& option : blazerc_options) {
     if (rcfile_index.contains(option.source_path)) continue;

src/main/cpp/option_processor.cc

@@ -55,7 +55,7 @@ private GlobalRcUtils() {}
         return false;
       };
   // LINT.ThenChange(//src/main/cpp/option_processor.cc,
-  // src/main/java/com/google/devtools/common/options/InvocationPolicyEnforcer.java
+  // //src/main/java/com/google/devtools/common/options/InvocationPolicyEnforcer.java)
 
   /** Is an rc file path a global rc? */
   public static boolean isGlobalRcFile(String rcFilePath) {

src/main/java/com/google/devtools/common/options/GlobalRcUtils.java

@@ -53,7 +53,7 @@ public final class InvocationPolicyEnforcer {
 
   // LINT.IfChange
   private static final String INVOCATION_POLICY_SOURCE = "Invocation policy";
-  // LINT.ThenChange(//src/main/java/com/google/devtools/common/options/GlobalRcUtils.java, src/main/java/com/google/devtools/common/options/GlobalRcUtils.java)
+  // LINT.ThenChange(//src/main/java/com/google/devtools/common/options/GlobalRcUtils.java, //src/main/java/com/google/devtools/common/options/GlobalRcUtils.java.oss)
   private final InvocationPolicy invocationPolicy;
   private final Level loglevel;
   @Nullable private final Object conversionContext;