Skip to content

Commit 1c7325e

Browse files
werktwerkt
authored
WORKSPACE updates for maven https availability (buildfarm#331)
1 parent 959b9e1 commit 1c7325e

File tree

3 files changed

+327
-29
lines changed

3 files changed

+327
-29
lines changed

‎WORKSPACE

+20-29
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@ http_archive(
1010
urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.10.0.zip"],
1111
)
1212

13-
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
14-
15-
protobuf_deps()
16-
1713
# Needed for @grpc_java//compiler:grpc_java_plugin.
1814
http_archive(
1915
name = "io_grpc_grpc_java",
16+
patch_args = ["-p1"],
17+
patches = ["//third_party/io_grpc_grpc_java:7461ef983d.patch"],
2018
sha256 = "11f2930cf31c964406e8a7e530272a263fbc39c5f8d21410b2b927b656f4d9be",
2119
strip_prefix = "grpc-java-1.26.0",
2220
urls = ["https://github.com/grpc/grpc-java/archive/v1.26.0.zip"],
@@ -33,29 +31,22 @@ http_archive(
3331
# The API that we implement.
3432
http_archive(
3533
name = "remote_apis",
36-
patches = ["@build_buildfarm//third_party/remote-apis:remote-apis.patch"],
37-
patch_args = ["-p1"],
3834
build_file = "@build_buildfarm//:BUILD.remote_apis",
35+
patch_args = ["-p1"],
36+
patches = ["@build_buildfarm//third_party/remote-apis:remote-apis.patch"],
3937
sha256 = "21ad15be502ef529ca07fdda56d25d6678647b954d41f08a040241ea5e43dce1",
4038
strip_prefix = "remote-apis-b5123b1bb2853393c7b9aa43236db924d7e32d61",
4139
url = "https://github.com/bazelbuild/remote-apis/archive/b5123b1bb2853393c7b9aa43236db924d7e32d61.zip",
4240
)
4341

44-
http_archive(
45-
name = "bazel_skylib",
46-
sha256 = "2ea8a5ed2b448baf4a6855d3ce049c4c452a6470b1efd1504fdb7c1c134d220a",
47-
strip_prefix = "bazel-skylib-0.8.0",
48-
url = "https://github.com/bazelbuild/bazel-skylib/archive/0.8.0.tar.gz",
49-
)
50-
51-
# Download the rules_docker repository at release v0.10.1
42+
# Download the rules_docker repository at release v0.14.1
5243
http_archive(
5344
name = "io_bazel_rules_docker",
54-
patches = ["@build_buildfarm//third_party/rules_docker:rules_docker.patch"],
5545
patch_args = ["-p1"],
56-
sha256 = "df13123c44b4a4ff2c2f337b906763879d94871d16411bf82dcfeba892b58607",
57-
strip_prefix = "rules_docker-0.13.0",
58-
urls = ["https://github.com/bazelbuild/rules_docker/archive/v0.13.0.tar.gz"],
46+
patches = ["@build_buildfarm//third_party/rules_docker:rules_docker.patch"],
47+
sha256 = "dc97fccceacd4c6be14e800b2a00693d5e8d07f69ee187babfd04a80a9f8e250",
48+
strip_prefix = "rules_docker-0.14.1",
49+
urls = ["https://github.com/bazelbuild/rules_docker/archive/v0.14.1.tar.gz"],
5950
)
6051

6152
http_jar(
@@ -70,17 +61,6 @@ load("//3rdparty:workspace.bzl", "maven_dependencies")
7061

7162
maven_dependencies()
7263

73-
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
74-
75-
protobuf_deps()
76-
77-
load("@io_grpc_grpc_java//:repositories.bzl", "grpc_java_repositories")
78-
79-
grpc_java_repositories(
80-
omit_com_google_guava = True,
81-
omit_com_google_guava_failureaccess = True,
82-
)
83-
8464
load("@remote_apis//:repository_rules.bzl", "switched_rules_by_language")
8565

8666
switched_rules_by_language(
@@ -114,6 +94,17 @@ container_pull(
11494
repository = "distroless/java",
11595
)
11696

97+
load("@io_grpc_grpc_java//:repositories.bzl", "grpc_java_repositories")
98+
99+
grpc_java_repositories(
100+
omit_com_google_guava = True,
101+
omit_com_google_guava_failureaccess = True,
102+
)
103+
104+
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
105+
106+
protobuf_deps()
107+
117108
bind(
118109
name = "jar/redis/clients/jedis",
119110
actual = "@jedis//jar",

‎third_party/io_grpc_grpc_java/7461ef983d.patch

+307
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,307 @@
1+
commit 7461ef983d681f592a27a98cb4f364295332789a
2+
Author: Eric Anderson <[email protected]>
3+
Date: Wed Dec 18 09:36:24 2019 -0800
4+
5+
bazel: Use https to download from Maven Central
6+
7+
central.maven.org shouldn't have been used in the first place as it isn't one
8+
of the canonical URLs to Maven Central, but even more importantly we want to
9+
use https. The previous URL will probably stop working January 15, 2020[1][2].
10+
11+
Fixes #6536
12+
13+
1. https://central.sonatype.org/articles/2019/Apr/30/http-access-to-repo1mavenorg-and-repomavenapacheorg-is-being-deprecated/
14+
2. https://central.sonatype.org/articles/2019/Nov/15/non-canonical-urls-will-be-redirected-today/
15+
16+
diff --git a/repositories.bzl b/repositories.bzl
17+
index f5e9e6bf7..f54019238 100644
18+
--- a/repositories.bzl
19+
+++ b/repositories.bzl
20+
@@ -165,7 +165,7 @@ def com_google_android_annotations():
21+
jvm_maven_import_external(
22+
name = "com_google_android_annotations",
23+
artifact = "com.google.android:annotations:4.1.1.4",
24+
- server_urls = ["http://central.maven.org/maven2"],
25+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
26+
artifact_sha256 = "ba734e1e84c09d615af6a09d33034b4f0442f8772dec120efb376d86a565ae15",
27+
licenses = ["notice"], # Apache 2.0
28+
)
29+
@@ -174,7 +174,7 @@ def com_google_api_grpc_google_common_protos():
30+
jvm_maven_import_external(
31+
name = "com_google_api_grpc_proto_google_common_protos",
32+
artifact = "com.google.api.grpc:proto-google-common-protos:1.12.0",
33+
- server_urls = ["http://central.maven.org/maven2"],
34+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
35+
artifact_sha256 = "bd60cd7a423b00fb824c27bdd0293aaf4781be1daba6ed256311103fb4b84108",
36+
licenses = ["notice"], # Apache 2.0
37+
)
38+
@@ -183,7 +183,7 @@ def com_google_auth_google_auth_library_credentials():
39+
jvm_maven_import_external(
40+
name = "com_google_auth_google_auth_library_credentials",
41+
artifact = "com.google.auth:google-auth-library-credentials:0.18.0",
42+
- server_urls = ["http://central.maven.org/maven2"],
43+
+ server_urls = ["https://central.maven.org/maven2"],
44+
artifact_sha256 = "2377b149dbf63f000f96b66f5dc0f07b9da3928f5e3f31973f2d21fcb63ce6ff",
45+
licenses = ["notice"], # BSD 3-clause
46+
)
47+
@@ -192,7 +192,7 @@ def com_google_auth_google_auth_library_oauth2_http():
48+
jvm_maven_import_external(
49+
name = "com_google_auth_google_auth_library_oauth2_http",
50+
artifact = "com.google.auth:google-auth-library-oauth2-http:0.18.0",
51+
- server_urls = ["http://central.maven.org/maven2"],
52+
+ server_urls = ["https://central.maven.org/maven2"],
53+
artifact_sha256 = "2f13eff0105debe54a91851684b78dd5a0f3839fae5acaa8ba7959c004c050d0",
54+
licenses = ["notice"], # BSD 3-clause
55+
)
56+
@@ -201,7 +201,7 @@ def com_google_code_findbugs_jsr305():
57+
jvm_maven_import_external(
58+
name = "com_google_code_findbugs_jsr305",
59+
artifact = "com.google.code.findbugs:jsr305:3.0.2",
60+
- server_urls = ["http://central.maven.org/maven2"],
61+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
62+
artifact_sha256 = "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7",
63+
licenses = ["notice"], # Apache 2.0
64+
)
65+
@@ -210,7 +210,7 @@ def com_google_code_gson():
66+
jvm_maven_import_external(
67+
name = "com_google_code_gson_gson",
68+
artifact = "com.google.code.gson:gson:jar:2.8.6",
69+
- server_urls = ["http://central.maven.org/maven2"],
70+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
71+
artifact_sha256 = "c8fb4839054d280b3033f800d1f5a97de2f028eb8ba2eb458ad287e536f3f25f",
72+
licenses = ["notice"], # Apache 2.0
73+
)
74+
@@ -219,7 +219,7 @@ def com_google_errorprone_error_prone_annotations():
75+
jvm_maven_import_external(
76+
name = "com_google_errorprone_error_prone_annotations",
77+
artifact = "com.google.errorprone:error_prone_annotations:2.3.3",
78+
- server_urls = ["http://central.maven.org/maven2"],
79+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
80+
artifact_sha256 = "ec59f1b702d9afc09e8c3929f5c42777dec623a6ea2731ac694332c7d7680f5a",
81+
licenses = ["notice"], # Apache 2.0
82+
)
83+
@@ -228,7 +228,7 @@ def com_google_guava():
84+
jvm_maven_import_external(
85+
name = "com_google_guava_guava",
86+
artifact = "com.google.guava:guava:28.1-android",
87+
- server_urls = ["http://central.maven.org/maven2"],
88+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
89+
artifact_sha256 = "e112ce92c0f0733965eede73d94589c59a72128b06b08bba5ebe2f9ea672ef60",
90+
licenses = ["notice"], # Apache 2.0
91+
)
92+
@@ -238,7 +238,7 @@ def com_google_guava_failureaccess():
93+
jvm_maven_import_external(
94+
name = "com_google_guava_failureaccess",
95+
artifact = "com.google.guava:failureaccess:1.0.1",
96+
- server_urls = ["http://central.maven.org/maven2"],
97+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
98+
artifact_sha256 = "a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26",
99+
licenses = ["notice"], # Apache 2.0
100+
)
101+
@@ -247,7 +247,7 @@ def com_google_j2objc_j2objc_annotations():
102+
jvm_maven_import_external(
103+
name = "com_google_j2objc_j2objc_annotations",
104+
artifact = "com.google.j2objc:j2objc-annotations:1.3",
105+
- server_urls = ["http://central.maven.org/maven2"],
106+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
107+
artifact_sha256 = "21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b",
108+
licenses = ["notice"], # Apache 2.0
109+
)
110+
@@ -276,7 +276,7 @@ def com_google_truth_truth():
111+
jvm_maven_import_external(
112+
name = "com_google_truth_truth",
113+
artifact = "com.google.truth:truth:1.0",
114+
- server_urls = ["http://central.maven.org/maven2"],
115+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
116+
artifact_sha256 = "edaa12f3b581fcf1c07311e94af8766919c4f3d904b00d3503147b99bf5b4004",
117+
licenses = ["notice"], # Apache 2.0
118+
)
119+
@@ -285,7 +285,7 @@ def com_squareup_okhttp():
120+
jvm_maven_import_external(
121+
name = "com_squareup_okhttp_okhttp",
122+
artifact = "com.squareup.okhttp:okhttp:2.5.0",
123+
- server_urls = ["http://central.maven.org/maven2"],
124+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
125+
artifact_sha256 = "1cc716e29539adcda677949508162796daffedb4794cbf947a6f65e696f0381c",
126+
licenses = ["notice"], # Apache 2.0
127+
)
128+
@@ -294,7 +294,7 @@ def com_squareup_okio():
129+
jvm_maven_import_external(
130+
name = "com_squareup_okio_okio",
131+
artifact = "com.squareup.okio:okio:1.13.0",
132+
- server_urls = ["http://central.maven.org/maven2"],
133+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
134+
artifact_sha256 = "734269c3ebc5090e3b23566db558f421f0b4027277c79ad5d176b8ec168bb850",
135+
licenses = ["notice"], # Apache 2.0
136+
)
137+
@@ -311,7 +311,7 @@ def io_netty_buffer():
138+
jvm_maven_import_external(
139+
name = "io_netty_netty_buffer",
140+
artifact = "io.netty:netty-buffer:4.1.42.Final",
141+
- server_urls = ["http://central.maven.org/maven2"],
142+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
143+
artifact_sha256 = "7b0171a4e8bcd573e08d9f2bba053c67b557ab5012106a5982ccbae5743814c0",
144+
licenses = ["notice"], # Apache 2.0
145+
)
146+
@@ -320,7 +320,7 @@ def io_netty_codec():
147+
jvm_maven_import_external(
148+
name = "io_netty_netty_codec",
149+
artifact = "io.netty:netty-codec:4.1.42.Final",
150+
- server_urls = ["http://central.maven.org/maven2"],
151+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
152+
artifact_sha256 = "e96ced697fb7df589da7c20c995e01f75a9cb246be242bbc4cd3b4af424ff189",
153+
licenses = ["notice"], # Apache 2.0
154+
)
155+
@@ -329,7 +329,7 @@ def io_netty_codec_http():
156+
jvm_maven_import_external(
157+
name = "io_netty_netty_codec_http",
158+
artifact = "io.netty:netty-codec-http:4.1.42.Final",
159+
- server_urls = ["http://central.maven.org/maven2"],
160+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
161+
artifact_sha256 = "eb349c0f1b249af7c7a8fbbd1c761d65d9bc230880cd8d37feab9e8278292625",
162+
licenses = ["notice"], # Apache 2.0
163+
)
164+
@@ -338,7 +338,7 @@ def io_netty_codec_http2():
165+
jvm_maven_import_external(
166+
name = "io_netty_netty_codec_http2",
167+
artifact = "io.netty:netty-codec-http2:4.1.42.Final",
168+
- server_urls = ["http://central.maven.org/maven2"],
169+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
170+
artifact_sha256 = "8bac9625eb68635396eb0c13c9cc0b22bde7c83d0cd2dae3fe9b6f9cf929e372",
171+
licenses = ["notice"], # Apache 2.0
172+
)
173+
@@ -347,7 +347,7 @@ def io_netty_codec_socks():
174+
jvm_maven_import_external(
175+
name = "io_netty_netty_codec_socks",
176+
artifact = "io.netty:netty-codec-socks:4.1.42.Final",
177+
- server_urls = ["http://central.maven.org/maven2"],
178+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
179+
artifact_sha256 = "7f14b3a95ee9aa5a26f66af668690578a81a883683ac1c4ca9e9afdf4d4c7894",
180+
licenses = ["notice"], # Apache 2.0
181+
)
182+
@@ -356,7 +356,7 @@ def io_netty_common():
183+
jvm_maven_import_external(
184+
name = "io_netty_netty_common",
185+
artifact = "io.netty:netty-common:4.1.42.Final",
186+
- server_urls = ["http://central.maven.org/maven2"],
187+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
188+
artifact_sha256 = "3d0a918d78292eeca02a7bb2188daa4e5053b6e29b71e6308309033e121242b5",
189+
licenses = ["notice"], # Apache 2.0
190+
)
191+
@@ -365,7 +365,7 @@ def io_netty_handler():
192+
jvm_maven_import_external(
193+
name = "io_netty_netty_handler",
194+
artifact = "io.netty:netty-handler:4.1.42.Final",
195+
- server_urls = ["http://central.maven.org/maven2"],
196+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
197+
artifact_sha256 = "11eda86500c33b9d386719b5419f513fd9c097d13894f25dd0c75b610d636e03",
198+
licenses = ["notice"], # Apache 2.0
199+
)
200+
@@ -374,7 +374,7 @@ def io_netty_handler_proxy():
201+
jvm_maven_import_external(
202+
name = "io_netty_netty_handler_proxy",
203+
artifact = "io.netty:netty-handler-proxy:4.1.42.Final",
204+
- server_urls = ["http://central.maven.org/maven2"],
205+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
206+
artifact_sha256 = "25f22da21c29ab0d3b6b889412351bcfc5f9ccd42e07d2d5513d5c4eb571f343",
207+
licenses = ["notice"], # Apache 2.0
208+
)
209+
@@ -383,7 +383,7 @@ def io_netty_resolver():
210+
jvm_maven_import_external(
211+
name = "io_netty_netty_resolver",
212+
artifact = "io.netty:netty-resolver:4.1.42.Final",
213+
- server_urls = ["http://central.maven.org/maven2"],
214+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
215+
artifact_sha256 = "89768242b6b7cce9bd9f5945ad21d1b4bae515c6b1bf03a8af5d1899779cebc9",
216+
licenses = ["notice"], # Apache 2.0
217+
)
218+
@@ -392,7 +392,7 @@ def io_netty_tcnative_boringssl_static():
219+
jvm_maven_import_external(
220+
name = "io_netty_netty_tcnative_boringssl_static",
221+
artifact = "io.netty:netty-tcnative-boringssl-static:2.0.26.Final",
222+
- server_urls = ["http://central.maven.org/maven2"],
223+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
224+
artifact_sha256 = "5f074a4b112bf7d087331e33d2da720745c5bda047b34b64bd70aaaae4de24c6",
225+
licenses = ["notice"], # Apache 2.0
226+
)
227+
@@ -401,7 +401,7 @@ def io_netty_transport():
228+
jvm_maven_import_external(
229+
name = "io_netty_netty_transport",
230+
artifact = "io.netty:netty-transport:4.1.42.Final",
231+
- server_urls = ["http://central.maven.org/maven2"],
232+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
233+
artifact_sha256 = "dfa817a156ea263aa9ad8364a2e226527665c9722aca40a7945f228c2c14f1da",
234+
licenses = ["notice"], # Apache 2.0
235+
)
236+
@@ -410,7 +410,7 @@ def io_netty_transport_native_epoll():
237+
jvm_maven_import_external(
238+
name = "io_netty_netty_transport_native_epoll",
239+
artifact = "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.42.Final",
240+
- server_urls = ["http://central.maven.org/maven2"],
241+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
242+
artifact_sha256 = "7bdf3003d5b60b061b494e62d1bafc420caf800efb743b14ec01ceaef1d3fa3e",
243+
licenses = ["notice"], # Apache 2.0
244+
)
245+
@@ -419,7 +419,7 @@ def io_opencensus_api():
246+
jvm_maven_import_external(
247+
name = "io_opencensus_opencensus_api",
248+
artifact = "io.opencensus:opencensus-api:0.24.0",
249+
- server_urls = ["http://central.maven.org/maven2"],
250+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
251+
artifact_sha256 = "f561b1cc2673844288e596ddf5bb6596868a8472fd2cb8993953fc5c034b2352",
252+
licenses = ["notice"], # Apache 2.0
253+
)
254+
@@ -428,7 +428,7 @@ def io_opencensus_grpc_metrics():
255+
jvm_maven_import_external(
256+
name = "io_opencensus_opencensus_contrib_grpc_metrics",
257+
artifact = "io.opencensus:opencensus-contrib-grpc-metrics:0.24.0",
258+
- server_urls = ["http://central.maven.org/maven2"],
259+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
260+
artifact_sha256 = "875582e093f11950ad3f4a50b5fee33a008023f7d1e47820a1bef05d23b9ed42",
261+
licenses = ["notice"], # Apache 2.0
262+
)
263+
@@ -437,7 +437,7 @@ def io_perfmark():
264+
jvm_maven_import_external(
265+
name = "io_perfmark_perfmark_api",
266+
artifact = "io.perfmark:perfmark-api:0.19.0",
267+
- server_urls = ["http://central.maven.org/maven2"],
268+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
269+
artifact_sha256 = "b734ba2149712409a44eabdb799f64768578fee0defe1418bb108fe32ea43e1a",
270+
licenses = ["notice"], # Apache 2.0
271+
)
272+
@@ -447,7 +447,7 @@ def javax_annotation():
273+
jvm_maven_import_external(
274+
name = "javax_annotation_javax_annotation_api",
275+
artifact = "javax.annotation:javax.annotation-api:1.2",
276+
- server_urls = ["http://central.maven.org/maven2"],
277+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
278+
artifact_sha256 = "5909b396ca3a2be10d0eea32c74ef78d816e1b4ead21de1d78de1f890d033e04",
279+
licenses = ["reciprocal"], # CDDL License
280+
)
281+
@@ -456,7 +456,7 @@ def junit_junit():
282+
jvm_maven_import_external(
283+
name = "junit_junit",
284+
artifact = "junit:junit:4.12",
285+
- server_urls = ["http://central.maven.org/maven2"],
286+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
287+
artifact_sha256 = "59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a",
288+
licenses = ["notice"], # EPL 1.0
289+
)
290+
@@ -465,7 +465,7 @@ def org_apache_commons_lang3():
291+
jvm_maven_import_external(
292+
name = "org_apache_commons_commons_lang3",
293+
artifact = "org.apache.commons:commons-lang3:3.5",
294+
- server_urls = ["http://central.maven.org/maven2"],
295+
+ server_urls = ["https://repo.maven.apache.org/maven2/"],
296+
artifact_sha256 = "8ac96fc686512d777fca85e144f196cd7cfe0c0aec23127229497d1a38ff651c",
297+
licenses = ["notice"], # Apache 2.0
298+
)
299+
@@ -474,7 +474,7 @@ def org_codehaus_mojo_animal_sniffer_annotations():
300+
jvm_maven_import_external(
301+
name = "org_codehaus_mojo_animal_sniffer_annotations",
302+
artifact = "org.codehaus.mojo:animal-sniffer-annotations:1.17",
303+
- server_urls = ["http://central.maven.org/maven2"],
304+
+ server_urls = ["https://central.maven.org/maven2"],
305+
artifact_sha256 = "92654f493ecfec52082e76354f0ebf87648dc3d5cec2e3c3cdb947c016747a53",
306+
licenses = ["notice"], # MIT
307+
)

‎third_party/io_grpc_grpc_java/BUILD

Whitespace-only changes.

0 commit comments

Comments
 (0)