aboutsummaryrefslogtreecommitdiffhomepage
path: root/third_party
diff options
context:
space:
mode:
authorGravatar Liam Miller-Cushon <cushon@google.com>2017-02-28 20:39:59 -0800
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2017-03-02 12:47:56 +0100
commit30490512eb0e48a3774cc4e4ef78680e77dd4e47 (patch)
tree7ca236b2af81128f98a05c9138daf1e2532e459a /third_party
parent105db844833c016550817662791e5c04efb91445 (diff)
Update to latest javac and Error Prone
Fixes #2591 Change-Id: I7038b71811c54d5ece1c0993052abdffc9d0de96
Diffstat (limited to 'third_party')
-rw-r--r--third_party/BUILD18
-rw-r--r--third_party/README.md4
-rw-r--r--third_party/error_prone/error_prone_annotation-2.0.18-20170224.jarbin10552 -> 0 bytes
-rw-r--r--third_party/error_prone/error_prone_annotation-2.0.18.jarbin0 -> 10534 bytes
-rw-r--r--third_party/error_prone/error_prone_annotations-2.0.18-20170224.jarbin12096 -> 0 bytes
-rw-r--r--third_party/error_prone/error_prone_annotations-2.0.18.jarbin0 -> 12078 bytes
-rw-r--r--third_party/error_prone/error_prone_check_api-2.0.18.jar (renamed from third_party/error_prone/error_prone_check_api-2.0.18-20170224.jar)bin465503 -> 464763 bytes
-rw-r--r--third_party/error_prone/error_prone_core-2.0.18.jar (renamed from third_party/error_prone/error_prone_core-2.0.18-20170224.jar)bin1346688 -> 1355935 bytes
-rw-r--r--third_party/java/jdk/README.md2
-rw-r--r--third_party/java/jdk/langtools/BUILD8
-rw-r--r--third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar (renamed from third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar)bin5096086 -> 4158851 bytes
-rw-r--r--third_party/java/jdk/langtools/javac-9-dev-r3297-4.srcjar (renamed from third_party/java/jdk/langtools/javac-9-dev-r3297-3.srcjar)bin3693828 -> 3694074 bytes
12 files changed, 16 insertions, 16 deletions
diff --git a/third_party/BUILD b/third_party/BUILD
index fd781ed19a..034789d627 100644
--- a/third_party/BUILD
+++ b/third_party/BUILD
@@ -310,10 +310,10 @@ java_import(
java_import(
name = "error_prone",
jars = [
- "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",
+ "error_prone/error_prone_check_api-2.0.18.jar",
+ "error_prone/error_prone_core-2.0.18.jar",
+ "error_prone/error_prone_annotations-2.0.18.jar",
+ "error_prone/error_prone_annotation-2.0.18.jar",
],
exports = [
":auto_common",
@@ -345,10 +345,10 @@ filegroup(
name = "bootstrap_guava_and_error_prone-jars",
srcs = [
"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",
+ "error_prone/error_prone_annotation-2.0.18.jar",
+ "error_prone/error_prone_annotations-2.0.18.jar",
+ "error_prone/error_prone_check_api-2.0.18.jar",
+ "error_prone/error_prone_core-2.0.18.jar",
"guava/guava-21.0.jar",
"jcip_annotations/jcip-annotations-1.0-1.jar",
"jsr305/jsr-305.jar",
@@ -367,7 +367,7 @@ filegroup(
java_import(
name = "guava",
jars = [
- "error_prone/error_prone_annotations-2.0.18-20170224.jar",
+ "error_prone/error_prone_annotations-2.0.18.jar",
"jcip_annotations/jcip-annotations-1.0-1.jar",
"jsr305/jsr-305.jar",
] + select({
diff --git a/third_party/README.md b/third_party/README.md
index ca9dab9c22..e20cf37ee5 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.18-20170224
+* Version: 2.0.18
* License: Apache License 2.0
@@ -166,7 +166,7 @@ a minimal set of extra dependencies.
## [javac](https://github.com/google/error-prone-javac)
-* Version: 9-dev-r3297-3 (javac-9-dev-r3297-3.jar)
+* Version: 9-dev-r3297-4 (javac-9-dev-r3297-4.jar)
* License: GNU GPL v2 with Classpath exception (plus other licenses, see third_party/java/jdk/langtools/LICENSE file).
## [jarjar](https://code.google.com/p/jarjar/)
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
deleted file mode 100644
index 6cc8408132..0000000000
--- a/third_party/error_prone/error_prone_annotation-2.0.18-20170224.jar
+++ /dev/null
Binary files differ
diff --git a/third_party/error_prone/error_prone_annotation-2.0.18.jar b/third_party/error_prone/error_prone_annotation-2.0.18.jar
new file mode 100644
index 0000000000..5e379f47b9
--- /dev/null
+++ b/third_party/error_prone/error_prone_annotation-2.0.18.jar
Binary files differ
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
deleted file mode 100644
index 2095ec72d8..0000000000
--- a/third_party/error_prone/error_prone_annotations-2.0.18-20170224.jar
+++ /dev/null
Binary files differ
diff --git a/third_party/error_prone/error_prone_annotations-2.0.18.jar b/third_party/error_prone/error_prone_annotations-2.0.18.jar
new file mode 100644
index 0000000000..fa549b4dbf
--- /dev/null
+++ b/third_party/error_prone/error_prone_annotations-2.0.18.jar
Binary files differ
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.jar
index e9ccc2bb9e..d7a79f1362 100644
--- 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.jar
Binary files differ
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.jar
index b8001fe117..a7cebc96e7 100644
--- a/third_party/error_prone/error_prone_core-2.0.18-20170224.jar
+++ b/third_party/error_prone/error_prone_core-2.0.18.jar
Binary files differ
diff --git a/third_party/java/jdk/README.md b/third_party/java/jdk/README.md
index 84e59cf35b..032acfb839 100644
--- a/third_party/java/jdk/README.md
+++ b/third_party/java/jdk/README.md
@@ -10,7 +10,7 @@ version of the JRE. Those builds are vendored in
//third_party/java/jdk/langtools.
Currently Bazel supports running on a JRE 8 only because the default Java
-compiler used (//third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar) is the
+compiler used (//third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar) is the
Java compiler of OpenJDK 9 compiled to run on a JRE 8. This cannot
be built to run on a JRE 7 because of code incompatibility. Bazel's
JavaBuilder at HEAD cannot be linked with earlier version of the
diff --git a/third_party/java/jdk/langtools/BUILD b/third_party/java/jdk/langtools/BUILD
index 579adf4256..b283021145 100644
--- a/third_party/java/jdk/langtools/BUILD
+++ b/third_party/java/jdk/langtools/BUILD
@@ -19,22 +19,22 @@ filegroup(
"//conditions:default": [
"BUILD",
"LICENSE",
- "javac-9-dev-r3297-3.jar",
- "javac-9-dev-r3297-3.srcjar",
+ "javac-9-dev-r3297-4.jar",
+ "javac-9-dev-r3297-4.srcjar",
],
}),
)
java_import(
name = "javac",
- jars = ["javac-9-dev-r3297-3.jar"],
+ jars = ["javac-9-dev-r3297-4.jar"],
)
filegroup(
name = "javac_jar",
srcs = select({
"//tools/jdk:jdk7": ["javac7.jar"],
- "//conditions:default": ["javac-9-dev-r3297-3.jar"],
+ "//conditions:default": ["javac-9-dev-r3297-4.jar"],
}),
)
diff --git a/third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar b/third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar
index 9f612cd3bb..6e4ae449ed 100644
--- a/third_party/java/jdk/langtools/javac-9-dev-r3297-3.jar
+++ b/third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar
Binary files differ
diff --git a/third_party/java/jdk/langtools/javac-9-dev-r3297-3.srcjar b/third_party/java/jdk/langtools/javac-9-dev-r3297-4.srcjar
index 2dea0ddabe..c2ca60349b 100644
--- a/third_party/java/jdk/langtools/javac-9-dev-r3297-3.srcjar
+++ b/third_party/java/jdk/langtools/javac-9-dev-r3297-4.srcjar
Binary files differ