Remove java_tools_javac14 (releases and dependencies) from Bazel.
Java_tools_javac14 is a binary equivalent to java_tools_javac11. It was split from java_tools_javac 11 in order to be able to provide specific support for Java 14.
As a result a release of java_tools_javac* we now need 6 binaries and fix of dependencies and their hashes in Bazel on cca. 18 different places. Adding another Java version (e.g. Java 15) will add additional 3 binaries and 9 places to fix (total 9/27).
Also JDK 14 has reached EOL.
It makes sense to have only one release until we actually have some specific support for Java 14 or newer.
This is a partial revert of commits fe291f7dcadc20eb85cff07b2cd4d899d79fba71 and 693c88a8f897b6764b98c7d9da922ffc96c6d890:
- Add support for toolchain java 14
- Add unit test against released java_tools_javac14
Closes #12180.
PiperOrigin-RevId: 334346567
diff --git a/WORKSPACE b/WORKSPACE
index cdcb49a..91fcf4a 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -907,39 +907,6 @@
# This must be kept in sync with src/test/shell/bazel/testdata/jdk_http_archives.
http_archive(
- name = "remote_java_tools_javac14_test_linux",
- patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
- patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
- sha256 = "ed18ff30d6fff6cff341f2153204cbd19b5cbe2a693351c96651d3dd2b6bf0b3",
- urls = [
- "https://mirror.bazel.build/bazel_java_tools/releases/javac14/v2.0/java_tools_javac14_linux-v2.0.zip",
- ],
-)
-
-# This must be kept in sync with src/test/shell/bazel/testdata/jdk_http_archives.
-http_archive(
- name = "remote_java_tools_javac14_test_windows",
- patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
- patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
- sha256 = "269d4dcd8fddcd94e7b54908f263f85486375b04d99fd68c75e430a34053c2e4",
- urls = [
- "https://mirror.bazel.build/bazel_java_tools/releases/javac14/v2.0/java_tools_javac14_windows-v2.0.zip",
- ],
-)
-
-# This must be kept in sync with src/test/shell/bazel/testdata/jdk_http_archives.
-http_archive(
- name = "remote_java_tools_javac14_test_darwin",
- patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
- patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
- sha256 = "ceebee0618e838a0aa904f010e382a407e4ef6302d5d35c803e77b29612c3224",
- urls = [
- "https://mirror.bazel.build/bazel_java_tools/releases/javac14/v2.0/java_tools_javac14_darwin-v2.0.zip",
- ],
-)
-
-# This must be kept in sync with src/test/shell/bazel/testdata/jdk_http_archives.
-http_archive(
name = "openjdk11_linux_archive",
build_file_content = """
java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])
diff --git a/src/BUILD b/src/BUILD
index 2cb0b5b..5bbf5c3 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -570,9 +570,7 @@
"//conditions:default": [],
})
-JAVA_VERSIONS = ("11", "14")
-
-# TODO(davido): Hard code the javac 11 for now; it is required for default toolchain.
+JAVA_VERSIONS = ("11",)
[
genrule(
@@ -763,9 +761,6 @@
"@remote_java_tools_javac11_test_darwin//:WORKSPACE",
"@remote_java_tools_javac11_test_linux//:WORKSPACE",
"@remote_java_tools_javac11_test_windows//:WORKSPACE",
- "@remote_java_tools_javac14_test_darwin//:WORKSPACE",
- "@remote_java_tools_javac14_test_linux//:WORKSPACE",
- "@remote_java_tools_javac14_test_windows//:WORKSPACE",
"@remote_java_tools_linux_for_testing//:WORKSPACE",
"@remote_java_tools_windows_for_testing//:WORKSPACE",
"@remotejdk11_linux_aarch64_for_testing//:WORKSPACE",
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD
index e120419..2d649d6 100644
--- a/src/test/shell/bazel/BUILD
+++ b/src/test/shell/bazel/BUILD
@@ -185,7 +185,7 @@
# --java_toolchain and --host_java_toolchain values
"@local_java_tools//:toolchain_jdk_14",
# java_tools zip to test
- "src/java_tools_java14.zip",
+ "src/java_tools_java11.zip",
] + select({
# --javabase and --host_javabase values
"//src/conditions:darwin": ["@openjdk14_darwin_archive//:runtime"],
@@ -195,7 +195,7 @@
}),
data = [
":test-deps",
- "//src:java_tools_java14_zip",
+ "//src:java_tools_java11_zip",
"//src/test/shell/bazel/testdata:jdk_http_archives_filegroup",
"@bazel_tools//tools/bash/runfiles",
],
@@ -232,7 +232,7 @@
# --java_toolchain
"@local_java_tools//:toolchain",
# java_tools zip to test
- "src/java_tools_java" + java_version + ".zip",
+ "src/java_tools_java11.zip",
# --javabase value
] + select({
"//src/conditions:darwin": ["@openjdk" + java_version + "_darwin_archive//:runtime"],
@@ -242,7 +242,7 @@
}),
data = [
":test-deps",
- "//src:java_tools_java" + java_version + "_zip",
+ "//src:java_tools_java11_zip",
"//src/test/shell/bazel/testdata:jdk_http_archives_filegroup",
"@bazel_tools//tools/bash/runfiles",
],
@@ -261,7 +261,7 @@
# --java_toolchain
"@local_java_tools//:prebuilt_toolchain",
# java_tools zip to test
- "src/java_tools_java" + java_version + ".zip",
+ "src/java_tools_java11.zip",
# --javabase value
] + select({
"//src/conditions:darwin": ["@openjdk" + java_version + "_darwin_archive//:runtime"],
@@ -271,7 +271,7 @@
}),
data = [
":test-deps",
- "//src:java_tools_java" + java_version + "_zip",
+ "//src:java_tools_java11_zip",
"//src/test/shell/bazel/testdata:jdk_http_archives_filegroup",
"@bazel_tools//tools/bash/runfiles",
],
@@ -321,35 +321,29 @@
tags = ["no_windows"],
)
-[
- sh_test(
- name = "bazel_java_tools_javac" + java_version + "_test",
- size = "medium",
- srcs = ["bazel_java_tools_test.sh"],
- args = ["java" + java_version],
- data = [
- ":test-deps",
- "//src:java_tools_java" + java_version + ".zip",
- "@bazel_tools//tools/bash/runfiles",
- ],
- )
- for java_version in JAVA_VERSIONS
-]
+sh_test(
+ name = "bazel_java_tools_javac11_test",
+ size = "medium",
+ srcs = ["bazel_java_tools_test.sh"],
+ args = ["java11"],
+ data = [
+ ":test-deps",
+ "//src:java_tools_java11.zip",
+ "@bazel_tools//tools/bash/runfiles",
+ ],
+)
-[
- sh_test(
- name = "bazel_java_tools_dist_javac" + java_version + "_test",
- size = "small",
- srcs = ["bazel_java_tools_dist_test.sh"],
- args = ["javac" + java_version],
- data = [
- ":test-deps",
- "//src:java_tools_dist_javac" + java_version + ".zip",
- "@bazel_tools//tools/bash/runfiles",
- ],
- )
- for java_version in JAVA_VERSIONS
-]
+sh_test(
+ name = "bazel_java_tools_dist_javac11_test",
+ size = "small",
+ srcs = ["bazel_java_tools_dist_test.sh"],
+ args = ["javac11"],
+ data = [
+ ":test-deps",
+ "//src:java_tools_dist_javac11.zip",
+ "@bazel_tools//tools/bash/runfiles",
+ ],
+)
sh_test(
name = "bazel_proto_library_test",
@@ -502,10 +496,10 @@
name = "bazel_coverage_java_jdk" + java_version + "_toolchain_released_test",
srcs = ["bazel_coverage_java_test.sh"],
args = select({
- "//src/conditions:darwin": ["@remote_java_tools_javac" + java_version + "_test_darwin//:toolchain"],
- "//src/conditions:darwin_x86_64": ["@remote_java_tools_javac" + java_version + "_test_darwin//:toolchain"],
- "//src/conditions:windows": ["@remote_java_tools_javac" + java_version + "_test_windows//:toolchain"],
- "//src/conditions:linux_x86_64": ["@remote_java_tools_javac" + java_version + "_test_linux//:toolchain"],
+ "//src/conditions:darwin": ["@remote_java_tools_javac11_test_darwin//:toolchain"],
+ "//src/conditions:darwin_x86_64": ["@remote_java_tools_javac11_test_darwin//:toolchain"],
+ "//src/conditions:windows": ["@remote_java_tools_javac11_test_windows//:toolchain"],
+ "//src/conditions:linux_x86_64": ["@remote_java_tools_javac11_test_linux//:toolchain"],
}) + [
# java_tools zip to test
"released",
@@ -538,7 +532,7 @@
# --java_toolchain
"@local_java_tools//:toolchain",
# java_tools zip to test
- "src/java_tools_java" + java_version + ".zip",
+ "src/java_tools_java11.zip",
# coverage output generator to test
"tools/test/CoverageOutputGenerator/java/com/google/devtools/coverageoutputgenerator/coverage",
# --javabase value
@@ -550,7 +544,7 @@
}),
data = [
":test-deps",
- "//src:java_tools_java" + java_version + "_zip",
+ "//src:java_tools_java11_zip",
"//src/test/shell/bazel/testdata:jdk_http_archives_filegroup",
"//tools/test/CoverageOutputGenerator/java/com/google/devtools/coverageoutputgenerator:coverage_output_generator_repo",
],
diff --git a/src/test/shell/bazel/testdata/jdk_http_archives b/src/test/shell/bazel/testdata/jdk_http_archives
index ce2376f..1c3f878 100644
--- a/src/test/shell/bazel/testdata/jdk_http_archives
+++ b/src/test/shell/bazel/testdata/jdk_http_archives
@@ -50,32 +50,6 @@
urls = ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip"],
)
-################### Remote java_tools with embedded javac 14 ###################
-# This must be kept in sync with the top-level WORKSPACE file.
-http_archive(
- name = "remote_java_tools_javac14_test_linux",
- sha256 = "ed18ff30d6fff6cff341f2153204cbd19b5cbe2a693351c96651d3dd2b6bf0b3",
- urls = [
- "https://mirror.bazel.build/bazel_java_tools/releases/javac14/v2.0/java_tools_javac14_linux-v2.0.zip",
- ],
-)
-# This must be kept in sync with the top-level WORKSPACE file.
-http_archive(
- name = "remote_java_tools_javac14_test_windows",
- sha256 = "269d4dcd8fddcd94e7b54908f263f85486375b04d99fd68c75e430a34053c2e4",
- urls = [
- "https://mirror.bazel.build/bazel_java_tools/releases/javac14/v2.0/java_tools_javac14_windows-v2.0.zip",
- ],
-)
-# This must be kept in sync with the top-level WORKSPACE file.
-http_archive(
- name = "remote_java_tools_javac14_test_darwin",
- sha256 = "ceebee0618e838a0aa904f010e382a407e4ef6302d5d35c803e77b29612c3224",
- urls = [
- "https://mirror.bazel.build/bazel_java_tools/releases/javac14/v2.0/java_tools_javac14_darwin-v2.0.zip",
- ],
-)
-
#################################### JDK 14 ####################################
# This must be kept in sync with the top-level WORKSPACE file.
http_archive(
diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh
index 8d84f01..77aa713 100755
--- a/src/test/shell/testenv.sh
+++ b/src/test/shell/testenv.sh
@@ -292,9 +292,6 @@
"remote_java_tools_javac11_test_darwin"
"remote_java_tools_javac11_test_linux"
"remote_java_tools_javac11_test_windows"
- "remote_java_tools_javac14_test_darwin"
- "remote_java_tools_javac14_test_linux"
- "remote_java_tools_javac14_test_windows"
"remote_java_tools_linux_for_testing"
"remote_java_tools_windows_for_testing"
"remotejdk11_linux_for_testing"
diff --git a/src/upload_all_java_tools.sh b/src/upload_all_java_tools.sh
index 3c79696..e96fd01 100755
--- a/src/upload_all_java_tools.sh
+++ b/src/upload_all_java_tools.sh
@@ -48,7 +48,7 @@
# Passing the same commit_hash and timestamp to all targets to mark all the artifacts
# uploaded on GCS with the same identifier.
-for java_version in 11 14; do
+for java_version in 11; do
bazel build //src:java_tools_java${java_version}_zip
zip_path=${PWD}/bazel-bin/src/java_tools_java${java_version}.zip
