Hack java invocation to patch the java.xml.ws.annotation.

Change-Id: I5e899cff0ed31e4128be5c7e949c99040a777a99

src/BUILD

@@ -173,6 +173,7 @@ py_binary(
         "//src/java_tools/buildjar/java/com/google/devtools/build/java/turbine:turbine_deploy.jar",
         "//third_party/java/jacoco:srcs",
         "//third_party/zlib:embedded_tools",
+        "//third_party/tomcat_annotations_api:embedded_tools",
     ] + select({
         "//src/conditions:darwin": [
             ":darwin_tools",

third_party/BUILD

@@ -483,15 +483,15 @@ java_import(
     ],
 )
 
-java_import(
+java_library(
     name = "tomcat_annotations_api",
-    jars = ["tomcat_annotations_api/tomcat-annotations-api-8.0.5.jar"],
+    exports = ["//third_party/tomcat_annotations_api"],
 )
 
 # For bootstrapping JavaBuilder
 filegroup(
     name = "tomcat_annotations_api-jars",
-    srcs = ["tomcat_annotations_api/tomcat-annotations-api-8.0.5.jar"],
+    srcs = ["//third_party/tomcat_annotations_api:tomcat-annotations-api-8.0.5.jar"],
 )
 
 # Testing

third_party/tomcat_annotations_api/BUILD

@@ -0,0 +1,18 @@
+licenses(["notice"])  # Apache 2.0
+
+java_import(
+    name = "tomcat_annotations_api",
+    jars = ["tomcat-annotations-api-8.0.5.jar"],
+    visibility = ["//visibility:public"],
+)
+
+exports_files(
+    ["tomcat-annotations-api-8.0.5.jar"],
+    visibility = ["//visibility:public"]
+)
+
+filegroup(
+    name = "embedded_tools",
+    srcs = glob(["*.jar"]) + ["BUILD"],
+    visibility = ["//visibility:public"],
+)

tools/jdk/BUILD

@@ -231,11 +231,22 @@ java_toolchain(
         "--add-opens=java.base/java.nio=ALL-UNNAMED",
         "-XX:+TieredCompilation",
         "-XX:TieredStopAtLevel=1",
+        "--patch-module",
+        "java.xml.ws.annotation=$(location @bazel_tools//third_party/tomcat_annotations_api:tomcat-annotations-api-8.0.5.jar)",
+        "--add-modules",
+        "java.xml.ws.annotation"
     ],
     misc = [
         "-XDskipDuplicateBridges=true",
         "-g",
         "-parameters",
+        "--patch-module",
+        "java.xml.ws.annotation=$(location @bazel_tools//third_party/tomcat_annotations_api:tomcat-annotations-api-8.0.5.jar)",
+        "--add-modules",
+        "java.xml.ws.annotation"
+    ],
+    tools = [
+        "@bazel_tools//third_party/tomcat_annotations_api:tomcat-annotations-api-8.0.5.jar",
     ],
     singlejar = ["@bazel_tools//tools/jdk:singlejar"],
     source_version = "9",