Java_tools benchmark bazelbuild#8

comius · Nov 27, 2020 · 14e080c · 14e080c
1 parent a4251ea
commit 14e080c
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 45 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -146,9 +146,9 @@ distdir_tar(
     # Keep in sync with the archives fetched as part of building bazel.
     archives = [
         "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip",
-        "java_tools_javac11_linux-v10.3.zip",
-        "java_tools_javac11_windows-v10.3.zip",
-        "java_tools_javac11_darwin-v10.3.zip",
+        "java_tools_javac11_linux-v10.4-rcbenchmark-8.zip",
+        "java_tools_javac11_windows-v10.4-rcbenchmark-8.zip",
+        "java_tools_javac11_darwin-v10.4-rcbenchmark-8.zip",
         "coverage_output_generator-v2.5.zip",
         # bazelbuid/stardoc
         "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz",
@@ -187,9 +187,9 @@ distdir_tar(
     dirname = "derived/distdir",
     sha256 = {
         "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d",
-        "java_tools_javac11_linux-v10.3.zip": "bd6e8b7091c1f61f2de7dfdf0c47996ffb019582f7c4147a851f59eee7c04e15",
-        "java_tools_javac11_windows-v10.3.zip": "022cef618b138199d7b21740d495fbbd201483234b4818185aa6cdc6d162d9a4",
-        "java_tools_javac11_darwin-v10.3.zip": "cd8f319b46876e7c3a814095ad9d91dd8589821480548ad48da11949f45a38e6",
+        "java_tools_javac11_linux-v10.4-rcbenchmark-8.zip": "2374463c6c44f776c40a3d5704492c880847aabdfd50725acafcab49b2c2a60e",
+        "java_tools_javac11_windows-v10.4-rcbenchmark-8.zip": "024423f2a8e32c6e9a750b960f9ec84dd2c4be268e0e70774a691e52131ac610",
+        "java_tools_javac11_darwin-v10.4-rcbenchmark-8.zip": "cead05547b43cce49723811ff7f6852702471a7d2f563b8d8497edbb0c34e5c1",
         "coverage_output_generator-v2.5.zip": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d",
         # bazelbuild/stardoc
         "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1",
@@ -230,14 +230,14 @@ distdir_tar(
             "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip",
             "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip",
         ],
-        "java_tools_javac11_linux-v10.3.zip": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.3/java_tools_javac11_linux-v10.3.zip",
+        "java_tools_javac11_linux-v10.4-rcbenchmark-8.zip": [
+            "https://mirror.bazel.build/bazel_java_tools/release_candidates/javac11/v10.4/java_tools_javac11_linux-v10.4-rcbenchmark-8.zip",
         ],
-        "java_tools_javac11_windows-v10.3.zip": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.3/java_tools_javac11_windows-v10.3.zip",
+        "java_tools_javac11_windows-v10.4-rcbenchmark-8.zip": [
+            "https://mirror.bazel.build/bazel_java_tools/release_candidates/javac11/v10.4/java_tools_javac11_windows-v10.4-rcbenchmark-8.zip",
         ],
-        "java_tools_javac11_darwin-v10.3.zip": [
-            "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.3/java_tools_javac11_darwin-v10.3.zip",
+        "java_tools_javac11_darwin-v10.4-rcbenchmark-8.zip": [
+            "https://mirror.bazel.build/bazel_java_tools/release_candidates/javac11/v10.4/java_tools_javac11_darwin-v10.4-rcbenchmark-8.zip",
         ],
         "coverage_output_generator-v2.5.zip": [
             "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip",
@@ -547,9 +547,9 @@ http_archive(
 distdir_tar(
     name = "test_WORKSPACE_files",
     archives = [
-        "java_tools_javac11_linux-v10.3.zip",
-        "java_tools_javac11_windows-v10.3.zip",
-        "java_tools_javac11_darwin-v10.3.zip",
+        "java_tools_javac11_linux-v10.4-rcbenchmark-8.zip",
+        "java_tools_javac11_windows-v10.4-rcbenchmark-8.zip",
+        "java_tools_javac11_darwin-v10.4-rcbenchmark-8.zip",
         "coverage_output_generator-v2.5.zip",
         "zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz",
         "zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz",
@@ -581,9 +581,9 @@ distdir_tar(
     ],
     dirname = "test_WORKSPACE/distdir",
     sha256 = {
-        "java_tools_javac11_linux-v10.3.zip": "bd6e8b7091c1f61f2de7dfdf0c47996ffb019582f7c4147a851f59eee7c04e15",
-        "java_tools_javac11_windows-v10.3.zip": "022cef618b138199d7b21740d495fbbd201483234b4818185aa6cdc6d162d9a4",
-        "java_tools_javac11_darwin-v10.3.zip": "cd8f319b46876e7c3a814095ad9d91dd8589821480548ad48da11949f45a38e6",
+        "java_tools_javac11_linux-v10.4-rcbenchmark-8.zip": "2374463c6c44f776c40a3d5704492c880847aabdfd50725acafcab49b2c2a60e",
+        "java_tools_javac11_windows-v10.4-rcbenchmark-8.zip": "024423f2a8e32c6e9a750b960f9ec84dd2c4be268e0e70774a691e52131ac610",
+        "java_tools_javac11_darwin-v10.4-rcbenchmark-8.zip": "cead05547b43cce49723811ff7f6852702471a7d2f563b8d8497edbb0c34e5c1",
         "coverage_output_generator-v2.5.zip": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d",
         "zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1",
         "zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4",
@@ -614,9 +614,9 @@ distdir_tar(
         "df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz": "f368a8476f4e2e0eccf8a7318b98dafbe30b2600f4e3cf52636e5eb145aba06a",
     },
     urls = {
-        "java_tools_javac11_linux-v10.3.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.3/java_tools_javac11_linux-v10.3.zip"],
-        "java_tools_javac11_windows-v10.3.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.3/java_tools_javac11_windows-v10.3.zip"],
-        "java_tools_javac11_darwin-v10.3.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.3/java_tools_javac11_darwin-v10.3.zip"],
+        "java_tools_javac11_linux-v10.3.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.3/java_tools_javac11_linux-v10.4-rcbenchmark-8.zip"],
+        "java_tools_javac11_windows-v10.3.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.3/java_tools_javac11_windows-v10.4-rcbenchmark-8.zip"],
+        "java_tools_javac11_darwin-v10.3.zip": ["https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.3/java_tools_javac11_darwin-v10.4-rcbenchmark-8.zip"],
         "coverage_output_generator-v2.5.zip": ["https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip"],
         "zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz"],
         "zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz"],
@@ -921,9 +921,9 @@ http_archive(
     name = "remote_java_tools_linux_for_testing",
     patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
     patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
-    sha256 = "bd6e8b7091c1f61f2de7dfdf0c47996ffb019582f7c4147a851f59eee7c04e15",
+    sha256 = "2374463c6c44f776c40a3d5704492c880847aabdfd50725acafcab49b2c2a60e",
     urls = [
-        "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.3/java_tools_javac11_linux-v10.3.zip",
+        "https://mirror.bazel.build/bazel_java_tools/release_candidates/javac11/v10.4/java_tools_javac11_linux-v10.4-rcbenchmark-8.zip",
         "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.3/java_tools_javac11_linux-v10.3.zip",
     ],
 )
@@ -933,9 +933,9 @@ http_archive(
     name = "remote_java_tools_windows_for_testing",
     patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
     patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
-    sha256 = "022cef618b138199d7b21740d495fbbd201483234b4818185aa6cdc6d162d9a4",
+    sha256 = "024423f2a8e32c6e9a750b960f9ec84dd2c4be268e0e70774a691e52131ac610",
     urls = [
-        "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.3/java_tools_javac11_windows-v10.3.zip",
+        "https://mirror.bazel.build/bazel_java_tools/release_candidates/javac11/v10.4/java_tools_javac11_windows-v10.4-rcbenchmark-8.zip",
         "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.3/java_tools_javac11_windows-v10.3.zip",
     ],
 )
@@ -945,9 +945,9 @@ http_archive(
     name = "remote_java_tools_darwin_for_testing",
     patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
     patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
-    sha256 = "cd8f319b46876e7c3a814095ad9d91dd8589821480548ad48da11949f45a38e6",
+    sha256 = "cead05547b43cce49723811ff7f6852702471a7d2f563b8d8497edbb0c34e5c1",
     urls = [
-        "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.3/java_tools_javac11_darwin-v10.3.zip",
+        "https://mirror.bazel.build/bazel_java_tools/release_candidates/javac11/v10.4/java_tools_javac11_darwin-v10.4-rcbenchmark-8.zip",
         "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.3/java_tools_javac11_darwin-v10.3.zip",
     ],
 )
@@ -957,9 +957,9 @@ http_archive(
     name = "remote_java_tools_javac11_test_linux",
     patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
     patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
-    sha256 = "bd6e8b7091c1f61f2de7dfdf0c47996ffb019582f7c4147a851f59eee7c04e15",
+    sha256 = "2374463c6c44f776c40a3d5704492c880847aabdfd50725acafcab49b2c2a60e",
     urls = [
-        "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.3/java_tools_javac11_linux-v10.3.zip",
+        "https://mirror.bazel.build/bazel_java_tools/release_candidates/javac11/v10.4/java_tools_javac11_linux-v10.4-rcbenchmark-8.zip",
     ],
 )
 
@@ -968,9 +968,9 @@ http_archive(
     name = "remote_java_tools_javac11_test_windows",
     patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
     patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
-    sha256 = "022cef618b138199d7b21740d495fbbd201483234b4818185aa6cdc6d162d9a4",
+    sha256 = "024423f2a8e32c6e9a750b960f9ec84dd2c4be268e0e70774a691e52131ac610",
     urls = [
-        "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.3/java_tools_javac11_windows-v10.3.zip",
+        "https://mirror.bazel.build/bazel_java_tools/release_candidates/javac11/v10.4/java_tools_javac11_windows-v10.4-rcbenchmark-8.zip",
     ],
 )
 
@@ -979,9 +979,9 @@ http_archive(
     name = "remote_java_tools_javac11_test_darwin",
     patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
     patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
-    sha256 = "cd8f319b46876e7c3a814095ad9d91dd8589821480548ad48da11949f45a38e6",
+    sha256 = "cead05547b43cce49723811ff7f6852702471a7d2f563b8d8497edbb0c34e5c1",
     urls = [
-        "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.3/java_tools_javac11_darwin-v10.3.zip",
+        "https://mirror.bazel.build/bazel_java_tools/release_candidates/javac11/v10.4/java_tools_javac11_darwin-v10.4-rcbenchmark-8.zip",
     ],
 )
 

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
@@ -163,9 +163,9 @@ maybe(
 maybe(
     http_archive,
     name = "remote_java_tools_linux",
-    sha256 = "bd6e8b7091c1f61f2de7dfdf0c47996ffb019582f7c4147a851f59eee7c04e15",
+    sha256 = "2374463c6c44f776c40a3d5704492c880847aabdfd50725acafcab49b2c2a60e",
     urls = [
-        "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.3/java_tools_javac11_linux-v10.3.zip",
+        "https://mirror.bazel.build/bazel_java_tools/release_candidates/javac11/v10.4/java_tools_javac11_linux-v10.4-rcbenchmark-8.zip",
         "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.3/java_tools_javac11_linux-v10.3.zip",
     ],
 )
@@ -174,9 +174,9 @@ maybe(
 maybe(
     http_archive,
     name = "remote_java_tools_windows",
-    sha256 = "022cef618b138199d7b21740d495fbbd201483234b4818185aa6cdc6d162d9a4",
+    sha256 = "024423f2a8e32c6e9a750b960f9ec84dd2c4be268e0e70774a691e52131ac610",
     urls = [
-        "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.3/java_tools_javac11_windows-v10.3.zip",
+        "https://mirror.bazel.build/bazel_java_tools/release_candidates/javac11/v10.4/java_tools_javac11_windows-v10.4-rcbenchmark-8.zip",
         "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.3/java_tools_javac11_windows-v10.3.zip",
     ],
 )
@@ -185,9 +185,9 @@ maybe(
 maybe(
     http_archive,
     name = "remote_java_tools_darwin",
-    sha256 = "cd8f319b46876e7c3a814095ad9d91dd8589821480548ad48da11949f45a38e6",
+    sha256 = "cead05547b43cce49723811ff7f6852702471a7d2f563b8d8497edbb0c34e5c1",
     urls = [
-        "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.3/java_tools_javac11_darwin-v10.3.zip",
+        "https://mirror.bazel.build/bazel_java_tools/release_candidates/javac11/v10.4/java_tools_javac11_darwin-v10.4-rcbenchmark-8.zip",
         "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.3/java_tools_javac11_darwin-v10.3.zip",
     ],
 )

diff --git a/src/test/shell/bazel/testdata/jdk_http_archives b/src/test/shell/bazel/testdata/jdk_http_archives
@@ -2,25 +2,25 @@
 # This must be kept in sync with the top-level WORKSPACE file.
 http_archive(
     name = "remote_java_tools_javac11_test_linux",
-    sha256 = "bd6e8b7091c1f61f2de7dfdf0c47996ffb019582f7c4147a851f59eee7c04e15",
+    sha256 = "2374463c6c44f776c40a3d5704492c880847aabdfd50725acafcab49b2c2a60e",
     urls = [
-         "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.3/java_tools_javac11_linux-v10.3.zip",
+         "https://mirror.bazel.build/bazel_java_tools/release_candidates/javac11/v10.4/java_tools_javac11_linux-v10.4-rcbenchmark-8.zip",
     ],
 )
 # This must be kept in sync with the top-level WORKSPACE file.
 http_archive(
     name = "remote_java_tools_javac11_test_windows",
-    sha256 = "022cef618b138199d7b21740d495fbbd201483234b4818185aa6cdc6d162d9a4",
+    sha256 = "024423f2a8e32c6e9a750b960f9ec84dd2c4be268e0e70774a691e52131ac610",
     urls = [
-        "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.3/java_tools_javac11_windows-v10.3.zip",
+        "https://mirror.bazel.build/bazel_java_tools/release_candidates/javac11/v10.4/java_tools_javac11_windows-v10.4-rcbenchmark-8.zip",
     ],
 )
 # This must be kept in sync with the top-level WORKSPACE file.
 http_archive(
     name = "remote_java_tools_javac11_test_darwin",
-    sha256 = "cd8f319b46876e7c3a814095ad9d91dd8589821480548ad48da11949f45a38e6",
+    sha256 = "cead05547b43cce49723811ff7f6852702471a7d2f563b8d8497edbb0c34e5c1",
     urls = [
-         "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.3/java_tools_javac11_darwin-v10.3.zip",
+         "https://mirror.bazel.build/bazel_java_tools/release_candidates/javac11/v10.4/java_tools_javac11_darwin-v10.4-rcbenchmark-8.zip",
     ],
 )