Release `rules_java` `v8.0.0-rc2` (w/ `java_tools` `v13.10`) Downgrades protobuf to v27.0 (earliest version with `ProtoInfo` redirect), needed to play nice with `@bazel_tools` PiperOrigin-RevId: 682339966 Change-Id: I55195faba79783fdd437bfa1628c6ed7b7657a98
diff --git a/BUILD b/BUILD index 51b19f7..c138b7f 100644 --- a/BUILD +++ b/BUILD
@@ -3,7 +3,6 @@ exports_files([ "LICENSE", "WORKSPACE", - "protobuf_29.0-rc1.patch", ]) filegroup(
diff --git a/MODULE.bazel b/MODULE.bazel index 4f8ef2a..5c564e3 100644 --- a/MODULE.bazel +++ b/MODULE.bazel
@@ -1,6 +1,6 @@ module( name = "rules_java", - version = "8.0.0-rc1", + version = "8.0.0-rc2", bazel_compatibility = [">=7.3.2"], compatibility_level = 1, ) @@ -9,13 +9,7 @@ bazel_dep(name = "rules_cc", version = "0.0.10") bazel_dep(name = "bazel_features", version = "1.11.0") bazel_dep(name = "bazel_skylib", version = "1.6.1") -bazel_dep(name = "protobuf", version = "29.0-rc1") -single_version_override( - module_name = "protobuf", - patch_strip = 1, - patches = ["//:protobuf_29.0-rc1.patch"], - version = "29.0-rc1", -) +bazel_dep(name = "protobuf", version = "27.0") # Required by @remote_java_tools, which is loaded via module extension. bazel_dep(name = "rules_proto", version = "6.0.2")
diff --git a/java/repositories.bzl b/java/repositories.bzl index 27f4f85..d41551e 100644 --- a/java/repositories.bzl +++ b/java/repositories.bzl
@@ -22,33 +22,33 @@ # visible for tests JAVA_TOOLS_CONFIG = { - "version": "v13.9", - "release": "false", + "version": "v13.10", + "release": "true", "artifacts": { "java_tools_linux": { - "mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.9/java_tools_linux-v13.9.zip", - "github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v13.9/java_tools_linux-v13.9.zip", - "sha": "7a3d7b1cd080efdf49ab2a3818177799416734acf2bd23040aa9037141287548", + "mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.10/java_tools_linux-v13.10.zip", + "github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v13.10/java_tools_linux-v13.10.zip", + "sha": "8d74d836be57fc92b76788c4fa605a941069cce69678ebe87e6ee02c8ad6c36b", }, "java_tools_windows": { - "mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.9/java_tools_windows-v13.9.zip", - "github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v13.9/java_tools_windows-v13.9.zip", - "sha": "6a17ac1921d60af5dca780f4200fd0f9963441bd7afff53b9efad6e7156c699d", + "mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.10/java_tools_windows-v13.10.zip", + "github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v13.10/java_tools_windows-v13.10.zip", + "sha": "5e63bc6382cf02c5adde702be04bb60b352811318d41aeceda4912a3ba9d4dc4", }, "java_tools_darwin_x86_64": { - "mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.9/java_tools_darwin_x86_64-v13.9.zip", - "github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v13.9/java_tools_darwin_x86_64-v13.9.zip", - "sha": "802bfb5085cec0ac5745a637ae2e7a7152c54230ba542d093a10bd48ba29ba6f", + "mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.10/java_tools_darwin_x86_64-v13.10.zip", + "github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v13.10/java_tools_darwin_x86_64-v13.10.zip", + "sha": "b6b56884d8749890ac1095b74fd2e941001673c5b3e5b9aee96fa63981a254a3", }, "java_tools_darwin_arm64": { - "mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.9/java_tools_darwin_arm64-v13.9.zip", - "github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v13.9/java_tools_darwin_arm64-v13.9.zip", - "sha": "9fa400a43153b048ae5a785e3ee533d675ed6a994ab3c763f50bd15a28544c10", + "mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.10/java_tools_darwin_arm64-v13.10.zip", + "github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v13.10/java_tools_darwin_arm64-v13.10.zip", + "sha": "743a3e6a4021e88f16adff04b7783da3e9cbbbd63250dbb0f36aee1ed070d83c", }, "java_tools": { - "mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.9/java_tools-v13.9.zip", - "github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v13.9/java_tools-v13.9.zip", - "sha": "3b92e0c1884ac0e9683e87c3c49e1098cff91faeacdb76cc90d92efb0df861cf", + "mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.10/java_tools-v13.10.zip", + "github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v13.10/java_tools-v13.10.zip", + "sha": "4ae903c8d51641c5cb8bf3f1dde4f1eef9d2f460d99d76e0c2116b17c55b19a6", }, }, }
diff --git a/protobuf_29.0-rc1.patch b/protobuf_29.0-rc1.patch deleted file mode 100644 index c033295..0000000 --- a/protobuf_29.0-rc1.patch +++ /dev/null
@@ -1,33 +0,0 @@ -diff --git a/bazel/common/BUILD b/bazel/common/BUILD -index c79d22280..9ab40ff05 100644 ---- a/bazel/common/BUILD -+++ b/bazel/common/BUILD -@@ -22,7 +22,8 @@ bzl_library( - ], - visibility = ["//visibility:public"], - deps = [ -- "//bazel/private:native_bzl", -+ "//bazel/private:proto_info_bzl", -+ "@proto_bazel_features//:features", - ], - ) - -diff --git a/bazel/private/BUILD b/bazel/private/BUILD -index 9b04c1f86..8e5207f3a 100644 ---- a/bazel/private/BUILD -+++ b/bazel/private/BUILD -@@ -108,6 +108,14 @@ bzl_library( - ], - ) - -+bzl_library( -+ name = "proto_info_bzl", -+ srcs = [ -+ "proto_info.bzl", -+ ], -+ visibility = ["//bazel:__subpackages__"], -+) -+ - native_bool_flag( - name = "experimental_proto_descriptor_sets_include_source_info", - flag = "experimental_proto_descriptor_sets_include_source_info",