diff --git a/WORKSPACE b/WORKSPACE index 6fe9fdea89dbc1..d24957270bbf95 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -701,6 +701,16 @@ http_archive( ], ) + +# TODO(davido): This is not needed, because jdk compiler module patching is disabled for JDK 14 +http_archive( + name = "java_tools_langtools_javac14", + sha256 = "cf0814fa002ef3d794582bb086516d8c9ed0958f83f19799cdb08949019fe4c7", + urls = [ + "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11_v2.zip", + ], +) + # This must be kept in sync with src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_remote_tools.WORKSPACE http_archive( name = "android_tools_for_testing", @@ -779,6 +789,39 @@ http_archive( urls = ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip"], ) +# This must be kept in sync with src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE. +http_archive( + name = "remotejdk14_linux_for_testing", + build_file = "@local_jdk//:BUILD.bazel", + patch_cmds = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE, + patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE_WIN, + sha256 = "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", + strip_prefix = "zulu14.28.21-ca-jdk14.0.1-linux_x64", + urls = ["https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz"], +) + +# This must be kept in sync with src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE. +http_archive( + name = "remotejdk14_macos_for_testing", + build_file = "@local_jdk//:BUILD.bazel", + patch_cmds = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE, + patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE_WIN, + sha256 = "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", + strip_prefix = "zulu14.28.21-ca-jdk14.0.1-macosx_x64", + urls = ["https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz"], +) + +# This must be kept in sync with src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE. +http_archive( + name = "remotejdk14_win_for_testing", + build_file = "@local_jdk//:BUILD.bazel", + patch_cmds = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE, + patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE_WIN, + sha256 = "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", + strip_prefix = "zulu14.28.21-ca-jdk14.0.1-win_x64", + urls = ["https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip"], +) + # This must be kept in sync with src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE. http_archive( name = "remote_java_tools_linux_for_testing", @@ -884,6 +927,42 @@ exports_files(["WORKSPACE"], visibility = ["//visibility:public"]) urls = ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip"], ) +# This must be kept in sync with src/test/shell/bazel/testdata/jdk_http_archives. +http_archive( + name = "openjdk14_linux_archive", + build_file_content = """ +java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public']) +exports_files(["WORKSPACE"], visibility = ["//visibility:public"]) +""", + sha256 = "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", + strip_prefix = "zulu14.28.21-ca-jdk14.0.1-linux_x64", + urls = ["https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz"], +) + +# This must be kept in sync with src/test/shell/bazel/testdata/jdk_http_archives. +http_archive( + name = "openjdk14_darwin_archive", + build_file_content = """ +java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public']) +exports_files(["WORKSPACE"], visibility = ["//visibility:public"]) +""", + sha256 = "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", + strip_prefix = "zulu14.28.21-ca-jdk14.0.1-macosx_x64", + urls = ["https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz"], +) + +# This must be kept in sync with src/test/shell/bazel/testdata/jdk_http_archives. +http_archive( + name = "openjdk14_windows_archive", + build_file_content = """ +java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public']) +exports_files(["WORKSPACE"], visibility = ["//visibility:public"]) +""", + sha256 = "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", + strip_prefix = "zulu14.28.21-ca-jdk14.0.1-win_x64", + urls = ["https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip"], +) + load("@io_bazel_skydoc//:setup.bzl", "stardoc_repositories") stardoc_repositories() diff --git a/src/BUILD b/src/BUILD index 2b9f3cc2c2d341..9d9df006eab0ae 100644 --- a/src/BUILD +++ b/src/BUILD @@ -567,7 +567,7 @@ JAVA_TOOLS_DEPLOY_JARS = [ "//conditions:default": [], }) -JAVA_VERSIONS = ("11",) +JAVA_VERSIONS = ("11", "14") [ genrule( @@ -638,8 +638,8 @@ JAVA_VERSIONS = ("11",) [ # The java_tools releases can have BUILD files that vary depending on the # javac version they embed. Currently the only difference is in the - # java_toolchain source version which has to be 12 for javac 12 to be able - # to build new Java 12 features. + # java_toolchain source version which has to be 14 for javac 14 to be able + # to build new Java 14 features. genrule( name = "create_java_tools_build_java" + java_version, srcs = ["//tools/jdk:BUILD.java_tools"], @@ -744,6 +744,9 @@ filegroup( "@openjdk11_darwin_archive//:WORKSPACE", "@openjdk11_linux_archive//:WORKSPACE", "@openjdk11_windows_archive//:WORKSPACE", + "@openjdk14_darwin_archive//:WORKSPACE", + "@openjdk14_linux_archive//:WORKSPACE", + "@openjdk14_windows_archive//:WORKSPACE", "@openjdk_linux_aarch64_minimal//file", "@openjdk_linux_minimal//file", "@openjdk_macos_minimal//file", @@ -760,6 +763,9 @@ filegroup( "@remotejdk11_linux_ppc64le_for_testing//:WORKSPACE", "@remotejdk11_macos_for_testing//:WORKSPACE", "@remotejdk11_win_for_testing//:WORKSPACE", + "@remotejdk14_linux_for_testing//:WORKSPACE", + "@remotejdk14_macos_for_testing//:WORKSPACE", + "@remotejdk14_win_for_testing//:WORKSPACE", "@rules_cc//:WORKSPACE", "@rules_java//:WORKSPACE", "@rules_pkg//:WORKSPACE", 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 91823eb5448003..761a518ba30575 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 @@ -154,6 +154,38 @@ maybe( ], ) +# This must be kept in sync with the top-level WORKSPACE file. +maybe( + http_archive, + name = "remotejdk14_linux", + build_file = "@local_jdk//:BUILD.bazel", + sha256 = "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", + strip_prefix = "zulu14.28.21-ca-jdk14.0.1-linux_x64", + urls = [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz", + ], +) + +# This must be kept in sync with the top-level WORKSPACE file. +maybe( + http_archive, + name = "remotejdk14_macos", + build_file = "@local_jdk//:BUILD.bazel", + sha256 = "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", + strip_prefix = "zulu14.28.21-ca-jdk14.0.1-macosx_x64", + urls = ["https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz"], +) + +# This must be kept in sync with the top-level WORKSPACE file. +maybe( + http_archive, + name = "remotejdk14_win", + build_file = "@local_jdk//:BUILD.bazel", + sha256 = "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", + strip_prefix = "zulu14.28.21-ca-jdk14.0.1-win_x64", + urls = ["https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip], +) + # This must be kept in sync with the top-level WORKSPACE file. maybe( http_archive, diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD index 26feef3dc4fac8..8c945640152f5c 100644 --- a/src/test/shell/bazel/BUILD +++ b/src/test/shell/bazel/BUILD @@ -178,6 +178,30 @@ sh_test( ], ) +sh_test( + name = "bazel_java14_test", + srcs = ["bazel_java14_test.sh"], + tags = ["local"], + args = [ + # --java_toolchain and --host_java_toolchain values + "@local_java_tools//:toolchain_jdk_14", + # java_tools zip to test + "src/java_tools_java14.zip", + ] + select({ + # --javabase and --host_javabase values + "//src/conditions:darwin": ["@openjdk12_darwin_archive//:runtime"], + "//src/conditions:darwin_x86_64": ["@openjdk12_darwin_archive//:runtime"], + "//src/conditions:windows": ["@openjdk12_windows_archive//:runtime"], + "//src/conditions:linux_x86_64": ["@openjdk14_linux_archive//:runtime"], + }), + data = [ + ":test-deps", + "//src:java_tools_java14_zip", + "//src/test/shell/bazel/testdata:jdk_http_archives_filegroup", + "@bazel_tools//tools/bash/runfiles", + ], +) + sh_test( name = "bazel_java_test", # TODO(iirina): Investigate if the 'large' and 'eternal' values still apply. @@ -196,7 +220,10 @@ sh_test( exec_compatible_with = ["//:highcpu_machine"], ) -JAVA_VERSIONS = ("11",) +JAVA_VERSIONS = ("11", "14") + +# TODO(davido): Remove this once remote_java_tools_javac14 is released +JAVA_TOOLS_VERSIONS = ("11",) [ sh_test( @@ -467,7 +494,7 @@ sh_test( "no_windows", ], ) - for java_version in JAVA_VERSIONS + for java_version in JAVA_TOOLS_VERSIONS ] # Test java coverage with the java_toolchain in the java_tools zip built at head. diff --git a/src/test/shell/bazel/bazel_java14_test.sh b/src/test/shell/bazel/bazel_java14_test.sh new file mode 100755 index 00000000000000..ed820373c2741c --- /dev/null +++ b/src/test/shell/bazel/bazel_java14_test.sh @@ -0,0 +1,116 @@ +#!/bin/bash +# +# Copyright 2020 The Bazel Authors. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Tests that bazel runs projects with Java 14 features. + +# --- begin runfiles.bash initialization --- +if [[ ! -d "${RUNFILES_DIR:-/dev/null}" && ! -f "${RUNFILES_MANIFEST_FILE:-/dev/null}" ]]; then + if [[ -f "$0.runfiles_manifest" ]]; then + export RUNFILES_MANIFEST_FILE="$0.runfiles_manifest" + elif [[ -f "$0.runfiles/MANIFEST" ]]; then + export RUNFILES_MANIFEST_FILE="$0.runfiles/MANIFEST" + elif [[ -f "$0.runfiles/bazel_tools/tools/bash/runfiles/runfiles.bash" ]]; then + export RUNFILES_DIR="$0.runfiles" + fi +fi +if [[ -f "${RUNFILES_DIR:-/dev/null}/bazel_tools/tools/bash/runfiles/runfiles.bash" ]]; then + source "${RUNFILES_DIR}/bazel_tools/tools/bash/runfiles/runfiles.bash" +elif [[ -f "${RUNFILES_MANIFEST_FILE:-/dev/null}" ]]; then + source "$(grep -m1 "^bazel_tools/tools/bash/runfiles/runfiles.bash " \ + "$RUNFILES_MANIFEST_FILE" | cut -d ' ' -f 2-)" +else + echo >&2 "ERROR: cannot find @bazel_tools//tools/bash/runfiles:runfiles.bash" + exit 1 +fi +# --- end runfiles.bash initialization --- + +source "$(rlocation "io_bazel/src/test/shell/integration_test_setup.sh")" \ + || { echo "integration_test_setup.sh not found!" >&2; exit 1; } + +case "$(uname -s | tr [:upper:] [:lower:])" in +msys*|mingw*|cygwin*) + declare -r is_windows=true + ;; +*) + declare -r is_windows=false + ;; +esac + +if "$is_windows"; then + export MSYS_NO_PATHCONV=1 + export MSYS2_ARG_CONV_EXCL="*" +fi + +JAVA_TOOLCHAIN="$1"; shift +JAVA_TOOLS_ZIP="$1"; shift +JAVA_RUNTIME="$1"; shift + +echo "JAVA_TOOLS_ZIP=$JAVA_TOOLS_ZIP" + + +JAVA_TOOLS_RLOCATION=$(rlocation io_bazel/$JAVA_TOOLS_ZIP) + +if "$is_windows"; then + JAVA_TOOLS_ZIP_FILE_URL="file:///${JAVA_TOOLS_RLOCATION}" +else + JAVA_TOOLS_ZIP_FILE_URL="file://${JAVA_TOOLS_RLOCATION}" +fi +JAVA_TOOLS_ZIP_FILE_URL=${JAVA_TOOLS_ZIP_FILE_URL:-} + +add_to_bazelrc "build --java_toolchain=${JAVA_TOOLCHAIN}" +add_to_bazelrc "build --host_java_toolchain=${JAVA_TOOLCHAIN}" +add_to_bazelrc "build --javabase=${JAVA_RUNTIME}" +add_to_bazelrc "build --host_javabase=${JAVA_RUNTIME}" + +function set_up() { + cat >>WORKSPACE <> WORKSPACE +} + +function test_java14_record_type() { + mkdir -p java/main + cat >java/main/BUILD <java/main/Javac14Example.java <"${TEST_log}" + expect_log "0" +} + +run_suite "Tests new Java 14 language features" diff --git a/src/test/shell/bazel/testdata/jdk_http_archives b/src/test/shell/bazel/testdata/jdk_http_archives index 4a24878ee49739..6b8caf94a89767 100644 --- a/src/test/shell/bazel/testdata/jdk_http_archives +++ b/src/test/shell/bazel/testdata/jdk_http_archives @@ -49,3 +49,29 @@ http_archive( strip_prefix = "zulu11.37.17-ca-jdk11.0.6-win_x64", urls = ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip"], ) + +#################################### JDK 14 #################################### +# This must be kept in sync with the top-level WORKSPACE file. +http_archive( + name = "openjdk14_linux_archive", + build_file_content = "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", + sha256 = "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", + strip_prefix = "zulu14.28.21-ca-jdk14.0.1-linux_x64", + urls = ["https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz"], +) +# This must be kept in sync with the top-level WORKSPACE file. +http_archive( + name = "openjdk14_darwin_archive", + build_file_content = "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", + sha256 = "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", + strip_prefix = "zulu14.28.21-ca-jdk14.0.1-macosx_x64", + urls = ["https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz"], +) +# This must be kept in sync with the top-level WORKSPACE file. +http_archive( + name = "openjdk14_windows_archive", + build_file_content = "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", + sha256 = "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", + strip_prefix = "zulu14.28.21-ca-jdk14.0.1-win_x64", + urls = ["https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz"], +) diff --git a/tools/jdk/BUILD.java_tools b/tools/jdk/BUILD.java_tools index 2315eec40e13cc..081852ef32ff99 100644 --- a/tools/jdk/BUILD.java_tools +++ b/tools/jdk/BUILD.java_tools @@ -66,6 +66,18 @@ java_toolchain( ], ) +patch_11 = [ + # In JDK9 we have seen a ~30% slow down in JavaBuilder performance + # when using G1 collector and having compact strings enabled. + "-XX:+UseParallelOldGC", + "-XX:-CompactStrings", + # override the javac in the JDK. + "--patch-module=java.compiler=$(location :java_compiler_jar)", + "--patch-module=jdk.compiler=$(location :jdk_compiler_jar)", +] + +patch_14 = [] + # A toolchain that targets java JAVA_LANGUAGE_LEVEL. java_toolchain( name = "toolchain_jdk_JAVA_LANGUAGE_LEVEL", @@ -80,10 +92,6 @@ java_toolchain( javac = [":javac_jar"], javac_supports_workers = 1, jvm_opts = [ - # In JDK9 we have seen a ~30% slow down in JavaBuilder performance - # when using G1 collector and having compact strings enabled. - "-XX:+UseParallelOldGC", - "-XX:-CompactStrings", # Allow JavaBuilder to access internal javac APIs. "--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED", "--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED", @@ -94,16 +102,12 @@ java_toolchain( "--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED", "--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED", - # override the javac in the JDK. - "--patch-module=java.compiler=$(location :java_compiler_jar)", - "--patch-module=jdk.compiler=$(location :jdk_compiler_jar)", - # quiet warnings from com.google.protobuf.UnsafeUtil, # see: https://github.com/google/protobuf/issues/3781 # and: https://github.com/bazelbuild/bazel/issues/5599 "--add-opens=java.base/java.nio=ALL-UNNAMED", "--add-opens=java.base/java.lang=ALL-UNNAMED", - ], + ] + patch_JAVA_LANGUAGE_LEVEL, misc = [ "-XDskipDuplicateBridges=true", "-g",