Update Error Prone to 2.1.0

Change-Id: I2cc29588818295b04566d0c7f1340dd9133b33bc

11 files changed, 22 insertions, 10 deletions

diff --git a/third_party/BUILD b/third_party/BUILD
index 4424529f6f..fb097889d1 100644
--- a/third_party/BUILD
+++ b/third_party/BUILD
@@ -335,16 +335,23 @@ java_import(
 )
 
 java_import(
+    name = "hungarian_algorithm",
+    jars = ["hungarian_algorithm/software-and-algorithms-1.0.jar"],
+    srcjar = "hungarian_algorithm/software-and-algorithms-1.0-src.jar",
+)
+
+java_import(
     name = "error_prone",
     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",
+        "error_prone/error_prone_check_api-2.1.0.jar",
+        "error_prone/error_prone_core-2.1.0.jar",
+        "error_prone/error_prone_annotations-2.1.0.jar",
+        "error_prone/error_prone_annotation-2.1.0.jar",
     ],
-    exports = [
+    deps = [
         ":auto_common",
         ":guava",
+        ":hungarian_algorithm",
         ":jcip_annotations",
         ":jsr305",
         ":pcollections",
@@ -379,11 +386,12 @@ filegroup(
     name = "bootstrap_guava_and_error_prone-jars",
     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",
+        "error_prone/error_prone_annotation-2.1.0.jar",
+        "error_prone/error_prone_annotations-2.1.0.jar",
+        "error_prone/error_prone_check_api-2.1.0.jar",
+        "error_prone/error_prone_core-2.1.0.jar",
         "guava/guava-21.0.jar",
+        "hungarian_algorithm/software-and-algorithms-1.0.jar",
         "jcip_annotations/jcip-annotations-1.0-1.jar",
         "jsr305/jsr-305.jar",
         "pcollections/pcollections-2.1.2.jar",
diff --git a/third_party/README.md b/third_party/README.md
index b18c2be9d7..a40c0ab1b1 100644
--- a/third_party/README.md
+++ b/third_party/README.md
@@ -97,9 +97,13 @@ a minimal set of extra dependencies.
 
 ## [Error Prone](https://github.com/google/error-prone)
 
-* Version: 2.0.20-SNAPSHOT
+* Version: 2.1.0
 * License: Apache License 2.0
 
+## [Hungarian Algorithm](https://github.com/KevinStern/software-and-algorithms)
+
+* Version 1.0
+* License: MIT
 
 ## [JCIP Annotations](https://github.com/stephenc/jcip-annotations/)
 
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
deleted file mode 100644
index 55c58f50df..0000000000
--- a/third_party/error_prone/error_prone_annotation-2.0.20-SNAPSHOT.jar
+++ /dev/null
diff --git a/third_party/error_prone/error_prone_annotation-2.1.0.jar b/third_party/error_prone/error_prone_annotation-2.1.0.jar
new file mode 100644
index 0000000000..c6f5cb4681
--- /dev/null
+++ b/third_party/error_prone/error_prone_annotation-2.1.0.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.1.0.jar
index a0b455023f..0c3c06249b 100644
--- a/third_party/error_prone/error_prone_annotations-2.0.20-SNAPSHOT.jar
+++ b/third_party/error_prone/error_prone_annotations-2.1.0.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
deleted file mode 100644
index 3280a3e69d..0000000000
--- a/third_party/error_prone/error_prone_check_api-2.0.20-SNAPSHOT.jar
+++ /dev/null
diff --git a/third_party/error_prone/error_prone_check_api-2.1.0.jar b/third_party/error_prone/error_prone_check_api-2.1.0.jar
new file mode 100644
index 0000000000..6d42badf86
--- /dev/null
+++ b/third_party/error_prone/error_prone_check_api-2.1.0.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
deleted file mode 100644
index f354d243f7..0000000000
--- a/third_party/error_prone/error_prone_core-2.0.20-SNAPSHOT.jar
+++ /dev/null
diff --git a/third_party/error_prone/error_prone_core-2.1.0.jar b/third_party/error_prone/error_prone_core-2.1.0.jar
new file mode 100644
index 0000000000..dd6fcd0d3a
--- /dev/null
+++ b/third_party/error_prone/error_prone_core-2.1.0.jar
diff --git a/third_party/hungarian_algorithm/software-and-algorithms-1.0-src.jar b/third_party/hungarian_algorithm/software-and-algorithms-1.0-src.jar
new file mode 100644
index 0000000000..d204d1225b
--- /dev/null
+++ b/third_party/hungarian_algorithm/software-and-algorithms-1.0-src.jar
diff --git a/third_party/hungarian_algorithm/software-and-algorithms-1.0.jar b/third_party/hungarian_algorithm/software-and-algorithms-1.0.jar
new file mode 100644
index 0000000000..a684e2c1d5
--- /dev/null
+++ b/third_party/hungarian_algorithm/software-and-algorithms-1.0.jar