Remove singlejar from bazel binary
Remove singlejar from the bazel binary and use singlejar from the java_tools instead.
Upgrade the java_tools version in bazel to the version that includes singlejar.
Closes #7952.
PiperOrigin-RevId: 242643670
diff --git a/WORKSPACE b/WORKSPACE
index 83e3100..6f9c474 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -109,10 +109,9 @@
archives = [
"e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip",
"f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz",
- "java_tools_pkg-0.5.1.tar.gz",
- "java_tools_javac10_linux-x86_64-v1.0.zip",
- "java_tools_javac10_windows-x86_64-v1.0_copy.zip",
- "java_tools_javac10_darwin-v1.0.zip",
+ "java_tools_javac10_linux-x86_64-v2.1.zip",
+ "java_tools_javac10_windows-x86_64-v2.1.zip",
+ "java_tools_javac10_darwin-v2.1.zip",
"2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz",
"8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz",
"0.16.2.zip",
@@ -122,10 +121,9 @@
sha256 = {
"e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d",
"f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz": "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52",
- "java_tools_pkg-0.5.1.tar.gz": "bcfc1a3dd0d638a49fed50f17f0f1f7d77101debf19ae2c82119c82459a9a8d1",
- "java_tools_javac10_linux-x86_64-v1.0.zip": "3eb952a53de09163024ad6c1ee964d6261bd6af2b1a644ea930d1b49f1cdfcc6",
- "java_tools_javac10_windows-x86_64-v1.0_copy.zip": "56adebe4a120dea79c7cc1c0249490d3fcbadb1874d8b58020ab032d99b7fcf4",
- "java_tools_javac10_darwin-v1.0.zip": "f5cd64d0474dca3ae4cef8e0325d7f5955223bff95dade15ce797821512bcd12",
+ "java_tools_javac10_linux-x86_64-v2.1.zip": "9163c9963f31e10101d538163c435db9534baf9db63d380508311b775fbe3c37",
+ "java_tools_javac10_windows-x86_64-v2.1.zip": "a7a99e34213eb80384b81dda0217582a38f876f420c7b648900f254bf9ea3bd7",
+ "java_tools_javac10_darwin-v2.1.zip": "5f6a7abf7ec0c491dc2d0b15add6a2abb594e31809f4cabc2cfde41efa995f92",
"2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz": "4a1318fed4831697b83ce879b3ab70ae09592b167e5bda8edaff45132d1c3b3f",
"8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz": "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898",
"0.16.2.zip": "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0",
@@ -140,17 +138,14 @@
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz",
"https://github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz",
],
- "java_tools_pkg-0.5.1.tar.gz": [
- "https://mirror.bazel.build/bazel_java_tools/java_tools_pkg-0.5.1.tar.gz",
+ "java_tools_javac10_linux-x86_64-v2.1.zip": [
+ "https://mirror.bazel.build/bazel_java_tools/releases/java_tools_javac10_linux-x86_64-v2.1.zip",
],
- "java_tools_javac10_linux-x86_64-v1.0.zip": [
- "https://mirror.bazel.build/bazel_java_tools/java_tools_javac10_linux-x86_64-v1.0.zip",
+ "java_tools_javac10_windows-x86_64-v2.1.zip": [
+ "https://mirror.bazel.build/bazel_java_tools/releases/java_tools_javac10_windows-x86_64-v2.1.zip",
],
- "java_tools_javac10_windows-x86_64-v1.0_copy.zip": [
- "https://mirror.bazel.build/bazel_java_tools/java_tools_javac10_windows-x86_64-v1.0_copy.zip",
- ],
- "java_tools_javac10_darwin-v1.0.zip": [
- "https://mirror.bazel.build/bazel_java_tools/java_tools_javac10_darwin-v1.0.zip",
+ "java_tools_javac10_darwin-v2.1.zip": [
+ "https://mirror.bazel.build/bazel_java_tools/releases/java_tools_javac10_darwin-v2.1.zip",
],
"2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz": [
"https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz",
@@ -341,9 +336,9 @@
"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_javac10_linux-x86_64-v1.0.zip",
- "java_tools_javac10_windows-x86_64-v1.0_copy.zip",
- "java_tools_javac10_darwin-v1.0.zip",
+ "java_tools_javac10_linux-x86_64-v2.1.zip",
+ "java_tools_javac10_windows-x86_64-v2.1.zip",
+ "java_tools_javac10_darwin-v2.1.zip",
"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",
@@ -362,9 +357,9 @@
"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_javac10_linux-x86_64-v1.0.zip": "3eb952a53de09163024ad6c1ee964d6261bd6af2b1a644ea930d1b49f1cdfcc6",
- "java_tools_javac10_windows-x86_64-v1.0_copy.zip": "56adebe4a120dea79c7cc1c0249490d3fcbadb1874d8b58020ab032d99b7fcf4",
- "java_tools_javac10_darwin-v1.0.zip": "f5cd64d0474dca3ae4cef8e0325d7f5955223bff95dade15ce797821512bcd12",
+ "java_tools_javac10_linux-x86_64-v2.1.zip": "9163c9963f31e10101d538163c435db9534baf9db63d380508311b775fbe3c37",
+ "java_tools_javac10_windows-x86_64-v2.1.zip": "a7a99e34213eb80384b81dda0217582a38f876f420c7b648900f254bf9ea3bd7",
+ "java_tools_javac10_darwin-v2.1.zip": "5f6a7abf7ec0c491dc2d0b15add6a2abb594e31809f4cabc2cfde41efa995f92",
"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",
@@ -382,9 +377,9 @@
"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_javac10_linux-x86_64-v1.0.zip": ["https://mirror.bazel.build/bazel_java_tools/java_tools_javac10_linux-x86_64-v1.0.zip"],
- "java_tools_javac10_windows-x86_64-v1.0_copy.zip": ["https://mirror.bazel.build/bazel_java_tools/java_tools_javac10_windows-x86_64-v1.0_copy.zip"],
- "java_tools_javac10_darwin-v1.0.zip": ["https://mirror.bazel.build/bazel_java_tools/java_tools_javac10_darwin-v1.0.zip"],
+ "java_tools_javac10_linux-x86_64-v2.1.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/java_tools_javac10_linux-x86_64-v2.1.zip"],
+ "java_tools_javac10_windows-x86_64-v2.1.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/java_tools_javac10_windows-x86_64-v2.1.zip"],
+ "java_tools_javac10_darwin-v2.1.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/java_tools_javac10_darwin-v2.1.zip"],
"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"],
