aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--context/BUILD.bazel4
-rw-r--r--core/BUILD.bazel14
-rw-r--r--examples/BUILD.bazel4
-rw-r--r--java_grpc_library.bzl2
-rw-r--r--netty/BUILD.bazel22
-rw-r--r--okhttp/BUILD.bazel6
-rw-r--r--protobuf-lite/BUILD.bazel2
-rw-r--r--protobuf-nano/BUILD.bazel2
-rw-r--r--protobuf/BUILD.bazel4
-rw-r--r--repositories.bzl36
-rw-r--r--stub/BUILD.bazel2
11 files changed, 49 insertions, 49 deletions
diff --git a/context/BUILD.bazel b/context/BUILD.bazel
index 88e216a13..53fcab2f9 100644
--- a/context/BUILD.bazel
+++ b/context/BUILD.bazel
@@ -7,7 +7,7 @@ java_library(
deps = [
"@com_google_code_findbugs_jsr305//jar",
"@com_google_errorprone_error_prone_annotations//jar",
- "@com_google_guava//jar",
- "@com_google_instrumentation_api//jar",
+ "@com_google_guava_guava//jar",
+ "@com_google_instrumentation_instrumentation_api//jar",
],
)
diff --git a/core/BUILD.bazel b/core/BUILD.bazel
index 40eed3bea..2b8f75b7b 100644
--- a/core/BUILD.bazel
+++ b/core/BUILD.bazel
@@ -11,8 +11,8 @@ java_library(
"//context",
"@com_google_code_findbugs_jsr305//jar",
"@com_google_errorprone_error_prone_annotations//jar",
- "@com_google_guava//jar",
- "@com_google_instrumentation_api//jar",
+ "@com_google_guava_guava//jar",
+ "@com_google_instrumentation_instrumentation_api//jar",
],
)
@@ -26,7 +26,7 @@ java_library(
":internal",
":core",
"@com_google_code_findbugs_jsr305//jar",
- "@com_google_guava//jar",
+ "@com_google_guava_guava//jar",
],
)
@@ -41,9 +41,9 @@ java_library(
"//context",
"@com_google_code_findbugs_jsr305//jar",
"@com_google_errorprone_error_prone_annotations//jar",
- "@com_google_guava//jar",
- "@com_google_instrumentation_api//jar",
- "@io_opencensus_api//jar",
+ "@com_google_guava_guava//jar",
+ "@com_google_instrumentation_instrumentation_api//jar",
+ "@com_google_code_gson_gson//jar",
],
)
@@ -57,6 +57,6 @@ java_library(
":core",
":internal",
"@com_google_code_findbugs_jsr305//jar",
- "@com_google_guava//jar",
+ "@com_google_guava_guava//jar",
],
)
diff --git a/examples/BUILD.bazel b/examples/BUILD.bazel
index 9255676a8..dab4ed630 100644
--- a/examples/BUILD.bazel
+++ b/examples/BUILD.bazel
@@ -46,9 +46,9 @@ java_library(
":helloworld_java_proto",
":route_guide_java_grpc",
":route_guide_java_proto",
- "@com_google_api_grpc_google_common_protos//jar",
+ "@com_google_api_grpc_proto_google_common_protos//jar",
"@com_google_code_findbugs_jsr305//jar",
- "@com_google_guava//jar",
+ "@com_google_guava_guava//jar",
"@com_google_protobuf_java//:protobuf_java",
"@com_google_protobuf_java//:protobuf_java_util",
"@grpc_java//core",
diff --git a/java_grpc_library.bzl b/java_grpc_library.bzl
index 008457e48..c227e6c92 100644
--- a/java_grpc_library.bzl
+++ b/java_grpc_library.bzl
@@ -110,7 +110,7 @@ def java_grpc_library(name, srcs, deps, flavor=None,
"@grpc_java//core",
"@grpc_java//stub",
"@grpc_java//protobuf",
- "@com_google_guava//jar",
+ "@com_google_guava_guava//jar",
]
if flavor == "normal":
added_deps += ["@com_google_protobuf_java//:protobuf_java"]
diff --git a/netty/BUILD.bazel b/netty/BUILD.bazel
index f238d4520..44c10f392 100644
--- a/netty/BUILD.bazel
+++ b/netty/BUILD.bazel
@@ -13,16 +13,16 @@ java_library(
"//core:internal",
"@com_google_code_findbugs_jsr305//jar",
"@com_google_errorprone_error_prone_annotations//jar",
- "@com_google_guava//jar",
- "@io_netty_buffer//jar",
- "@io_netty_codec//jar",
- "@io_netty_codec_http//jar",
- "@io_netty_codec_http2//jar",
- "@io_netty_codec_socks//jar",
- "@io_netty_common//jar",
- "@io_netty_handler//jar",
- "@io_netty_handler_proxy//jar",
- "@io_netty_resolver//jar",
- "@io_netty_transport//jar",
+ "@com_google_guava_guava//jar",
+ "@io_netty_netty_buffer//jar",
+ "@io_netty_netty_codec//jar",
+ "@io_netty_netty_codec_http//jar",
+ "@io_netty_netty_codec_http2//jar",
+ "@io_netty_netty_codec_socks//jar",
+ "@io_netty_netty_common//jar",
+ "@io_netty_netty_handler//jar",
+ "@io_netty_netty_handler_proxy//jar",
+ "@io_netty_netty_resolver//jar",
+ "@io_netty_netty_netty_transport//jar",
],
)
diff --git a/okhttp/BUILD.bazel b/okhttp/BUILD.bazel
index db88030c2..75b672101 100644
--- a/okhttp/BUILD.bazel
+++ b/okhttp/BUILD.bazel
@@ -12,8 +12,8 @@ java_library(
"//core",
"//core:internal",
"@com_google_code_findbugs_jsr305//jar",
- "@com_google_guava//jar",
- "@com_squareup_okhttp//jar",
- "@com_squareup_okio//jar",
+ "@com_google_guava_guava//jar",
+ "@com_squareup_okhttp_okhttp//jar",
+ "@com_squareup_okio_okio//jar",
],
)
diff --git a/protobuf-lite/BUILD.bazel b/protobuf-lite/BUILD.bazel
index 74939c2fe..f14d44859 100644
--- a/protobuf-lite/BUILD.bazel
+++ b/protobuf-lite/BUILD.bazel
@@ -9,7 +9,7 @@ java_library(
"//core",
"//core:internal",
"@com_google_code_findbugs_jsr305//jar",
- "@com_google_guava//jar",
+ "@com_google_guava_guava//jar",
"@com_google_protobuf_java//:protobuf_java",
],
)
diff --git a/protobuf-nano/BUILD.bazel b/protobuf-nano/BUILD.bazel
index 2fc1dd115..5854245a1 100644
--- a/protobuf-nano/BUILD.bazel
+++ b/protobuf-nano/BUILD.bazel
@@ -7,7 +7,7 @@ java_library(
deps = [
"//core",
"@com_google_code_findbugs_jsr305//jar",
- "@com_google_guava//jar",
+ "@com_google_guava_guava//jar",
"@com_google_protobuf_nano_protobuf_javanano//jar",
],
)
diff --git a/protobuf/BUILD.bazel b/protobuf/BUILD.bazel
index 29fc11c6e..69949ea44 100644
--- a/protobuf/BUILD.bazel
+++ b/protobuf/BUILD.bazel
@@ -7,9 +7,9 @@ java_library(
deps = [
"//core",
"//protobuf-lite:protobuf_lite",
- "@com_google_api_grpc_google_common_protos//jar",
+ "@com_google_api_grpc_proto_google_common_protos//jar",
"@com_google_code_findbugs_jsr305//jar",
- "@com_google_guava//jar",
+ "@com_google_guava_guava//jar",
"@com_google_protobuf_java//:protobuf_java",
"@com_google_protobuf_java//:protobuf_java_util",
],
diff --git a/repositories.bzl b/repositories.bzl
index 2f77c27ee..fa54e310d 100644
--- a/repositories.bzl
+++ b/repositories.bzl
@@ -73,7 +73,7 @@ def grpc_java_repositories(
io_opencensus_api()
native.bind(
name = "guava",
- actual = "@com_google_guava//jar",
+ actual = "@com_google_guava_guava//jar",
)
native.bind(
name = "gson",
@@ -82,7 +82,7 @@ def grpc_java_repositories(
def com_google_api_grpc_google_common_protos():
native.maven_jar(
- name = "com_google_api_grpc_google_common_protos",
+ name = "com_google_api_grpc_proto_google_common_protos",
artifact = "com.google.api.grpc:proto-google-common-protos:0.1.9",
sha1 = "3760f6a6e13c8ab070aa629876cdd183614ee877",
)
@@ -110,14 +110,14 @@ def com_google_errorprone_error_prone_annotations():
def com_google_guava():
native.maven_jar(
- name = "com_google_guava",
+ name = "com_google_guava_guava",
artifact = "com.google.guava:guava:19.0",
sha1 = "6ce200f6b23222af3d8abb6b6459e6c44f4bb0e9",
)
def com_google_instrumentation_api():
native.maven_jar(
- name = "com_google_instrumentation_api",
+ name = "com_google_instrumentation_instrumentation_api",
artifact = "com.google.instrumentation:instrumentation-api:0.4.3",
sha1 = "41614af3429573dc02645d541638929d877945a2",
)
@@ -152,98 +152,98 @@ def com_google_protobuf_nano_protobuf_javanano():
def com_squareup_okhttp():
native.maven_jar(
- name = "com_squareup_okhttp",
+ name = "com_squareup_okhttp_okhttp",
artifact = "com.squareup.okhttp:okhttp:2.5.0",
sha1 = "4de2b4ed3445c37ec1720a7d214712e845a24636",
)
def com_squareup_okio():
native.maven_jar(
- name = "com_squareup_okio",
+ name = "com_squareup_okio_okio",
artifact = "com.squareup.okio:okio:1.6.0",
sha1 = "98476622f10715998eacf9240d6b479f12c66143",
)
def io_netty_codec_http2():
native.maven_jar(
- name = "io_netty_codec_http2",
+ name = "io_netty_netty_codec_http2",
artifact = "io.netty:netty-codec-http2:4.1.14.Final",
sha1 = "00d2af27befab8e1abfbf37d1ac2a5185dce1dbe",
)
def io_netty_buffer():
native.maven_jar(
- name = "io_netty_buffer",
+ name = "io_netty_netty_buffer",
artifact = "io.netty:netty-buffer:4.1.14.Final",
sha1 = "71f0a707209b1356d924d6f8b2f415f8b8e1cf82",
)
def io_netty_common():
native.maven_jar(
- name = "io_netty_common",
+ name = "io_netty_netty_common",
artifact = "io.netty:netty-common:4.1.14.Final",
sha1 = "230ff063651295d2695c0b4e9411e22bbbb9c09d",
)
def io_netty_transport():
native.maven_jar(
- name = "io_netty_transport",
+ name = "io_netty_netty_netty_transport",
artifact = "io.netty:netty-transport:4.1.14.Final",
sha1 = "3ed6474f1289635fc0696ec37380e20f258950a2",
)
def io_netty_codec():
native.maven_jar(
- name = "io_netty_codec",
+ name = "io_netty_netty_codec",
artifact = "io.netty:netty-codec:4.1.14.Final",
sha1 = "b8573ae401f17e6927f158e4c446311bf0646173",
)
def io_netty_codec_socks():
native.maven_jar(
- name = "io_netty_codec_socks",
+ name = "io_netty_netty_codec_socks",
artifact = "io.netty:netty-codec-socks:4.1.14.Final",
sha1 = "b8d856c686ac960b9e9b9f8f9b4083978c161327",
)
def io_netty_codec_http():
native.maven_jar(
- name = "io_netty_codec_http",
+ name = "io_netty_netty_codec_http",
artifact = "io.netty:netty-codec-http:4.1.14.Final",
sha1 = "f287b593a37e516f98c9dae7337303e7254e8ea1",
)
def io_netty_handler():
native.maven_jar(
- name = "io_netty_handler",
+ name = "io_netty_netty_handler",
artifact = "io.netty:netty-handler:4.1.14.Final",
sha1 = "626a48b846736c944eb35dd9b0fe0435b76ebf93",
)
def io_netty_handler_proxy():
native.maven_jar(
- name = "io_netty_handler_proxy",
+ name = "io_netty_netty_handler_proxy",
artifact = "io.netty:netty-handler-proxy:4.1.14.Final",
sha1 = "9dbedd6cc6ab9299c927d0c73791d3d8fd76ac20",
)
def io_netty_resolver():
native.maven_jar(
- name = "io_netty_resolver",
+ name = "io_netty_netty_resolver",
artifact = "io.netty:netty-resolver:4.1.14.Final",
sha1 = "f91e0197522e7d33fce84b3dfd86ade15edb0006",
)
def io_netty_tcnative_boringssl_static():
native.maven_jar(
- name = "io_netty_tcnative_boringssl_static",
+ name = "io_netty_netty_tcnative_boringssl_static",
artifact = "io.netty:netty-tcnative-boringssl-static:2.0.5.Final",
sha1 = "321c1239ceb3faec04531ffcdeb1bc8e85408b12",
)
def io_opencensus_api():
native.maven_jar(
- name = "io_opencensus_api",
+ name = "com_google_code_gson_gson",
artifact = "io.opencensus:opencensus-api:0.5.1",
sha1 = "cbd0a716a7d85ac34b83d86b13f0a6655e45c2ba",
)
diff --git a/stub/BUILD.bazel b/stub/BUILD.bazel
index 24ee43461..92a4f2187 100644
--- a/stub/BUILD.bazel
+++ b/stub/BUILD.bazel
@@ -8,6 +8,6 @@ java_library(
"//context",
"//core",
"@com_google_code_findbugs_jsr305//jar",
- "@com_google_guava//jar",
+ "@com_google_guava_guava//jar",
],
)