feat: Add macros to customize JavaBuilder and Error Prone checkers

BUILD

@@ -19,6 +19,7 @@ filegroup(
         "MODULE.bazel",
         "WORKSPACE",
         "//java:srcs",
+        "//java_tools/buildjar:srcs",
         "//toolchains:srcs",
     ],
     visibility = ["//visibility:public"],

MODULE.bazel

@@ -9,23 +9,14 @@ bazel_dep(name = "platforms", version = "0.0.11")
 bazel_dep(name = "rules_cc", version = "0.2.17")
 bazel_dep(name = "bazel_features", version = "1.30.0")
 bazel_dep(name = "bazel_skylib", version = "1.6.1")
-bazel_dep(name = "protobuf", version = "32.1", repo_name = "com_google_protobuf")
+bazel_dep(name = "protobuf", version = "33.4", repo_name = "com_google_protobuf")
 bazel_dep(name = "zlib", version = "1.3.1.bcr.5")
 
 # Required by @remote_java_tools, which is loaded via module extension.
 bazel_dep(name = "rules_license", version = "0.0.3")
 bazel_dep(name = "abseil-cpp", version = "20250814.1", repo_name = "com_google_absl")
 bazel_dep(name = "re2", version = "2025-11-05.bcr.1")
 
-single_version_override(
-    module_name = "protobuf",
-    patch_strip = 1,
-    patches = [
-        "//third_party:protobuf_load-cc-rules.patch",
-    ],
-    version = "32.1",
-)
-
 register_toolchains("//toolchains:all")
 
 toolchains = use_extension("//java:extensions.bzl", "toolchains")
@@ -117,6 +108,25 @@ REMOTE_JDK_REPOS = [(("remote_jdk" if version == "8" else "remotejdk") + version
 compat = use_extension("//java:rules_java_deps.bzl", "compatibility_proxy")
 use_repo(compat, "compatibility_proxy")
 
+java_tools_deps = use_extension("//java_tools/buildjar:deps.bzl", "java_tools_deps_ext")
+use_repo(
+    java_tools_deps,
+    "rules_java_auto_value",
+    "rules_java_auto_value_annotations",
+    "rules_java_caffeine",
+    "rules_java_error_prone",
+    "rules_java_error_prone_annotation",
+    "rules_java_error_prone_annotations",
+    "rules_java_error_prone_check_api",
+    "rules_java_gson",
+    "rules_java_guava",
+    "rules_java_jacoco_core",
+    "rules_java_javax_inject",
+    "rules_java_jsr305",
+    "rules_java_junit4",
+    "rules_java_truth",
+)
+
 # Dev dependencies
 bazel_dep(name = "rules_pkg", version = "0.9.1", dev_dependency = True)
 bazel_dep(name = "stardoc", version = "0.8.0", dev_dependency = True)

java/rules_java_deps.bzl

@@ -3,6 +3,7 @@
 load("@bazel_features//private:util.bzl", _bazel_version_ge = "ge")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
+load("//java_tools/buildjar:deps.bzl", "java_tools_deps")
 
 def _compatibility_proxy_repo_impl(rctx):
     if _bazel_version_ge("8.0.0"):
@@ -234,3 +235,4 @@ def rules_java_dependencies():
     absl_repo()
     rules_license_repo()
     re2_repo()
+    java_tools_deps()

java_tools/buildjar/BUILD

@@ -0,0 +1,57 @@
+package(
+    default_applicable_licenses = ["@rules_java//:license"],
+    default_visibility = [":buildjar_package_group"],
+)
+
+filegroup(
+    name = "srcs",
+    srcs = [
+        "BUILD",
+        "deps.bzl",
+        "//java_tools/buildjar/java/com/google/devtools/build/buildjar:srcs",
+        "//java_tools/buildjar/java/com/google/devtools/build/java/turbine:srcs",
+        "//java_tools/buildjar/javatests/com/google/devtools/build/buildjar:srcs",
+    ],
+    visibility = ["//visibility:public"],
+)
+
+package_group(
+    name = "buildjar_package_group",
+    packages = [
+        "//...",
+    ],
+)
+
+alias(
+    name = "JavaBuilder",
+    actual = "//java_tools/buildjar/java/com/google/devtools/build/buildjar:BazelJavaBuilder",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "javabuilder_core",
+    actual = "//java_tools/buildjar/java/com/google/devtools/build/buildjar:javabuilder_core",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "VanillaJavaBuilder",
+    actual = "//java_tools/buildjar/java/com/google/devtools/build/buildjar:VanillaJavaBuilder",
+    visibility = ["//visibility:public"],
+)
+
+filegroup(
+    name = "bootstrap_VanillaJavaBuilder_deploy.jar",
+    srcs = ["//java_tools/buildjar/java/com/google/devtools/build/buildjar:bootstrap_VanillaJavaBuilder_deploy.jar"],
+    tags = ["manual"],
+    visibility = ["//visibility:public"],
+)
+
+filegroup(
+    name = "bootstrap_genclass_deploy.jar",
+    srcs = ["//java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass:bootstrap_genclass_deploy.jar"],
+    tags = ["manual"],
+    visibility = ["//visibility:public"],
+)
+
+exports_files(["deps.bzl"])

java_tools/buildjar/deps.bzl

@@ -0,0 +1,98 @@
+"""Dependencies for java_tools."""
+
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_jar")
+load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
+
+def java_tools_deps():
+    """Declares repository rules for java_tools dependencies."""
+    maybe(
+        http_jar,
+        name = "rules_java_guava",
+        url = "https://repo1.maven.org/maven2/com/google/guava/guava/33.5.0-jre/guava-33.5.0-jre.jar",
+        sha256 = "1e301f0c52ac248b0b14fdc3d12283c77252d4d6f48521d572e7d8c4c2cc4ac7",
+    )
+    maybe(
+        http_jar,
+        name = "rules_java_jsr305",
+        url = "https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar",
+        sha256 = "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7",
+    )
+    maybe(
+        http_jar,
+        name = "rules_java_gson",
+        url = "https://repo1.maven.org/maven2/com/google/code/gson/gson/2.11.0/gson-2.11.0.jar",
+        sha256 = "57928d6e5a6edeb2abd3770a8f95ba44dce45f3b23b7a9dc2b309c581552a78b",
+    )
+    maybe(
+        http_jar,
+        name = "rules_java_auto_value",
+        url = "https://repo1.maven.org/maven2/com/google/auto/value/auto-value/1.11.0/auto-value-1.11.0.jar",
+        sha256 = "aaf8d637bfed3c420436b9facf1b7a88d12c8785374e4202382783005319c2c3",
+    )
+    maybe(
+        http_jar,
+        name = "rules_java_auto_value_annotations",
+        url = "https://repo1.maven.org/maven2/com/google/auto/value/auto-value-annotations/1.11.0/auto-value-annotations-1.11.0.jar",
+        sha256 = "5a055ce4255333b3346e1a8703da5bf8ff049532286fdcd31712d624abe111dd",
+    )
+    maybe(
+        http_jar,
+        name = "rules_java_error_prone",
+        url = "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_core/2.50.0/error_prone_core-2.50.0.jar",
+        sha256 = "40a88d3ea732fac3a57ae0e2b27f1729ce76cc41857bcd63d5845e79eae5f72e",
+    )
+    maybe(
+        http_jar,
+        name = "rules_java_error_prone_annotations",
+        url = "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.50.0/error_prone_annotations-2.50.0.jar",
+        sha256 = "4667724877f1d37a689202da191e23efa7657c62eef93ccdac406eccfe5cdd0a",
+    )
+    maybe(
+        http_jar,
+        name = "rules_java_error_prone_annotation",
+        url = "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotation/2.50.0/error_prone_annotation-2.50.0.jar",
+        sha256 = "aa9b67a3aa3418b366e26594e1ae35d100ad3369cd1010ae7d4782d984ea9aaf",
+    )
+    maybe(
+        http_jar,
+        name = "rules_java_jacoco_core",
+        url = "https://repo1.maven.org/maven2/org/jacoco/org.jacoco.core/0.8.14/org.jacoco.core-0.8.14.jar",
+        sha256 = "28abbf0eea5a08e4f24097f2fbac663ca17c341c25c3a04d90d6cd325943c995",
+    )
+    maybe(
+        http_jar,
+        name = "rules_java_caffeine",
+        url = "https://repo1.maven.org/maven2/com/github/ben-manes/caffeine/caffeine/3.1.8/caffeine-3.1.8.jar",
+        sha256 = "7dd15f9df1be238ffaa367ce6f556737a88031de4294dad18eef57c474ddf1d3",
+    )
+    maybe(
+        http_jar,
+        name = "rules_java_junit4",
+        url = "https://repo1.maven.org/maven2/junit/junit/4.13.2/junit-4.13.2.jar",
+        sha256 = "8e495b634469d64fb8acfa3495a065cbacc8a0fff55ce1e31007be4c16dc57d3",
+    )
+    maybe(
+        http_jar,
+        name = "rules_java_truth",
+        url = "https://repo1.maven.org/maven2/com/google/truth/truth/1.4.4/truth-1.4.4.jar",
+        sha256 = "52c86cddadc31bc8457c1e15689fc6b75e2e97ce2a83d8b54b795d556d489f8c",
+    )
+    maybe(
+        http_jar,
+        name = "rules_java_error_prone_check_api",
+        url = "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_check_api/2.50.0/error_prone_check_api-2.50.0.jar",
+        sha256 = "ee935a4f42ac409fb0a471affea938c3050c6887dbaadb106868936d83d8c8f1",
+    )
+    maybe(
+        http_jar,
+        name = "rules_java_javax_inject",
+        url = "https://repo1.maven.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar",
+        sha256 = "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff",
+    )
+
+def _java_tools_deps_impl(_ctx):
+    java_tools_deps()
+
+java_tools_deps_ext = module_extension(
+    implementation = _java_tools_deps_impl,
+)