Update Error Prone to 2.0.8-20151216

Also split out dependencies, instead of repackaging them.

--
MOS_MIGRATED_REVID=110433600

9 files changed, 42 insertions, 5 deletions

diff --git a/third_party/BUILD b/third_party/BUILD
index 9744055ebc..a1e4d3fc0d 100644
--- a/third_party/BUILD
+++ b/third_party/BUILD
@@ -210,12 +210,31 @@ java_import(
 java_import(
     name = "error_prone",
     jars = [
-        "error_prone/error_prone_core-2.0.6-20151001-884eec772c13541a7b1af249a68373cd9f30e488.jar",
-        "error_prone/error_prone_annotations-2.0.6-20151001-884eec772c13541a7b1af249a68373cd9f30e488.jar",
+        "error_prone/error_prone_core-2.0.8-20151216.jar",
+        "error_prone/error_prone_annotations-2.0.8-20151216.jar",
+        "error_prone/error_prone_annotation-2.0.8-20151216.jar",
     ],
     exports = [
         ":checker_framework_dataflow",
+        ":guava",
+        ":jcip_annotations",
         ":jformatstring",
+        ":jsr305",
+        ":pcollections",
+    ],
+)
+
+java_import(
+    name = "jcip_annotations",
+    jars = [
+        "jcip_annotations/jcip-annotations-1.0-1.jar",
+    ],
+)
+
+java_import(
+    name = "pcollections",
+    jars = [
+        "pcollections/pcollections-2.1.2.jar",
     ],
 )
 
@@ -238,9 +257,14 @@ filegroup(
     name = "error_prone-jars",
     srcs = [
         "checker_framework_dataflow/dataflow-1.8.10.jar",
-        "error_prone/error_prone_annotations-2.0.6-20151001-884eec772c13541a7b1af249a68373cd9f30e488.jar",
-        "error_prone/error_prone_core-2.0.6-20151001-884eec772c13541a7b1af249a68373cd9f30e488.jar",
+        "error_prone/error_prone_annotation-2.0.8-20151216.jar",
+        "error_prone/error_prone_annotations-2.0.8-20151216.jar",
+        "error_prone/error_prone_core-2.0.8-20151216.jar",
+        "guava/guava-19.0.jar",
+        "jcip_annotations/jcip-annotations-1.0-1.jar",
         "jformatstring/jFormatString-3.0.0.jar",
+        "jsr305/jsr-305.jar",
+        "pcollections/pcollections-2.1.2.jar",
     ],
 )
 
diff --git a/third_party/README.md b/third_party/README.md
index 9a28ebfd1d..b721793de3 100644
--- a/third_party/README.md
+++ b/third_party/README.md
@@ -84,9 +84,22 @@ a minimal set of extra dependencies.
 
 ## [Error Prone](https://github.com/google/error-prone)
 
-* Version: 2.0.6-20151001-884eec772c13541a7b1af249a68373cd9f30e488
+* Version: 2.0.6-20151216
 * License: Apache License 2.0
 
+
+## [JCIP Annotations](https://github.com/stephenc/jcip-annotations/)
+
+* Version: 1.0-1
+* License: Apache License 2.0
+
+
+## [PCollections](https://github.com/pcollections/pcollections/)
+
+* Version: 2.1.2
+* License: MIT
+
+
 ## [jFormatString](https://code.google.com/p/j-format-string/)
 
 * Version: 3.0.0
diff --git a/third_party/error_prone/error_prone_annotation-2.0.8-20151216.jar b/third_party/error_prone/error_prone_annotation-2.0.8-20151216.jar
new file mode 100644
index 0000000000..26e297517b
--- /dev/null
+++ b/third_party/error_prone/error_prone_annotation-2.0.8-20151216.jar
diff --git a/third_party/error_prone/error_prone_annotations-2.0.6-20151001-884eec772c13541a7b1af249a68373cd9f30e488.jar b/third_party/error_prone/error_prone_annotations-2.0.6-20151001-884eec772c13541a7b1af249a68373cd9f30e488.jar
deleted file mode 100644
index f8e7258a61..0000000000
--- a/third_party/error_prone/error_prone_annotations-2.0.6-20151001-884eec772c13541a7b1af249a68373cd9f30e488.jar
+++ /dev/null
diff --git a/third_party/error_prone/error_prone_annotations-2.0.8-20151216.jar b/third_party/error_prone/error_prone_annotations-2.0.8-20151216.jar
new file mode 100644
index 0000000000..2f685c6971
--- /dev/null
+++ b/third_party/error_prone/error_prone_annotations-2.0.8-20151216.jar
diff --git a/third_party/error_prone/error_prone_core-2.0.6-20151001-884eec772c13541a7b1af249a68373cd9f30e488.jar b/third_party/error_prone/error_prone_core-2.0.6-20151001-884eec772c13541a7b1af249a68373cd9f30e488.jar
deleted file mode 100644
index 89b0580109..0000000000
--- a/third_party/error_prone/error_prone_core-2.0.6-20151001-884eec772c13541a7b1af249a68373cd9f30e488.jar
+++ /dev/null
diff --git a/third_party/error_prone/error_prone_core-2.0.8-20151216.jar b/third_party/error_prone/error_prone_core-2.0.8-20151216.jar
new file mode 100644
index 0000000000..3227f1e139
--- /dev/null
+++ b/third_party/error_prone/error_prone_core-2.0.8-20151216.jar
diff --git a/third_party/jcip_annotations/jcip-annotations-1.0-1.jar b/third_party/jcip_annotations/jcip-annotations-1.0-1.jar
new file mode 100644
index 0000000000..edfda762f7
--- /dev/null
+++ b/third_party/jcip_annotations/jcip-annotations-1.0-1.jar
diff --git a/third_party/pcollections/pcollections-2.1.2.jar b/third_party/pcollections/pcollections-2.1.2.jar
new file mode 100644
index 0000000000..ae7ff25c75
--- /dev/null
+++ b/third_party/pcollections/pcollections-2.1.2.jar