8 files changed, 11 insertions, 43 deletions
diff --git a/third_party/BUILD b/third_party/BUILD
index 3bdae0720a..b2be51013f 100644
--- a/third_party/BUILD
+++ b/third_party/BUILD
@@ -365,22 +365,14 @@ filegroup(
     ],
 )
 
-# As of Guava 20.0, Guava code uses Error Prone annotations. This isn't a
-# problem when compiling with java 8, but is a problem when compiling Bazel
-# with java 7 (the Error Prone jars need to be on the javac classpath). So,
-# until we drop support for compiling Bazel with java 7, we unfortunately need
-# to ensure that the Error Prone jars are always used together with the Guava
-# jars.
 java_import(
     name = "guava",
     jars = [
-        "error_prone/error_prone_annotations-2.0.19.jar",
+        "error_prone/error_prone_annotations-2.1.1.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"],
-    }),
+        "guava/guava-21.0.jar",
+    ],
 )
 
 java_import(
@@ -489,10 +481,7 @@ java_import(
 
 java_import(
     name = "guava-testlib",
-    jars = select({
-        "//tools/jdk:jdk7": ["guava/guava-testlib-21.0-20161101.jar"],
-        "//conditions:default": ["guava/guava-testlib-21.0.jar"],
-    }),
+    jars = ["guava/guava-testlib-21.0.jar"],
 )
 
 java_import(
diff --git a/third_party/error_prone/error_prone_annotation-2.0.19.jar b/third_party/error_prone/error_prone_annotation-2.0.19.jar
deleted file mode 100644
index da08f42945..0000000000
--- a/third_party/error_prone/error_prone_annotation-2.0.19.jar
+++ /dev/null
diff --git a/third_party/error_prone/error_prone_annotations-2.0.19.jar b/third_party/error_prone/error_prone_annotations-2.0.19.jar
deleted file mode 100644
index 508cc64d5f..0000000000
--- a/third_party/error_prone/error_prone_annotations-2.0.19.jar
+++ /dev/null
diff --git a/third_party/error_prone/error_prone_check_api-2.0.19.jar b/third_party/error_prone/error_prone_check_api-2.0.19.jar
deleted file mode 100644
index 7197c0b549..0000000000
--- a/third_party/error_prone/error_prone_check_api-2.0.19.jar
+++ /dev/null
diff --git a/third_party/error_prone/error_prone_core-2.0.19.jar b/third_party/error_prone/error_prone_core-2.0.19.jar
deleted file mode 100644
index 41f92e254b..0000000000
--- a/third_party/error_prone/error_prone_core-2.0.19.jar
+++ /dev/null
diff --git a/third_party/java/jdk/langtools/BUILD b/third_party/java/jdk/langtools/BUILD
index 668c74d44d..2e8422c192 100644
--- a/third_party/java/jdk/langtools/BUILD
+++ b/third_party/java/jdk/langtools/BUILD
@@ -9,20 +9,12 @@ filegroup(
 
 filegroup(
     name = "test-srcs",
-    srcs = select({
-        "//tools/jdk:jdk7": [
-            "BUILD",
-            "LICENSE",
-            "javac7.jar",
-            "javac7.srcjar",
-        ],
-        "//conditions:default": [
-            "BUILD",
-            "LICENSE",
-            "javac-9-dev-r4023-3.jar",
-            "javac-9-dev-r4023-3.srcjar",
-        ],
-    }),
+    srcs = [
+        "BUILD",
+        "LICENSE",
+        "javac-9-dev-r4023-3.jar",
+        "javac-9-dev-r4023-3.srcjar",
+    ],
 )
 
 java_import(
@@ -32,18 +24,5 @@ java_import(
 
 filegroup(
     name = "javac_jar",
-    srcs = select({
-        "//tools/jdk:jdk7": ["javac7.jar"],
-        "//conditions:default": ["javac-9-dev-r4023-3.jar"],
-    }),
-)
-
-java_import(
-    name = "javac7",
-    jars = ["javac7.jar"],
-)
-
-filegroup(
-    name = "javac7_jar",
-    srcs = ["javac7.jar"],
+    srcs = ["javac-9-dev-r4023-3.jar"],
 )
diff --git a/third_party/java/jdk/langtools/javac7.jar b/third_party/java/jdk/langtools/javac7.jar
deleted file mode 100644
index f9661da993..0000000000
--- a/third_party/java/jdk/langtools/javac7.jar
+++ /dev/null
diff --git a/third_party/java/jdk/langtools/javac7.srcjar b/third_party/java/jdk/langtools/javac7.srcjar
deleted file mode 100644
index 8fdd335ef4..0000000000
--- a/third_party/java/jdk/langtools/javac7.srcjar
+++ /dev/null