Update java_tools to 0.4 and a new BUILD file.
We need to use an intermediate BUILD file because the `third_party` changes to the BUILD file (#7455) have to be merged separately from the bazel change and that would break the CI.
Partial fix for #7440.
Closes #7456.
PiperOrigin-RevId: 234460149
diff --git a/WORKSPACE b/WORKSPACE
index b8fd42e..5e0ac76 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -278,7 +278,7 @@
"zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz",
"zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip",
"jdk10-server-release-1804.tar.xz",
- "java_tools_pkg-0.3.tar.gz",
+ "java_tools_pkg-0.4.tar.gz",
"zulu11.2.3-jdk11.0.1-linux_x64.tar.gz",
"zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz",
"zulu11.2.3-jdk11.0.1-win_x64.zip",
@@ -296,7 +296,7 @@
"zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz": "e669c9a897413d855b550b4e39d79614392e6fb96f494e8ef99a34297d9d85d3",
"zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip": "c39e7700a8d41794d60985df5a20352435196e78ecbc6a2b30df7be8637bffd5",
"jdk10-server-release-1804.tar.xz": "b7098b7aaf6ee1ffd4a2d0371a0be26c5a5c87f6aebbe46fe9a92c90583a84be",
- "java_tools_pkg-0.3.tar.gz": "f1f280546ee4da3446d10a60fde585f5283534b0cc01c0284c93740f15d1932d",
+ "java_tools_pkg-0.4.tar.gz": "9e36d7604a8946755452ac573b5e2bb7b3a9c14d35e15954d75df9d3e5956660",
"zulu11.2.3-jdk11.0.1-linux_x64.tar.gz": "232b1c3511f0d26e92582b7c3cc363be7ac633e371854ca2f2e9f2b50eb72a75",
"zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz": "1edf366ee821e5db8e348152fcb337b28dfd6bf0f97943c270dcc6747cedb6cb",
"zulu11.2.3-jdk11.0.1-win_x64.zip": "8e1e2b8347de6746f3fd1538840dd643201533ab113abc4ed93678e342d28aa3",
@@ -313,7 +313,7 @@
"zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz"],
"zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip": ["https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip"],
"jdk10-server-release-1804.tar.xz": ["https://mirror.bazel.build/openjdk.linaro.org/releases/jdk10-server-release-1804.tar.xz"],
- "java_tools_pkg-0.3.tar.gz": ["https://mirror.bazel.build/bazel_java_tools/java_tools_pkg-0.3.tar.gz"],
+ "java_tools_pkg-0.4.tar.gz": ["https://mirror.bazel.build/bazel_java_tools/java_tools_pkg-0.4.tar.gz"],
"zulu11.2.3-jdk11.0.1-linux_x64.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-linux_x64.tar.gz"],
"zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz"],
"zulu11.2.3-jdk11.0.1-win_x64.zip": ["https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-win_x64.zip"],
diff --git a/src/create_embedded_tools.py b/src/create_embedded_tools.py
index bbeb6f1..a1b4590 100644
--- a/src/create_embedded_tools.py
+++ b/src/create_embedded_tools.py
@@ -38,7 +38,7 @@
lambda x: 'tools/jdk/jarjar_command_deploy.jar'),
('*JacocoCoverage*_deploy.jar',
lambda x: 'tools/jdk/JacocoCoverage_deploy.jar'),
- ('*BUILD.pkg', lambda x: 'tools/jdk/BUILD.pkg'),
+ ('*BUILD-new.pkg', lambda x: 'tools/jdk/BUILD.pkg'),
('*turbine_deploy.jar', lambda x: 'tools/jdk/turbine_deploy.jar'),
('*turbine_direct*', lambda x: 'tools/jdk/' + os.path.basename(x)),
('*javac-9+181-r4173-1.jar',
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE
index 5e203a8..cbc02d3 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE
@@ -208,9 +208,9 @@
http_archive(
name = "remote_java_tools",
build_file = "@bazel_tools//tools/jdk:BUILD.pkg",
- sha256 = "f1f280546ee4da3446d10a60fde585f5283534b0cc01c0284c93740f15d1932d",
+ sha256 = "9e36d7604a8946755452ac573b5e2bb7b3a9c14d35e15954d75df9d3e5956660",
urls = [
- "https://mirror.bazel.build/bazel_java_tools/java_tools_pkg-0.3.tar.gz",
+ "https://mirror.bazel.build/bazel_java_tools/java_tools_pkg-0.4.tar.gz",
],
)
