Remove the --incompatible_use_jdk11_as_host_javabase flag.
It has been flipped long ago (in Bazel 0.25.0) and its existence blocks removing the remote_jdk10 http_archive from Bazel's bundled jdk.WORKSPACE.
RELNOTES[INC]: The --incompatible_use_jdk11_as_host_javabase flag has been removed (it was flipped in Bazel 0.25.0).
PiperOrigin-RevId: 295195391
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
index bbda518..94c8249 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
@@ -117,18 +117,6 @@
public Label hostJavaBase;
@Option(
- name = "incompatible_use_jdk11_as_host_javabase",
- defaultValue = "true",
- documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
- effectTags = {OptionEffectTag.UNKNOWN},
- metadataTags = {
- OptionMetadataTag.INCOMPATIBLE_CHANGE,
- OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
- },
- help = "If enabled, the default --host_javabase is JDK 11.")
- public boolean useJDK11AsHostJavaBase;
-
- @Option(
name = "javacopt",
allowMultiple = true,
defaultValue = "",
@@ -634,10 +622,7 @@
}
Label defaultHostJavaBase() {
- if (useJDK11AsHostJavaBase) {
- return Label.parseAbsoluteUnchecked("@bazel_tools//tools/jdk:remote_jdk11");
- }
- return Label.parseAbsoluteUnchecked("@bazel_tools//tools/jdk:remote_jdk10");
+ return Label.parseAbsoluteUnchecked("@bazel_tools//tools/jdk:remote_jdk11");
}
Label defaultJavaToolchain() {
diff --git a/src/test/shell/integration/bazel_java_test.sh b/src/test/shell/integration/bazel_java_test.sh
index bf8021a..9288b66 100755
--- a/src/test/shell/integration/bazel_java_test.sh
+++ b/src/test/shell/integration/bazel_java_test.sh
@@ -79,7 +79,7 @@
expect_log "exec .*foobar/bin/java"
expect_not_log "exec external/remotejdk_.*/bin/java"
- bazel aquery --output=text --incompatible_use_jdk11_as_host_javabase \
+ bazel aquery --output=text \
//java:javalib >& $TEST_log
expect_log "exec external/remotejdk11_.*/bin/java"
}
