Enable --incompatible_use_jdk10_as_host_javabase by default

bazelbuild#6661 RELNOTES: Enable --incompatible_use_jdk10_as_host_javabase by default, see bazelbuild#6661 PiperOrigin-RevId: 230581781
weixiao-huang · Jan 31, 2019 · 5f931a6 · 5f931a6
1 parent f4f8c26
commit 5f931a6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
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
@@ -114,7 +114,7 @@ public ImportDepsCheckingLevelConverter() {
 
   @Option(
       name = "incompatible_use_jdk10_as_host_javabase",
-      defaultValue = "false",
+      defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
       effectTags = {OptionEffectTag.UNKNOWN},
       metadataTags = {

diff --git a/src/test/shell/bazel/bazel_enable_disable_tools_defaults_flag_test.sh b/src/test/shell/bazel/bazel_enable_disable_tools_defaults_flag_test.sh
@@ -55,7 +55,7 @@ EOF
   expect_query_targets //tools/defaults:jdk //a:a
 
   bazel query 'deps(//tools/defaults:jdk, 1)' >& "$TEST_log" --incompatible_disable_tools_defaults_package=false || fail "Query failed"
-  expect_query_targets //tools/defaults:jdk @bazel_tools//tools/jdk:{jdk,host_jdk}
+  expect_query_targets //tools/defaults:jdk @bazel_tools//tools/jdk:{jdk,remote_jdk10}
 
   rm tools/defaults/BUILD
   rm a/BUILD
@@ -77,7 +77,7 @@ filegroup(
 )
 EOF
   bazel query 'deps(//tools/defaults:jdk, 1)' >& "$TEST_log" --incompatible_disable_tools_defaults_package=false || fail "Query failed"
-  expect_query_targets //tools/defaults:jdk @bazel_tools//tools/jdk:{jdk,host_jdk}
+  expect_query_targets //tools/defaults:jdk @bazel_tools//tools/jdk:{jdk,remote_jdk10}
 
 
   bazel query 'deps(//tools/defaults:jdk, 1)' >& "$TEST_log" --incompatible_disable_tools_defaults_package=true || fail "Query failed"

diff --git a/src/test/shell/integration/bazel_java_test.sh b/src/test/shell/integration/bazel_java_test.sh
@@ -72,7 +72,7 @@ EOF
   # Note that this will change in the future but is the current state.
   bazel aquery --output=text //java:javalib >& $TEST_log
   expect_not_log "exec external/embedded_jdk/bin/java"
-  expect_log "exec external/remotejdk_.*/bin/java"
+  expect_log "exec external/remotejdk10_.*/bin/java"
 
   bazel aquery --output=text --host_javabase=//:host_javabase \
     //java:javalib >& $TEST_log