Update to guava 21.0 and Error Prone version 2.0.18-20160224

Change-Id: I89875f8233092e2704142fc306f9ec60da739b5f

12 files changed, 27 insertions, 39 deletions

diff --git a/third_party/BUILD b/third_party/BUILD
index ee53c633c9..fd781ed19a 100644
--- a/third_party/BUILD
+++ b/third_party/BUILD
@@ -310,12 +310,13 @@ java_import(
 java_import(
     name = "error_prone",
     jars = [
-        "error_prone/error_prone_check_api-2.0.15.jar",
-        "error_prone/error_prone_core-2.0.15.jar",
-        "error_prone/error_prone_annotations-2.0.15.jar",
-        "error_prone/error_prone_annotation-2.0.15.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_annotations-2.0.18-20170224.jar",
+        "error_prone/error_prone_annotation-2.0.18-20170224.jar",
     ],
     exports = [
+        ":auto_common",
         ":guava",
         ":jcip_annotations",
         ":jsr305",
@@ -339,39 +340,16 @@ java_import(
     ],
 )
 
-filegroup(
-    name = "guava_and_error_prone-jars",
-    srcs = [
-        "guava/guava-21.0-20161101.jar",
-        "error_prone/error_prone_annotation-2.0.15.jar",
-        "error_prone/error_prone_annotations-2.0.15.jar",
-        "error_prone/error_prone_check_api-2.0.15.jar",
-        # error_prone_core contains a copy of an earlier version of guava, so
-        # it's very important that it occur *after* the guava jar in the
-        # -classpath arg for both 'javac' and 'java'. The latter is especially
-        # important when dealing with pre-built jars that themselves assume
-        # they'll be provided guava classes at runtime via -classpath (e.g.
-        # guava-testlib uses stuff from guava).
-        "error_prone/error_prone_core-2.0.15.jar",
-        "jcip_annotations/jcip-annotations-1.0-1.jar",
-        "jsr305/jsr-305.jar",
-        "pcollections/pcollections-2.1.2.jar",
-        "//third_party/checker_framework_dataflow",
-        "//third_party/jformatstring",
-    ],
-)
-
 # For bootstrapping JavaBuilder
 filegroup(
     name = "bootstrap_guava_and_error_prone-jars",
     srcs = [
-        "guava/guava-21.0-20161101.jar",
-        "error_prone/error_prone_annotation-2.0.15.jar",
-        "error_prone/error_prone_annotations-2.0.15.jar",
-        "error_prone/error_prone_check_api-2.0.15.jar",
-        # See the comment about error_prone_core in 'guava_and_error_prone-jars'
-        # above.
-        "error_prone/error_prone_core-2.0.15.jar",
+        "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",
+        "guava/guava-21.0.jar",
         "jcip_annotations/jcip-annotations-1.0-1.jar",
         "jsr305/jsr-305.jar",
         "pcollections/pcollections-2.1.2.jar",
@@ -388,13 +366,20 @@ filegroup(
 # jars.
 java_import(
     name = "guava",
-    jars = [":guava_and_error_prone-jars"],
+    jars = [
+        "error_prone/error_prone_annotations-2.0.18-20170224.jar",
+        "jcip_annotations/jcip-annotations-1.0-1.jar",
+        "jsr305/jsr-305.jar",
+    ] + select({
+        "//tools/jdk:jdk7": ["guava/guava-21.0-20161101.jar"],
+        "//conditions:default": ["guava/guava-21.0.jar"],
+    }),
 )
 
 # For bootstrapping JavaBuilder
 filegroup(
     name = "guava-jars",
-    srcs = ["guava/guava-21.0-20161101.jar"],
+    srcs = ["guava/guava-21.0.jar"],
 )
 
 java_import(
@@ -485,7 +470,10 @@ java_import(
 
 java_import(
     name = "guava-testlib",
-    jars = ["guava/guava-testlib-21.0-20161101.jar"],
+    jars = select({
+        "//tools/jdk:jdk7": ["guava/guava-testlib-21.0-20161101.jar"],
+        "//conditions:default": ["guava/guava-testlib-21.0.jar"],
+    }),
 )
 
 java_import(
diff --git a/third_party/README.md b/third_party/README.md
index afa5e049e8..ca9dab9c22 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.15
+* Version: 2.0.18-20170224
 * License: Apache License 2.0
 
 
@@ -158,9 +158,9 @@ a minimal set of extra dependencies.
 * License: Apache License 2.0
 
 
-## [guava](https://code.google.com/p/guava-libraries/)
+## [guava](https://github.com/google/guava)
 
-* Version: 19.0
+* Version: 21.0
 * License: Apache License 2.0
 
 
diff --git a/third_party/error_prone/error_prone_annotation-2.0.15.jar b/third_party/error_prone/error_prone_annotation-2.0.15.jar
deleted file mode 100644
index d7b85e6f17..0000000000
--- a/third_party/error_prone/error_prone_annotation-2.0.15.jar
+++ /dev/null
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
new file mode 100644
index 0000000000..6cc8408132
--- /dev/null
+++ b/third_party/error_prone/error_prone_annotation-2.0.18-20170224.jar
diff --git a/third_party/error_prone/error_prone_annotations-2.0.15.jar b/third_party/error_prone/error_prone_annotations-2.0.15.jar
deleted file mode 100644
index 675813642b..0000000000
--- a/third_party/error_prone/error_prone_annotations-2.0.15.jar
+++ /dev/null
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
new file mode 100644
index 0000000000..2095ec72d8
--- /dev/null
+++ b/third_party/error_prone/error_prone_annotations-2.0.18-20170224.jar
diff --git a/third_party/error_prone/error_prone_check_api-2.0.15.jar b/third_party/error_prone/error_prone_check_api-2.0.15.jar
deleted file mode 100644
index 25029a3ea1..0000000000
--- a/third_party/error_prone/error_prone_check_api-2.0.15.jar
+++ /dev/null
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-20170224.jar
new file mode 100644
index 0000000000..e9ccc2bb9e
--- /dev/null
+++ b/third_party/error_prone/error_prone_check_api-2.0.18-20170224.jar
diff --git a/third_party/error_prone/error_prone_core-2.0.15.jar b/third_party/error_prone/error_prone_core-2.0.15.jar
deleted file mode 100644
index a560aa28c4..0000000000
--- a/third_party/error_prone/error_prone_core-2.0.15.jar
+++ /dev/null
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-20170224.jar
new file mode 100644
index 0000000000..b8001fe117
--- /dev/null
+++ b/third_party/error_prone/error_prone_core-2.0.18-20170224.jar
diff --git a/third_party/guava/guava-21.0.jar b/third_party/guava/guava-21.0.jar
new file mode 100644
index 0000000000..0618195945
--- /dev/null
+++ b/third_party/guava/guava-21.0.jar
diff --git a/third_party/guava/guava-testlib-21.0.jar b/third_party/guava/guava-testlib-21.0.jar
new file mode 100644
index 0000000000..c141effe7f
--- /dev/null
+++ b/third_party/guava/guava-testlib-21.0.jar