Skip to content
This repository has been archived by the owner on Sep 26, 2023. It is now read-only.

Commit

Permalink
chore(deps): Add javax.annotations dependency in bazel build to gax-g…
Browse files Browse the repository at this point in the history
…rpc (#1000)

This is to solve java11 incompatibility issue.
Also use transitive dependencies directly from grpc for bazel.
  • Loading branch information
vam-google committed Mar 31, 2020
1 parent ad62e61 commit 7300468
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 16 deletions.
6 changes: 5 additions & 1 deletion WORKSPACE
Expand Up @@ -14,4 +14,8 @@ com_google_api_gax_java_repositories()

load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")

protobuf_deps()
protobuf_deps()

load("@io_grpc_grpc_java//:repositories.bzl", "grpc_java_repositories")

grpc_java_repositories()
15 changes: 0 additions & 15 deletions dependencies.properties
Expand Up @@ -54,21 +54,6 @@ maven.com_google_http_client_google_http_client_jackson2=com.google.http-client:
maven.com_fasterxml_jackson_core_jackson_core=com.fasterxml.jackson.core:jackson-core:2.10.1
maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-sniffer-annotations:1.18
maven.org_apache_commons_commons_lang3=org.apache.commons:commons-lang3:3.6
# Used by grpc stub
maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-api:1.3.2
maven.com_google_guava_failureaccess=com.google.guava:failureaccess:1.0.1
maven.io_perfmark_perfmark_api=io.perfmark:perfmark-api:0.17.0
maven.io_netty_netty_handler=io.netty:netty-handler:4.1.38.Final
maven.io_netty_netty_common=io.netty:netty-common:4.1.38.Final
maven.io_netty_netty_transport=io.netty:netty-transport:4.1.38.Final
maven.io_netty_netty_codec=io.netty:netty-codec:4.1.38.Final
maven.io_netty_netty_buffer=io.netty:netty-buffer:4.1.38.Final
maven.io_netty_netty_codec_http=io.netty:netty-codec-http:4.1.38.Final
maven.io_netty_netty_codec_http2=io.netty:netty-codec-http2:4.1.38.Final
maven.io_netty_netty_codec_socks=io.netty:netty-codec-socks:4.1.38.Final
maven.io_netty_netty_handler_proxy=io.netty:netty-handler-proxy:4.1.38.Final
maven.io_netty_netty_resolver=io.netty:netty-resolver:4.1.38.Final
maven.io_netty_netty_tcnative_boringssl_static=io.netty:netty-tcnative-boringssl-static:2.0.25.Final

# Testing maven artifacts
maven.junit_junit=junit:junit:4.13
Expand Down
1 change: 1 addition & 0 deletions gax-grpc/BUILD.bazel
Expand Up @@ -26,6 +26,7 @@ _COMPILE_DEPS = [
"@io_grpc_grpc_netty_shaded//jar",
"@io_grpc_grpc_java//alts:alts",
"@io_netty_netty_tcnative_boringssl_static//jar",
"@javax_annotation_javax_annotation_api//jar",
"//gax:gax",
]

Expand Down
1 change: 1 addition & 0 deletions gax-httpjson/BUILD.bazel
Expand Up @@ -18,6 +18,7 @@ _COMPILE_DEPS = [
"@com_google_api_api_common//jar",
"@com_google_auto_value_auto_value//jar",
"@com_google_http_client_google_http_client_jackson2//jar",
"@javax_annotation_javax_annotation_api//jar",
"//gax:gax",
]

Expand Down
1 change: 1 addition & 0 deletions gax/BUILD.bazel
Expand Up @@ -22,6 +22,7 @@ _COMPILE_DEPS = [
"@com_google_http_client_google_http_client_jackson2//jar",
"@com_fasterxml_jackson_core_jackson_core//jar",
"@com_google_guava_failureaccess//jar",
"@javax_annotation_javax_annotation_api//jar",
]

_TEST_COMPILE_DEPS = [
Expand Down

0 comments on commit 7300468

Please sign in to comment.