From 608dd28671357c568c3930930eba67cddc75fd63 Mon Sep 17 00:00:00 2001 From: keertk Date: Mon, 10 Jul 2023 08:37:04 +0530 Subject: [PATCH 1/4] Update java_tools version to 12.4 --- distdir_deps.bzl | 50 ++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/distdir_deps.bzl b/distdir_deps.bzl index 8df4c75e7887e7..905093023d666a 100644 --- a/distdir_deps.bzl +++ b/distdir_deps.bzl @@ -382,80 +382,80 @@ DIST_DEPS = { "remote_java_tools_test", "remote_java_tools_for_testing", ], - "archive": "java_tools-v12.3.zip", - "sha256": "cbb62ecfef61568ded46260a8e8e8430755db7ec9638c0c7ff668a656f6c042f", + "archive": "java_tools-v12.4.zip", + "sha256": "e91fbced948cdafce21c29c9ce006de19a2e7fc40706aac6197096d0847ae93d", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools-v12.3.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools-v12.3.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.4/java_tools-v12.4.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.4/java_tools-v12.4.zip", ], "used_in": [ "test_WORKSPACE_files", ], - "package_version": "12.3", + "package_version": "12.4", }, "remote_java_tools_linux": { "aliases": [ "remote_java_tools_test_linux", "remote_java_tools_linux_for_testing", ], - "archive": "java_tools_linux-v12.3.zip", - "sha256": "32157b5218b151009f5b99bf5e2f65e28823d269dfbba8cd57e7da5e7cdd291d", + "archive": "java_tools_linux-v12.4.zip", + "sha256": "ed1438453d5142c0cf022a43a21255d4a764f9f221cce08c17a2285d04479a06", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_linux-v12.3.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_linux-v12.3.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.4/java_tools_linux-v12.4.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.4/java_tools_linux-v12.4.zip", ], "used_in": [ "test_WORKSPACE_files", ], - "package_version": "12.3", + "package_version": "12.4", }, "remote_java_tools_windows": { "aliases": [ "remote_java_tools_test_windows", "remote_java_tools_windows_for_testing", ], - "archive": "java_tools_windows-v12.3.zip", - "sha256": "ec6f91387d2353eacb0ca0492f35f68c5c7b0e7a80acd1fb825088b4b069fab1", + "archive": "java_tools_windows-v12.4.zip", + "sha256": "11b61fa63da07380dec212448a0e44b66f3d1ee5469f1c8a2845ca8a4431d851", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_windows-v12.3.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_windows-v12.3.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.4/java_tools_windows-v12.4.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.4/java_tools_windows-v12.4.zip", ], "used_in": [ "test_WORKSPACE_files", ], - "package_version": "12.3", + "package_version": "12.4", }, "remote_java_tools_darwin_x86_64": { "aliases": [ "remote_java_tools_test_darwin_x86_64", "remote_java_tools_darwin_x86_64_for_testing", ], - "archive": "java_tools_darwin_x86_64-v12.3.zip", - "sha256": "3c3fb1967a0f35c73ff509505de53ca4611518922a6b7c8c22a468aa7503132c", + "archive": "java_tools_darwin_x86_64-v12.4.zip", + "sha256": "564ed4f744ed947f27641ac1dc256ef294f38a7b0955b70f4c9407173a838a86", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_darwin_x86_64-v12.3.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_darwin_x86_64-v12.3.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.4/java_tools_darwin_x86_64-v12.4.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.4/java_tools_darwin_x86_64-v12.4.zip", ], "used_in": [ "test_WORKSPACE_files", ], - "package_version": "12.3", + "package_version": "12.4", }, "remote_java_tools_darwin_arm64": { "aliases": [ "remote_java_tools_test_darwin_arm64", "remote_java_tools_darwin_arm64_for_testing", ], - "archive": "java_tools_darwin_arm64-v12.3.zip", - "sha256": "29aa0c2de4e3cf45bc55d2995ba803ecbd1173a8d363860abbc309551db7931b", + "archive": "java_tools_darwin_arm64-v12.4.zip", + "sha256": "7c0f2b7295b1738e7192731124730bfd9a9b2034895fa99a98dd5b8fb4a96c1b", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_darwin_arm64-v12.3.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_darwin_arm64-v12.3.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.4/java_tools_darwin_arm64-v12.4.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.4/java_tools_darwin_arm64-v12.4.zip", ], "used_in": [ "test_WORKSPACE_files", ], - "package_version": "12.3", + "package_version": "12.4", }, "remotejdk11_linux": { "aliases": [ From 3a1a80c9cf8f6c51d298976428cdbe8c02ec87e2 Mon Sep 17 00:00:00 2001 From: keertk Date: Wed, 12 Jul 2023 05:33:34 +0530 Subject: [PATCH 2/4] Update java_tools version to 12.5 --- distdir_deps.bzl | 50 ++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/distdir_deps.bzl b/distdir_deps.bzl index 905093023d666a..ac773f6478d239 100644 --- a/distdir_deps.bzl +++ b/distdir_deps.bzl @@ -382,80 +382,80 @@ DIST_DEPS = { "remote_java_tools_test", "remote_java_tools_for_testing", ], - "archive": "java_tools-v12.4.zip", - "sha256": "e91fbced948cdafce21c29c9ce006de19a2e7fc40706aac6197096d0847ae93d", + "archive": "java_tools-v12.5.zip", + "sha256": "942b3d88ebd785a5face38049077a1f8dab5a3500f5ebd0c0df090244acc4e16", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.4/java_tools-v12.4.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.4/java_tools-v12.4.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.5/java_tools-v12.5.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.5/java_tools-v12.5.zip", ], "used_in": [ "test_WORKSPACE_files", ], - "package_version": "12.4", + "package_version": "12.5", }, "remote_java_tools_linux": { "aliases": [ "remote_java_tools_test_linux", "remote_java_tools_linux_for_testing", ], - "archive": "java_tools_linux-v12.4.zip", - "sha256": "ed1438453d5142c0cf022a43a21255d4a764f9f221cce08c17a2285d04479a06", + "archive": "java_tools_linux-v12.5.zip", + "sha256": "45dda5441b46385e8ec95d3bc4a04b9337a6ff837bb41bdaa6247d8d36edceae", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.4/java_tools_linux-v12.4.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.4/java_tools_linux-v12.4.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.5/java_tools_linux-v12.5.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.5/java_tools_linux-v12.5.zip", ], "used_in": [ "test_WORKSPACE_files", ], - "package_version": "12.4", + "package_version": "12.5", }, "remote_java_tools_windows": { "aliases": [ "remote_java_tools_test_windows", "remote_java_tools_windows_for_testing", ], - "archive": "java_tools_windows-v12.4.zip", - "sha256": "11b61fa63da07380dec212448a0e44b66f3d1ee5469f1c8a2845ca8a4431d851", + "archive": "java_tools_windows-v12.5.zip", + "sha256": "0b319cf762e256133f8d0f5f99fd7d35ca4cf00f35e7c0e8aea1b9fcd9cf4fb0", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.4/java_tools_windows-v12.4.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.4/java_tools_windows-v12.4.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.5/java_tools_windows-v12.5.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.5/java_tools_windows-v12.5.zip", ], "used_in": [ "test_WORKSPACE_files", ], - "package_version": "12.4", + "package_version": "12.5", }, "remote_java_tools_darwin_x86_64": { "aliases": [ "remote_java_tools_test_darwin_x86_64", "remote_java_tools_darwin_x86_64_for_testing", ], - "archive": "java_tools_darwin_x86_64-v12.4.zip", - "sha256": "564ed4f744ed947f27641ac1dc256ef294f38a7b0955b70f4c9407173a838a86", + "archive": "java_tools_darwin_x86_64-v12.5.zip", + "sha256": "7e96d0310222e9c27e4c87987978c0c59a0acb97cebdbd838ff652a13abbed77", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.4/java_tools_darwin_x86_64-v12.4.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.4/java_tools_darwin_x86_64-v12.4.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.5/java_tools_darwin_x86_64-v12.5.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.5/java_tools_darwin_x86_64-v12.5.zip", ], "used_in": [ "test_WORKSPACE_files", ], - "package_version": "12.4", + "package_version": "12.5", }, "remote_java_tools_darwin_arm64": { "aliases": [ "remote_java_tools_test_darwin_arm64", "remote_java_tools_darwin_arm64_for_testing", ], - "archive": "java_tools_darwin_arm64-v12.4.zip", - "sha256": "7c0f2b7295b1738e7192731124730bfd9a9b2034895fa99a98dd5b8fb4a96c1b", + "archive": "java_tools_darwin_arm64-v12.5.zip", + "sha256": "5fb927b24043dd79010b54be31ec5f18b38ee9dbd9fd03d8353232431a7e2392", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.4/java_tools_darwin_arm64-v12.4.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.4/java_tools_darwin_arm64-v12.4.zip", + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.5/java_tools_darwin_arm64-v12.5.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.5/java_tools_darwin_arm64-v12.5.zip", ], "used_in": [ "test_WORKSPACE_files", ], - "package_version": "12.4", + "package_version": "12.5", }, "remotejdk11_linux": { "aliases": [ From eac3e6ec135bc80c18ed3b949b23c866079b3492 Mon Sep 17 00:00:00 2001 From: Googler Date: Thu, 29 Jun 2023 02:28:28 -0700 Subject: [PATCH 3/4] Fix error prone ComparisonOutOfRange in PersistentStringIndexer PiperOrigin-RevId: 544294153 Change-Id: Ia89d02a025dfafa213d68ea2110a79e5adccf79c --- .../build/lib/actions/cache/PersistentStringIndexer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/google/devtools/build/lib/actions/cache/PersistentStringIndexer.java b/src/main/java/com/google/devtools/build/lib/actions/cache/PersistentStringIndexer.java index beb9a16bda6609..19fe48352cb4c6 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/cache/PersistentStringIndexer.java +++ b/src/main/java/com/google/devtools/build/lib/actions/cache/PersistentStringIndexer.java @@ -66,7 +66,7 @@ public PersistentIndexMap(Path mapFile, Path journalFile, Clock clock) throws IO @Override protected boolean updateJournal() { long time = clock.nanoTime(); - if (SAVE_INTERVAL_NS == 0 || time > nextUpdate) { + if (SAVE_INTERVAL_NS == 0L || time > nextUpdate) { nextUpdate = time + SAVE_INTERVAL_NS; return true; } From d5e9b9763b7731e90eccb3540de66ae7ff2d31f9 Mon Sep 17 00:00:00 2001 From: Googler Date: Thu, 29 Jun 2023 05:25:31 -0700 Subject: [PATCH 4/4] Fix error prone ComparisonOutOfRange in ZipTester `filename` has type `byte[]`, so the range of each element is `[-128,127]` PiperOrigin-RevId: 544327350 Change-Id: I58b4829044fa5891157c4ef7dbc3e70fb458e33f --- .../com/google/devtools/build/singlejar/ZipTester.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar/ZipTester.java b/src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar/ZipTester.java index f2e8b3a8445dd6..ac18f593e4dd4d 100644 --- a/src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar/ZipTester.java +++ b/src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar/ZipTester.java @@ -228,7 +228,7 @@ private void readEntry() throws IOException { String name = new String(filename, "UTF-8"); for (int i = 0; i < filename.length; i++) { - if ((filename[i] < ' ') || (filename[i] > 127)) { + if ((filename[i] < ' ')) { warn(entryDesc + ": file name has unexpected non-ascii characters"); } }