Patching rules closure's maven download to an https url, since the cu…

…rrent one is causing a 501. PiperOrigin-RevId: 289903847 Change-Id: Ia34f27fd4e2a6f1116d49a77d81f613e18f73563
tensorflow · Jan 15, 2020 · 9d6198d · 9d6198d
1 parent f18ffa8
commit 9d6198d
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 1 deletion.
diff --git a/WORKSPACE b/WORKSPACE
@@ -1,11 +1,13 @@
 workspace(name = "org_tensorflow")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("//third_party:repo.bzl", "tf_http_archive")
 
-http_archive(
+tf_http_archive(
     name = "io_bazel_rules_closure",
     sha256 = "5b00383d08dd71f28503736db0500b6fb4dda47489ff5fc6bed42557c07c6ba9",
     strip_prefix = "rules_closure-308b05b2419edb5c8ee0471b67a40403df940149",
+    patch_file = "@org_tensorflow//third_party:rules_closure.patch",
     urls = [
         "https://storage.googleapis.com/mirror.tensorflow.org/github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz",
         "https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz",  # 2019-06-13

diff --git a/tensorflow/opensource_only.files b/tensorflow/opensource_only.files
@@ -146,6 +146,7 @@ tensorflow/third_party/py/python_configure.bzl
 tensorflow/third_party/pybind11.BUILD
 tensorflow/third_party/python_runtime/BUILD
 tensorflow/third_party/repo.bzl
+tensorflow/third_party/rules_closure.patch
 tensorflow/third_party/rules_swift.patch
 tensorflow/third_party/six.BUILD
 tensorflow/third_party/snappy.BUILD

diff --git a/third_party/rules_closure.patch b/third_party/rules_closure.patch
@@ -0,0 +1,26 @@
+From d68041ee6da4285108e407e18edd0decbccfe33b Mon Sep 17 00:00:00 2001
+From: Brian Zhao <bmzhao@google.com>
+Date: Wed, 15 Jan 2020 10:57:14 -0800
+Subject: [PATCH] Fixing https 501 error from maven that is blocking TF
+ presubmits.
+
+---
+ closure/repositories.bzl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/closure/repositories.bzl b/closure/repositories.bzl
+index f21ff2b..4514bc4 100644
+--- a/closure/repositories.bzl
++++ b/closure/repositories.bzl
+@@ -644,7 +644,7 @@ def com_google_javascript_closure_compiler():
+         licenses = ["reciprocal"],  # MPL v1.1 (Rhino AST), Apache 2.0 (JSCompiler)
+         jar_urls = [
+             "https://mirror.bazel.build/repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/%s/%s" % (version, jar),
+-            "http://repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/%s/%s" % (version, jar),
++            "https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/%s/%s" % (version, jar),
+         ],
+         jar_sha256 = "5e8262a9208e3acf22cf1109928355e6d6c0b4bfe44fbf42e3ef537084353fe5",
+         deps = [
+-- 
+2.25.0.rc1.283.g88dfdc4193-goog
+