Add support for toolchain java 15
Closes https://github.com/bazelbuild/bazel/issues/11871
I modelled this on @davido's addition of a java 14 toolchain, here:[https://github.com/bazelbuild/bazel/pull/11514](url).
The test plan has the same form:
Create java_tools from this commit:
` $ bazel build src:java_tools_java11.zip`
Switch to using the java_tools from the above step in WORKSPACE file:
```
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
http_archive(
name = "remote_java_tools_linux",
urls = [
"file:///<path to the java_tools_java11.zip>",
],
)
```
Add Zulu OpenJDK15 to use as javabase in WORKSPACE file:
```
http_archive(
name = "openjdk15_linux_archive",
build_file_content = """
java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])
exports_files(["WORKSPACE"], visibility = ["//visibility:public"])
""",
strip_prefix = "zulu15.27.17-ca-jdk15.0.0-linux_x64",
urls = ["https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz"],
)
```
Activate custom java toolchain and javabase in .bazelrc file:
```
build --java_toolchain=@remote_java_tools_linux//:toolchain_jdk_15
build --host_java_toolchain=@remote_java_tools_linux//:toolchain_jdk_15
build --javabase=@openjdk15_linux_archive//:runtime
build --host_javabase=@openjdk15_linux_archive//:runtime
```
Create Java 15 example class file:
```
public class Javac15Example {
static String textBlock = """
Hello,
World
""";
public static void main(String[] args) {
System.out.println(textBlock);
}
}
```
Add Bazel file to build Java 15 syntax class:
```
java_binary(
name = "Javac15Example",
srcs = ["Javac15Example.java"],
main_class = "Javac15Example",
)
```
Test that it works as expected:
```
$ bazel run java:Javac15Example
INFO: Analyzed target //java:Javac15Example (1 packages loaded, 2 targets configured).
INFO: Found 1 target...
INFO: From Building java/Javac15Example.jar (1 source file):
Target //java:Javac15Example up-to-date:
bazel-bin/java/Javac15Example.jar
bazel-bin/java/Javac15Example
INFO: Elapsed time: 1.502s, Critical Path: 1.30s
INFO: 1 process: 1 worker.
INFO: Build completed successfully, 2 total actions
INFO: Build completed successfully, 2 total actions
Hello,
World
```
Closes #12168.
PiperOrigin-RevId: 335931179
diff --git a/src/BUILD b/src/BUILD
index a7794cd..dae383d 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -753,6 +753,9 @@
"@openjdk14_darwin_archive//:WORKSPACE",
"@openjdk14_linux_archive//:WORKSPACE",
"@openjdk14_windows_archive//:WORKSPACE",
+ "@openjdk15_darwin_archive//:WORKSPACE",
+ "@openjdk15_linux_archive//:WORKSPACE",
+ "@openjdk15_windows_archive//:WORKSPACE",
"@openjdk_linux_aarch64_minimal//file",
"@openjdk_linux_minimal//file",
"@openjdk_macos_minimal//file",
@@ -773,6 +776,9 @@
"@remotejdk14_linux_for_testing//:WORKSPACE",
"@remotejdk14_macos_for_testing//:WORKSPACE",
"@remotejdk14_win_for_testing//:WORKSPACE",
+ "@remotejdk15_linux_for_testing//:WORKSPACE",
+ "@remotejdk15_macos_for_testing//:WORKSPACE",
+ "@remotejdk15_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 dcf3fa5..23e4fe2 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
@@ -202,6 +202,42 @@
# This must be kept in sync with the top-level WORKSPACE file.
maybe(
http_archive,
+ name = "remotejdk15_linux",
+ build_file = "@bazel_tools//tools/jdk:jdk.BUILD",
+ strip_prefix = "zulu15.27.17-ca-jdk15.0.0-linux_x64",
+ urls = [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz"
+ ],
+)
+
+# This must be kept in sync with the top-level WORKSPACE file.
+maybe(
+ http_archive,
+ name = "remotejdk15_macos",
+ build_file = "@bazel_tools//tools/jdk:jdk.BUILD",
+ strip_prefix = "zulu15.27.17-ca-jdk15.0.0-macosx_x64",
+ urls = [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz",
+ ],
+)
+
+# This must be kept in sync with the top-level WORKSPACE file.
+maybe(
+ http_archive,
+ name = "remotejdk15_win",
+ build_file = "@bazel_tools//tools/jdk:jdk.BUILD",
+ strip_prefix = "zulu15.27.17-ca-jdk15.0.0-win_x64",
+ urls = [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip",
+ "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip"
+ ],
+)
+
+# This must be kept in sync with the top-level WORKSPACE file.
+maybe(
+ http_archive,
name = "remote_java_tools_linux",
sha256 = "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1",
urls = [
diff --git a/src/test/py/bazel/test_base.py b/src/test/py/bazel/test_base.py
index 51186cb..d12da12 100644
--- a/src/test/py/bazel/test_base.py
+++ b/src/test/py/bazel/test_base.py
@@ -66,6 +66,9 @@
'remotejdk14_linux_for_testing',
'remotejdk14_macos_for_testing',
'remotejdk14_win_for_testing',
+ 'remotejdk15_linux_for_testing',
+ 'remotejdk15_macos_for_testing',
+ 'remotejdk15_win_for_testing',
'remote_java_tools_darwin_for_testing',
'remote_java_tools_linux_for_testing',
'remote_java_tools_windows_for_testing',
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD
index 2d649d6..8eea13e 100644
--- a/src/test/shell/bazel/BUILD
+++ b/src/test/shell/bazel/BUILD
@@ -203,6 +203,30 @@
)
sh_test(
+ name = "bazel_java15_test",
+ srcs = ["bazel_java15_test.sh"],
+ args = [
+ # --java_toolchain and --host_java_toolchain values
+ "@local_java_tools//:toolchain_jdk_15",
+ # java_tools zip to test
+ "src/java_tools_java11.zip",
+ ] + select({
+ # --javabase and --host_javabase values
+ "//src/conditions:darwin": ["@openjdk15_darwin_archive//:runtime"],
+ "//src/conditions:darwin_x86_64": ["@openjdk15_darwin_archive//:runtime"],
+ "//src/conditions:windows": ["@openjdk15_windows_archive//:runtime"],
+ "//src/conditions:linux_x86_64": ["@openjdk15_linux_archive//:runtime"],
+ }),
+ data = [
+ ":test-deps",
+ "//src:java_tools_java11_zip",
+ "//src/test/shell/bazel/testdata:jdk_http_archives_filegroup",
+ "@bazel_tools//tools/bash/runfiles",
+ ],
+ tags = ["local"],
+)
+
+sh_test(
name = "bazel_java_test",
# TODO(iirina): Investigate if the 'large' and 'eternal' values still apply.
size = "large",
@@ -220,7 +244,7 @@
exec_compatible_with = ["//:highcpu_machine"],
)
-JAVA_VERSIONS = ("11", "14")
+JAVA_VERSIONS = ("11", "14", "15")
[
sh_test(
diff --git a/src/test/shell/bazel/bazel_java15_test.sh b/src/test/shell/bazel/bazel_java15_test.sh
new file mode 100755
index 0000000..124e40a
--- /dev/null
+++ b/src/test/shell/bazel/bazel_java15_test.sh
@@ -0,0 +1,117 @@
+#!/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 <<EOF
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+# java_tools versions only used to test Bazel with various JDK toolchains.
+
+http_archive(
+ name = "local_java_tools",
+ urls = ["${JAVA_TOOLS_ZIP_FILE_URL}"]
+)
+EOF
+ cat $(rlocation io_bazel/src/test/shell/bazel/testdata/jdk_http_archives) >> WORKSPACE
+}
+
+function test_java15_text_block() {
+ mkdir -p java/main
+ cat >java/main/BUILD <<EOF
+java_binary(
+ name = 'Javac15Example',
+ srcs = ['Javac15Example.java'],
+ main_class = 'Javac15Example',
+)
+EOF
+
+ cat >java/main/Javac15Example.java <<EOF
+public class Javac15Example {
+ static String textBlock = """
+ Hello,
+ World
+ """;
+ public static void main(String[] args) {
+ System.out.println(textBlock);
+ }
+}
+EOF
+ bazel run java/main:Javac15Example --test_output=all --verbose_failures &>"${TEST_log}"
+ expect_log "^Hello,\$"
+ expect_log "^World\$"
+}
+
+run_suite "Tests new Java 15 language features"
diff --git a/src/test/shell/bazel/testdata/jdk_http_archives b/src/test/shell/bazel/testdata/jdk_http_archives
index 1c3f878..9cc383b 100644
--- a/src/test/shell/bazel/testdata/jdk_http_archives
+++ b/src/test/shell/bazel/testdata/jdk_http_archives
@@ -75,3 +75,45 @@
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"],
)
+
+#################################### JDK 15 ####################################
+# This must be kept in sync with the top-level WORKSPACE file.
+http_archive(
+ name = "openjdk15_linux_archive",
+ build_file_content = """
+java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])
+exports_files(["WORKSPACE"], visibility = ["//visibility:public"])
+""",
+ strip_prefix = "zulu15.27.17-ca-jdk15.0.0-linux_x64",
+ urls = [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz",
+ ],
+)
+# This must be kept in sync with the top-level WORKSPACE file.
+http_archive(
+ name = "openjdk15_darwin_archive",
+ build_file_content = """
+java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])
+exports_files(["WORKSPACE"], visibility = ["//visibility:public"])
+""",
+ strip_prefix = "zulu15.27.17-ca-jdk15.0.0-macosx_x64",
+ urls = [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz",
+ ],
+)
+# This must be kept in sync with the top-level WORKSPACE file.
+http_archive(
+ name = "openjdk15_windows_archive",
+ build_file_content = """
+java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])
+exports_files(["WORKSPACE"], visibility = ["//visibility:public"])
+""",
+ strip_prefix = "zulu15.27.17-ca-jdk15.0.0-win_x64",
+ urls = [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip",
+ "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip",
+ ],
+)
+
diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh
index 276a75e..e068751 100755
--- a/src/test/shell/testenv.sh
+++ b/src/test/shell/testenv.sh
@@ -283,6 +283,9 @@
"openjdk14_darwin_archive"
"openjdk14_linux_archive"
"openjdk14_windows_archive"
+ "openjdk15_darwin_archive"
+ "openjdk15_linux_archive"
+ "openjdk15_windows_archive"
"openjdk_linux_aarch64_minimal"
"openjdk_linux_minimal"
"openjdk_macos_minimal"
@@ -303,6 +306,9 @@
"remotejdk14_linux_for_testing"
"remotejdk14_macos_for_testing"
"remotejdk14_win_for_testing"
+ "remotejdk15_linux_for_testing"
+ "remotejdk15_macos_for_testing"
+ "remotejdk15_win_for_testing"
"rules_cc"
"rules_java"
"rules_pkg"
