From 36ce4b433e19498a78c34540d5a166d4e0006b22 Mon Sep 17 00:00:00 2001 From: Liam Miller-Cushon Date: Tue, 9 May 2017 09:15:09 -0700 Subject: Update javac version to 9-dev-r4023-2 Fixes #2979 Change-Id: I23e38767e18a90b2262a38bf8f4b347e06d1de8d --- third_party/README.md | 2 +- third_party/java/jdk/README.md | 2 +- third_party/java/jdk/langtools/BUILD | 14 +++++++------- .../java/jdk/langtools/javac-9-dev-r4023-1.jar | Bin 6840951 -> 0 bytes .../java/jdk/langtools/javac-9-dev-r4023-1.srcjar | Bin 6755603 -> 0 bytes .../java/jdk/langtools/javac-9-dev-r4023-2.jar | Bin 0 -> 6842614 bytes .../java/jdk/langtools/javac-9-dev-r4023-2.srcjar | Bin 0 -> 6756453 bytes 7 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 third_party/java/jdk/langtools/javac-9-dev-r4023-1.jar delete mode 100644 third_party/java/jdk/langtools/javac-9-dev-r4023-1.srcjar create mode 100644 third_party/java/jdk/langtools/javac-9-dev-r4023-2.jar create mode 100644 third_party/java/jdk/langtools/javac-9-dev-r4023-2.srcjar diff --git a/third_party/README.md b/third_party/README.md index d14d184134..41768fd50d 100644 --- a/third_party/README.md +++ b/third_party/README.md @@ -166,7 +166,7 @@ a minimal set of extra dependencies. ## [javac](https://github.com/google/error-prone-javac) -* Version: 9-dev-r4023-1 (javac-9-dev-r4023-1.jar) +* Version: 9-dev-r4023-2 (javac-9-dev-r4023-2.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/java/jdk/README.md b/third_party/java/jdk/README.md index 032acfb839..74c0762e5f 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-4.jar) is the +compiler used (//third_party/java/jdk/langtools/javac-9-dev-r4023-2.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 f0f57c20fd..94eb08099b 100644 --- a/third_party/java/jdk/langtools/BUILD +++ b/third_party/java/jdk/langtools/BUILD @@ -19,40 +19,40 @@ filegroup( "//conditions:default": [ "BUILD", "LICENSE", - "javac-9-dev-r4023-1.jar", - "javac-9-dev-r4023-1.srcjar", + "javac-9-dev-r4023-2.jar", + "javac-9-dev-r4023-2.srcjar", ], }), ) java_import( name = "javac", - jars = ["javac-9-dev-r4023-1.jar"], + jars = ["javac-9-dev-r4023-2.jar"], ) filegroup( name = "javac_jar", srcs = select({ "//tools/jdk:jdk7": ["javac7.jar"], - "//conditions:default": ["javac-9-dev-r4023-1.jar"], + "//conditions:default": ["javac-9-dev-r4023-2.jar"], }), ) # TODO(cushon): delete alias( - name = "test-srcs-9-dev-r4023-1", + name = "test-srcs-9-dev-r4023-2", actual = ":test-srcs", ) # TODO(cushon): delete alias( - name = "javac-9-dev-r4023-1", + name = "javac-9-dev-r4023-2", actual = ":javac", ) # TODO(cushon): delete alias( - name = "javac_jar-9-dev-r4023-1", + name = "javac_jar-9-dev-r4023-2", actual = ":javac_jar", ) diff --git a/third_party/java/jdk/langtools/javac-9-dev-r4023-1.jar b/third_party/java/jdk/langtools/javac-9-dev-r4023-1.jar deleted file mode 100644 index 3547e81a8b..0000000000 Binary files a/third_party/java/jdk/langtools/javac-9-dev-r4023-1.jar and /dev/null differ diff --git a/third_party/java/jdk/langtools/javac-9-dev-r4023-1.srcjar b/third_party/java/jdk/langtools/javac-9-dev-r4023-1.srcjar deleted file mode 100644 index 6c17b89b71..0000000000 Binary files a/third_party/java/jdk/langtools/javac-9-dev-r4023-1.srcjar and /dev/null differ diff --git a/third_party/java/jdk/langtools/javac-9-dev-r4023-2.jar b/third_party/java/jdk/langtools/javac-9-dev-r4023-2.jar new file mode 100644 index 0000000000..65a195d6b1 Binary files /dev/null and b/third_party/java/jdk/langtools/javac-9-dev-r4023-2.jar differ diff --git a/third_party/java/jdk/langtools/javac-9-dev-r4023-2.srcjar b/third_party/java/jdk/langtools/javac-9-dev-r4023-2.srcjar new file mode 100644 index 0000000000..da27481622 Binary files /dev/null and b/third_party/java/jdk/langtools/javac-9-dev-r4023-2.srcjar differ -- cgit v1.2.3