Update to latest javac and Error Prone

Fixes #2591

Change-Id: I7038b71811c54d5ece1c0993052abdffc9d0de96

15 files changed, 22 insertions, 22 deletions

diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh
index 95b59d3556..ec7156937d 100755
--- a/scripts/bootstrap/compile.sh
+++ b/scripts/bootstrap/compile.sh
@@ -17,7 +17,7 @@
 # Script for building bazel from scratch without bazel
 
 PROTO_FILES=$(ls src/main/protobuf/*.proto src/main/java/com/google/devtools/build/lib/buildeventstream/proto/*.proto)
-LIBRARY_JARS=$(find third_party -name '*.jar' | grep -Fv /javac-9-dev-r3297-3.jar | grep -Fv /javac7.jar | grep -Fv JavaBuilder | grep -ve third_party/grpc/grpc.*jar | tr "\n" " ")
+LIBRARY_JARS=$(find third_party -name '*.jar' | grep -Fv /javac-9-dev-r3297-4.jar | grep -Fv /javac7.jar | grep -Fv JavaBuilder | grep -ve third_party/grpc/grpc.*jar | tr "\n" " ")
 GRPC_JAVA_VERSION=0.15.0
 GRPC_LIBRARY_JARS=$(find third_party/grpc -name '*.jar' | grep -e .*${GRPC_JAVA_VERSION}.*jar | tr "\n" " ")
 LIBRARY_JARS="${LIBRARY_JARS} ${GRPC_LIBRARY_JARS}"
diff --git a/src/create_embedded_tools.sh b/src/create_embedded_tools.sh
index f478b9f3ab..56ddf8dda2 100755
--- a/src/create_embedded_tools.sh
+++ b/src/create_embedded_tools.sh
@@ -44,7 +44,7 @@ for i in $*; do
     *JavaBuilder*_deploy.jar) OUTPUT_PATH=tools/jdk/JavaBuilder_deploy.jar ;;
     *JacocoCoverage*_deploy.jar) OUTPUT_PATH=tools/jdk/JacocoCoverage_deploy.jar ;;
     *turbine_deploy.jar) OUTPUT_PATH=tools/jdk/turbine_deploy.jar ;;
-    *javac-9-dev-r3297-3.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar ;;
+    *javac-9-dev-r3297-4.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar ;;
     *javac7.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac7.jar ;;
     *SingleJar_deploy.jar) OUTPUT_PATH=tools/jdk/SingleJar_deploy.jar ;;
     *GenClass_deploy.jar) OUTPUT_PATH=tools/jdk/GenClass_deploy.jar ;;
@@ -68,9 +68,9 @@ for i in $*; do
   chmod u+w "${PACKAGE_DIR}/${OUTPUT_PATH}"
 done
 
-if [ ! -f ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar ]; then
+if [ ! -f ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar ]; then
   cp ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac7.jar \
-      ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar
+      ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar
 fi
 
 cat > "${PACKAGE_DIR}/WORKSPACE" <<EOF
diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh
index 004b689524..ffc1b5813d 100755
--- a/src/test/shell/testenv.sh
+++ b/src/test/shell/testenv.sh
@@ -364,8 +364,8 @@ function create_new_workspace() {
 
   copy_tools_directory
 
-  [ -e third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar ] \
-    || ln -s "${langtools_path}"  third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar
+  [ -e third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar ] \
+    || ln -s "${langtools_path}"  third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar
 
   touch WORKSPACE
 }
diff --git a/third_party/BUILD b/third_party/BUILD
index fd781ed19a..034789d627 100644
--- a/third_party/BUILD
+++ b/third_party/BUILD
@@ -310,10 +310,10 @@ java_import(
 java_import(
     name = "error_prone",
     jars = [
-        "error_prone/error_prone_check_api-2.0.18-20170224.jar",
-        "error_prone/error_prone_core-2.0.18-20170224.jar",
-        "error_prone/error_prone_annotations-2.0.18-20170224.jar",
-        "error_prone/error_prone_annotation-2.0.18-20170224.jar",
+        "error_prone/error_prone_check_api-2.0.18.jar",
+        "error_prone/error_prone_core-2.0.18.jar",
+        "error_prone/error_prone_annotations-2.0.18.jar",
+        "error_prone/error_prone_annotation-2.0.18.jar",
     ],
     exports = [
         ":auto_common",
@@ -345,10 +345,10 @@ filegroup(
     name = "bootstrap_guava_and_error_prone-jars",
     srcs = [
         "auto/auto-common-0.3.jar",
-        "error_prone/error_prone_annotation-2.0.18-20170224.jar",
-        "error_prone/error_prone_annotations-2.0.18-20170224.jar",
-        "error_prone/error_prone_check_api-2.0.18-20170224.jar",
-        "error_prone/error_prone_core-2.0.18-20170224.jar",
+        "error_prone/error_prone_annotation-2.0.18.jar",
+        "error_prone/error_prone_annotations-2.0.18.jar",
+        "error_prone/error_prone_check_api-2.0.18.jar",
+        "error_prone/error_prone_core-2.0.18.jar",
         "guava/guava-21.0.jar",
         "jcip_annotations/jcip-annotations-1.0-1.jar",
         "jsr305/jsr-305.jar",
@@ -367,7 +367,7 @@ filegroup(
 java_import(
     name = "guava",
     jars = [
-        "error_prone/error_prone_annotations-2.0.18-20170224.jar",
+        "error_prone/error_prone_annotations-2.0.18.jar",
         "jcip_annotations/jcip-annotations-1.0-1.jar",
         "jsr305/jsr-305.jar",
     ] + select({
diff --git a/third_party/README.md b/third_party/README.md
index ca9dab9c22..e20cf37ee5 100644
--- a/third_party/README.md
+++ b/third_party/README.md
@@ -97,7 +97,7 @@ a minimal set of extra dependencies.
 
 ## [Error Prone](https://github.com/google/error-prone)
 
-* Version: 2.0.18-20170224
+* Version: 2.0.18
 * License: Apache License 2.0
 
 
@@ -166,7 +166,7 @@ a minimal set of extra dependencies.
 
 ## [javac](https://github.com/google/error-prone-javac)
 
-* Version: 9-dev-r3297-3 (javac-9-dev-r3297-3.jar)
+* Version: 9-dev-r3297-4 (javac-9-dev-r3297-4.jar)
 * License: GNU GPL v2 with Classpath exception (plus other licenses, see third_party/java/jdk/langtools/LICENSE file).
 
 ## [jarjar](https://code.google.com/p/jarjar/)
diff --git a/third_party/error_prone/error_prone_annotation-2.0.18-20170224.jar b/third_party/error_prone/error_prone_annotation-2.0.18-20170224.jar
deleted file mode 100644
index 6cc8408132..0000000000
--- a/third_party/error_prone/error_prone_annotation-2.0.18-20170224.jar
+++ /dev/null
diff --git a/third_party/error_prone/error_prone_annotation-2.0.18.jar b/third_party/error_prone/error_prone_annotation-2.0.18.jar
new file mode 100644
index 0000000000..5e379f47b9
--- /dev/null
+++ b/third_party/error_prone/error_prone_annotation-2.0.18.jar
diff --git a/third_party/error_prone/error_prone_annotations-2.0.18-20170224.jar b/third_party/error_prone/error_prone_annotations-2.0.18-20170224.jar
deleted file mode 100644
index 2095ec72d8..0000000000
--- a/third_party/error_prone/error_prone_annotations-2.0.18-20170224.jar
+++ /dev/null
diff --git a/third_party/error_prone/error_prone_annotations-2.0.18.jar b/third_party/error_prone/error_prone_annotations-2.0.18.jar
new file mode 100644
index 0000000000..fa549b4dbf
--- /dev/null
+++ b/third_party/error_prone/error_prone_annotations-2.0.18.jar
diff --git a/third_party/error_prone/error_prone_check_api-2.0.18-20170224.jar b/third_party/error_prone/error_prone_check_api-2.0.18.jar
index e9ccc2bb9e..d7a79f1362 100644
--- a/third_party/error_prone/error_prone_check_api-2.0.18-20170224.jar
+++ b/third_party/error_prone/error_prone_check_api-2.0.18.jar
diff --git a/third_party/error_prone/error_prone_core-2.0.18-20170224.jar b/third_party/error_prone/error_prone_core-2.0.18.jar
index b8001fe117..a7cebc96e7 100644
--- a/third_party/error_prone/error_prone_core-2.0.18-20170224.jar
+++ b/third_party/error_prone/error_prone_core-2.0.18.jar
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