Update to latest javac and Error Prone

Fixes #2591

Change-Id: I7038b71811c54d5ece1c0993052abdffc9d0de96

4 files changed, 5 insertions, 5 deletions

diff --git a/third_party/java/jdk/README.md b/third_party/java/jdk/README.md
index 84e59cf35b..032acfb839 100644
--- a/third_party/java/jdk/README.md
+++ b/third_party/java/jdk/README.md
@@ -10,7 +10,7 @@ version of the JRE. Those builds are vendored in
 //third_party/java/jdk/langtools.
 
 Currently Bazel supports running on a JRE 8 only because the default Java
-compiler used (//third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar) is the
+compiler used (//third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar) is the
 Java compiler of OpenJDK 9 compiled to run on a JRE 8. This cannot
 be built to run on a JRE 7 because of code incompatibility. Bazel's
 JavaBuilder at HEAD cannot be linked with earlier version of the
diff --git a/third_party/java/jdk/langtools/BUILD b/third_party/java/jdk/langtools/BUILD
index 579adf4256..b283021145 100644
--- a/third_party/java/jdk/langtools/BUILD
+++ b/third_party/java/jdk/langtools/BUILD
@@ -19,22 +19,22 @@ filegroup(
         "//conditions:default": [
             "BUILD",
             "LICENSE",
-            "javac-9-dev-r3297-3.jar",
-            "javac-9-dev-r3297-3.srcjar",
+            "javac-9-dev-r3297-4.jar",
+            "javac-9-dev-r3297-4.srcjar",
         ],
     }),
 )
 
 java_import(
     name = "javac",
-    jars = ["javac-9-dev-r3297-3.jar"],
+    jars = ["javac-9-dev-r3297-4.jar"],
 )
 
 filegroup(
     name = "javac_jar",
     srcs = select({
         "//tools/jdk:jdk7": ["javac7.jar"],
-        "//conditions:default": ["javac-9-dev-r3297-3.jar"],
+        "//conditions:default": ["javac-9-dev-r3297-4.jar"],
     }),
 )
 
diff --git a/third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar b/third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar
index 9f612cd3bb..6e4ae449ed 100644
--- a/third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar
+++ b/third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar
diff --git a/third_party/java/jdk/langtools/javac-9-dev-r3297-3.srcjar b/third_party/java/jdk/langtools/javac-9-dev-r3297-4.srcjar
index 2dea0ddabe..c2ca60349b 100644
--- a/third_party/java/jdk/langtools/javac-9-dev-r3297-3.srcjar
+++ b/third_party/java/jdk/langtools/javac-9-dev-r3297-4.srcjar