Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[6.3.0] Update java_tools to v12.5 #18868

Merged
merged 9 commits into from
Jul 12, 2023
Merged

[6.3.0] Update java_tools to v12.5 #18868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
608dd28
Update java_tools version to 12.4
keertk Jul 10, 2023
d55e43e
Merge branch 'release-6.3.0' into 6.3.0-java_tools
keertk Jul 10, 2023
ea86b16
Merge branch 'release-6.3.0' into 6.3.0-java_tools
keertk Jul 11, 2023
83f6806
Merge branch 'release-6.3.0' into 6.3.0-java_tools
keertk Jul 11, 2023
3a1a80c
Update java_tools version to 12.5
keertk Jul 12, 2023
abc9928
Merge branch 'release-6.3.0' into 6.3.0-java_tools
keertk Jul 12, 2023
eac3e6e
Fix error prone ComparisonOutOfRange in PersistentStringIndexer
hvadehra Jun 29, 2023
d5e9b97
Fix error prone ComparisonOutOfRange in ZipTester
hvadehra Jun 29, 2023
a22b9d4
Merge branch 'release-6.3.0' into 6.3.0-java_tools
keertk Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions distdir_deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.zip",
"sha256": "942b3d88ebd785a5face38049077a1f8dab5a3500f5ebd0c0df090244acc4e16",
"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.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.3",
"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.3.zip",
"sha256": "32157b5218b151009f5b99bf5e2f65e28823d269dfbba8cd57e7da5e7cdd291d",
"archive": "java_tools_linux-v12.5.zip",
"sha256": "45dda5441b46385e8ec95d3bc4a04b9337a6ff837bb41bdaa6247d8d36edceae",
"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.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.3",
"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.3.zip",
"sha256": "ec6f91387d2353eacb0ca0492f35f68c5c7b0e7a80acd1fb825088b4b069fab1",
"archive": "java_tools_windows-v12.5.zip",
"sha256": "0b319cf762e256133f8d0f5f99fd7d35ca4cf00f35e7c0e8aea1b9fcd9cf4fb0",
"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.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.3",
"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.3.zip",
"sha256": "3c3fb1967a0f35c73ff509505de53ca4611518922a6b7c8c22a468aa7503132c",
"archive": "java_tools_darwin_x86_64-v12.5.zip",
"sha256": "7e96d0310222e9c27e4c87987978c0c59a0acb97cebdbd838ff652a13abbed77",
"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.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.3",
"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.3.zip",
"sha256": "29aa0c2de4e3cf45bc55d2995ba803ecbd1173a8d363860abbc309551db7931b",
"archive": "java_tools_darwin_arm64-v12.5.zip",
"sha256": "5fb927b24043dd79010b54be31ec5f18b38ee9dbd9fd03d8353232431a7e2392",
"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.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.3",
"package_version": "12.5",
},
"remotejdk11_linux": {
"aliases": [
Expand Down
2 changes: 1 addition & 1 deletion src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar/ZipTester.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/google/devtools/build/lib/actions/cache/PersistentStringIndexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down