From 5f931a620085695b6f4ff36cbc726a7191e6f52a Mon Sep 17 00:00:00 2001
From: cushon <cushon@google.com>
Date: Wed, 23 Jan 2019 12:37:09 -0800
Subject: [PATCH] Enable --incompatible_use_jdk10_as_host_javabase by default

https://github.com/bazelbuild/bazel/issues/6661

RELNOTES: Enable --incompatible_use_jdk10_as_host_javabase by default, see https://github.com/bazelbuild/bazel/issues/6661
PiperOrigin-RevId: 230581781
---
 .../com/google/devtools/build/lib/rules/java/JavaOptions.java | 2 +-
 .../bazel/bazel_enable_disable_tools_defaults_flag_test.sh    | 4 ++--
 src/test/shell/integration/bazel_java_test.sh                 | 2 +-
 3 files changed, 4 insertions(+), 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
index fc5e7606468932..c205a5ae164f65 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
@@ -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
index 36274b431447e4..c187025c4ad75a 100755
--- 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
index 59ce290573b3cb..219ecce15e2171 100755
--- 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