Update Error Prone version

Change-Id: Iba6fa9cbee4d9801cf95463558aa7606bd0b1d78

Closes #5070.

8 files changed, 23 insertions, 12 deletions

diff --git a/third_party/BUILD b/third_party/BUILD
index 689a00dbad..842c462cd7 100644
--- a/third_party/BUILD
+++ b/third_party/BUILD
@@ -330,12 +330,22 @@ java_import(
 )
 
 java_import(
-    name = "error_prone",
+    name = "error_prone_annotations",
     jars = [
-        "error_prone/error_prone_check_api-2.2.0.jar",
-        "error_prone/error_prone_core-2.2.0.jar",
         "error_prone/error_prone_annotations-2.2.0.jar",
-        "error_prone/error_prone_annotation-2.2.0.jar",
+        "error_prone/error_prone_type_annotations-2.3.1.jar",
+    ],
+)
+
+java_import(
+    name = "error_prone",
+    jars = [
+        "error_prone/error_prone_annotation-2.3.1.jar",
+        "error_prone/error_prone_check_api-2.3.1.jar",
+        "error_prone/error_prone_core-2.3.1.jar",
+    ],
+    exports = [
+        ":error_prone_annotations",
     ],
     deps = [
         ":auto_common",
@@ -375,10 +385,11 @@ filegroup(
     name = "bootstrap_guava_and_error_prone-jars",
     srcs = [
         "auto/auto-common-0.3.jar",
-        "error_prone/error_prone_annotation-2.2.0.jar",
+        "error_prone/error_prone_annotation-2.3.1.jar",
         "error_prone/error_prone_annotations-2.2.0.jar",
-        "error_prone/error_prone_check_api-2.2.0.jar",
-        "error_prone/error_prone_core-2.2.0.jar",
+        "error_prone/error_prone_check_api-2.3.1.jar",
+        "error_prone/error_prone_core-2.3.1.jar",
+        "error_prone/error_prone_type_annotations-2.3.1.jar",
         "guava/guava-24.1-jre.jar",
         "hungarian_algorithm/software-and-algorithms-1.0.jar",
         "jcip_annotations/jcip-annotations-1.0-1.jar",
@@ -392,11 +403,11 @@ filegroup(
 
 java_import(
     name = "guava",
-    jars = [
-        "error_prone/error_prone_annotations-2.2.0.jar",
-        "jcip_annotations/jcip-annotations-1.0-1.jar",
-        "jsr305/jsr-305.jar",
-        "guava/guava-24.1-jre.jar",
+    jars = ["guava/guava-24.1-jre.jar"],
+    exports = [
+        ":error_prone_annotations",
+        ":jcip_annotations",
+        ":jsr305",
     ],
 )
 
diff --git a/third_party/error_prone/error_prone_annotation-2.2.0.jar b/third_party/error_prone/error_prone_annotation-2.2.0.jar
deleted file mode 100644
index 905c2b2873..0000000000
--- a/third_party/error_prone/error_prone_annotation-2.2.0.jar
+++ /dev/null
diff --git a/third_party/error_prone/error_prone_annotation-2.3.1.jar b/third_party/error_prone/error_prone_annotation-2.3.1.jar
new file mode 100644
index 0000000000..a569fe0a85
--- /dev/null
+++ b/third_party/error_prone/error_prone_annotation-2.3.1.jar
diff --git a/third_party/error_prone/error_prone_check_api-2.2.0.jar b/third_party/error_prone/error_prone_check_api-2.2.0.jar
deleted file mode 100644
index c247445fa0..0000000000
--- a/third_party/error_prone/error_prone_check_api-2.2.0.jar
+++ /dev/null
diff --git a/third_party/error_prone/error_prone_check_api-2.3.1.jar b/third_party/error_prone/error_prone_check_api-2.3.1.jar
new file mode 100644
index 0000000000..b6a68d518b
--- /dev/null
+++ b/third_party/error_prone/error_prone_check_api-2.3.1.jar
diff --git a/third_party/error_prone/error_prone_core-2.2.0.jar b/third_party/error_prone/error_prone_core-2.2.0.jar
deleted file mode 100644
index 3909df75a9..0000000000
--- a/third_party/error_prone/error_prone_core-2.2.0.jar
+++ /dev/null
diff --git a/third_party/error_prone/error_prone_core-2.3.1.jar b/third_party/error_prone/error_prone_core-2.3.1.jar
new file mode 100644
index 0000000000..47ec217470
--- /dev/null
+++ b/third_party/error_prone/error_prone_core-2.3.1.jar
diff --git a/third_party/error_prone/error_prone_type_annotations-2.3.1.jar b/third_party/error_prone/error_prone_type_annotations-2.3.1.jar
new file mode 100644
index 0000000000..7d80026ad7
--- /dev/null
+++ b/third_party/error_prone/error_prone_type_annotations-2.3.1.jar