From 8645ce7cbc3e9771b1e1519ece4389f4f82e399d Mon Sep 17 00:00:00 2001
From: Alex Cook <a5cook@uwaterloo.ca>
Date: Wed, 21 Jan 2026 08:52:02 -0500
Subject: [PATCH 1/3] fix: try setting bazel version at job level

---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6db7790bca91..397cbe8bee15 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,6 +26,7 @@ jobs:
         java_version: [21]
     env:
       JAVA_VERSION: ${{ matrix.java_version }}
+      USE_BAZEL_VERSION: "8.5.1"
     steps:
     - uses: actions/checkout@v6
     - name: Set up JDK ${{ matrix.java_version }}
@@ -177,6 +178,7 @@ jobs:
 
     env:
       JAVA_VERSION: ${{ matrix.java.version }}
+      USE_BAZEL_VERSION: "8.5.1"
     continue-on-error: ${{ matrix.java.experimental }}
     steps:
     - name: Check out sources

From c57cc6e90e2c322cab23b74b022af7084b676ae3 Mon Sep 17 00:00:00 2001
From: Alex Cook <a5cook@uwaterloo.ca>
Date: Wed, 21 Jan 2026 11:53:34 -0500
Subject: [PATCH 2/3] ci: add regex manager to renovate to check for bazel
 version updates

---
 .github/renovate.json | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/renovate.json b/.github/renovate.json
index 69151a9046b8..a0500e0f92b3 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -18,5 +18,14 @@
       "matchPackageNames": ["org.apache.spark:spark-sql_2.12"],
       "enabled": false
     }
+  ],
+    "regexManagers": [
+    {
+      "description": "Update USE_BAZEL_VERSION in GitHub Actions",
+      "fileMatch": ["^\\.github/workflows/.*\\.yml$"],
+      "matchStrings": ["USE_BAZEL_VERSION: \"(?<currentValue>.*?)\""],
+      "datasourceTemplate": "github-releases",
+      "depNameTemplate": "bazelbuild/bazel"
+    }
   ]
 }

From 781447131f8e4c9969a7126806e906d97acb3f66 Mon Sep 17 00:00:00 2001
From: Alex Cook <a5cook@uwaterloo.ca>
Date: Wed, 21 Jan 2026 11:55:01 -0500
Subject: [PATCH 3/3] docs(examples): update bazel exmaple to explicitly use
 rules_java

---
 docs/examples/BazelExample/BUILD        | 2 ++
 docs/examples/BazelExample/MODULE.bazel | 1 +
 2 files changed, 3 insertions(+)

diff --git a/docs/examples/BazelExample/BUILD b/docs/examples/BazelExample/BUILD
index adb5bfc4f273..fef40b03884c 100644
--- a/docs/examples/BazelExample/BUILD
+++ b/docs/examples/BazelExample/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_binary", "java_plugin")
+
 java_binary(
     name = "example",
     srcs = ["BazelExample.java"],
diff --git a/docs/examples/BazelExample/MODULE.bazel b/docs/examples/BazelExample/MODULE.bazel
index ed9feeac17ca..2c94bd1e2ac6 100644
--- a/docs/examples/BazelExample/MODULE.bazel
+++ b/docs/examples/BazelExample/MODULE.bazel
@@ -1,3 +1,4 @@
+bazel_dep(name = "rules_java", version = "8.6.1")
 bazel_dep(name = "rules_jvm_external", version = "6.6")
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 maven.install(