From 13e85b4ad6c142aea39605593e98c8d971981369 Mon Sep 17 00:00:00 2001 From: "Ian (Hee) Cha" Date: Tue, 17 Sep 2024 22:24:20 -0700 Subject: [PATCH 1/5] Update repositories.bzl --- java/repositories.bzl | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/java/repositories.bzl b/java/repositories.bzl index 37a0d31..2451ba3 100644 --- a/java/repositories.bzl +++ b/java/repositories.bzl @@ -22,33 +22,28 @@ load("//toolchains:remote_java_repository.bzl", "remote_java_repository") # visible for tests JAVA_TOOLS_CONFIG = { - "version": "v13.8", + "version": "v13.9", "release": "false", "artifacts": { "java_tools_linux": { - "mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.8/java_tools_linux-v13.8.zip", - "github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v13.8/java_tools_linux-v13.8.zip", - "sha": "e480906978b34d1f15fa958699112872c7b5883a3d48b630b6bed574d86523ca", + "mirror_url": "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v13.9/java_tools_linux-v13.9-rc1.zip", + "sha": "7a3d7b1cd080efdf49ab2a3818177799416734acf2bd23040aa9037141287548", }, "java_tools_windows": { - "mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.8/java_tools_windows-v13.8.zip", - "github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v13.8/java_tools_windows-v13.8.zip", - "sha": "bae74a8f1c7d3d5f73f944a31446b2d87d4e94966ef9cc0bc6b07de6fed6e382", + "mirror_url": "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v13.9/java_tools_windows-v13.9-rc1.zip", + "sha": "6a17ac1921d60af5dca780f4200fd0f9963441bd7afff53b9efad6e7156c699d", }, "java_tools_darwin_x86_64": { - "mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.8/java_tools_darwin_x86_64-v13.8.zip", - "github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v13.8/java_tools_darwin_x86_64-v13.8.zip", - "sha": "78a750e24d0bf0f125f3bb4218f58c4e60343f3d28c834e88bd09c7924c83d8d", + "mirror_url": "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v13.9/java_tools_darwin_x86_64-v13.9-rc1.zip", + "sha": "802bfb5085cec0ac5745a637ae2e7a7152c54230ba542d093a10bd48ba29ba6f", }, "java_tools_darwin_arm64": { - "mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.8/java_tools_darwin_arm64-v13.8.zip", - "github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v13.8/java_tools_darwin_arm64-v13.8.zip", - "sha": "7a4bf783c67db892e3e670d61c194a0595df8f151c0684146ec7bcf2057a6500", + "mirror_url": "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v13.9/java_tools_darwin_arm64-v13.9-rc1.zip", + "sha": "9fa400a43153b048ae5a785e3ee533d675ed6a994ab3c763f50bd15a28544c10", }, "java_tools": { - "mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.8/java_tools-v13.8.zip", - "github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v13.8/java_tools-v13.8.zip", - "sha": "224287ef2b581795392cbd8b1b9f4306d11abb95bba41ea72810cc9c7872a5f8", + "mirror_url": "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v13.9/java_tools-v13.9-rc1.zip", + "sha": "3b92e0c1884ac0e9683e87c3c49e1098cff91faeacdb76cc90d92efb0df861cf", }, }, } @@ -62,7 +57,6 @@ def java_tools_repos(): sha256 = config["sha"], urls = [ config["mirror_url"], - config["github_url"], ], ) From e4a8fd86103e6e54713109a71545967182c6ff8b Mon Sep 17 00:00:00 2001 From: iancha1992 Date: Thu, 26 Sep 2024 11:55:47 -0700 Subject: [PATCH 2/5] Update defs.bzl --- java/defs.bzl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java/defs.bzl b/java/defs.bzl index 64de71a..7ad176b 100644 --- a/java/defs.bzl +++ b/java/defs.bzl @@ -25,6 +25,8 @@ load("//java/toolchains:java_package_configuration.bzl", _java_package_configura load("//java/toolchains:java_runtime.bzl", _java_runtime = "java_runtime") load("//java/toolchains:java_toolchain.bzl", _java_toolchain = "java_toolchain") +version = "7.12.0" + # Language rules java_binary = _java_binary From b4bd6e8f70c5b10ff7b83eea71a1ed28dc241bde Mon Sep 17 00:00:00 2001 From: iancha1992 Date: Thu, 26 Sep 2024 11:56:29 -0700 Subject: [PATCH 3/5] MODULE.bazel --- MODULE.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MODULE.bazel b/MODULE.bazel index 5c75778..0902c3a 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,6 +1,6 @@ module( name = "rules_java", - version = "7.11.1", + version = "7.12.0", bazel_compatibility = [">=6.2.0"], compatibility_level = 1, ) From dba5a15c1be8c04923a4a374e6d94655b783b028 Mon Sep 17 00:00:00 2001 From: iancha1992 Date: Thu, 26 Sep 2024 12:01:18 -0700 Subject: [PATCH 4/5] Update repositories.bzl --- java/repositories.bzl | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/java/repositories.bzl b/java/repositories.bzl index 2451ba3..27f4f85 100644 --- a/java/repositories.bzl +++ b/java/repositories.bzl @@ -26,23 +26,28 @@ JAVA_TOOLS_CONFIG = { "release": "false", "artifacts": { "java_tools_linux": { - "mirror_url": "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v13.9/java_tools_linux-v13.9-rc1.zip", + "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", }, "java_tools_windows": { - "mirror_url": "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v13.9/java_tools_windows-v13.9-rc1.zip", + "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", }, "java_tools_darwin_x86_64": { - "mirror_url": "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v13.9/java_tools_darwin_x86_64-v13.9-rc1.zip", + "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", }, "java_tools_darwin_arm64": { - "mirror_url": "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v13.9/java_tools_darwin_arm64-v13.9-rc1.zip", + "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", }, "java_tools": { - "mirror_url": "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v13.9/java_tools-v13.9-rc1.zip", + "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", }, }, @@ -57,6 +62,7 @@ def java_tools_repos(): sha256 = config["sha"], urls = [ config["mirror_url"], + config["github_url"], ], ) From fb6d56758a4606b0122bdd0d0159a336a2f901b6 Mon Sep 17 00:00:00 2001 From: iancha1992 Date: Thu, 26 Sep 2024 12:09:20 -0700 Subject: [PATCH 5/5] Clean up defs.bzl --- java/defs.bzl | 2 -- 1 file changed, 2 deletions(-) diff --git a/java/defs.bzl b/java/defs.bzl index 7ad176b..64de71a 100644 --- a/java/defs.bzl +++ b/java/defs.bzl @@ -25,8 +25,6 @@ load("//java/toolchains:java_package_configuration.bzl", _java_package_configura load("//java/toolchains:java_runtime.bzl", _java_runtime = "java_runtime") load("//java/toolchains:java_toolchain.bzl", _java_toolchain = "java_toolchain") -version = "7.12.0" - # Language rules java_binary = _java_binary