From 5c8e84299c56e0ebf2f6e180b57251fd954f8dcd Mon Sep 17 00:00:00 2001 From: keertk Date: Fri, 14 Apr 2023 01:59:52 -0700 Subject: [PATCH 1/6] Update java_tools v12.1 --- distdir_deps.bzl | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/distdir_deps.bzl b/distdir_deps.bzl index 20b66341f07c49..9c1b6343364ecd 100644 --- a/distdir_deps.bzl +++ b/distdir_deps.bzl @@ -391,11 +391,10 @@ DIST_DEPS = { "remote_java_tools_test", "remote_java_tools_for_testing", ], - "archive": "java_tools-v12.0.zip", - "sha256": "6efab6ca6e16e02c90e62bbd08ca65f61527984ab78564ea7ad7a2692b2ffdbb", + "archive": "java_tools-v12.1.zip", + "sha256": "307723ab278273281d3e7f79347f0e7c4a647cdc507ca851d04d104afffda09b", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.0/java_tools-v12.0.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.0/java_tools-v12.0.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.1/java_tools-v12.1.zip", ], "used_in": [ "test_WORKSPACE_files", @@ -407,11 +406,10 @@ DIST_DEPS = { "remote_java_tools_test_linux", "remote_java_tools_linux_for_testing", ], - "archive": "java_tools_linux-v12.0.zip", - "sha256": "4b8366b780387fc5ce69527ed287f2b444ee429d3325305ad062c92ac43c7fb6", + "archive": "java_tools_linux-v12.1.zip", + "sha256": "057aa3e1ea26707b49de11e56be86cb5fe2968a56e2da66e37c1891c452f515c", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.0/java_tools_linux-v12.0.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.0/java_tools_linux-v12.0.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.1/java_tools_linux-v12.1.zip", ], "used_in": [ "test_WORKSPACE_files", @@ -423,11 +421,10 @@ DIST_DEPS = { "remote_java_tools_test_windows", "remote_java_tools_windows_for_testing", ], - "archive": "java_tools_windows-v12.0.zip", - "sha256": "7b938f0c67d9d390f10489b1b9a4dabb51e39ecc94532c3acdf8c4c16900457f", + "archive": "java_tools_windows-v12.1.zip", + "sha256": "da1d0e473b3596dce674a7dcfa8f047035918de5d804044885dd9de2907cddd2", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.0/java_tools_windows-v12.0.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.0/java_tools_windows-v12.0.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.1/java_tools_windows-v12.1.zip", ], "used_in": [ "test_WORKSPACE_files", @@ -439,11 +436,10 @@ DIST_DEPS = { "remote_java_tools_test_darwin_x86_64", "remote_java_tools_darwin_x86_64_for_testing", ], - "archive": "java_tools_darwin_x86_64-v12.0.zip", - "sha256": "abc434be713ee9e1fd6525d7a7bd9d7cdff6e27ae3ca9d96420490e7ff6e28a3", + "archive": "java_tools_darwin_x86_64-v12.1.zip", + "sha256": "67df3aff44ee74fd3443f1895c0f18eca478d5c14f0cb6cc46f75e061a336a5f", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.0/java_tools_darwin_x86_64-v12.0.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.0/java_tools_darwin_x86_64-v12.0.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.1/java_tools_darwin_x86_64-v12.1.zip", ], "used_in": [ "test_WORKSPACE_files", @@ -455,11 +451,10 @@ DIST_DEPS = { "remote_java_tools_test_darwin_arm64", "remote_java_tools_darwin_arm64_for_testing", ], - "archive": "java_tools_darwin_arm64-v12.0.zip", - "sha256": "24a47a5557ee2ccdacd10a54fe4c15d627c6aeaf7596a5dccf2e11a866a5a32a", + "archive": "java_tools_darwin_arm64-v12.1.zip", + "sha256": "5ce9c8ca5aecccff92827edcaadb9e86f89df38a678423f38b62b01972f61891", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.0/java_tools_darwin_arm64-v12.0.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.0/java_tools_darwin_arm64-v12.0.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.1/java_tools_darwin_arm64-v12.1.zip", ], "used_in": [ "test_WORKSPACE_files", From 2f6d57cec384247874be3541da53f81f728476ec Mon Sep 17 00:00:00 2001 From: keertk Date: Fri, 14 Apr 2023 02:04:59 -0700 Subject: [PATCH 2/6] Update urls --- distdir_deps.bzl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/distdir_deps.bzl b/distdir_deps.bzl index 9c1b6343364ecd..d8f36618466573 100644 --- a/distdir_deps.bzl +++ b/distdir_deps.bzl @@ -394,7 +394,7 @@ DIST_DEPS = { "archive": "java_tools-v12.1.zip", "sha256": "307723ab278273281d3e7f79347f0e7c4a647cdc507ca851d04d104afffda09b", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.1/java_tools-v12.1.zip", + "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools-v12.1.zip", ], "used_in": [ "test_WORKSPACE_files", @@ -409,7 +409,7 @@ DIST_DEPS = { "archive": "java_tools_linux-v12.1.zip", "sha256": "057aa3e1ea26707b49de11e56be86cb5fe2968a56e2da66e37c1891c452f515c", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.1/java_tools_linux-v12.1.zip", + "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools_linux-v12.1.zip", ], "used_in": [ "test_WORKSPACE_files", @@ -424,7 +424,7 @@ DIST_DEPS = { "archive": "java_tools_windows-v12.1.zip", "sha256": "da1d0e473b3596dce674a7dcfa8f047035918de5d804044885dd9de2907cddd2", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.1/java_tools_windows-v12.1.zip", + "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools_windows-v12.1.zip", ], "used_in": [ "test_WORKSPACE_files", @@ -439,7 +439,7 @@ DIST_DEPS = { "archive": "java_tools_darwin_x86_64-v12.1.zip", "sha256": "67df3aff44ee74fd3443f1895c0f18eca478d5c14f0cb6cc46f75e061a336a5f", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.1/java_tools_darwin_x86_64-v12.1.zip", + "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools_darwin_x86_64-v12.1.zip", ], "used_in": [ "test_WORKSPACE_files", @@ -454,7 +454,7 @@ DIST_DEPS = { "archive": "java_tools_darwin_arm64-v12.1.zip", "sha256": "5ce9c8ca5aecccff92827edcaadb9e86f89df38a678423f38b62b01972f61891", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.1/java_tools_darwin_arm64-v12.1.zip", + "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools_darwin_arm64-v12.1.zip", ], "used_in": [ "test_WORKSPACE_files", From d1ccbc34ef0f6ecf1a06f9d5d1835bd15d21e4b6 Mon Sep 17 00:00:00 2001 From: keertk Date: Fri, 14 Apr 2023 02:09:20 -0700 Subject: [PATCH 3/6] Update urls --- distdir_deps.bzl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/distdir_deps.bzl b/distdir_deps.bzl index d8f36618466573..4307b305beaebf 100644 --- a/distdir_deps.bzl +++ b/distdir_deps.bzl @@ -394,7 +394,7 @@ DIST_DEPS = { "archive": "java_tools-v12.1.zip", "sha256": "307723ab278273281d3e7f79347f0e7c4a647cdc507ca851d04d104afffda09b", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools-v12.1.zip", + "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools-v12.1-rc1.zip", ], "used_in": [ "test_WORKSPACE_files", @@ -409,7 +409,7 @@ DIST_DEPS = { "archive": "java_tools_linux-v12.1.zip", "sha256": "057aa3e1ea26707b49de11e56be86cb5fe2968a56e2da66e37c1891c452f515c", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools_linux-v12.1.zip", + "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools_linux-v12.1-rc1.zip", ], "used_in": [ "test_WORKSPACE_files", @@ -424,7 +424,7 @@ DIST_DEPS = { "archive": "java_tools_windows-v12.1.zip", "sha256": "da1d0e473b3596dce674a7dcfa8f047035918de5d804044885dd9de2907cddd2", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools_windows-v12.1.zip", + "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools_windows-v12.1-rc1.zip", ], "used_in": [ "test_WORKSPACE_files", @@ -439,7 +439,7 @@ DIST_DEPS = { "archive": "java_tools_darwin_x86_64-v12.1.zip", "sha256": "67df3aff44ee74fd3443f1895c0f18eca478d5c14f0cb6cc46f75e061a336a5f", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools_darwin_x86_64-v12.1.zip", + "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools_darwin_x86_64-v12.1-rc1.zip", ], "used_in": [ "test_WORKSPACE_files", @@ -454,7 +454,7 @@ DIST_DEPS = { "archive": "java_tools_darwin_arm64-v12.1.zip", "sha256": "5ce9c8ca5aecccff92827edcaadb9e86f89df38a678423f38b62b01972f61891", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools_darwin_arm64-v12.1.zip", + "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools_darwin_arm64-v12.1-rc1.zip", ], "used_in": [ "test_WORKSPACE_files", From 7bf0a867f56b5991f46286e52a16636394e3e93e Mon Sep 17 00:00:00 2001 From: keertk Date: Thu, 20 Apr 2023 05:54:16 -0700 Subject: [PATCH 4/6] Update for rc2 --- distdir_deps.bzl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/distdir_deps.bzl b/distdir_deps.bzl index 4307b305beaebf..bfacbc4a287bfb 100644 --- a/distdir_deps.bzl +++ b/distdir_deps.bzl @@ -392,9 +392,9 @@ DIST_DEPS = { "remote_java_tools_for_testing", ], "archive": "java_tools-v12.1.zip", - "sha256": "307723ab278273281d3e7f79347f0e7c4a647cdc507ca851d04d104afffda09b", + "sha256": "0db35ec44745fd15b77d9df954e70a4fcf74554dd5bfe3f6e6cb6bbdc1f1c649", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools-v12.1-rc1.zip", + "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools-v12.1-rc2.zip", ], "used_in": [ "test_WORKSPACE_files", @@ -407,9 +407,9 @@ DIST_DEPS = { "remote_java_tools_linux_for_testing", ], "archive": "java_tools_linux-v12.1.zip", - "sha256": "057aa3e1ea26707b49de11e56be86cb5fe2968a56e2da66e37c1891c452f515c", + "sha256": "093ecac3b42fcbc3621d08edc3ae3c8b0bc2bf56a0d9a85ddcdb1e0bcf10cbc7", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools_linux-v12.1-rc1.zip", + "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools_linux-v12.1-rc2.zip", ], "used_in": [ "test_WORKSPACE_files", @@ -422,9 +422,9 @@ DIST_DEPS = { "remote_java_tools_windows_for_testing", ], "archive": "java_tools_windows-v12.1.zip", - "sha256": "da1d0e473b3596dce674a7dcfa8f047035918de5d804044885dd9de2907cddd2", + "sha256": "1df7cc7fac54f437f43c24c019462e13058f394fdba5a64f566b92e8af18d0cf", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools_windows-v12.1-rc1.zip", + "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools_windows-v12.1-rc2.zip", ], "used_in": [ "test_WORKSPACE_files", @@ -437,9 +437,9 @@ DIST_DEPS = { "remote_java_tools_darwin_x86_64_for_testing", ], "archive": "java_tools_darwin_x86_64-v12.1.zip", - "sha256": "67df3aff44ee74fd3443f1895c0f18eca478d5c14f0cb6cc46f75e061a336a5f", + "sha256": "16ca145203a62a1fcd6ae50513c0935d938591cb309b9b1172e257c57873f60d", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools_darwin_x86_64-v12.1-rc1.zip", + "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools_darwin_x86_64-v12.1-rc2.zip", ], "used_in": [ "test_WORKSPACE_files", @@ -452,9 +452,9 @@ DIST_DEPS = { "remote_java_tools_darwin_arm64_for_testing", ], "archive": "java_tools_darwin_arm64-v12.1.zip", - "sha256": "5ce9c8ca5aecccff92827edcaadb9e86f89df38a678423f38b62b01972f61891", + "sha256": "1d8e575e558782c2ceec0940e424f0e2df56b0df3d7fae68333eaceef2c4e41c", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools_darwin_arm64-v12.1-rc1.zip", + "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools_darwin_arm64-v12.1-rc2.zip", ], "used_in": [ "test_WORKSPACE_files", From 40d3038b39b75b17f6bb4daeed66b829694b0b0c Mon Sep 17 00:00:00 2001 From: keertk Date: Thu, 20 Apr 2023 09:54:27 -0700 Subject: [PATCH 5/6] Final v12.1 --- distdir_deps.bzl | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/distdir_deps.bzl b/distdir_deps.bzl index bfacbc4a287bfb..87095d5f9f02f1 100644 --- a/distdir_deps.bzl +++ b/distdir_deps.bzl @@ -394,7 +394,8 @@ DIST_DEPS = { "archive": "java_tools-v12.1.zip", "sha256": "0db35ec44745fd15b77d9df954e70a4fcf74554dd5bfe3f6e6cb6bbdc1f1c649", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools-v12.1-rc2.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.1/java_tools-v12.1.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.1/java_tools-v12.1.zip", ], "used_in": [ "test_WORKSPACE_files", @@ -409,7 +410,8 @@ DIST_DEPS = { "archive": "java_tools_linux-v12.1.zip", "sha256": "093ecac3b42fcbc3621d08edc3ae3c8b0bc2bf56a0d9a85ddcdb1e0bcf10cbc7", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools_linux-v12.1-rc2.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.1/java_tools_linux-v12.1.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.1/java_tools_linux-v12.1.zip", ], "used_in": [ "test_WORKSPACE_files", @@ -424,7 +426,8 @@ DIST_DEPS = { "archive": "java_tools_windows-v12.1.zip", "sha256": "1df7cc7fac54f437f43c24c019462e13058f394fdba5a64f566b92e8af18d0cf", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools_windows-v12.1-rc2.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.1/java_tools_windows-v12.1.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.1/java_tools_windows-v12.1.zip", ], "used_in": [ "test_WORKSPACE_files", @@ -439,7 +442,8 @@ DIST_DEPS = { "archive": "java_tools_darwin_x86_64-v12.1.zip", "sha256": "16ca145203a62a1fcd6ae50513c0935d938591cb309b9b1172e257c57873f60d", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools_darwin_x86_64-v12.1-rc2.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.1/java_tools_darwin_x86_64-v12.1.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.1/java_tools_darwin_x86_64-v12.1.zip", ], "used_in": [ "test_WORKSPACE_files", @@ -454,7 +458,8 @@ DIST_DEPS = { "archive": "java_tools_darwin_arm64-v12.1.zip", "sha256": "1d8e575e558782c2ceec0940e424f0e2df56b0df3d7fae68333eaceef2c4e41c", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/release_candidates/java/v12.1/java_tools_darwin_arm64-v12.1-rc2.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.1/java_tools_darwin_arm64-v12.1.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.1/java_tools_darwin_arm64-v12.1.zip", ], "used_in": [ "test_WORKSPACE_files", From d5e318d8a76c5c772f489d92a818bb972e04c66c Mon Sep 17 00:00:00 2001 From: keertk Date: Thu, 20 Apr 2023 10:07:04 -0700 Subject: [PATCH 6/6] Update package_version --- distdir_deps.bzl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/distdir_deps.bzl b/distdir_deps.bzl index 87095d5f9f02f1..3aca0ececb9780 100644 --- a/distdir_deps.bzl +++ b/distdir_deps.bzl @@ -400,7 +400,7 @@ DIST_DEPS = { "used_in": [ "test_WORKSPACE_files", ], - "package_version": "12.0", + "package_version": "12.1", }, "remote_java_tools_linux": { "aliases": [ @@ -416,7 +416,7 @@ DIST_DEPS = { "used_in": [ "test_WORKSPACE_files", ], - "package_version": "12.0", + "package_version": "12.1", }, "remote_java_tools_windows": { "aliases": [ @@ -432,7 +432,7 @@ DIST_DEPS = { "used_in": [ "test_WORKSPACE_files", ], - "package_version": "12.0", + "package_version": "12.1", }, "remote_java_tools_darwin_x86_64": { "aliases": [ @@ -448,7 +448,7 @@ DIST_DEPS = { "used_in": [ "test_WORKSPACE_files", ], - "package_version": "12.0", + "package_version": "12.1", }, "remote_java_tools_darwin_arm64": { "aliases": [ @@ -464,7 +464,7 @@ DIST_DEPS = { "used_in": [ "test_WORKSPACE_files", ], - "package_version": "12.0", + "package_version": "12.1", }, "remotejdk11_linux": { "aliases": [