From 659b32b6d37873f9448e45dfe7920251cdc5a92d Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Wed, 27 Mar 2024 13:52:06 -0700 Subject: [PATCH 1/5] Add grpc-java --- modules/grpc-java/1.62.2/MODULE.bazel | 198 +++ .../1.62.2/patches/add_module_bazel.patch | 203 +++ .../1.62.2/patches/maven_lockfile.patch | 1142 +++++++++++++++++ .../1.62.2/patches/update_labels.patch | 683 ++++++++++ modules/grpc-java/1.62.2/presubmit.yml | 9 + modules/grpc-java/1.62.2/source.json | 11 + modules/grpc-java/metadata.json | 16 + 7 files changed, 2262 insertions(+) create mode 100644 modules/grpc-java/1.62.2/MODULE.bazel create mode 100644 modules/grpc-java/1.62.2/patches/add_module_bazel.patch create mode 100644 modules/grpc-java/1.62.2/patches/maven_lockfile.patch create mode 100644 modules/grpc-java/1.62.2/patches/update_labels.patch create mode 100644 modules/grpc-java/1.62.2/presubmit.yml create mode 100644 modules/grpc-java/1.62.2/source.json create mode 100644 modules/grpc-java/metadata.json diff --git a/modules/grpc-java/1.62.2/MODULE.bazel b/modules/grpc-java/1.62.2/MODULE.bazel new file mode 100644 index 00000000000..5aa6c416218 --- /dev/null +++ b/modules/grpc-java/1.62.2/MODULE.bazel @@ -0,0 +1,198 @@ +module( + name = "grpc-java", + version = "1.62.2", + compatibility_level = 0, + repo_name = "io_grpc_grpc_java", +) + +bazel_dep(name = "grpc", version = "1.56.3.bcr.1", repo_name = "com_github_grpc_grpc") +bazel_dep(name = "protobuf", version = "23.1", repo_name = "com_google_protobuf") +bazel_dep(name = "rules_cc", version = "0.0.9") +bazel_dep(name = "rules_go", version = "0.46.0", repo_name = "io_bazel_rules_go") +bazel_dep(name = "rules_jvm_external", version = "6.0") +bazel_dep(name = "rules_proto", version = "5.3.0-21.7") + +non_module_deps = use_extension("//:repositories.bzl", "grpc_java_repositories_extension") +use_repo( + non_module_deps, + "com_github_cncf_xds", + "envoy_api", + "io_grpc_grpc_proto", +) + +grpc_repo_deps_ext = use_extension("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_repo_deps_ext") +use_repo( + grpc_repo_deps_ext, + "com_envoyproxy_protoc_gen_validate", + "com_github_cncf_udpa", + "opencensus_proto", +) + +bazel_dep(name = "googleapis", repo_name = "com_google_googleapis") + +maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") +maven.install( + name = "grpc_java_maven", + artifacts = [ + "com.google.android:annotations:4.1.1.4", + "com.google.api.grpc:proto-google-common-protos:2.29.0", + "com.google.auth:google-auth-library-credentials:1.4.0", + "com.google.auth:google-auth-library-oauth2-http:1.4.0", + "com.google.auto.value:auto-value-annotations:1.10.4", + "com.google.auto.value:auto-value:1.10.4", + "com.google.code.findbugs:jsr305:3.0.2", + "com.google.code.gson:gson:2.10.1", + "com.google.errorprone:error_prone_annotations:2.23.0", + "com.google.guava:failureaccess:1.0.1", + "com.google.guava:guava:32.1.3-android", + "com.google.re2j:re2j:1.7", + "com.google.truth:truth:1.1.5", + "com.squareup.okhttp:okhttp:2.7.5", + "com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day + "io.netty:netty-buffer:4.1.100.Final", + "io.netty:netty-codec-http2:4.1.100.Final", + "io.netty:netty-codec-http:4.1.100.Final", + "io.netty:netty-codec-socks:4.1.100.Final", + "io.netty:netty-codec:4.1.100.Final", + "io.netty:netty-common:4.1.100.Final", + "io.netty:netty-handler-proxy:4.1.100.Final", + "io.netty:netty-handler:4.1.100.Final", + "io.netty:netty-resolver:4.1.100.Final", + "io.netty:netty-tcnative-boringssl-static:2.0.61.Final", + "io.netty:netty-tcnative-classes:2.0.61.Final", + "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.100.Final", + "io.netty:netty-transport-native-unix-common:4.1.100.Final", + "io.netty:netty-transport:4.1.100.Final", + "io.opencensus:opencensus-api:0.31.0", + "io.opencensus:opencensus-contrib-grpc-metrics:0.31.0", + "io.perfmark:perfmark-api:0.26.0", + "junit:junit:4.13.2", + "org.apache.tomcat:annotations-api:6.0.53", + "org.codehaus.mojo:animal-sniffer-annotations:1.23", + ], + lock_file = "//:maven_install.json", + repositories = [ + "https://repo1.maven.org/maven2", + "https://maven.google.com", + ], +) +use_repo(maven, "grpc_java_maven", "unpinned_grpc_java_maven") +maven.override( + name = "grpc_java_maven", + coordinates = "com.google.protobuf:protobuf-java", + target = "@com_google_protobuf//:protobuf_java", +) +maven.override( + name = "grpc_java_maven", + coordinates = "com.google.protobuf:protobuf-java-util", + target = "@com_google_protobuf//:protobuf_java_util", +) +maven.override( + name = "grpc_java_maven", + coordinates = "com.google.protobuf:protobuf-javalite", + target = "@com_google_protobuf_javalite//:protobuf_javalite", +) +maven.override( + name = "grpc_java_maven", + coordinates = "io.grpc:grpc-alts", + target = "@io_grpc_grpc_java//alts", +) +maven.override( + name = "grpc_java_maven", + coordinates = "io.grpc:grpc-api", + target = "@io_grpc_grpc_java//api", +) +maven.override( + name = "grpc_java_maven", + coordinates = "io.grpc:grpc-auth", + target = "@io_grpc_grpc_java//auth", +) +maven.override( + name = "grpc_java_maven", + coordinates = "io.grpc:grpc-census", + target = "@io_grpc_grpc_java//census", +) +maven.override( + name = "grpc_java_maven", + coordinates = "io.grpc:grpc-context", + target = "@io_grpc_grpc_java//context", +) +maven.override( + name = "grpc_java_maven", + coordinates = "io.grpc:grpc-core", + target = "@io_grpc_grpc_java//core:core_maven", +) +maven.override( + name = "grpc_java_maven", + coordinates = "io.grpc:grpc-googleapis", + target = "@io_grpc_grpc_java//googleapis", +) +maven.override( + name = "grpc_java_maven", + coordinates = "io.grpc:grpc-grpclb", + target = "@io_grpc_grpc_java//grpclb", +) +maven.override( + name = "grpc_java_maven", + coordinates = "io.grpc:grpc-inprocess", + target = "@io_grpc_grpc_java//inprocess", +) +maven.override( + name = "grpc_java_maven", + coordinates = "io.grpc:grpc-netty", + target = "@io_grpc_grpc_java//netty", +) +maven.override( + name = "grpc_java_maven", + coordinates = "io.grpc:grpc-netty-shaded", + target = "@io_grpc_grpc_java//netty:shaded_maven", +) +maven.override( + name = "grpc_java_maven", + coordinates = "io.grpc:grpc-okhttp", + target = "@io_grpc_grpc_java//okhttp", +) +maven.override( + name = "grpc_java_maven", + coordinates = "io.grpc:grpc-protobuf", + target = "@io_grpc_grpc_java//protobuf", +) +maven.override( + name = "grpc_java_maven", + coordinates = "io.grpc:grpc-protobuf-lite", + target = "@io_grpc_grpc_java//protobuf-lite", +) +maven.override( + name = "grpc_java_maven", + coordinates = "io.grpc:grpc-rls", + target = "@io_grpc_grpc_java//rls", +) +maven.override( + name = "grpc_java_maven", + coordinates = "io.grpc:grpc-services", + target = "@io_grpc_grpc_java//services:services_maven", +) +maven.override( + name = "grpc_java_maven", + coordinates = "io.grpc:grpc-stub", + target = "@io_grpc_grpc_java//stub", +) +maven.override( + name = "grpc_java_maven", + coordinates = "io.grpc:grpc-testing", + target = "@io_grpc_grpc_java//testing", +) +maven.override( + name = "grpc_java_maven", + coordinates = "io.grpc:grpc-xds", + target = "@io_grpc_grpc_java//xds:xds_maven", +) +maven.override( + name = "grpc_java_maven", + coordinates = "io.grpc:grpc-util", + target = "@io_grpc_grpc_java//util", +) + +switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules") +switched_rules.use_languages(java = True) +use_repo(switched_rules, "com_google_googleapis_imports") diff --git a/modules/grpc-java/1.62.2/patches/add_module_bazel.patch b/modules/grpc-java/1.62.2/patches/add_module_bazel.patch new file mode 100644 index 00000000000..49fbd849e0c --- /dev/null +++ b/modules/grpc-java/1.62.2/patches/add_module_bazel.patch @@ -0,0 +1,203 @@ +diff --git a/MODULE.bazel b/MODULE.bazel +new file mode 100644 +index 000000000..46bbe69f5 +--- /dev/null ++++ b/MODULE.bazel +@@ -0,0 +1,197 @@ ++module( ++ name = "grpc-java", ++ version = "1.62.2", ++ compatibility_level = 0, ++ repo_name = "io_grpc_grpc_java", ++) ++ ++bazel_dep(name = "googleapis", version = "0.0.0-20240326-1c8d509c5", repo_name = "com_google_googleapis") ++bazel_dep(name = "grpc", version = "1.56.3.bcr.1", repo_name = "com_github_grpc_grpc") ++bazel_dep(name = "protobuf", version = "23.1", repo_name = "com_google_protobuf") ++bazel_dep(name = "rules_cc", version = "0.0.9") ++bazel_dep(name = "rules_go", version = "0.46.0", repo_name = "io_bazel_rules_go") ++bazel_dep(name = "rules_jvm_external", version = "6.0") ++bazel_dep(name = "rules_proto", version = "5.3.0-21.7") ++ ++non_module_deps = use_extension("//:repositories.bzl", "grpc_java_repositories_extension") ++use_repo( ++ non_module_deps, ++ "com_github_cncf_xds", ++ "envoy_api", ++ "io_grpc_grpc_proto", ++) ++ ++grpc_repo_deps_ext = use_extension("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_repo_deps_ext") ++use_repo( ++ grpc_repo_deps_ext, ++ "com_envoyproxy_protoc_gen_validate", ++ "com_github_cncf_udpa", ++ "opencensus_proto", ++) ++ ++maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") ++maven.install( ++ name = "grpc_java_maven", ++ artifacts = [ ++ "com.google.android:annotations:4.1.1.4", ++ "com.google.api.grpc:proto-google-common-protos:2.29.0", ++ "com.google.auth:google-auth-library-credentials:1.4.0", ++ "com.google.auth:google-auth-library-oauth2-http:1.4.0", ++ "com.google.auto.value:auto-value-annotations:1.10.4", ++ "com.google.auto.value:auto-value:1.10.4", ++ "com.google.code.findbugs:jsr305:3.0.2", ++ "com.google.code.gson:gson:2.10.1", ++ "com.google.errorprone:error_prone_annotations:2.23.0", ++ "com.google.guava:failureaccess:1.0.1", ++ "com.google.guava:guava:32.1.3-android", ++ "com.google.re2j:re2j:1.7", ++ "com.google.truth:truth:1.1.5", ++ "com.squareup.okhttp:okhttp:2.7.5", ++ "com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day ++ "io.netty:netty-buffer:4.1.100.Final", ++ "io.netty:netty-codec-http2:4.1.100.Final", ++ "io.netty:netty-codec-http:4.1.100.Final", ++ "io.netty:netty-codec-socks:4.1.100.Final", ++ "io.netty:netty-codec:4.1.100.Final", ++ "io.netty:netty-common:4.1.100.Final", ++ "io.netty:netty-handler-proxy:4.1.100.Final", ++ "io.netty:netty-handler:4.1.100.Final", ++ "io.netty:netty-resolver:4.1.100.Final", ++ "io.netty:netty-tcnative-boringssl-static:2.0.61.Final", ++ "io.netty:netty-tcnative-classes:2.0.61.Final", ++ "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.100.Final", ++ "io.netty:netty-transport-native-unix-common:4.1.100.Final", ++ "io.netty:netty-transport:4.1.100.Final", ++ "io.opencensus:opencensus-api:0.31.0", ++ "io.opencensus:opencensus-contrib-grpc-metrics:0.31.0", ++ "io.perfmark:perfmark-api:0.26.0", ++ "junit:junit:4.13.2", ++ "org.apache.tomcat:annotations-api:6.0.53", ++ "org.codehaus.mojo:animal-sniffer-annotations:1.23", ++ ], ++ lock_file = "//:maven_install.json", ++ repositories = [ ++ "https://repo1.maven.org/maven2", ++ "https://maven.google.com", ++ ], ++) ++use_repo(maven, "grpc_java_maven", "unpinned_grpc_java_maven") ++maven.override( ++ name = "grpc_java_maven", ++ coordinates = "com.google.protobuf:protobuf-java", ++ target = "@com_google_protobuf//:protobuf_java", ++) ++maven.override( ++ name = "grpc_java_maven", ++ coordinates = "com.google.protobuf:protobuf-java-util", ++ target = "@com_google_protobuf//:protobuf_java_util", ++) ++maven.override( ++ name = "grpc_java_maven", ++ coordinates = "com.google.protobuf:protobuf-javalite", ++ target = "@com_google_protobuf_javalite//:protobuf_javalite", ++) ++maven.override( ++ name = "grpc_java_maven", ++ coordinates = "io.grpc:grpc-alts", ++ target = "@io_grpc_grpc_java//alts", ++) ++maven.override( ++ name = "grpc_java_maven", ++ coordinates = "io.grpc:grpc-api", ++ target = "@io_grpc_grpc_java//api", ++) ++maven.override( ++ name = "grpc_java_maven", ++ coordinates = "io.grpc:grpc-auth", ++ target = "@io_grpc_grpc_java//auth", ++) ++maven.override( ++ name = "grpc_java_maven", ++ coordinates = "io.grpc:grpc-census", ++ target = "@io_grpc_grpc_java//census", ++) ++maven.override( ++ name = "grpc_java_maven", ++ coordinates = "io.grpc:grpc-context", ++ target = "@io_grpc_grpc_java//context", ++) ++maven.override( ++ name = "grpc_java_maven", ++ coordinates = "io.grpc:grpc-core", ++ target = "@io_grpc_grpc_java//core:core_maven", ++) ++maven.override( ++ name = "grpc_java_maven", ++ coordinates = "io.grpc:grpc-googleapis", ++ target = "@io_grpc_grpc_java//googleapis", ++) ++maven.override( ++ name = "grpc_java_maven", ++ coordinates = "io.grpc:grpc-grpclb", ++ target = "@io_grpc_grpc_java//grpclb", ++) ++maven.override( ++ name = "grpc_java_maven", ++ coordinates = "io.grpc:grpc-inprocess", ++ target = "@io_grpc_grpc_java//inprocess", ++) ++maven.override( ++ name = "grpc_java_maven", ++ coordinates = "io.grpc:grpc-netty", ++ target = "@io_grpc_grpc_java//netty", ++) ++maven.override( ++ name = "grpc_java_maven", ++ coordinates = "io.grpc:grpc-netty-shaded", ++ target = "@io_grpc_grpc_java//netty:shaded_maven", ++) ++maven.override( ++ name = "grpc_java_maven", ++ coordinates = "io.grpc:grpc-okhttp", ++ target = "@io_grpc_grpc_java//okhttp", ++) ++maven.override( ++ name = "grpc_java_maven", ++ coordinates = "io.grpc:grpc-protobuf", ++ target = "@io_grpc_grpc_java//protobuf", ++) ++maven.override( ++ name = "grpc_java_maven", ++ coordinates = "io.grpc:grpc-protobuf-lite", ++ target = "@io_grpc_grpc_java//protobuf-lite", ++) ++maven.override( ++ name = "grpc_java_maven", ++ coordinates = "io.grpc:grpc-rls", ++ target = "@io_grpc_grpc_java//rls", ++) ++maven.override( ++ name = "grpc_java_maven", ++ coordinates = "io.grpc:grpc-services", ++ target = "@io_grpc_grpc_java//services:services_maven", ++) ++maven.override( ++ name = "grpc_java_maven", ++ coordinates = "io.grpc:grpc-stub", ++ target = "@io_grpc_grpc_java//stub", ++) ++maven.override( ++ name = "grpc_java_maven", ++ coordinates = "io.grpc:grpc-testing", ++ target = "@io_grpc_grpc_java//testing", ++) ++maven.override( ++ name = "grpc_java_maven", ++ coordinates = "io.grpc:grpc-xds", ++ target = "@io_grpc_grpc_java//xds:xds_maven", ++) ++maven.override( ++ name = "grpc_java_maven", ++ coordinates = "io.grpc:grpc-util", ++ target = "@io_grpc_grpc_java//util", ++) ++ ++switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules") ++switched_rules.use_languages(java = True) ++use_repo(switched_rules, "com_google_googleapis_imports") diff --git a/modules/grpc-java/1.62.2/patches/maven_lockfile.patch b/modules/grpc-java/1.62.2/patches/maven_lockfile.patch new file mode 100644 index 00000000000..f94a06b2441 --- /dev/null +++ b/modules/grpc-java/1.62.2/patches/maven_lockfile.patch @@ -0,0 +1,1142 @@ +diff --git a/maven_install.json b/maven_install.json +new file mode 100755 +index 000000000..9b94b5ea6 +--- /dev/null ++++ b/maven_install.json +@@ -0,0 +1,1136 @@ ++{ ++ "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", ++ "__INPUT_ARTIFACTS_HASH": 1473377632, ++ "__RESOLVED_ARTIFACTS_HASH": 452421059, ++ "artifacts": { ++ "com.google.android:annotations": { ++ "shasums": { ++ "jar": "ba734e1e84c09d615af6a09d33034b4f0442f8772dec120efb376d86a565ae15" ++ }, ++ "version": "4.1.1.4" ++ }, ++ "com.google.api.grpc:proto-google-common-protos": { ++ "shasums": { ++ "jar": "ee9c751f06b112e92b37f75e4f73a17d03ef2c3302c6e8d986adbcc721b63cb0" ++ }, ++ "version": "2.29.0" ++ }, ++ "com.google.auth:google-auth-library-credentials": { ++ "shasums": { ++ "jar": "6ad4416d9360a1df3a660c43493e9605416ddd4de953ffbb14dd582a591b09a1" ++ }, ++ "version": "1.4.0" ++ }, ++ "com.google.auth:google-auth-library-oauth2-http": { ++ "shasums": { ++ "jar": "bbf99bba3394c699c48b2e67257dfa96b84c6ee54c348bd426c94207b84254ba" ++ }, ++ "version": "1.4.0" ++ }, ++ "com.google.auto.value:auto-value": { ++ "shasums": { ++ "jar": "f3c438d1f82904bbcb452084d488b660f3c7488e9274c3a58f049e121632d434" ++ }, ++ "version": "1.10.4" ++ }, ++ "com.google.auto.value:auto-value-annotations": { ++ "shasums": { ++ "jar": "e1c45e6beadaef9797cb0d9afd5a45621ad061cd8632012f85582853a3887825" ++ }, ++ "version": "1.10.4" ++ }, ++ "com.google.code.findbugs:jsr305": { ++ "shasums": { ++ "jar": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7" ++ }, ++ "version": "3.0.2" ++ }, ++ "com.google.code.gson:gson": { ++ "shasums": { ++ "jar": "4241c14a7727c34feea6507ec801318a3d4a90f070e4525681079fb94ee4c593" ++ }, ++ "version": "2.10.1" ++ }, ++ "com.google.errorprone:error_prone_annotations": { ++ "shasums": { ++ "jar": "ec6f39f068b6ff9ac323c68e28b9299f8c0a80ca512dccb1d4a70f40ac3ec054" ++ }, ++ "version": "2.23.0" ++ }, ++ "com.google.guava:failureaccess": { ++ "shasums": { ++ "jar": "a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26" ++ }, ++ "version": "1.0.1" ++ }, ++ "com.google.guava:guava": { ++ "shasums": { ++ "jar": "20e6ac8902ddf49e7806cc70f3054c8d91accb5eefdc10f3207e80e0a336b263" ++ }, ++ "version": "32.1.3-android" ++ }, ++ "com.google.guava:listenablefuture": { ++ "shasums": { ++ "jar": "b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99" ++ }, ++ "version": "9999.0-empty-to-avoid-conflict-with-guava" ++ }, ++ "com.google.http-client:google-http-client": { ++ "shasums": { ++ "jar": "4a42d2c383373bf61c798f1882745989b9836bb032a8a4019890ecb6cd903ef3" ++ }, ++ "version": "1.41.0" ++ }, ++ "com.google.http-client:google-http-client-gson": { ++ "shasums": { ++ "jar": "18766d1bbeb6d363763ef725bc82ed3c8c45f88eadbf149965e6e8c8d9b70d9f" ++ }, ++ "version": "1.41.0" ++ }, ++ "com.google.j2objc:j2objc-annotations": { ++ "shasums": { ++ "jar": "f02a95fa1a5e95edb3ed859fd0fb7df709d121a35290eff8b74dce2ab7f4d6ed" ++ }, ++ "version": "2.8" ++ }, ++ "com.google.protobuf:protobuf-java": { ++ "shasums": { ++ "jar": "48a8e58a1a8f82eff141a7a388d38dfe77d7a48d5e57c9066ee37f19147e20df" ++ }, ++ "version": "3.25.1" ++ }, ++ "com.google.re2j:re2j": { ++ "shasums": { ++ "jar": "4f657af51ab8bb0909bcc3eb40862d26125af8cbcf92aaaba595fed77f947bc0" ++ }, ++ "version": "1.7" ++ }, ++ "com.google.truth:truth": { ++ "shasums": { ++ "jar": "7f6d50d6f43a102942ef2c5a05f37a84f77788bb448cf33cceebf86d34e575c0" ++ }, ++ "version": "1.1.5" ++ }, ++ "com.squareup.okhttp:okhttp": { ++ "shasums": { ++ "jar": "88ac9fd1bb51f82bcc664cc1eb9c225c90dc4389d660231b4cc737bebfe7d0aa" ++ }, ++ "version": "2.7.5" ++ }, ++ "com.squareup.okio:okio": { ++ "shasums": { ++ "jar": "a27f091d34aa452e37227e2cfa85809f29012a8ef2501a9b5a125a978e4fcbc1" ++ }, ++ "version": "2.10.0" ++ }, ++ "commons-codec:commons-codec": { ++ "shasums": { ++ "jar": "e599d5318e97aa48f42136a2927e6dfa4e8881dff0e6c8e3109ddbbff51d7b7d" ++ }, ++ "version": "1.11" ++ }, ++ "commons-logging:commons-logging": { ++ "shasums": { ++ "jar": "daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636" ++ }, ++ "version": "1.2" ++ }, ++ "io.grpc:grpc-context": { ++ "shasums": { ++ "jar": "bcbf9055dff453fd6508bd7cca2a0aa2d5f059a9c94beed1f5fda1dc015607b8" ++ }, ++ "version": "1.27.2" ++ }, ++ "io.netty:netty-buffer": { ++ "shasums": { ++ "jar": "462874b44ee782fbefec64078cda6eb8e7bf9f0e0af71a928ef4c1f2d564f7ee" ++ }, ++ "version": "4.1.100.Final" ++ }, ++ "io.netty:netty-codec": { ++ "shasums": { ++ "jar": "180a01ed67af399602e24ff1c32864e7f57f57c4a0fa5e9ab3fe9b0e5e9cf051" ++ }, ++ "version": "4.1.100.Final" ++ }, ++ "io.netty:netty-codec-http": { ++ "shasums": { ++ "jar": "326811d249cb0e5555e78e026e877834e792261c38f0666d80464426695d9590" ++ }, ++ "version": "4.1.100.Final" ++ }, ++ "io.netty:netty-codec-http2": { ++ "shasums": { ++ "jar": "23b4a74350f4cf8d41b93fb93d52b5050667d8d53fffc385672c86eab83b8749" ++ }, ++ "version": "4.1.100.Final" ++ }, ++ "io.netty:netty-codec-socks": { ++ "shasums": { ++ "jar": "608a453b90f8384ba4efcdc6db7f899a1f10b9ea1890954696e6cfac45ff1ba9" ++ }, ++ "version": "4.1.100.Final" ++ }, ++ "io.netty:netty-common": { ++ "shasums": { ++ "jar": "d2908301f1ac6f2910900742473c15d701765d3d4467acdb1eebb9df3aa82885" ++ }, ++ "version": "4.1.100.Final" ++ }, ++ "io.netty:netty-handler": { ++ "shasums": { ++ "jar": "0e10e584c2e7fdf7f4804e14760ed987003f1b62ab982f62eaf13a9892793d3a" ++ }, ++ "version": "4.1.100.Final" ++ }, ++ "io.netty:netty-handler-proxy": { ++ "shasums": { ++ "jar": "686dbc2e61407f216d6cb267dd7954896f851dd34b58be3e757c5a89f20a5e67" ++ }, ++ "version": "4.1.100.Final" ++ }, ++ "io.netty:netty-resolver": { ++ "shasums": { ++ "jar": "c42c481c776e9d367a45cc3a67a06f65897d280334eb30b2362b8c55b7523f4f" ++ }, ++ "version": "4.1.100.Final" ++ }, ++ "io.netty:netty-tcnative-boringssl-static": { ++ "shasums": { ++ "jar": "b6f974972c44cd6f9cecabc255290286faac40b6393c66c3c3c0db7f421cc28e", ++ "linux-aarch_64": "3614395218ae379cec22ccaa089c4f27b9329a660e0d53c93e7cb12b7a2cee46", ++ "linux-x86_64": "4ff9d14f1ec6ccee35b78f53a6f3d9c7c54535aa2a76138311c2f619c5e150e1", ++ "osx-aarch_64": "58e0302c9fde3db984c3ff7ee7ec7159dc0320bdb91533cc290e12e40911cd1a", ++ "osx-x86_64": "fcfea887f4f0802d363c699b444d504b7109a7cb198ae6845eeff63745e5b0ba", ++ "windows-x86_64": "17cd2fa3c63b7ed23edea01c945e55cb7baed1faa0f553732c3f5f56da90b3e0" ++ }, ++ "version": "2.0.61.Final" ++ }, ++ "io.netty:netty-tcnative-classes": { ++ "shasums": { ++ "jar": "9b970eccd844bfae175a5cbbf7bf94891894add06d6ccbe1abf2250cd64080f6" ++ }, ++ "version": "2.0.61.Final" ++ }, ++ "io.netty:netty-transport": { ++ "shasums": { ++ "jar": "b1deeceedab3734cdb959c55f4be5ab4a667a8aed59121ff93763f49470f5470" ++ }, ++ "version": "4.1.100.Final" ++ }, ++ "io.netty:netty-transport-classes-epoll": { ++ "shasums": { ++ "jar": "9abc4b17b1212b33666eae4e8013d0bb78a9a2bcd0a9a621b9bd06a7e5fc0050" ++ }, ++ "version": "4.1.100.Final" ++ }, ++ "io.netty:netty-transport-native-epoll": { ++ "shasums": { ++ "linux-x86_64": "a108fb47babb7678b5b2abb1fc8b34510bd2f705faa450447860647f2de4ebaa" ++ }, ++ "version": "4.1.100.Final" ++ }, ++ "io.netty:netty-transport-native-unix-common": { ++ "shasums": { ++ "jar": "5d888230a04c4a3e647c64e933cefb64fd49056f969bfb734c8a3fcedf0bea8a" ++ }, ++ "version": "4.1.100.Final" ++ }, ++ "io.opencensus:opencensus-api": { ++ "shasums": { ++ "jar": "702ba55d78f39d55195dcf041fdfaab7a7490a9ac45013542487ed9e4d3a4d23" ++ }, ++ "version": "0.31.0" ++ }, ++ "io.opencensus:opencensus-contrib-grpc-metrics": { ++ "shasums": { ++ "jar": "b28fc72490edd49c4c40a3c216b709200833fb361f7f602f1c7c9a527f7b7f63" ++ }, ++ "version": "0.31.0" ++ }, ++ "io.opencensus:opencensus-contrib-http-util": { ++ "shasums": { ++ "jar": "49c3db2a29f1fdb2f73928cbea969bd1d40fab7cc5bb6273022babd96f7a789b" ++ }, ++ "version": "0.28.0" ++ }, ++ "io.perfmark:perfmark-api": { ++ "shasums": { ++ "jar": "b7d23e93a34537ce332708269a0d1404788a5b5e1949e82f5535fce51b3ea95b" ++ }, ++ "version": "0.26.0" ++ }, ++ "junit:junit": { ++ "shasums": { ++ "jar": "8e495b634469d64fb8acfa3495a065cbacc8a0fff55ce1e31007be4c16dc57d3" ++ }, ++ "version": "4.13.2" ++ }, ++ "org.apache.httpcomponents:httpclient": { ++ "shasums": { ++ "jar": "6fe9026a566c6a5001608cf3fc32196641f6c1e5e1986d1037ccdbd5f31ef743" ++ }, ++ "version": "4.5.13" ++ }, ++ "org.apache.httpcomponents:httpcore": { ++ "shasums": { ++ "jar": "3cbaed088c499a10f96dde58f39dc0e7985171abd88138ca1655a872011bb142" ++ }, ++ "version": "4.4.15" ++ }, ++ "org.apache.tomcat:annotations-api": { ++ "shasums": { ++ "jar": "253829d3c12b7381d1044fc22c6436cff025fe0d459e4a329413e560a7d0dd13" ++ }, ++ "version": "6.0.53" ++ }, ++ "org.checkerframework:checker-qual": { ++ "shasums": { ++ "jar": "e4ce1376cc2735e1dde220b62ad0913f51297704daad155a33f386bc5db0d9f7" ++ }, ++ "version": "3.37.0" ++ }, ++ "org.codehaus.mojo:animal-sniffer-annotations": { ++ "shasums": { ++ "jar": "9ffe526bf43a6348e9d8b33b9cd6f580a7f5eed0cf055913007eda263de974d0" ++ }, ++ "version": "1.23" ++ }, ++ "org.hamcrest:hamcrest-core": { ++ "shasums": { ++ "jar": "66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9" ++ }, ++ "version": "1.3" ++ }, ++ "org.jetbrains.kotlin:kotlin-stdlib": { ++ "shasums": { ++ "jar": "b8ab1da5cdc89cb084d41e1f28f20a42bd431538642a5741c52bbfae3fa3e656" ++ }, ++ "version": "1.4.20" ++ }, ++ "org.jetbrains.kotlin:kotlin-stdlib-common": { ++ "shasums": { ++ "jar": "a7112c9b3cefee418286c9c9372f7af992bd1e6e030691d52f60cb36dbec8320" ++ }, ++ "version": "1.4.20" ++ }, ++ "org.jetbrains:annotations": { ++ "shasums": { ++ "jar": "ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478" ++ }, ++ "version": "13.0" ++ }, ++ "org.ow2.asm:asm": { ++ "shasums": { ++ "jar": "b62e84b5980729751b0458c534cf1366f727542bb8d158621335682a460f0353" ++ }, ++ "version": "9.5" ++ } ++ }, ++ "dependencies": { ++ "com.google.api.grpc:proto-google-common-protos": [ ++ "com.google.protobuf:protobuf-java" ++ ], ++ "com.google.auth:google-auth-library-oauth2-http": [ ++ "com.google.auth:google-auth-library-credentials", ++ "com.google.auto.value:auto-value-annotations", ++ "com.google.code.findbugs:jsr305", ++ "com.google.guava:guava", ++ "com.google.http-client:google-http-client", ++ "com.google.http-client:google-http-client-gson" ++ ], ++ "com.google.guava:guava": [ ++ "com.google.code.findbugs:jsr305", ++ "com.google.errorprone:error_prone_annotations", ++ "com.google.guava:failureaccess", ++ "com.google.guava:listenablefuture", ++ "com.google.j2objc:j2objc-annotations", ++ "org.checkerframework:checker-qual" ++ ], ++ "com.google.http-client:google-http-client": [ ++ "com.google.code.findbugs:jsr305", ++ "com.google.guava:guava", ++ "com.google.j2objc:j2objc-annotations", ++ "io.opencensus:opencensus-api", ++ "io.opencensus:opencensus-contrib-http-util", ++ "org.apache.httpcomponents:httpclient", ++ "org.apache.httpcomponents:httpcore" ++ ], ++ "com.google.http-client:google-http-client-gson": [ ++ "com.google.code.gson:gson", ++ "com.google.http-client:google-http-client" ++ ], ++ "com.google.truth:truth": [ ++ "com.google.auto.value:auto-value-annotations", ++ "com.google.errorprone:error_prone_annotations", ++ "com.google.guava:guava", ++ "junit:junit", ++ "org.checkerframework:checker-qual", ++ "org.ow2.asm:asm" ++ ], ++ "com.squareup.okhttp:okhttp": [ ++ "com.squareup.okio:okio" ++ ], ++ "com.squareup.okio:okio": [ ++ "org.jetbrains.kotlin:kotlin-stdlib", ++ "org.jetbrains.kotlin:kotlin-stdlib-common" ++ ], ++ "io.netty:netty-buffer": [ ++ "io.netty:netty-common" ++ ], ++ "io.netty:netty-codec": [ ++ "io.netty:netty-buffer", ++ "io.netty:netty-common", ++ "io.netty:netty-transport" ++ ], ++ "io.netty:netty-codec-http": [ ++ "io.netty:netty-buffer", ++ "io.netty:netty-codec", ++ "io.netty:netty-common", ++ "io.netty:netty-handler", ++ "io.netty:netty-transport" ++ ], ++ "io.netty:netty-codec-http2": [ ++ "io.netty:netty-buffer", ++ "io.netty:netty-codec", ++ "io.netty:netty-codec-http", ++ "io.netty:netty-common", ++ "io.netty:netty-handler", ++ "io.netty:netty-transport" ++ ], ++ "io.netty:netty-codec-socks": [ ++ "io.netty:netty-buffer", ++ "io.netty:netty-codec", ++ "io.netty:netty-common", ++ "io.netty:netty-transport" ++ ], ++ "io.netty:netty-handler": [ ++ "io.netty:netty-buffer", ++ "io.netty:netty-codec", ++ "io.netty:netty-common", ++ "io.netty:netty-resolver", ++ "io.netty:netty-transport", ++ "io.netty:netty-transport-native-unix-common" ++ ], ++ "io.netty:netty-handler-proxy": [ ++ "io.netty:netty-buffer", ++ "io.netty:netty-codec", ++ "io.netty:netty-codec-http", ++ "io.netty:netty-codec-socks", ++ "io.netty:netty-common", ++ "io.netty:netty-transport" ++ ], ++ "io.netty:netty-resolver": [ ++ "io.netty:netty-common" ++ ], ++ "io.netty:netty-tcnative-boringssl-static": [ ++ "io.netty:netty-tcnative-boringssl-static:jar:linux-aarch_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:linux-x86_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:osx-aarch_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:osx-x86_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:windows-x86_64", ++ "io.netty:netty-tcnative-classes" ++ ], ++ "io.netty:netty-tcnative-boringssl-static:jar:linux-aarch_64": [ ++ "io.netty:netty-tcnative-boringssl-static:jar:linux-x86_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:osx-aarch_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:osx-x86_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:windows-x86_64", ++ "io.netty:netty-tcnative-classes" ++ ], ++ "io.netty:netty-tcnative-boringssl-static:jar:linux-x86_64": [ ++ "io.netty:netty-tcnative-boringssl-static:jar:linux-aarch_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:osx-aarch_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:osx-x86_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:windows-x86_64", ++ "io.netty:netty-tcnative-classes" ++ ], ++ "io.netty:netty-tcnative-boringssl-static:jar:osx-aarch_64": [ ++ "io.netty:netty-tcnative-boringssl-static:jar:linux-aarch_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:linux-x86_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:osx-x86_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:windows-x86_64", ++ "io.netty:netty-tcnative-classes" ++ ], ++ "io.netty:netty-tcnative-boringssl-static:jar:osx-x86_64": [ ++ "io.netty:netty-tcnative-boringssl-static:jar:linux-aarch_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:linux-x86_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:osx-aarch_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:windows-x86_64", ++ "io.netty:netty-tcnative-classes" ++ ], ++ "io.netty:netty-tcnative-boringssl-static:jar:windows-x86_64": [ ++ "io.netty:netty-tcnative-boringssl-static:jar:linux-aarch_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:linux-x86_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:osx-aarch_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:osx-x86_64", ++ "io.netty:netty-tcnative-classes" ++ ], ++ "io.netty:netty-transport": [ ++ "io.netty:netty-buffer", ++ "io.netty:netty-common", ++ "io.netty:netty-resolver" ++ ], ++ "io.netty:netty-transport-classes-epoll": [ ++ "io.netty:netty-buffer", ++ "io.netty:netty-common", ++ "io.netty:netty-transport", ++ "io.netty:netty-transport-native-unix-common" ++ ], ++ "io.netty:netty-transport-native-epoll:jar:linux-x86_64": [ ++ "io.netty:netty-buffer", ++ "io.netty:netty-common", ++ "io.netty:netty-transport", ++ "io.netty:netty-transport-classes-epoll", ++ "io.netty:netty-transport-native-unix-common" ++ ], ++ "io.netty:netty-transport-native-unix-common": [ ++ "io.netty:netty-buffer", ++ "io.netty:netty-common", ++ "io.netty:netty-transport" ++ ], ++ "io.opencensus:opencensus-api": [ ++ "io.grpc:grpc-context" ++ ], ++ "io.opencensus:opencensus-contrib-grpc-metrics": [ ++ "com.google.guava:guava", ++ "io.opencensus:opencensus-api" ++ ], ++ "io.opencensus:opencensus-contrib-http-util": [ ++ "com.google.guava:guava", ++ "io.opencensus:opencensus-api" ++ ], ++ "junit:junit": [ ++ "org.hamcrest:hamcrest-core" ++ ], ++ "org.apache.httpcomponents:httpclient": [ ++ "commons-codec:commons-codec", ++ "commons-logging:commons-logging", ++ "org.apache.httpcomponents:httpcore" ++ ], ++ "org.jetbrains.kotlin:kotlin-stdlib": [ ++ "org.jetbrains.kotlin:kotlin-stdlib-common", ++ "org.jetbrains:annotations" ++ ] ++ }, ++ "packages": { ++ "com.google.android:annotations": [ ++ "android.annotation" ++ ], ++ "com.google.api.grpc:proto-google-common-protos": [ ++ "com.google.api", ++ "com.google.cloud", ++ "com.google.cloud.audit", ++ "com.google.cloud.location", ++ "com.google.geo.type", ++ "com.google.logging.type", ++ "com.google.longrunning", ++ "com.google.rpc", ++ "com.google.rpc.context", ++ "com.google.type" ++ ], ++ "com.google.auth:google-auth-library-credentials": [ ++ "com.google.auth" ++ ], ++ "com.google.auth:google-auth-library-oauth2-http": [ ++ "com.google.auth.http", ++ "com.google.auth.oauth2" ++ ], ++ "com.google.auto.value:auto-value": [ ++ "autovalue.shaded.com.google.auto.common", ++ "autovalue.shaded.com.google.auto.service", ++ "autovalue.shaded.com.google.common.annotations", ++ "autovalue.shaded.com.google.common.base", ++ "autovalue.shaded.com.google.common.cache", ++ "autovalue.shaded.com.google.common.collect", ++ "autovalue.shaded.com.google.common.escape", ++ "autovalue.shaded.com.google.common.eventbus", ++ "autovalue.shaded.com.google.common.graph", ++ "autovalue.shaded.com.google.common.hash", ++ "autovalue.shaded.com.google.common.html", ++ "autovalue.shaded.com.google.common.io", ++ "autovalue.shaded.com.google.common.math", ++ "autovalue.shaded.com.google.common.net", ++ "autovalue.shaded.com.google.common.primitives", ++ "autovalue.shaded.com.google.common.reflect", ++ "autovalue.shaded.com.google.common.util.concurrent", ++ "autovalue.shaded.com.google.common.xml", ++ "autovalue.shaded.com.google.errorprone.annotations", ++ "autovalue.shaded.com.google.errorprone.annotations.concurrent", ++ "autovalue.shaded.com.google.escapevelocity", ++ "autovalue.shaded.com.google.j2objc.annotations", ++ "autovalue.shaded.com.squareup.javapoet", ++ "autovalue.shaded.kotlin", ++ "autovalue.shaded.kotlin.annotation", ++ "autovalue.shaded.kotlin.collections", ++ "autovalue.shaded.kotlin.collections.builders", ++ "autovalue.shaded.kotlin.collections.unsigned", ++ "autovalue.shaded.kotlin.comparisons", ++ "autovalue.shaded.kotlin.contracts", ++ "autovalue.shaded.kotlin.coroutines", ++ "autovalue.shaded.kotlin.coroutines.intrinsics", ++ "autovalue.shaded.kotlin.coroutines.jvm.internal", ++ "autovalue.shaded.kotlin.enums", ++ "autovalue.shaded.kotlin.experimental", ++ "autovalue.shaded.kotlin.internal", ++ "autovalue.shaded.kotlin.internal.jdk7", ++ "autovalue.shaded.kotlin.internal.jdk8", ++ "autovalue.shaded.kotlin.jvm", ++ "autovalue.shaded.kotlin.jvm.functions", ++ "autovalue.shaded.kotlin.jvm.internal", ++ "autovalue.shaded.kotlin.jvm.internal.markers", ++ "autovalue.shaded.kotlin.random", ++ "autovalue.shaded.kotlin.random.jdk8", ++ "autovalue.shaded.kotlin.ranges", ++ "autovalue.shaded.kotlin.reflect", ++ "autovalue.shaded.kotlin.sequences", ++ "autovalue.shaded.kotlin.text", ++ "autovalue.shaded.kotlinx.metadata", ++ "autovalue.shaded.kotlinx.metadata.internal", ++ "autovalue.shaded.kotlinx.metadata.internal.common", ++ "autovalue.shaded.kotlinx.metadata.internal.extensions", ++ "autovalue.shaded.kotlinx.metadata.internal.metadata", ++ "autovalue.shaded.kotlinx.metadata.internal.metadata.deserialization", ++ "autovalue.shaded.kotlinx.metadata.internal.metadata.jvm", ++ "autovalue.shaded.kotlinx.metadata.internal.metadata.jvm.deserialization", ++ "autovalue.shaded.kotlinx.metadata.internal.metadata.jvm.serialization", ++ "autovalue.shaded.kotlinx.metadata.internal.metadata.serialization", ++ "autovalue.shaded.kotlinx.metadata.internal.protobuf", ++ "autovalue.shaded.kotlinx.metadata.jvm", ++ "autovalue.shaded.kotlinx.metadata.jvm.internal", ++ "autovalue.shaded.net.ltgt.gradle.incap", ++ "autovalue.shaded.org.checkerframework.checker.nullness.qual", ++ "autovalue.shaded.org.checkerframework.framework.qual", ++ "autovalue.shaded.org.jetbrains.annotations", ++ "autovalue.shaded.org.objectweb.asm", ++ "com.google.auto.value.extension", ++ "com.google.auto.value.extension.memoized.processor", ++ "com.google.auto.value.extension.serializable.processor", ++ "com.google.auto.value.extension.serializable.serializer", ++ "com.google.auto.value.extension.serializable.serializer.impl", ++ "com.google.auto.value.extension.serializable.serializer.interfaces", ++ "com.google.auto.value.extension.serializable.serializer.runtime", ++ "com.google.auto.value.extension.toprettystring.processor", ++ "com.google.auto.value.processor" ++ ], ++ "com.google.auto.value:auto-value-annotations": [ ++ "com.google.auto.value", ++ "com.google.auto.value.extension.memoized", ++ "com.google.auto.value.extension.serializable", ++ "com.google.auto.value.extension.toprettystring" ++ ], ++ "com.google.code.findbugs:jsr305": [ ++ "javax.annotation", ++ "javax.annotation.concurrent", ++ "javax.annotation.meta" ++ ], ++ "com.google.code.gson:gson": [ ++ "com.google.gson", ++ "com.google.gson.annotations", ++ "com.google.gson.internal", ++ "com.google.gson.internal.bind", ++ "com.google.gson.internal.bind.util", ++ "com.google.gson.internal.reflect", ++ "com.google.gson.internal.sql", ++ "com.google.gson.reflect", ++ "com.google.gson.stream" ++ ], ++ "com.google.errorprone:error_prone_annotations": [ ++ "com.google.errorprone.annotations", ++ "com.google.errorprone.annotations.concurrent" ++ ], ++ "com.google.guava:failureaccess": [ ++ "com.google.common.util.concurrent.internal" ++ ], ++ "com.google.guava:guava": [ ++ "com.google.common.annotations", ++ "com.google.common.base", ++ "com.google.common.base.internal", ++ "com.google.common.cache", ++ "com.google.common.collect", ++ "com.google.common.escape", ++ "com.google.common.eventbus", ++ "com.google.common.graph", ++ "com.google.common.hash", ++ "com.google.common.html", ++ "com.google.common.io", ++ "com.google.common.math", ++ "com.google.common.net", ++ "com.google.common.primitives", ++ "com.google.common.reflect", ++ "com.google.common.util.concurrent", ++ "com.google.common.xml", ++ "com.google.thirdparty.publicsuffix" ++ ], ++ "com.google.http-client:google-http-client": [ ++ "com.google.api.client.http", ++ "com.google.api.client.http.apache", ++ "com.google.api.client.http.javanet", ++ "com.google.api.client.http.json", ++ "com.google.api.client.json", ++ "com.google.api.client.json.rpc2", ++ "com.google.api.client.json.webtoken", ++ "com.google.api.client.testing.http", ++ "com.google.api.client.testing.http.apache", ++ "com.google.api.client.testing.http.javanet", ++ "com.google.api.client.testing.json", ++ "com.google.api.client.testing.json.webtoken", ++ "com.google.api.client.testing.util", ++ "com.google.api.client.util", ++ "com.google.api.client.util.escape", ++ "com.google.api.client.util.store" ++ ], ++ "com.google.http-client:google-http-client-gson": [ ++ "com.google.api.client.json.gson" ++ ], ++ "com.google.j2objc:j2objc-annotations": [ ++ "com.google.j2objc.annotations" ++ ], ++ "com.google.protobuf:protobuf-java": [ ++ "com.google.protobuf", ++ "com.google.protobuf.compiler" ++ ], ++ "com.google.re2j:re2j": [ ++ "com.google.re2j" ++ ], ++ "com.google.truth:truth": [ ++ "com.google.common.truth" ++ ], ++ "com.squareup.okhttp:okhttp": [ ++ "com.squareup.okhttp", ++ "com.squareup.okhttp.internal", ++ "com.squareup.okhttp.internal.framed", ++ "com.squareup.okhttp.internal.http", ++ "com.squareup.okhttp.internal.io", ++ "com.squareup.okhttp.internal.tls" ++ ], ++ "com.squareup.okio:okio": [ ++ "okio", ++ "okio.internal" ++ ], ++ "commons-codec:commons-codec": [ ++ "org.apache.commons.codec", ++ "org.apache.commons.codec.binary", ++ "org.apache.commons.codec.cli", ++ "org.apache.commons.codec.digest", ++ "org.apache.commons.codec.language", ++ "org.apache.commons.codec.language.bm", ++ "org.apache.commons.codec.net" ++ ], ++ "commons-logging:commons-logging": [ ++ "org.apache.commons.logging", ++ "org.apache.commons.logging.impl" ++ ], ++ "io.grpc:grpc-context": [ ++ "io.grpc" ++ ], ++ "io.netty:netty-buffer": [ ++ "io.netty.buffer", ++ "io.netty.buffer.search" ++ ], ++ "io.netty:netty-codec": [ ++ "io.netty.handler.codec", ++ "io.netty.handler.codec.base64", ++ "io.netty.handler.codec.bytes", ++ "io.netty.handler.codec.compression", ++ "io.netty.handler.codec.json", ++ "io.netty.handler.codec.marshalling", ++ "io.netty.handler.codec.protobuf", ++ "io.netty.handler.codec.serialization", ++ "io.netty.handler.codec.string", ++ "io.netty.handler.codec.xml" ++ ], ++ "io.netty:netty-codec-http": [ ++ "io.netty.handler.codec.http", ++ "io.netty.handler.codec.http.cookie", ++ "io.netty.handler.codec.http.cors", ++ "io.netty.handler.codec.http.multipart", ++ "io.netty.handler.codec.http.websocketx", ++ "io.netty.handler.codec.http.websocketx.extensions", ++ "io.netty.handler.codec.http.websocketx.extensions.compression", ++ "io.netty.handler.codec.rtsp", ++ "io.netty.handler.codec.spdy" ++ ], ++ "io.netty:netty-codec-http2": [ ++ "io.netty.handler.codec.http2" ++ ], ++ "io.netty:netty-codec-socks": [ ++ "io.netty.handler.codec.socks", ++ "io.netty.handler.codec.socksx", ++ "io.netty.handler.codec.socksx.v4", ++ "io.netty.handler.codec.socksx.v5" ++ ], ++ "io.netty:netty-common": [ ++ "io.netty.util", ++ "io.netty.util.collection", ++ "io.netty.util.concurrent", ++ "io.netty.util.internal", ++ "io.netty.util.internal.logging", ++ "io.netty.util.internal.shaded.org.jctools.queues", ++ "io.netty.util.internal.shaded.org.jctools.queues.atomic", ++ "io.netty.util.internal.shaded.org.jctools.util", ++ "io.netty.util.internal.svm" ++ ], ++ "io.netty:netty-handler": [ ++ "io.netty.handler.address", ++ "io.netty.handler.flow", ++ "io.netty.handler.flush", ++ "io.netty.handler.ipfilter", ++ "io.netty.handler.logging", ++ "io.netty.handler.pcap", ++ "io.netty.handler.ssl", ++ "io.netty.handler.ssl.ocsp", ++ "io.netty.handler.ssl.util", ++ "io.netty.handler.stream", ++ "io.netty.handler.timeout", ++ "io.netty.handler.traffic" ++ ], ++ "io.netty:netty-handler-proxy": [ ++ "io.netty.handler.proxy" ++ ], ++ "io.netty:netty-resolver": [ ++ "io.netty.resolver" ++ ], ++ "io.netty:netty-tcnative-classes": [ ++ "io.netty.internal.tcnative" ++ ], ++ "io.netty:netty-transport": [ ++ "io.netty.bootstrap", ++ "io.netty.channel", ++ "io.netty.channel.embedded", ++ "io.netty.channel.group", ++ "io.netty.channel.internal", ++ "io.netty.channel.local", ++ "io.netty.channel.nio", ++ "io.netty.channel.oio", ++ "io.netty.channel.pool", ++ "io.netty.channel.socket", ++ "io.netty.channel.socket.nio", ++ "io.netty.channel.socket.oio" ++ ], ++ "io.netty:netty-transport-classes-epoll": [ ++ "io.netty.channel.epoll" ++ ], ++ "io.netty:netty-transport-native-unix-common": [ ++ "io.netty.channel.unix" ++ ], ++ "io.opencensus:opencensus-api": [ ++ "io.opencensus.common", ++ "io.opencensus.internal", ++ "io.opencensus.metrics", ++ "io.opencensus.metrics.data", ++ "io.opencensus.metrics.export", ++ "io.opencensus.resource", ++ "io.opencensus.stats", ++ "io.opencensus.tags", ++ "io.opencensus.tags.propagation", ++ "io.opencensus.tags.unsafe", ++ "io.opencensus.trace", ++ "io.opencensus.trace.config", ++ "io.opencensus.trace.export", ++ "io.opencensus.trace.internal", ++ "io.opencensus.trace.propagation", ++ "io.opencensus.trace.samplers", ++ "io.opencensus.trace.unsafe" ++ ], ++ "io.opencensus:opencensus-contrib-grpc-metrics": [ ++ "io.opencensus.contrib.grpc.metrics" ++ ], ++ "io.opencensus:opencensus-contrib-http-util": [ ++ "io.opencensus.contrib.http", ++ "io.opencensus.contrib.http.util" ++ ], ++ "io.perfmark:perfmark-api": [ ++ "io.perfmark" ++ ], ++ "junit:junit": [ ++ "junit.extensions", ++ "junit.framework", ++ "junit.runner", ++ "junit.textui", ++ "org.junit", ++ "org.junit.experimental", ++ "org.junit.experimental.categories", ++ "org.junit.experimental.max", ++ "org.junit.experimental.results", ++ "org.junit.experimental.runners", ++ "org.junit.experimental.theories", ++ "org.junit.experimental.theories.internal", ++ "org.junit.experimental.theories.suppliers", ++ "org.junit.function", ++ "org.junit.internal", ++ "org.junit.internal.builders", ++ "org.junit.internal.management", ++ "org.junit.internal.matchers", ++ "org.junit.internal.requests", ++ "org.junit.internal.runners", ++ "org.junit.internal.runners.model", ++ "org.junit.internal.runners.rules", ++ "org.junit.internal.runners.statements", ++ "org.junit.matchers", ++ "org.junit.rules", ++ "org.junit.runner", ++ "org.junit.runner.manipulation", ++ "org.junit.runner.notification", ++ "org.junit.runners", ++ "org.junit.runners.model", ++ "org.junit.runners.parameterized", ++ "org.junit.validator" ++ ], ++ "org.apache.httpcomponents:httpclient": [ ++ "org.apache.http.auth", ++ "org.apache.http.auth.params", ++ "org.apache.http.client", ++ "org.apache.http.client.config", ++ "org.apache.http.client.entity", ++ "org.apache.http.client.methods", ++ "org.apache.http.client.params", ++ "org.apache.http.client.protocol", ++ "org.apache.http.client.utils", ++ "org.apache.http.conn", ++ "org.apache.http.conn.params", ++ "org.apache.http.conn.routing", ++ "org.apache.http.conn.scheme", ++ "org.apache.http.conn.socket", ++ "org.apache.http.conn.ssl", ++ "org.apache.http.conn.util", ++ "org.apache.http.cookie", ++ "org.apache.http.cookie.params", ++ "org.apache.http.impl.auth", ++ "org.apache.http.impl.client", ++ "org.apache.http.impl.conn", ++ "org.apache.http.impl.conn.tsccm", ++ "org.apache.http.impl.cookie", ++ "org.apache.http.impl.execchain" ++ ], ++ "org.apache.httpcomponents:httpcore": [ ++ "org.apache.http", ++ "org.apache.http.annotation", ++ "org.apache.http.concurrent", ++ "org.apache.http.config", ++ "org.apache.http.entity", ++ "org.apache.http.impl", ++ "org.apache.http.impl.bootstrap", ++ "org.apache.http.impl.entity", ++ "org.apache.http.impl.io", ++ "org.apache.http.impl.pool", ++ "org.apache.http.io", ++ "org.apache.http.message", ++ "org.apache.http.params", ++ "org.apache.http.pool", ++ "org.apache.http.protocol", ++ "org.apache.http.ssl", ++ "org.apache.http.util" ++ ], ++ "org.apache.tomcat:annotations-api": [ ++ "javax.annotation", ++ "javax.annotation.security", ++ "javax.ejb", ++ "javax.persistence", ++ "javax.xml.ws" ++ ], ++ "org.checkerframework:checker-qual": [ ++ "org.checkerframework.checker.builder.qual", ++ "org.checkerframework.checker.calledmethods.qual", ++ "org.checkerframework.checker.compilermsgs.qual", ++ "org.checkerframework.checker.fenum.qual", ++ "org.checkerframework.checker.formatter.qual", ++ "org.checkerframework.checker.guieffect.qual", ++ "org.checkerframework.checker.i18n.qual", ++ "org.checkerframework.checker.i18nformatter.qual", ++ "org.checkerframework.checker.index.qual", ++ "org.checkerframework.checker.initialization.qual", ++ "org.checkerframework.checker.interning.qual", ++ "org.checkerframework.checker.lock.qual", ++ "org.checkerframework.checker.mustcall.qual", ++ "org.checkerframework.checker.nullness.qual", ++ "org.checkerframework.checker.optional.qual", ++ "org.checkerframework.checker.propkey.qual", ++ "org.checkerframework.checker.regex.qual", ++ "org.checkerframework.checker.signature.qual", ++ "org.checkerframework.checker.signedness.qual", ++ "org.checkerframework.checker.tainting.qual", ++ "org.checkerframework.checker.units.qual", ++ "org.checkerframework.common.aliasing.qual", ++ "org.checkerframework.common.initializedfields.qual", ++ "org.checkerframework.common.reflection.qual", ++ "org.checkerframework.common.returnsreceiver.qual", ++ "org.checkerframework.common.subtyping.qual", ++ "org.checkerframework.common.util.report.qual", ++ "org.checkerframework.common.value.qual", ++ "org.checkerframework.dataflow.qual", ++ "org.checkerframework.framework.qual" ++ ], ++ "org.codehaus.mojo:animal-sniffer-annotations": [ ++ "org.codehaus.mojo.animal_sniffer" ++ ], ++ "org.hamcrest:hamcrest-core": [ ++ "org.hamcrest", ++ "org.hamcrest.core", ++ "org.hamcrest.internal" ++ ], ++ "org.jetbrains.kotlin:kotlin-stdlib": [ ++ "kotlin", ++ "kotlin.annotation", ++ "kotlin.collections", ++ "kotlin.collections.builders", ++ "kotlin.collections.unsigned", ++ "kotlin.comparisons", ++ "kotlin.concurrent", ++ "kotlin.contracts", ++ "kotlin.coroutines", ++ "kotlin.coroutines.cancellation", ++ "kotlin.coroutines.intrinsics", ++ "kotlin.coroutines.jvm.internal", ++ "kotlin.experimental", ++ "kotlin.internal", ++ "kotlin.io", ++ "kotlin.js", ++ "kotlin.jvm", ++ "kotlin.jvm.functions", ++ "kotlin.jvm.internal", ++ "kotlin.jvm.internal.markers", ++ "kotlin.jvm.internal.unsafe", ++ "kotlin.math", ++ "kotlin.properties", ++ "kotlin.random", ++ "kotlin.ranges", ++ "kotlin.reflect", ++ "kotlin.sequences", ++ "kotlin.system", ++ "kotlin.text", ++ "kotlin.time" ++ ], ++ "org.jetbrains:annotations": [ ++ "org.intellij.lang.annotations", ++ "org.jetbrains.annotations" ++ ], ++ "org.ow2.asm:asm": [ ++ "org.objectweb.asm", ++ "org.objectweb.asm.signature" ++ ] ++ }, ++ "repositories": { ++ "https://repo1.maven.org/maven2/": [ ++ "com.google.android:annotations", ++ "com.google.api.grpc:proto-google-common-protos", ++ "com.google.auth:google-auth-library-credentials", ++ "com.google.auth:google-auth-library-oauth2-http", ++ "com.google.auto.value:auto-value", ++ "com.google.auto.value:auto-value-annotations", ++ "com.google.code.findbugs:jsr305", ++ "com.google.code.gson:gson", ++ "com.google.errorprone:error_prone_annotations", ++ "com.google.guava:failureaccess", ++ "com.google.guava:guava", ++ "com.google.guava:listenablefuture", ++ "com.google.http-client:google-http-client", ++ "com.google.http-client:google-http-client-gson", ++ "com.google.j2objc:j2objc-annotations", ++ "com.google.protobuf:protobuf-java", ++ "com.google.re2j:re2j", ++ "com.google.truth:truth", ++ "com.squareup.okhttp:okhttp", ++ "com.squareup.okio:okio", ++ "commons-codec:commons-codec", ++ "commons-logging:commons-logging", ++ "io.grpc:grpc-context", ++ "io.netty:netty-buffer", ++ "io.netty:netty-codec", ++ "io.netty:netty-codec-http", ++ "io.netty:netty-codec-http2", ++ "io.netty:netty-codec-socks", ++ "io.netty:netty-common", ++ "io.netty:netty-handler", ++ "io.netty:netty-handler-proxy", ++ "io.netty:netty-resolver", ++ "io.netty:netty-tcnative-boringssl-static", ++ "io.netty:netty-tcnative-boringssl-static:jar:linux-aarch_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:linux-x86_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:osx-aarch_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:osx-x86_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:windows-x86_64", ++ "io.netty:netty-tcnative-classes", ++ "io.netty:netty-transport", ++ "io.netty:netty-transport-classes-epoll", ++ "io.netty:netty-transport-native-epoll:jar:linux-x86_64", ++ "io.netty:netty-transport-native-unix-common", ++ "io.opencensus:opencensus-api", ++ "io.opencensus:opencensus-contrib-grpc-metrics", ++ "io.opencensus:opencensus-contrib-http-util", ++ "io.perfmark:perfmark-api", ++ "junit:junit", ++ "org.apache.httpcomponents:httpclient", ++ "org.apache.httpcomponents:httpcore", ++ "org.apache.tomcat:annotations-api", ++ "org.checkerframework:checker-qual", ++ "org.codehaus.mojo:animal-sniffer-annotations", ++ "org.hamcrest:hamcrest-core", ++ "org.jetbrains.kotlin:kotlin-stdlib", ++ "org.jetbrains.kotlin:kotlin-stdlib-common", ++ "org.jetbrains:annotations", ++ "org.ow2.asm:asm" ++ ], ++ "https://maven.google.com/": [ ++ "com.google.android:annotations", ++ "com.google.api.grpc:proto-google-common-protos", ++ "com.google.auth:google-auth-library-credentials", ++ "com.google.auth:google-auth-library-oauth2-http", ++ "com.google.auto.value:auto-value", ++ "com.google.auto.value:auto-value-annotations", ++ "com.google.code.findbugs:jsr305", ++ "com.google.code.gson:gson", ++ "com.google.errorprone:error_prone_annotations", ++ "com.google.guava:failureaccess", ++ "com.google.guava:guava", ++ "com.google.guava:listenablefuture", ++ "com.google.http-client:google-http-client", ++ "com.google.http-client:google-http-client-gson", ++ "com.google.j2objc:j2objc-annotations", ++ "com.google.protobuf:protobuf-java", ++ "com.google.re2j:re2j", ++ "com.google.truth:truth", ++ "com.squareup.okhttp:okhttp", ++ "com.squareup.okio:okio", ++ "commons-codec:commons-codec", ++ "commons-logging:commons-logging", ++ "io.grpc:grpc-context", ++ "io.netty:netty-buffer", ++ "io.netty:netty-codec", ++ "io.netty:netty-codec-http", ++ "io.netty:netty-codec-http2", ++ "io.netty:netty-codec-socks", ++ "io.netty:netty-common", ++ "io.netty:netty-handler", ++ "io.netty:netty-handler-proxy", ++ "io.netty:netty-resolver", ++ "io.netty:netty-tcnative-boringssl-static", ++ "io.netty:netty-tcnative-boringssl-static:jar:linux-aarch_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:linux-x86_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:osx-aarch_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:osx-x86_64", ++ "io.netty:netty-tcnative-boringssl-static:jar:windows-x86_64", ++ "io.netty:netty-tcnative-classes", ++ "io.netty:netty-transport", ++ "io.netty:netty-transport-classes-epoll", ++ "io.netty:netty-transport-native-epoll:jar:linux-x86_64", ++ "io.netty:netty-transport-native-unix-common", ++ "io.opencensus:opencensus-api", ++ "io.opencensus:opencensus-contrib-grpc-metrics", ++ "io.opencensus:opencensus-contrib-http-util", ++ "io.perfmark:perfmark-api", ++ "junit:junit", ++ "org.apache.httpcomponents:httpclient", ++ "org.apache.httpcomponents:httpcore", ++ "org.apache.tomcat:annotations-api", ++ "org.checkerframework:checker-qual", ++ "org.codehaus.mojo:animal-sniffer-annotations", ++ "org.hamcrest:hamcrest-core", ++ "org.jetbrains.kotlin:kotlin-stdlib", ++ "org.jetbrains.kotlin:kotlin-stdlib-common", ++ "org.jetbrains:annotations", ++ "org.ow2.asm:asm" ++ ] ++ }, ++ "version": "2" ++} diff --git a/modules/grpc-java/1.62.2/patches/update_labels.patch b/modules/grpc-java/1.62.2/patches/update_labels.patch new file mode 100644 index 00000000000..4ddf3767fb9 --- /dev/null +++ b/modules/grpc-java/1.62.2/patches/update_labels.patch @@ -0,0 +1,683 @@ +diff --git a/BUILD.bazel b/BUILD.bazel +index 40c040226..89de9e40e 100644 +--- a/BUILD.bazel ++++ b/BUILD.bazel +@@ -33,9 +33,9 @@ java_library( + "//protobuf", + "//stub", + "//stub:javax_annotation", +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_guava_guava//jar", + "@com_google_protobuf//:protobuf_java", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_guava_guava", + ], + ) + +@@ -47,8 +47,8 @@ java_library( + "//protobuf-lite", + "//stub", + "//stub:javax_annotation", +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_guava_guava//jar", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_guava_guava", + ], + ) + +@@ -56,7 +56,7 @@ java_plugin( + name = "auto_value", + generates_api = 1, + processor_class = "com.google.auto.value.processor.AutoValueProcessor", +- deps = ["@com_google_auto_value_auto_value//jar"], ++ deps = ["@grpc_java_maven//:com_google_auto_value_auto_value"], + ) + + java_library( +@@ -65,7 +65,7 @@ java_library( + neverlink = 1, + visibility = ["//:__subpackages__"], + exports = [ +- "@com_google_auto_value_auto_value_annotations//jar", +- "@org_apache_tomcat_annotations_api//jar", # @Generated for Java 9+ ++ "@grpc_java_maven//:com_google_auto_value_auto_value_annotations", ++ "@grpc_java_maven//:org_apache_tomcat_annotations_api", # @Generated for Java 9+ + ], + ) +diff --git a/alts/BUILD.bazel b/alts/BUILD.bazel +index c99689bac..2264c1023 100644 +--- a/alts/BUILD.bazel ++++ b/alts/BUILD.bazel +@@ -14,16 +14,16 @@ java_library( + "//grpclb", + "//netty", + "//stub", +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_guava_guava//jar", +- "@com_google_j2objc_j2objc_annotations//jar", + "@com_google_protobuf//:protobuf_java", + "@com_google_protobuf//:protobuf_java_util", +- "@io_netty_netty_buffer//jar", +- "@io_netty_netty_codec//jar", +- "@io_netty_netty_common//jar", +- "@io_netty_netty_handler//jar", +- "@io_netty_netty_transport//jar", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_guava_guava", ++ "@grpc_java_maven//:com_google_j2objc_j2objc_annotations", ++ "@grpc_java_maven//:io_netty_netty_buffer", ++ "@grpc_java_maven//:io_netty_netty_codec", ++ "@grpc_java_maven//:io_netty_netty_common", ++ "@grpc_java_maven//:io_netty_netty_handler", ++ "@grpc_java_maven//:io_netty_netty_transport", + ], + ) + +@@ -35,19 +35,19 @@ java_library( + visibility = ["//visibility:public"], + deps = [ + ":alts_internal", +- ":handshaker_java_proto", + ":handshaker_java_grpc", ++ ":handshaker_java_proto", + "//api", + "//auth", + "//core:internal", + "//netty", +- "@com_google_auth_google_auth_library_oauth2_http//jar", +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_guava_guava//jar", +- "@com_google_j2objc_j2objc_annotations//jar", +- "@io_netty_netty_common//jar", +- "@io_netty_netty_handler//jar", +- "@io_netty_netty_transport//jar", ++ "@grpc_java_maven//:com_google_auth_google_auth_library_oauth2_http", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_guava_guava", ++ "@grpc_java_maven//:com_google_j2objc_j2objc_annotations", ++ "@grpc_java_maven//:io_netty_netty_common", ++ "@grpc_java_maven//:io_netty_netty_handler", ++ "@grpc_java_maven//:io_netty_netty_transport", + ], + ) + +diff --git a/api/BUILD.bazel b/api/BUILD.bazel +index efd1e8d96..ab6782304 100644 +--- a/api/BUILD.bazel ++++ b/api/BUILD.bazel +@@ -7,10 +7,10 @@ java_library( + javacopts = ["-Xep:DoNotCall:OFF"], # Remove once requiring Bazel 3.4.0+; allows non-final + visibility = ["//visibility:public"], + deps = [ +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_errorprone_error_prone_annotations//jar", +- "@com_google_guava_failureaccess//jar", # future transitive dep of Guava. See #5214 +- "@com_google_guava_guava//jar", +- "@com_google_j2objc_j2objc_annotations//jar", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_errorprone_error_prone_annotations", ++ "@grpc_java_maven//:com_google_guava_failureaccess", # future transitive dep of Guava. See #5214 ++ "@grpc_java_maven//:com_google_guava_guava", ++ "@grpc_java_maven//:com_google_j2objc_j2objc_annotations", + ], + ) +diff --git a/auth/BUILD.bazel b/auth/BUILD.bazel +index cc923dce2..66863ade3 100644 +--- a/auth/BUILD.bazel ++++ b/auth/BUILD.bazel +@@ -6,9 +6,9 @@ java_library( + visibility = ["//visibility:public"], + deps = [ + "//api", +- "@com_google_auth_google_auth_library_credentials//jar", +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_guava_guava//jar", +- "@com_google_j2objc_j2objc_annotations//jar", ++ "@grpc_java_maven//:com_google_auth_google_auth_library_credentials", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_guava_guava", ++ "@grpc_java_maven//:com_google_j2objc_j2objc_annotations", + ], + ) +diff --git a/census/BUILD.bazel b/census/BUILD.bazel +index c0bf29b3f..1b1b8dba2 100644 +--- a/census/BUILD.bazel ++++ b/census/BUILD.bazel +@@ -5,11 +5,11 @@ java_library( + ]), + visibility = ["//visibility:public"], + deps = [ +- "//api", +- "//context", +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_guava_guava//jar", +- "@io_opencensus_opencensus_api//jar", +- "@io_opencensus_opencensus_contrib_grpc_metrics//jar", ++ "//api", ++ "//context", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_guava_guava", ++ "@grpc_java_maven//:io_opencensus_opencensus_api", ++ "@grpc_java_maven//:io_opencensus_opencensus_contrib_grpc_metrics", + ], + ) +diff --git a/compiler/BUILD.bazel b/compiler/BUILD.bazel +index f88075c0e..81c91ac55 100644 +--- a/compiler/BUILD.bazel ++++ b/compiler/BUILD.bazel +@@ -22,9 +22,9 @@ java_library( + "//protobuf", + "//stub", + "//stub:javax_annotation", +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_guava_guava//jar", + "@com_google_protobuf//:protobuf_java", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_guava_guava", + ], + ) + +@@ -35,8 +35,8 @@ java_library( + "//protobuf-lite", + "//stub", + "//stub:javax_annotation", +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_guava_guava//jar", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_guava_guava", + ], + ) + +diff --git a/core/BUILD.bazel b/core/BUILD.bazel +index ebe5b64c2..fa499a01c 100644 +--- a/core/BUILD.bazel ++++ b/core/BUILD.bazel +@@ -23,14 +23,14 @@ java_library( + deps = [ + "//api", + "//context", +- "@com_google_android_annotations//jar", +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_code_gson_gson//jar", +- "@com_google_errorprone_error_prone_annotations//jar", +- "@com_google_guava_guava//jar", +- "@com_google_j2objc_j2objc_annotations//jar", +- "@io_perfmark_perfmark_api//jar", +- "@org_codehaus_mojo_animal_sniffer_annotations//jar", ++ "@grpc_java_maven//:com_google_android_annotations", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_code_gson_gson", ++ "@grpc_java_maven//:com_google_errorprone_error_prone_annotations", ++ "@grpc_java_maven//:com_google_guava_guava", ++ "@grpc_java_maven//:com_google_j2objc_j2objc_annotations", ++ "@grpc_java_maven//:io_perfmark_perfmark_api", ++ "@grpc_java_maven//:org_codehaus_mojo_animal_sniffer_annotations", + ], + ) + +diff --git a/googleapis/BUILD.bazel b/googleapis/BUILD.bazel +index 77b0bcd93..758be86c4 100644 +--- a/googleapis/BUILD.bazel ++++ b/googleapis/BUILD.bazel +@@ -9,6 +9,6 @@ java_library( + "//api", + "//core:internal", + "//xds", +- "@com_google_guava_guava//jar", ++ "@grpc_java_maven//:com_google_guava_guava", + ], + ) +diff --git a/grpclb/BUILD.bazel b/grpclb/BUILD.bazel +index e82d8022b..c58a36a9f 100644 +--- a/grpclb/BUILD.bazel ++++ b/grpclb/BUILD.bazel +@@ -14,12 +14,12 @@ java_library( + "//api", + "//context", + "//core:internal", +- "//util", + "//stub", +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_guava_guava//jar", +- "@com_google_j2objc_j2objc_annotations//jar", ++ "//util", + "@com_google_protobuf//:protobuf_java_util", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_guava_guava", ++ "@grpc_java_maven//:com_google_j2objc_j2objc_annotations", + "@io_grpc_grpc_proto//:grpclb_load_balancer_java_proto", + ], + ) +diff --git a/inprocess/BUILD.bazel b/inprocess/BUILD.bazel +index 65f2adced..92112ebb3 100644 +--- a/inprocess/BUILD.bazel ++++ b/inprocess/BUILD.bazel +@@ -5,12 +5,12 @@ java_library( + ]), + visibility = ["//visibility:public"], + deps = [ +- "//core:internal", + "//api", + "//context", +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_errorprone_error_prone_annotations//jar", +- "@com_google_guava_guava//jar", +- "@com_google_j2objc_j2objc_annotations//jar", ++ "//core:internal", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_errorprone_error_prone_annotations", ++ "@grpc_java_maven//:com_google_guava_guava", ++ "@grpc_java_maven//:com_google_j2objc_j2objc_annotations", + ], + ) +diff --git a/netty/BUILD.bazel b/netty/BUILD.bazel +index d2497d065..4fb1809c7 100644 +--- a/netty/BUILD.bazel ++++ b/netty/BUILD.bazel +@@ -10,22 +10,22 @@ java_library( + deps = [ + "//api", + "//core:internal", +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_errorprone_error_prone_annotations//jar", +- "@com_google_guava_guava//jar", +- "@com_google_j2objc_j2objc_annotations//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_transport//jar", +- "@io_netty_netty_transport_native_unix_common//jar", +- "@io_perfmark_perfmark_api//jar", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_errorprone_error_prone_annotations", ++ "@grpc_java_maven//:com_google_guava_guava", ++ "@grpc_java_maven//:com_google_j2objc_j2objc_annotations", ++ "@grpc_java_maven//:io_netty_netty_buffer", ++ "@grpc_java_maven//:io_netty_netty_codec", ++ "@grpc_java_maven//:io_netty_netty_codec_http", ++ "@grpc_java_maven//:io_netty_netty_codec_http2", ++ "@grpc_java_maven//:io_netty_netty_codec_socks", ++ "@grpc_java_maven//:io_netty_netty_common", ++ "@grpc_java_maven//:io_netty_netty_handler", ++ "@grpc_java_maven//:io_netty_netty_handler_proxy", ++ "@grpc_java_maven//:io_netty_netty_resolver", ++ "@grpc_java_maven//:io_netty_netty_transport", ++ "@grpc_java_maven//:io_netty_netty_transport_native_unix_common", ++ "@grpc_java_maven//:io_perfmark_perfmark_api", + ], + ) + +diff --git a/netty/shaded/BUILD.bazel b/netty/shaded/BUILD.bazel +index 657bf6aaf..9ce69760a 100644 +--- a/netty/shaded/BUILD.bazel ++++ b/netty/shaded/BUILD.bazel +@@ -4,9 +4,9 @@ java_library( + visibility = ["//netty:__pkg__"], + runtime_deps = [ + "//netty", +- "@io_netty_netty_tcnative_boringssl_static//jar", +- "@io_netty_netty_tcnative_classes//jar", +- "@io_netty_netty_transport_native_unix_common//jar", +- "@io_netty_netty_transport_native_epoll_linux_x86_64//jar", ++ "@grpc_java_maven//:io_netty_netty_tcnative_boringssl_static", ++ "@grpc_java_maven//:io_netty_netty_tcnative_classes", ++ "@grpc_java_maven//:io_netty_netty_transport_native_unix_common", ++ "@grpc_java_maven//:io_netty_netty_transport_native_epoll_linux_x86_64", + ], + ) +diff --git a/okhttp/BUILD.bazel b/okhttp/BUILD.bazel +index 30a77b114..b7ede3995 100644 +--- a/okhttp/BUILD.bazel ++++ b/okhttp/BUILD.bazel +@@ -12,12 +12,12 @@ java_library( + "//api", + "//core:internal", + "//util", +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_errorprone_error_prone_annotations//jar", +- "@com_google_guava_guava//jar", +- "@com_google_j2objc_j2objc_annotations//jar", +- "@com_squareup_okhttp_okhttp//jar", +- "@com_squareup_okio_okio//jar", +- "@io_perfmark_perfmark_api//jar", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_errorprone_error_prone_annotations", ++ "@grpc_java_maven//:com_google_guava_guava", ++ "@grpc_java_maven//:com_google_j2objc_j2objc_annotations", ++ "@grpc_java_maven//:com_squareup_okhttp_okhttp", ++ "@grpc_java_maven//:com_squareup_okio_okio", ++ "@grpc_java_maven//:io_perfmark_perfmark_api", + ], + ) +diff --git a/protobuf-lite/BUILD.bazel b/protobuf-lite/BUILD.bazel +index 85cd9669e..73ecf34c6 100644 +--- a/protobuf-lite/BUILD.bazel ++++ b/protobuf-lite/BUILD.bazel +@@ -6,9 +6,9 @@ java_library( + visibility = ["//visibility:public"], + deps = [ + "//api", +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_guava_guava//jar", +- "@com_google_j2objc_j2objc_annotations//jar", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_guava_guava", ++ "@grpc_java_maven//:com_google_j2objc_j2objc_annotations", + ] + select({ + ":android": ["@com_google_protobuf_javalite//:protobuf_javalite"], + "//conditions:default": ["@com_google_protobuf//:protobuf_java"], +diff --git a/protobuf/BUILD.bazel b/protobuf/BUILD.bazel +index 42085eea5..a7acceeb7 100644 +--- a/protobuf/BUILD.bazel ++++ b/protobuf/BUILD.bazel +@@ -7,10 +7,10 @@ java_library( + deps = [ + "//api", + "//protobuf-lite", +- "@com_google_api_grpc_proto_google_common_protos//jar", +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_guava_guava//jar", +- "@com_google_j2objc_j2objc_annotations//jar", + "@com_google_protobuf//:protobuf_java", ++ "@grpc_java_maven//:com_google_api_grpc_proto_google_common_protos", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_guava_guava", ++ "@grpc_java_maven//:com_google_j2objc_j2objc_annotations", + ], + ) +diff --git a/repositories.bzl b/repositories.bzl +index 942a347cb..100014fc0 100644 +--- a/repositories.bzl ++++ b/repositories.bzl +@@ -83,7 +83,7 @@ IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS = { + "io.grpc:grpc-util": "@io_grpc_grpc_java//util", + } + +-def grpc_java_repositories(): ++def grpc_java_repositories(bzlmod = False): + """Imports dependencies for grpc-java.""" + if not native.existing_rule("com_github_cncf_xds"): + http_archive( +@@ -94,7 +94,7 @@ def grpc_java_repositories(): + "https://github.com/cncf/xds/archive/e9ce68804cb4e64cab5a52e3c8baf840d4ff87b7.tar.gz", + ], + ) +- if not native.existing_rule("com_github_grpc_grpc"): ++ if not bzlmod and not native.existing_rule("com_github_grpc_grpc"): + http_archive( + name = "com_github_grpc_grpc", + strip_prefix = "grpc-1.46.0", +@@ -103,11 +103,11 @@ def grpc_java_repositories(): + "https://github.com/grpc/grpc/archive/v1.46.0.tar.gz", + ], + ) +- if not native.existing_rule("com_google_protobuf"): ++ if not bzlmod and not native.existing_rule("com_google_protobuf"): + com_google_protobuf() +- if not native.existing_rule("com_google_protobuf_javalite"): ++ if not bzlmod and not native.existing_rule("com_google_protobuf_javalite"): + com_google_protobuf_javalite() +- if not native.existing_rule("com_google_googleapis"): ++ if not bzlmod and not native.existing_rule("com_google_googleapis"): + http_archive( + name = "com_google_googleapis", + sha256 = "49930468563dd48283e8301e8d4e71436bf6d27ac27c235224cc1a098710835d", +@@ -116,7 +116,7 @@ def grpc_java_repositories(): + "https://github.com/googleapis/googleapis/archive/ca1372c6d7bcb199638ebfdb40d2b2660bab7b88.tar.gz", + ], + ) +- if not native.existing_rule("io_bazel_rules_go"): ++ if not bzlmod and not native.existing_rule("io_bazel_rules_go"): + http_archive( + name = "io_bazel_rules_go", + sha256 = "ab21448cef298740765f33a7f5acee0607203e4ea321219f2a4c85a6e0fb0a27", +@@ -164,3 +164,8 @@ def io_grpc_grpc_proto(): + strip_prefix = "grpc-proto-08911e9d585cbda3a55eb1dcc4b99c89aebccff8", + urls = ["https://github.com/grpc/grpc-proto/archive/08911e9d585cbda3a55eb1dcc4b99c89aebccff8.zip"], + ) ++ ++def _grpc_java_repositories_extension(_): ++ grpc_java_repositories(bzlmod = True) ++ ++grpc_java_repositories_extension = module_extension(implementation = _grpc_java_repositories_extension) +diff --git a/rls/BUILD.bazel b/rls/BUILD.bazel +index c67c7cd56..0be74a662 100644 +--- a/rls/BUILD.bazel ++++ b/rls/BUILD.bazel +@@ -12,11 +12,11 @@ java_library( + "//api", + "//core", + "//core:internal", +- "//util", + "//stub", +- "@com_google_auto_value_auto_value_annotations//jar", +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_guava_guava//jar", ++ "//util", ++ "@grpc_java_maven//:com_google_auto_value_auto_value_annotations", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_guava_guava", + "@io_grpc_grpc_proto//:rls_config_java_proto", + "@io_grpc_grpc_proto//:rls_java_proto", + ], +diff --git a/services/BUILD.bazel b/services/BUILD.bazel +index fa708dd04..fbf34d485 100644 +--- a/services/BUILD.bazel ++++ b/services/BUILD.bazel +@@ -26,7 +26,7 @@ java_library( + deps = [ + ":channelz", + "//api", +- "@com_google_code_findbugs_jsr305//jar", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", + ], + ) + +@@ -35,15 +35,15 @@ java_library( + srcs = [ + "src/main/java/io/grpc/services/CallMetricRecorder.java", + "src/main/java/io/grpc/services/MetricRecorder.java", +- "src/main/java/io/grpc/services/MetricReport.java", + "src/main/java/io/grpc/services/MetricRecorderHelper.java", ++ "src/main/java/io/grpc/services/MetricReport.java", + ], + deps = [ + "//api", + "//context", +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_errorprone_error_prone_annotations//jar", +- "@com_google_guava_guava//jar", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_errorprone_error_prone_annotations", ++ "@grpc_java_maven//:com_google_guava_guava", + ], + ) + +@@ -72,10 +72,10 @@ java_library( + ":_channelz_java_grpc", + "//api", + "//stub", +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_guava_guava//jar", + "@com_google_protobuf//:protobuf_java", + "@com_google_protobuf//:protobuf_java_util", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_guava_guava", + "@io_grpc_grpc_proto//:channelz_java_proto", + ], + ) +@@ -90,10 +90,10 @@ java_library( + "//api", + "//protobuf", + "//stub", +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_guava_guava//jar", + "@com_google_protobuf//:protobuf_java", + "@com_google_protobuf//:protobuf_java_util", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_guava_guava", + "@io_grpc_grpc_proto//:reflection_java_proto_deprecated", + ], + ) +@@ -110,8 +110,8 @@ java_library( + "//api", + "//context", + "//stub", +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_guava_guava//jar", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_guava_guava", + "@io_grpc_grpc_proto//:health_java_proto", + ], + ) +@@ -131,8 +131,8 @@ java_library( + "//api", + "//core:internal", + "//util", +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_guava_guava//jar", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_guava_guava", + "@io_grpc_grpc_proto//:health_java_proto", + ], + ) +diff --git a/stub/BUILD.bazel b/stub/BUILD.bazel +index c65b01a23..3131a3632 100644 +--- a/stub/BUILD.bazel ++++ b/stub/BUILD.bazel +@@ -7,10 +7,10 @@ java_library( + deps = [ + "//api", + "//context", +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_errorprone_error_prone_annotations//jar", +- "@com_google_guava_guava//jar", +- "@com_google_j2objc_j2objc_annotations//jar", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_errorprone_error_prone_annotations", ++ "@grpc_java_maven//:com_google_guava_guava", ++ "@grpc_java_maven//:com_google_j2objc_j2objc_annotations", + ], + ) + +@@ -20,5 +20,5 @@ java_library( + name = "javax_annotation", + neverlink = 1, # @Generated is source-retention + visibility = ["//visibility:public"], +- exports = ["@org_apache_tomcat_annotations_api//jar"], ++ exports = ["@grpc_java_maven//:org_apache_tomcat_annotations_api"], + ) +diff --git a/testing/BUILD.bazel b/testing/BUILD.bazel +index 974cb32f7..69ee8b651 100644 +--- a/testing/BUILD.bazel ++++ b/testing/BUILD.bazel +@@ -12,12 +12,12 @@ java_library( + "//api", + "//context", + "//inprocess", +- "//util", + "//stub", +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_guava_guava//jar", +- "@com_google_j2objc_j2objc_annotations//jar", +- "@com_google_truth_truth//jar", +- "@junit_junit//jar", ++ "//util", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_guava_guava", ++ "@grpc_java_maven//:com_google_j2objc_j2objc_annotations", ++ "@grpc_java_maven//:com_google_truth_truth", ++ "@grpc_java_maven//:junit_junit", + ], + ) +diff --git a/util/BUILD.bazel b/util/BUILD.bazel +index b95e428f4..cd1402886 100644 +--- a/util/BUILD.bazel ++++ b/util/BUILD.bazel +@@ -10,9 +10,9 @@ java_library( + deps = [ + "//api", + "//core:internal", +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_guava_guava//jar", +- "@com_google_j2objc_j2objc_annotations//jar", +- "@org_codehaus_mojo_animal_sniffer_annotations//jar", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_guava_guava", ++ "@grpc_java_maven//:com_google_j2objc_j2objc_annotations", ++ "@grpc_java_maven//:org_codehaus_mojo_animal_sniffer_annotations", + ], + ) +diff --git a/xds/BUILD.bazel b/xds/BUILD.bazel +index d3b746e39..e5349ebbe 100644 +--- a/xds/BUILD.bazel ++++ b/xds/BUILD.bazel +@@ -31,31 +31,31 @@ java_library( + ":envoy_service_load_stats_v2_java_grpc", + ":envoy_service_load_stats_v3_java_grpc", + ":envoy_service_status_v3_java_grpc", +- ":xds_protos_java", + ":orca", ++ ":xds_protos_java", + "//:auto_value_annotations", + "//alts", + "//api", + "//context", + "//core:internal", +- "//util", + "//netty", +- "//stub", + "//services:metrics", + "//services:metrics_internal", +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_code_gson_gson//jar", +- "@com_google_errorprone_error_prone_annotations//jar", ++ "//stub", ++ "//util", + "@com_google_googleapis//google/rpc:rpc_java_proto", +- "@com_google_guava_guava//jar", + "@com_google_protobuf//:protobuf_java", + "@com_google_protobuf//:protobuf_java_util", +- "@com_google_re2j_re2j//jar", +- "@io_netty_netty_buffer//jar", +- "@io_netty_netty_codec//jar", +- "@io_netty_netty_common//jar", +- "@io_netty_netty_handler//jar", +- "@io_netty_netty_transport//jar", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_code_gson_gson", ++ "@grpc_java_maven//:com_google_errorprone_error_prone_annotations", ++ "@grpc_java_maven//:com_google_guava_guava", ++ "@grpc_java_maven//:com_google_re2j_re2j", ++ "@grpc_java_maven//:io_netty_netty_buffer", ++ "@grpc_java_maven//:io_netty_netty_codec", ++ "@grpc_java_maven//:io_netty_netty_common", ++ "@grpc_java_maven//:io_netty_netty_handler", ++ "@grpc_java_maven//:io_netty_netty_transport", + ], + ) + +@@ -145,14 +145,14 @@ java_library( + "//api", + "//context", + "//core:internal", +- "//util", + "//protobuf", + "//services:metrics", + "//services:metrics_internal", + "//stub", +- "@com_google_code_findbugs_jsr305//jar", +- "@com_google_guava_guava//jar", ++ "//util", + "@com_google_protobuf//:protobuf_java_util", ++ "@grpc_java_maven//:com_google_code_findbugs_jsr305", ++ "@grpc_java_maven//:com_google_guava_guava", + ], + ) + diff --git a/modules/grpc-java/1.62.2/presubmit.yml b/modules/grpc-java/1.62.2/presubmit.yml new file mode 100644 index 00000000000..3bdbf1c3280 --- /dev/null +++ b/modules/grpc-java/1.62.2/presubmit.yml @@ -0,0 +1,9 @@ +matrix: + platform: ["debian10", "macos", "ubuntu2004", "windows"] + bazel: ["6.x", "7.x"] +tasks: + verify_targets: + platform: ${{ platform }} + bazel: ${{ bazel }} + build_targets: + - '@grpc-java//:java_grpc_library__external_repo_test' diff --git a/modules/grpc-java/1.62.2/source.json b/modules/grpc-java/1.62.2/source.json new file mode 100644 index 00000000000..4600fba5693 --- /dev/null +++ b/modules/grpc-java/1.62.2/source.json @@ -0,0 +1,11 @@ +{ + "integrity": "sha256-MM/JVMIXRJOCJgGnS4doN5hsRE2bnpFwgplLXjQ0jzQ=", + "strip_prefix": "grpc-java-1.62.2", + "url": "https://github.com/grpc/grpc-java/archive/refs/tags/v1.62.2.tar.gz", + "patch_strip": 1, + "patches": { + "add_module_bazel.patch": "sha256-CBDMVs47Z5StAQx+xSGGJCVqkmz9WtK0flsU9rb4MkE=", + "maven_lockfile.patch": "sha256-VSRs53yvnCbNzxLFLSvf2FmBCGnJrD+ArNMN2QKLBbs=", + "update_labels.patch": "sha256-22pO7tCUdPKjo4xOasAdrU2N50aHAH2bYAoSkPN4HeU=" + } +} diff --git a/modules/grpc-java/metadata.json b/modules/grpc-java/metadata.json new file mode 100644 index 00000000000..28a45cad92a --- /dev/null +++ b/modules/grpc-java/metadata.json @@ -0,0 +1,16 @@ +{ + "homepage": "https://github.com/grpc/grpc-java", + "maintainers": [ + { + "email": "bcr-maintainers@bazel.build", + "name": "No Maintainer Specified" + } + ], + "repository": [ + "github:grpc/grpc-java" + ], + "versions": [ + "1.62.2" + ], + "yanked_versions": {} +} From 51051f6398f6ed7ce6aec234fb90e48cbe1df6d3 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Wed, 27 Mar 2024 14:02:39 -0700 Subject: [PATCH 2/5] Add googleapis --- .../0.0.0-20240326-1c8d509c5/MODULE.bazel | 29 +++++ .../patches/add_module_bazel.patch | 100 ++++++++++++++++++ .../0.0.0-20240326-1c8d509c5/presubmit.yml | 9 ++ .../0.0.0-20240326-1c8d509c5/source.json | 9 ++ modules/googleapis/metadata.json | 16 +++ 5 files changed, 163 insertions(+) create mode 100644 modules/googleapis/0.0.0-20240326-1c8d509c5/MODULE.bazel create mode 100644 modules/googleapis/0.0.0-20240326-1c8d509c5/patches/add_module_bazel.patch create mode 100644 modules/googleapis/0.0.0-20240326-1c8d509c5/presubmit.yml create mode 100644 modules/googleapis/0.0.0-20240326-1c8d509c5/source.json create mode 100644 modules/googleapis/metadata.json diff --git a/modules/googleapis/0.0.0-20240326-1c8d509c5/MODULE.bazel b/modules/googleapis/0.0.0-20240326-1c8d509c5/MODULE.bazel new file mode 100644 index 00000000000..f1cde24c88b --- /dev/null +++ b/modules/googleapis/0.0.0-20240326-1c8d509c5/MODULE.bazel @@ -0,0 +1,29 @@ +module( + name = "googleapis", + version = "0.0.0-20240326-1c8d509c5", + repo_name = "com_google_googleapis", +) + +bazel_dep(name = "grpc", version = "1.56.3.bcr.1", repo_name = "com_github_grpc_grpc") +bazel_dep(name = "grpc-java", repo_name = "io_grpc_grpc_java") +bazel_dep(name = "protobuf", version = "21.7", repo_name = "com_google_protobuf") +bazel_dep(name = "rules_go", version = "0.46.0", repo_name = "io_bazel_rules_go") +bazel_dep(name = "rules_proto", version = "5.3.0-21.7") +bazel_dep(name = "rules_python", version = "0.31.0") + +switched_rules = use_extension("//:extensions.bzl", "switched_rules") + +# TODO: Enable support for other languages with bzlmod +switched_rules.use_languages( + cc = True, + # csharp = True, + # gapic = True, + go = True, + grpc = True, + java = True, + # nodejs = True, + # php = True, + python = True, + # ruby = True, +) +use_repo(switched_rules, "com_google_googleapis_imports") diff --git a/modules/googleapis/0.0.0-20240326-1c8d509c5/patches/add_module_bazel.patch b/modules/googleapis/0.0.0-20240326-1c8d509c5/patches/add_module_bazel.patch new file mode 100644 index 00000000000..30e0e7baa31 --- /dev/null +++ b/modules/googleapis/0.0.0-20240326-1c8d509c5/patches/add_module_bazel.patch @@ -0,0 +1,100 @@ +diff --git a/MODULE.bazel b/MODULE.bazel +new file mode 100644 +index 000000000..169133e43 +--- /dev/null ++++ b/MODULE.bazel +@@ -0,0 +1,29 @@ ++module( ++ name = "googleapis", ++ version = "0.0.0-20240326-1c8d509c5", ++ repo_name = "com_google_googleapis", ++) ++ ++bazel_dep(name = "grpc", version = "1.56.3.bcr.1", repo_name = "com_github_grpc_grpc") ++bazel_dep(name = "grpc-java", version = "1.62.2", repo_name = "io_grpc_grpc_java") ++bazel_dep(name = "protobuf", version = "21.7", repo_name = "com_google_protobuf") ++bazel_dep(name = "rules_go", version = "0.46.0", repo_name = "io_bazel_rules_go") ++bazel_dep(name = "rules_proto", version = "5.3.0-21.7") ++bazel_dep(name = "rules_python", version = "0.31.0") ++ ++switched_rules = use_extension("//:extensions.bzl", "switched_rules") ++ ++# TODO: Enable support for other languages with bzlmod ++switched_rules.use_languages( ++ cc = True, ++ # csharp = True, ++ # gapic = True, ++ go = True, ++ grpc = True, ++ java = True, ++ # nodejs = True, ++ # php = True, ++ python = True, ++ # ruby = True, ++) ++use_repo(switched_rules, "com_google_googleapis_imports") +diff --git a/extensions.bzl b/extensions.bzl +new file mode 100644 +index 000000000..9aa161841 +--- /dev/null ++++ b/extensions.bzl +@@ -0,0 +1,59 @@ ++load(":repository_rules.bzl", "switched_rules_by_language") ++ ++_use_languages_tag = tag_class( ++ attrs = { ++ "cc": attr.bool(default = False), ++ "csharp": attr.bool(default = False), ++ "gapic": attr.bool(default = False), ++ "go": attr.bool(default = False), ++ "go_test": attr.bool(default = False), ++ "grpc": attr.bool(default = False), ++ "java": attr.bool(default = False), ++ "nodejs": attr.bool(default = False), ++ "php": attr.bool(default = False), ++ "python": attr.bool(default = False), ++ "ruby": attr.bool(default = False), ++ }, ++) ++ ++def _switched_rules_impl(ctx): ++ attrs = {} ++ for module in ctx.modules: ++ if not module.is_root: ++ continue ++ ++ is_tag_set = False ++ set_tag_name = "" ++ ++ for t in module.tags.use_languages: ++ if is_tag_set: ++ fail("Multiple use_language tags are set in the root module: '{}' and '{}'. Only one is allowed.".format(set_tag_name, module.name)) ++ ++ is_tag_set = True ++ set_tag_name = module.name ++ ++ attrs = { ++ "cc": t.cc, ++ "csharp": t.csharp, ++ "gapic": t.gapic, ++ "go": t.go, ++ "go_test": t.go_test, ++ "grpc": t.grpc, ++ "java": t.java, ++ "nodejs": t.nodejs, ++ "php": t.php, ++ "python": t.python, ++ "ruby": t.ruby, ++ } ++ ++ switched_rules_by_language( ++ name = "com_google_googleapis_imports", ++ **attrs ++ ) ++ ++switched_rules = module_extension( ++ implementation = _switched_rules_impl, ++ tag_classes = { ++ "use_languages": _use_languages_tag, ++ }, ++) diff --git a/modules/googleapis/0.0.0-20240326-1c8d509c5/presubmit.yml b/modules/googleapis/0.0.0-20240326-1c8d509c5/presubmit.yml new file mode 100644 index 00000000000..c515885eeb6 --- /dev/null +++ b/modules/googleapis/0.0.0-20240326-1c8d509c5/presubmit.yml @@ -0,0 +1,9 @@ +matrix: + platform: ["debian10", "macos", "ubuntu2004", "windows"] + bazel: ["6.x", "7.x"] +tasks: + verify_targets: + platform: ${{ platform }} + bazel: ${{ bazel }} + build_targets: + - '@googleapis//google/devtools/source/v1:source_proto' diff --git a/modules/googleapis/0.0.0-20240326-1c8d509c5/source.json b/modules/googleapis/0.0.0-20240326-1c8d509c5/source.json new file mode 100644 index 00000000000..d385e6a8283 --- /dev/null +++ b/modules/googleapis/0.0.0-20240326-1c8d509c5/source.json @@ -0,0 +1,9 @@ +{ + "integrity": "sha256-uFSuF925M8JJUw90PbjXjfgJBd+0JoElVWSh0ZId/Dw=", + "strip_prefix": "googleapis-1c8d509c574aeab7478be1bfd4f2e8f0931cfead", + "url": "https://github.com/googleapis/googleapis/archive/1c8d509c574aeab7478be1bfd4f2e8f0931cfead.tar.gz", + "patch_strip": 1, + "patches": { + "add_module_bazel.patch": "sha256-fyl8LjxecJdTeeCNtpG4rfZMDiSOPTUi7HvJGDWvP1o=" + } +} diff --git a/modules/googleapis/metadata.json b/modules/googleapis/metadata.json new file mode 100644 index 00000000000..9ce0da135c8 --- /dev/null +++ b/modules/googleapis/metadata.json @@ -0,0 +1,16 @@ +{ + "homepage": "https://github.com/googleapis/googleapis", + "maintainers": [ + { + "email": "bcr-maintainers@bazel.build", + "name": "No Maintainer Specified" + } + ], + "repository": [ + "github:googleapis/googleapis" + ], + "versions": [ + "0.0.0-20240326-1c8d509c5" + ], + "yanked_versions": {} +} From 8b540c66652df04223217c9d932dfb5467dd982d Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Wed, 27 Mar 2024 14:10:10 -0700 Subject: [PATCH 3/5] update here too --- modules/grpc-java/1.62.2/MODULE.bazel | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/grpc-java/1.62.2/MODULE.bazel b/modules/grpc-java/1.62.2/MODULE.bazel index 5aa6c416218..46bbe69f581 100644 --- a/modules/grpc-java/1.62.2/MODULE.bazel +++ b/modules/grpc-java/1.62.2/MODULE.bazel @@ -5,6 +5,7 @@ module( repo_name = "io_grpc_grpc_java", ) +bazel_dep(name = "googleapis", version = "0.0.0-20240326-1c8d509c5", repo_name = "com_google_googleapis") bazel_dep(name = "grpc", version = "1.56.3.bcr.1", repo_name = "com_github_grpc_grpc") bazel_dep(name = "protobuf", version = "23.1", repo_name = "com_google_protobuf") bazel_dep(name = "rules_cc", version = "0.0.9") @@ -28,8 +29,6 @@ use_repo( "opencensus_proto", ) -bazel_dep(name = "googleapis", repo_name = "com_google_googleapis") - maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") maven.install( name = "grpc_java_maven", From 9d1818b0c837b8ce476dc7f4188289975dd5f677 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Wed, 27 Mar 2024 14:12:53 -0700 Subject: [PATCH 4/5] add version --- modules/googleapis/0.0.0-20240326-1c8d509c5/MODULE.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/googleapis/0.0.0-20240326-1c8d509c5/MODULE.bazel b/modules/googleapis/0.0.0-20240326-1c8d509c5/MODULE.bazel index f1cde24c88b..169133e4376 100644 --- a/modules/googleapis/0.0.0-20240326-1c8d509c5/MODULE.bazel +++ b/modules/googleapis/0.0.0-20240326-1c8d509c5/MODULE.bazel @@ -5,7 +5,7 @@ module( ) bazel_dep(name = "grpc", version = "1.56.3.bcr.1", repo_name = "com_github_grpc_grpc") -bazel_dep(name = "grpc-java", repo_name = "io_grpc_grpc_java") +bazel_dep(name = "grpc-java", version = "1.62.2", repo_name = "io_grpc_grpc_java") bazel_dep(name = "protobuf", version = "21.7", repo_name = "com_google_protobuf") bazel_dep(name = "rules_go", version = "0.46.0", repo_name = "io_bazel_rules_go") bazel_dep(name = "rules_proto", version = "5.3.0-21.7") From 843308ab4bb8c261123b1bbf319b693e12eeea1e Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Wed, 27 Mar 2024 14:14:52 -0700 Subject: [PATCH 5/5] drop 6.x because of rules_jvm_external --- modules/googleapis/0.0.0-20240326-1c8d509c5/presubmit.yml | 2 +- modules/grpc-java/1.62.2/presubmit.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/googleapis/0.0.0-20240326-1c8d509c5/presubmit.yml b/modules/googleapis/0.0.0-20240326-1c8d509c5/presubmit.yml index c515885eeb6..5579de0b95d 100644 --- a/modules/googleapis/0.0.0-20240326-1c8d509c5/presubmit.yml +++ b/modules/googleapis/0.0.0-20240326-1c8d509c5/presubmit.yml @@ -1,6 +1,6 @@ matrix: platform: ["debian10", "macos", "ubuntu2004", "windows"] - bazel: ["6.x", "7.x"] + bazel: ["7.x"] tasks: verify_targets: platform: ${{ platform }} diff --git a/modules/grpc-java/1.62.2/presubmit.yml b/modules/grpc-java/1.62.2/presubmit.yml index 3bdbf1c3280..777eadca061 100644 --- a/modules/grpc-java/1.62.2/presubmit.yml +++ b/modules/grpc-java/1.62.2/presubmit.yml @@ -1,6 +1,6 @@ matrix: platform: ["debian10", "macos", "ubuntu2004", "windows"] - bazel: ["6.x", "7.x"] + bazel: ["7.x"] tasks: verify_targets: platform: ${{ platform }}