Change in bazel[master]: Update javac version to 9-dev-r4023-2

2 views
Skip to first unread message

Liam Miller-Cushon (Gerrit)

unread,
May 9, 2017, 12:16:26 PM5/9/17
to bazel-de...@googlegroups.com

Liam Miller-Cushon has uploaded this change for review.

View Change

Update javac version to 9-dev-r4023-2

Change-Id: I23e38767e18a90b2262a38bf8f4b347e06d1de8d
---
M scripts/bootstrap/compile.sh
M src/create_embedded_tools.sh
M src/test/shell/testenv.sh
M third_party/README.md
M third_party/java/jdk/README.md
M third_party/java/jdk/langtools/BUILD
R third_party/java/jdk/langtools/javac-9-dev-r4023-2.jar
R third_party/java/jdk/langtools/javac-9-dev-r4023-2.srcjar
8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh
index 0fce0dc..e18691c 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-1.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-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" " ")
 GRPC_JAVA_VERSION=0.15.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.sh b/src/create_embedded_tools.sh
index da55a70..a687495 100755
--- a/src/create_embedded_tools.sh
+++ b/src/create_embedded_tools.sh
@@ -37,7 +37,7 @@
     *JavaBuilder*_deploy.jar) OUTPUT_PATH=tools/jdk/${i##*/} ;;
     *JacocoCoverage*_deploy.jar) OUTPUT_PATH=tools/jdk/JacocoCoverage_deploy.jar ;;
     *turbine_deploy.jar) OUTPUT_PATH=tools/jdk/turbine_deploy.jar ;;
-    *javac-9-dev-r4023-1.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac-9-dev-r4023-1.jar ;;
+    *javac-9-dev-r4023-2.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac-9-dev-r4023-2.jar ;;
     *javac7.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac7.jar ;;
     *SingleJar_deploy.jar) OUTPUT_PATH=tools/jdk/SingleJar_deploy.jar ;;
     *GenClass_deploy.jar) OUTPUT_PATH=tools/jdk/GenClass_deploy.jar ;;
@@ -76,9 +76,9 @@
   mv ${PACKAGE_DIR}/zulu* ${PACKAGE_DIR}/jdk
 fi
 
-if [ ! -f ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r4023-1.jar ]; then
+if [ ! -f ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r4023-2.jar ]; then
   cp ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac7.jar \
-      ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r4023-1.jar
+      ${PACKAGE_DIR}/third_party/java/jdk/langtools/javac-9-dev-r4023-2.jar
 fi
 
 cat > "${PACKAGE_DIR}/WORKSPACE" <<EOF
diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh
index 7683871..c03bce4 100755
--- a/src/test/shell/testenv.sh
+++ b/src/test/shell/testenv.sh
@@ -381,8 +381,8 @@
 
   copy_tools_directory
 
-  [ -e third_party/java/jdk/langtools/javac-9-dev-r4023-1.jar ] \
-    || ln -s "${langtools_path}"  third_party/java/jdk/langtools/javac-9-dev-r4023-1.jar
+  [ -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
 
   touch WORKSPACE
 }
diff --git a/third_party/README.md b/third_party/README.md
index d14d184..41768fd 100644
--- a/third_party/README.md
+++ b/third_party/README.md
@@ -166,7 +166,7 @@
 
 ## [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 032acfb..74c0762 100644
--- a/third_party/java/jdk/README.md
+++ b/third_party/java/jdk/README.md
@@ -10,7 +10,7 @@
 //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 f0f57c2..94eb080 100644
--- a/third_party/java/jdk/langtools/BUILD
+++ b/third_party/java/jdk/langtools/BUILD
@@ -19,40 +19,40 @@
         "//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-2.jar
similarity index 94%
rename from third_party/java/jdk/langtools/javac-9-dev-r4023-1.jar
rename to third_party/java/jdk/langtools/javac-9-dev-r4023-2.jar
index 3547e81..65a195d 100644
--- a/third_party/java/jdk/langtools/javac-9-dev-r4023-1.jar
+++ b/third_party/java/jdk/langtools/javac-9-dev-r4023-2.jar
Binary files 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-2.srcjar
similarity index 98%
rename from third_party/java/jdk/langtools/javac-9-dev-r4023-1.srcjar
rename to third_party/java/jdk/langtools/javac-9-dev-r4023-2.srcjar
index 6c17b89..da27481 100644
--- a/third_party/java/jdk/langtools/javac-9-dev-r4023-1.srcjar
+++ b/third_party/java/jdk/langtools/javac-9-dev-r4023-2.srcjar
Binary files differ

To view, visit change 10990. To unsubscribe, visit settings.

Gerrit-Project: bazel
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I23e38767e18a90b2262a38bf8f4b347e06d1de8d
Gerrit-Change-Number: 10990
Gerrit-PatchSet: 1
Gerrit-Owner: Liam Miller-Cushon <cus...@google.com>

Marcel Hlopko (Gerrit)

unread,
May 9, 2017, 12:34:08 PM5/9/17
to Liam Miller-Cushon, Damien Martin-guillerez

Marcel Hlopko posted comments on this change.

View Change

Patch set 1:Verified +1

    To view, visit change 10990. To unsubscribe, visit settings.

    Gerrit-Project: bazel
    Gerrit-Branch: master
    Gerrit-MessageType: comment
    Gerrit-Change-Id: I23e38767e18a90b2262a38bf8f4b347e06d1de8d
    Gerrit-Change-Number: 10990
    Gerrit-PatchSet: 1
    Gerrit-Owner: Liam Miller-Cushon <cus...@google.com>
    Gerrit-Reviewer: Damien Martin-guillerez <dmar...@google.com>
    Gerrit-Reviewer: Liam Miller-Cushon <cus...@google.com>
    Gerrit-Reviewer: Marcel Hlopko <hlo...@google.com>
    Gerrit-Comment-Date: Tue, 09 May 2017 16:34:03 +0000
    Gerrit-HasComments: No
    Gerrit-HasLabels: Yes

    Liam Miller-Cushon (Gerrit)

    unread,
    May 10, 2017, 10:51:35 AM5/10/17
    to Marcel Hlopko, Damien Martin-guillerez, Bazel CI

    Liam Miller-Cushon uploaded patch set #2 to this change.

    View Change

    Update javac version to 9-dev-r4023-2

    Fixes #2979


    Change-Id: I23e38767e18a90b2262a38bf8f4b347e06d1de8d
    ---
    M scripts/bootstrap/compile.sh
    M src/create_embedded_tools.sh
    M src/test/shell/testenv.sh
    M third_party/README.md
    M third_party/java/jdk/README.md
    M third_party/java/jdk/langtools/BUILD
    R third_party/java/jdk/langtools/javac-9-dev-r4023-2.jar
    R third_party/java/jdk/langtools/javac-9-dev-r4023-2.srcjar
    8 files changed, 15 insertions(+), 15 deletions(-)

    To view, visit change 10990. To unsubscribe, visit settings.
    


     Gerrit-Project: bazel 
    

     Gerrit-Branch: master 
    

     Gerrit-MessageType: newpatchset 
    

     Gerrit-Change-Id: I23e38767e18a90b2262a38bf8f4b347e06d1de8d 
    

     Gerrit-Change-Number: 10990 
    

     Gerrit-PatchSet: 2 
    

     Gerrit-Owner: Liam Miller-Cushon <cus...@google.com> 
    

     Gerrit-Reviewer: Bazel CI <ci.b...@gmail.com> 
    Kristina Chodorow (Gerrit)
    unread,
    May 10, 2017, 1:37:47 PM5/10/17
    to Liam Miller-Cushon, Bazel CI, Marcel Hlopko, Damien Martin-guillerez
    Kristina Chodorow merged this change.
    View Change
    Approvals:
  Marcel Hlopko: Verified

Objections:
  Bazel CI: Fails


    Update javac version to 9-dev-r4023-2

    Change-Id: I23e38767e18a90b2262a38bf8f4b347e06d1de8d
    PiperOrigin-RevId: 155630560

    ---
    M scripts/bootstrap/compile.sh
    M src/create_embedded_tools.sh
    M src/test/shell/testenv.sh
    3 files changed, 6 insertions(+), 6 deletions(-)

    To view, visit change 10990. To unsubscribe, visit settings.
    


     Gerrit-Project: bazel 
    

     Gerrit-Branch: master 
    

     Gerrit-MessageType: merged 
    

     Gerrit-Change-Id: I23e38767e18a90b2262a38bf8f4b347e06d1de8d 
    

     Gerrit-Change-Number: 10990 
    

     Gerrit-PatchSet: 3 
    

     Gerrit-Owner: Liam Miller-Cushon <cus...@google.com> 
    

     Gerrit-Reviewer: Bazel CI <ci.b...@gmail.com> 
    

     Gerrit-Reviewer: Damien Martin-guillerez <dmar...@google.com> 
    

     Gerrit-Reviewer: Kristina Chodorow <kcho...@google.com> 
    Kristina Chodorow (Gerrit)
    unread,
    May 10, 2017, 1:37:47 PM5/10/17
    to Liam Miller-Cushon, Marcel Hlopko, Damien Martin-guillerez, Bazel CI
    Kristina Chodorow uploaded patch set #3 to the change originally created by Liam Miller-Cushon.
    View Change
    Update javac version to 9-dev-r4023-2

    Change-Id: I23e38767e18a90b2262a38bf8f4b347e06d1de8d
    PiperOrigin-RevId: 155630560

    ---
    M scripts/bootstrap/compile.sh
    M src/create_embedded_tools.sh
    M src/test/shell/testenv.sh
    3 files changed, 6 insertions(+), 6 deletions(-)

    To view, visit change 10990. To unsubscribe, visit settings.
    


     Gerrit-Project: bazel 
    

     Gerrit-Branch: master 
    

     Gerrit-MessageType: newpatchset 
    

     Gerrit-Change-Id: I23e38767e18a90b2262a38bf8f4b347e06d1de8d 
    

     Gerrit-Change-Number: 10990 
    Reply all
    Reply to author
    Forward
    0 new messages