Add javac9-4023-1 and Error Prone 2.0.20

This is the first part of a two-step migration to the new versions.

Change-Id: I3835b3db386f43cd00ca0d68c7fd2a42c3f9714f

9 files changed, 69 insertions, 2 deletions

diff --git a/third_party/BUILD b/third_party/BUILD
index e2338456ea..9649933aae 100644
--- a/third_party/BUILD
+++ b/third_party/BUILD
@@ -334,6 +334,25 @@ java_import(
 )
 
 java_import(
+    name = "error_prone-2.0.20-SNAPSHOT",
+    jars = [
+        "error_prone/error_prone_check_api-2.0.20-SNAPSHOT.jar",
+        "error_prone/error_prone_core-2.0.20-SNAPSHOT.jar",
+        "error_prone/error_prone_annotations-2.0.20-SNAPSHOT.jar",
+        "error_prone/error_prone_annotation-2.0.20-SNAPSHOT.jar",
+    ],
+    exports = [
+        ":auto_common",
+        ":guava",
+        ":jcip_annotations",
+        ":jsr305",
+        ":pcollections",
+        "//third_party/checker_framework_dataflow",
+        "//third_party/jformatstring",
+    ],
+)
+
+java_import(
     name = "error_prone",
     jars = [
         "error_prone/error_prone_check_api-2.0.19.jar",
@@ -375,6 +394,23 @@ java_import(
 
 # For bootstrapping JavaBuilder
 filegroup(
+    name = "bootstrap_guava_and_error_prone-jars-2.0.20-SNAPSHOT",
+    srcs = [
+        "auto/auto-common-0.3.jar",
+        "error_prone/error_prone_annotation-2.0.20-SNAPSHOT.jar",
+        "error_prone/error_prone_annotations-2.0.20-SNAPSHOT.jar",
+        "error_prone/error_prone_check_api-2.0.20-SNAPSHOT.jar",
+        "error_prone/error_prone_core-2.0.20-SNAPSHOT.jar",
+        "guava/guava-21.0.jar",
+        "jcip_annotations/jcip-annotations-1.0-1.jar",
+        "jsr305/jsr-305.jar",
+        "pcollections/pcollections-2.1.2.jar",
+        "//third_party/checker_framework_dataflow:bootstrap",
+        "//third_party/jformatstring:bootstrap",
+    ],
+)
+
+filegroup(
     name = "bootstrap_guava_and_error_prone-jars",
     srcs = [
         "auto/auto-common-0.3.jar",
diff --git a/third_party/README.md b/third_party/README.md
index fbe6a9a393..ff7323747a 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.19
+* Version: 2.0.19, 2.0.20-SNAPSHOT
 * 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-4 (javac-9-dev-r3297-4.jar)
+* Version: 9-dev-r3297-4 (javac-9-dev-r3297-4.jar), 9-dev-r4023-1 (javac-9-dev-r4023-1.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.20-SNAPSHOT.jar b/third_party/error_prone/error_prone_annotation-2.0.20-SNAPSHOT.jar
new file mode 100644
index 0000000000..55c58f50df
--- /dev/null
+++ b/third_party/error_prone/error_prone_annotation-2.0.20-SNAPSHOT.jar
diff --git a/third_party/error_prone/error_prone_annotations-2.0.20-SNAPSHOT.jar b/third_party/error_prone/error_prone_annotations-2.0.20-SNAPSHOT.jar
new file mode 100644
index 0000000000..a0b455023f
--- /dev/null
+++ b/third_party/error_prone/error_prone_annotations-2.0.20-SNAPSHOT.jar
diff --git a/third_party/error_prone/error_prone_check_api-2.0.20-SNAPSHOT.jar b/third_party/error_prone/error_prone_check_api-2.0.20-SNAPSHOT.jar
new file mode 100644
index 0000000000..3280a3e69d
--- /dev/null
+++ b/third_party/error_prone/error_prone_check_api-2.0.20-SNAPSHOT.jar
diff --git a/third_party/error_prone/error_prone_core-2.0.20-SNAPSHOT.jar b/third_party/error_prone/error_prone_core-2.0.20-SNAPSHOT.jar
new file mode 100644
index 0000000000..f354d243f7
--- /dev/null
+++ b/third_party/error_prone/error_prone_core-2.0.20-SNAPSHOT.jar
diff --git a/third_party/java/jdk/langtools/BUILD b/third_party/java/jdk/langtools/BUILD
index b283021145..bb4070eb2c 100644
--- a/third_party/java/jdk/langtools/BUILD
+++ b/third_party/java/jdk/langtools/BUILD
@@ -38,6 +38,37 @@ filegroup(
     }),
 )
 
+filegroup(
+    name = "test-srcs-9-dev-r4023-1",
+    srcs = select({
+        "//tools/jdk:jdk7": [
+            "BUILD",
+            "LICENSE",
+            "javac7.jar",
+            "javac7.srcjar",
+        ],
+        "//conditions:default": [
+            "BUILD",
+            "LICENSE",
+            "javac-9-dev-r4023-1.jar",
+            "javac-9-dev-r4023-1.srcjar",
+        ],
+    }),
+)
+
+java_import(
+    name = "javac-9-dev-r4023-1",
+    jars = ["javac-9-dev-r4023-1.jar"],
+)
+
+filegroup(
+    name = "javac_jar-9-dev-r4023-1",
+    srcs = select({
+        "//tools/jdk:jdk7": ["javac7.jar"],
+        "//conditions:default": ["javac-9-dev-r4023-1.jar"],
+    }),
+)
+
 java_import(
     name = "javac7",
     jars = ["javac7.jar"],
diff --git a/third_party/java/jdk/langtools/javac-9-dev-r4023-1.jar b/third_party/java/jdk/langtools/javac-9-dev-r4023-1.jar
new file mode 100644
index 0000000000..3547e81a8b
--- /dev/null
+++ b/third_party/java/jdk/langtools/javac-9-dev-r4023-1.jar
diff --git a/third_party/java/jdk/langtools/javac-9-dev-r4023-1.srcjar b/third_party/java/jdk/langtools/javac-9-dev-r4023-1.srcjar
new file mode 100644
index 0000000000..6c17b89b71
--- /dev/null
+++ b/third_party/java/jdk/langtools/javac-9-dev-r4023-1.srcjar