Update javac version to 9-dev-r4023-3

Change-Id: If9373f81193050009432759da6299f1382e587ec
PiperOrigin-RevId: 165994437

9 files changed, 11 insertions, 11 deletions

diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh
index 4280e003e0..087507221b 100755
--- a/scripts/bootstrap/compile.sh
+++ b/scripts/bootstrap/compile.sh
@@ -17,7 +17,7 @@
 # Script for building bazel from scratch without bazel
 
 PROTO_FILES=$(ls src/main/protobuf/*.proto src/main/java/com/google/devtools/build/lib/buildeventstream/proto/*.proto)
-LIBRARY_JARS=$(find third_party -name '*.jar' | grep -Fv /javac-9-dev-r3297-4.jar | grep -Fv /javac-9-dev-4023-2.jar | grep -Fv /javac7.jar | grep -Fv JavaBuilder | grep -Fv third_party/guava | grep -Fv third_party/guava | grep -ve third_party/grpc/grpc.*jar | tr "\n" " ")
+LIBRARY_JARS=$(find third_party -name '*.jar' | grep -Fv /javac-9-dev-r3297-4.jar | grep -Fv /javac-9-dev-4023-3.jar | grep -Fv /javac7.jar | grep -Fv JavaBuilder | grep -Fv third_party/guava | grep -Fv third_party/guava | grep -ve third_party/grpc/grpc.*jar | tr "\n" " ")
 GRPC_JAVA_VERSION=1.3.0
 GRPC_LIBRARY_JARS=$(find third_party/grpc -name '*.jar' | grep -e .*${GRPC_JAVA_VERSION}.*jar | tr "\n" " ")
 # Guava jars are different for JDK 7 build and JDK 8 build, we select the good
diff --git a/src/create_embedded_tools.py b/src/create_embedded_tools.py
index a29e013627..699edd09f5 100644
--- a/src/create_embedded_tools.py
+++ b/src/create_embedded_tools.py
@@ -35,8 +35,8 @@ output_paths = [
     ('*JacocoCoverage*_deploy.jar',
      lambda x: 'tools/jdk/JacocoCoverage_deploy.jar'),
     ('*turbine_deploy.jar', lambda x: 'tools/jdk/turbine_deploy.jar'),
-    ('*javac-9-dev-r4023-2.jar',
-     lambda x: 'third_party/java/jdk/langtools/javac-9-dev-r4023-2.jar'),
+    ('*javac-9-dev-r4023-3.jar',
+     lambda x: 'third_party/java/jdk/langtools/javac-9-dev-r4023-3.jar'),
     ('*SingleJar_deploy.jar',
      lambda x: 'tools/jdk/singlejar/SingleJar_deploy.jar'),
     ('*GenClass_deploy.jar', lambda x: 'tools/jdk/GenClass_deploy.jar'),
diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh
index 99bc3945ef..45a23c4132 100755
--- a/src/test/shell/testenv.sh
+++ b/src/test/shell/testenv.sh
@@ -399,8 +399,8 @@ function create_new_workspace() {
 
   copy_tools_directory
 
-  [ -e third_party/java/jdk/langtools/javac-9-dev-r4023-2.jar ] \
-    || ln -s "${langtools_path}"  third_party/java/jdk/langtools/javac-9-dev-r4023-2.jar
+  [ -e third_party/java/jdk/langtools/javac-9-dev-r4023-3.jar ] \
+    || ln -s "${langtools_path}"  third_party/java/jdk/langtools/javac-9-dev-r4023-3.jar
 
   touch WORKSPACE
 }
diff --git a/third_party/README.md b/third_party/README.md
index 9ef8ab632d..b18c2be9d7 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-2 (javac-9-dev-r4023-2.jar)
+* Version: 9-dev-r4023-3 (javac-9-dev-r4023-3.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 74c0762e5f..f158d77ee6 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-r4023-2.jar) is the
+compiler used (//third_party/java/jdk/langtools/javac-9-dev-r4023-3.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 8e727ed072..668c74d44d 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-r4023-2.jar",
-            "javac-9-dev-r4023-2.srcjar",
+            "javac-9-dev-r4023-3.jar",
+            "javac-9-dev-r4023-3.srcjar",
         ],
     }),
 )
 
 java_import(
     name = "javac",
-    jars = ["javac-9-dev-r4023-2.jar"],
+    jars = ["javac-9-dev-r4023-3.jar"],
 )
 
 filegroup(
     name = "javac_jar",
     srcs = select({
         "//tools/jdk:jdk7": ["javac7.jar"],
-        "//conditions:default": ["javac-9-dev-r4023-2.jar"],
+        "//conditions:default": ["javac-9-dev-r4023-3.jar"],
     }),
 )
 
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
deleted file mode 100644
index da27481622..0000000000
--- a/third_party/java/jdk/langtools/javac-9-dev-r4023-2.srcjar
+++ /dev/null
diff --git a/third_party/java/jdk/langtools/javac-9-dev-r4023-2.jar b/third_party/java/jdk/langtools/javac-9-dev-r4023-3.jar
index 65a195d6b1..362885da49 100644
--- a/third_party/java/jdk/langtools/javac-9-dev-r4023-2.jar
+++ b/third_party/java/jdk/langtools/javac-9-dev-r4023-3.jar
diff --git a/third_party/java/jdk/langtools/javac-9-dev-r4023-3.srcjar b/third_party/java/jdk/langtools/javac-9-dev-r4023-3.srcjar
new file mode 100644
index 0000000000..6a9e39d52b
--- /dev/null
+++ b/third_party/java/jdk/langtools/javac-9-dev-r4023-3.srcjar