From 04d46abcf4d0a0a4054372a3da9b8e76c573aee5 Mon Sep 17 00:00:00 2001 From: Damien Martin-Guillerez Date: Wed, 13 Apr 2016 19:27:56 +0000 Subject: Rollback of commit 6cb8d820689ad029a9d0dc4ee1100db9b2d96515. *** Reason for rollback *** Breaks ci.bazel.io While the basics for fixing the build is easy (just a few typos in packages building), fixing the test is a bit more tricky. I see only one solution for fixing the test: use a select statement that would select the good bazel version but that would always pull JavaBuilder as an external dependency when we do test. Better roll this back then check the JavaBuilder 0.1.0 as a binary in third_party before rolling forward (a similar change is still needed to decouple running the test and building the binary for JDK 7) *** Original change description *** Refactor build for JDK 7 Now the JDK 7 tuning happens all in Bazel, removing logic from the CI script. It uses remote repositories to access JDK 7 dependencies. -- MOS_MIGRATED_REVID=119773123 --- WORKSPACE | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'WORKSPACE') diff --git a/WORKSPACE b/WORKSPACE index ed50f775fe..05c5117286 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -23,22 +23,6 @@ bind( actual = "//:dummy", ) -# For building for JDK 7 -# This is a JDK 7 JavaBuilder from release 0.1.0. -# Do not use the skylark bootstrapped version of JavaBuilder -http_file( - name = "io_bazel_javabuilder_jdk7", - # This was built from Bazel 0.1.0 (after ./compile.sh) and JDK 7. - url = "https://storage.googleapis.com/bazel/0.1.0/JavaBuilder_deploy.jar", - sha256 = "374f07be2f73ec170ef6bdd8057530e6842cb0cbc7a240caccbd7b80be239366", -) - -http_file( - name = "io_bazel_javac_jdk7", - url = "https://github.com/bazelbuild/bazel/blob/0.1.0/third_party/java/jdk/langtools/javac.jar?raw=true", - sha256 = "e063cf60cf9a1d24acd043f55dc605da559b913793c6a4e51c5ddbc4f5d494df", -) - # For tools/cpp/test/... load("//tools/cpp/test:docker_repository.bzl", "docker_repository") docker_repository() -- cgit v1.2.3