Skip to content

Commit

Permalink
Update bazel-deps to HEAD
Browse files Browse the repository at this point in the history
This removes our dependency on the deprecated native maven_jar rule:
bazelbuild/bazel#6799

All changes except maven_dependencies.yaml are generated by the tool.

At the same time, remove missing-jar-workaround.sh, which I haven't
needed for some time.

Change-Id: I22e15e340d98183156ef5942d0a11f4a759c6baa
  • Loading branch information
drigz committed Feb 22, 2019
1 parent c7d3582 commit 525db49
Show file tree
Hide file tree
Showing 19 changed files with 329 additions and 209 deletions.
36 changes: 0 additions & 36 deletions scripts/missing-jar-workaround.sh

This file was deleted.

18 changes: 15 additions & 3 deletions third_party/java/com/google/api/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ licenses(["notice"])
java_library(
name = "api_common",
exports = [
"//external:jar/com/google/api/api_common"
"//external:jar/com/google/api/api_common",
"//third_party/java/com/google/code/findbugs:jsr305",
"//third_party/java/com/google/guava:guava"
],
visibility = [
"//third_party/java:__subpackages__"
Expand All @@ -17,7 +19,10 @@ java_library(
exports = [
"//external:jar/com/google/api/gax",
"//third_party/java/com/google/auth:google_auth_library_oauth2_http",
"//third_party/java/org/threeten:threetenbp"
"//third_party/java/com/google/code/findbugs:jsr305",
"//third_party/java/com/google/guava:guava",
"//third_party/java/org/threeten:threetenbp",
":api_common"
],
visibility = [
"//third_party/java:__subpackages__"
Expand All @@ -30,8 +35,15 @@ java_library(
name = "gax_httpjson",
exports = [
"//external:jar/com/google/api/gax_httpjson",
"//third_party/java/com/google/auth:google_auth_library_credentials",
"//third_party/java/com/google/auth:google_auth_library_oauth2_http",
"//third_party/java/com/google/code/findbugs:jsr305",
"//third_party/java/com/google/code/gson:gson",
"//third_party/java/org/threeten:threetenbp"
"//third_party/java/com/google/guava:guava",
"//third_party/java/com/google/http_client:google_http_client",
"//third_party/java/org/threeten:threetenbp",
":api_common",
":gax"
],
visibility = [
"//third_party/java:__subpackages__"
Expand Down
12 changes: 9 additions & 3 deletions third_party/java/com/google/api/grpc/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ java_library(
name = "proto_google_cloud_datastore_v1",
exports = [
"//external:jar/com/google/api/grpc/proto_google_cloud_datastore_v1",
"//third_party/java/com/google/protobuf:protobuf_java"
"//third_party/java/com/google/api:api_common",
"//third_party/java/com/google/protobuf:protobuf_java",
":proto_google_common_protos"
],
visibility = [
"//third_party/java:__subpackages__"
Expand All @@ -16,7 +18,8 @@ java_library(
java_library(
name = "proto_google_common_protos",
exports = [
"//external:jar/com/google/api/grpc/proto_google_common_protos"
"//external:jar/com/google/api/grpc/proto_google_common_protos",
"//third_party/java/com/google/protobuf:protobuf_java"
],
visibility = [
"//third_party/java:__subpackages__"
Expand All @@ -28,7 +31,10 @@ java_library(
java_library(
name = "proto_google_iam_v1",
exports = [
"//external:jar/com/google/api/grpc/proto_google_iam_v1"
"//external:jar/com/google/api/grpc/proto_google_iam_v1",
"//third_party/java/com/google/api:api_common",
"//third_party/java/com/google/protobuf:protobuf_java",
":proto_google_common_protos"
],
visibility = [
"//third_party/java:__subpackages__"
Expand Down
8 changes: 7 additions & 1 deletion third_party/java/com/google/cloud/datastore/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ java_library(
name = "datastore_v1_proto_client",
exports = [
"//external:jar/com/google/cloud/datastore/datastore_v1_proto_client",
"//third_party/java/com/google/http_client:google_http_client_protobuf"
"//third_party/java/com/google/api/grpc:proto_google_cloud_datastore_v1",
"//third_party/java/com/google/api_client:google_api_client",
"//third_party/java/com/google/guava:guava",
"//third_party/java/com/google/http_client:google_http_client",
"//third_party/java/com/google/http_client:google_http_client_jackson",
"//third_party/java/com/google/http_client:google_http_client_protobuf",
"//third_party/java/com/google/oauth_client:google_oauth_client"
],
visibility = [
"//third_party/java:__subpackages__"
Expand Down
11 changes: 9 additions & 2 deletions third_party/java/com/google/dagger/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@ java_library(
name = "dagger_producers",
exports = [
"//external:jar/com/google/dagger/dagger_producers",
"//third_party/java/org/checkerframework:checker_compat_qual"
"//third_party/java/com/google/guava:guava",
"//third_party/java/javax/inject:javax_inject",
"//third_party/java/org/checkerframework:checker_compat_qual",
":dagger"
],
visibility = [
"//third_party/java:__subpackages__"
Expand All @@ -49,7 +52,11 @@ java_library(
java_library(
name = "dagger_spi",
exports = [
"//external:jar/com/google/dagger/dagger_spi"
"//external:jar/com/google/dagger/dagger_spi",
"//third_party/java/com/google/guava:guava",
"//third_party/java/javax/inject:javax_inject",
":dagger",
":dagger_producers"
],
visibility = [
"//third_party/java:__subpackages__"
Expand Down
3 changes: 2 additions & 1 deletion third_party/java/com/google/googlejavaformat/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ java_library(
name = "google_java_format",
exports = [
"//external:jar/com/google/googlejavaformat/google_java_format",
"//third_party/java/com/google/errorprone:javac_shaded"
"//third_party/java/com/google/errorprone:javac_shaded",
"//third_party/java/com/google/guava:guava"
],
visibility = [
"//third_party/java:__subpackages__"
Expand Down
10 changes: 7 additions & 3 deletions third_party/java/com/google/http_client/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ java_library(
java_library(
name = "google_http_client_appengine",
exports = [
"//external:jar/com/google/http_client/google_http_client_appengine"
"//external:jar/com/google/http_client/google_http_client_appengine",
":google_http_client"
],
visibility = [
"//third_party/java:__subpackages__"
Expand All @@ -30,7 +31,8 @@ java_library(
name = "google_http_client_jackson",
exports = [
"//external:jar/com/google/http_client/google_http_client_jackson",
"//third_party/java/org/codehaus/jackson:jackson_core_asl"
"//third_party/java/org/codehaus/jackson:jackson_core_asl",
":google_http_client"
],
visibility = [
"//third_party/java:__subpackages__"
Expand All @@ -56,7 +58,9 @@ java_library(
java_library(
name = "google_http_client_protobuf",
exports = [
"//external:jar/com/google/http_client/google_http_client_protobuf"
"//external:jar/com/google/http_client/google_http_client_protobuf",
"//third_party/java/com/google/protobuf:protobuf_java",
":google_http_client"
],
visibility = [
"//third_party/java:__subpackages__"
Expand Down
1 change: 1 addition & 0 deletions third_party/java/com/google/protobuf/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ java_library(
exports = [
"//external:jar/com/google/protobuf/protobuf_java_util",
"//third_party/java/com/google/code/gson:gson",
"//third_party/java/com/google/guava:guava",
":protobuf_java"
],
visibility = [
Expand Down
3 changes: 2 additions & 1 deletion third_party/java/com/squareup/okhttp3/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ licenses(["notice"])
java_library(
name = "logging_interceptor",
exports = [
"//external:jar/com/squareup/okhttp3/logging_interceptor"
"//external:jar/com/squareup/okhttp3/logging_interceptor",
":okhttp"
],
visibility = [
"//third_party/java:__subpackages__"
Expand Down
4 changes: 3 additions & 1 deletion third_party/java/io/fabric8/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ java_library(
java_library(
name = "zjsonpatch",
exports = [
"//external:jar/io/fabric8/zjsonpatch"
"//external:jar/io/fabric8/zjsonpatch",
"//third_party/java/com/fasterxml/jackson/core:jackson_core",
"//third_party/java/com/fasterxml/jackson/core:jackson_databind"
],
visibility = [
"//third_party/java:__subpackages__"
Expand Down
7 changes: 5 additions & 2 deletions third_party/java/io/grpc/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@ java_library(
java_library(
name = "grpc_protobuf_lite",
exports = [
"//external:jar/io/grpc/grpc_protobuf_lite"
"//external:jar/io/grpc/grpc_protobuf_lite",
"//third_party/java/com/google/guava:guava",
":grpc_core"
],
visibility = [
"//third_party/java:__subpackages__"
Expand Down Expand Up @@ -95,7 +97,8 @@ java_library(
java_library(
name = "grpc_stub",
exports = [
"//external:jar/io/grpc/grpc_stub"
"//external:jar/io/grpc/grpc_stub",
":grpc_core"
],
visibility = [
"//third_party/java:__subpackages__"
Expand Down
15 changes: 11 additions & 4 deletions third_party/java/io/netty/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ java_library(
java_library(
name = "netty_codec",
exports = [
"//external:jar/io/netty/netty_codec"
"//external:jar/io/netty/netty_codec",
":netty_transport"
],
visibility = [
"//third_party/java:__subpackages__"
Expand Down Expand Up @@ -55,7 +56,8 @@ java_library(
java_library(
name = "netty_codec_socks",
exports = [
"//external:jar/io/netty/netty_codec_socks"
"//external:jar/io/netty/netty_codec_socks",
":netty_codec"
],
visibility = [
"//third_party/java:__subpackages__"
Expand All @@ -80,7 +82,9 @@ java_library(
name = "netty_handler",
exports = [
"//external:jar/io/netty/netty_handler",
":netty_buffer"
":netty_buffer",
":netty_codec",
":netty_transport"
],
visibility = [
"//third_party/java:__subpackages__"
Expand All @@ -93,6 +97,7 @@ java_library(
name = "netty_handler_proxy",
exports = [
"//external:jar/io/netty/netty_handler_proxy",
":netty_codec_http",
":netty_codec_socks",
":netty_transport"
],
Expand All @@ -106,7 +111,8 @@ java_library(
java_library(
name = "netty_resolver",
exports = [
"//external:jar/io/netty/netty_resolver"
"//external:jar/io/netty/netty_resolver",
":netty_common"
],
visibility = [
"//third_party/java:__subpackages__"
Expand All @@ -119,6 +125,7 @@ java_library(
name = "netty_transport",
exports = [
"//external:jar/io/netty/netty_transport",
":netty_buffer",
":netty_resolver"
],
visibility = [
Expand Down
6 changes: 5 additions & 1 deletion third_party/java/io/opencensus/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ java_library(
java_library(
name = "opencensus_contrib_http_util",
exports = [
"//external:jar/io/opencensus/opencensus_contrib_http_util"
"//external:jar/io/opencensus/opencensus_contrib_http_util",
"//third_party/java/com/google/code/findbugs:jsr305",
"//third_party/java/com/google/errorprone:error_prone_annotations",
"//third_party/java/com/google/guava:guava",
":opencensus_api"
],
visibility = [
"//third_party/java:__subpackages__"
Expand Down
3 changes: 2 additions & 1 deletion third_party/java/io/prometheus/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ java_library(
java_library(
name = "simpleclient_common",
exports = [
"//external:jar/io/prometheus/simpleclient_common"
"//external:jar/io/prometheus/simpleclient_common",
":simpleclient"
],
visibility = [
"//third_party/java:__subpackages__"
Expand Down
3 changes: 2 additions & 1 deletion third_party/java/io/sundr/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ java_library(
name = "sundr_codegen",
exports = [
"//external:jar/io/sundr/sundr_codegen",
"//third_party/java/org/apache/velocity:velocity"
"//third_party/java/org/apache/velocity:velocity",
":sundr_core"
],
visibility = [
"//third_party/java:__subpackages__"
Expand Down
3 changes: 2 additions & 1 deletion third_party/java/org/junit/platform/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ licenses(["notice"])
java_library(
name = "junit_platform_commons",
exports = [
"//external:jar/org/junit/platform/junit_platform_commons"
"//external:jar/org/junit/platform/junit_platform_commons",
"//third_party/java/org/apiguardian:apiguardian_api"
],
visibility = [
"//third_party/java:__subpackages__"
Expand Down
3 changes: 2 additions & 1 deletion third_party/java/org/slf4j/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ licenses(["notice"])
java_library(
name = "jul_to_slf4j",
exports = [
"//external:jar/org/slf4j/jul_to_slf4j"
"//external:jar/org/slf4j/jul_to_slf4j",
":slf4j_api"
],
visibility = [
"//third_party/java:__subpackages__"
Expand Down
Loading

0 comments on commit 525db49

Please sign in to comment.