Add grpc and grpc-java 1.69.0 (#3470)

bazelbuild · Dec 24, 2024 · 7664af6 · 7664af6
1 parent 646d403
commit 7664af6
Show file tree

Hide file tree

Showing 12 changed files with 592 additions and 2 deletions.
diff --git a/modules/grpc-java/1.69.0/MODULE.bazel b/modules/grpc-java/1.69.0/MODULE.bazel
@@ -0,0 +1,195 @@
+module(
+    name = "grpc-java",
+    compatibility_level = 0,
+    repo_name = "io_grpc_grpc_java",
+    version = "1.69.0",  # CURRENT_GRPC_VERSION
+)
+
+# GRPC_DEPS_START
+IO_GRPC_GRPC_JAVA_ARTIFACTS = [
+    "com.google.android:annotations:4.1.1.4",
+    "com.google.api.grpc:proto-google-common-protos:2.48.0",
+    "com.google.auth:google-auth-library-credentials:1.24.1",
+    "com.google.auth:google-auth-library-oauth2-http:1.24.1",
+    "com.google.auto.value:auto-value-annotations:1.11.0",
+    "com.google.auto.value:auto-value:1.11.0",
+    "com.google.code.findbugs:jsr305:3.0.2",
+    "com.google.code.gson:gson:2.11.0",
+    "com.google.errorprone:error_prone_annotations:2.30.0",
+    "com.google.guava:failureaccess:1.0.1",
+    "com.google.guava:guava:33.3.1-android",
+    "com.google.re2j:re2j:1.7",
+    "com.google.truth:truth:1.4.2",
+    "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.110.Final",
+    "io.netty:netty-codec-http2:4.1.110.Final",
+    "io.netty:netty-codec-http:4.1.110.Final",
+    "io.netty:netty-codec-socks:4.1.110.Final",
+    "io.netty:netty-codec:4.1.110.Final",
+    "io.netty:netty-common:4.1.110.Final",
+    "io.netty:netty-handler-proxy:4.1.110.Final",
+    "io.netty:netty-handler:4.1.110.Final",
+    "io.netty:netty-resolver:4.1.110.Final",
+    "io.netty:netty-tcnative-boringssl-static:2.0.65.Final",
+    "io.netty:netty-tcnative-classes:2.0.65.Final",
+    "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.110.Final",
+    "io.netty:netty-transport-native-unix-common:4.1.110.Final",
+    "io.netty:netty-transport:4.1.110.Final",
+    "io.opencensus:opencensus-api:0.31.0",
+    "io.opencensus:opencensus-contrib-grpc-metrics:0.31.0",
+    "io.perfmark:perfmark-api:0.27.0",
+    "junit:junit:4.13.2",
+    "org.apache.tomcat:annotations-api:6.0.53",
+    "org.checkerframework:checker-qual:3.12.0",
+    "org.codehaus.mojo:animal-sniffer-annotations:1.24",
+]
+# GRPC_DEPS_END
+
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "googleapis", repo_name = "com_google_googleapis", version = "0.0.0-20240819-fe8ba054a")
+# CEL Spec may be removed when cncf/xds MODULE is no longer using protobuf 27.x
+bazel_dep(name = "cel-spec", repo_name = "dev_cel", version = "0.15.0")
+bazel_dep(name = "envoy_api", version = "0.0.0-20241214-918efc9")
+bazel_dep(name = "grpc", repo_name = "com_github_grpc_grpc", version = "1.69.0")
+bazel_dep(name = "grpc-proto", repo_name = "io_grpc_grpc_proto", version = "0.0.0-20240627-ec30f58")
+bazel_dep(name = "opencensus-proto", repo_name = "opencensus_proto", version = "0.4.1")
+bazel_dep(name = "protobuf", repo_name = "com_google_protobuf", version = "23.1")
+bazel_dep(name = "protoc-gen-validate", repo_name = "com_envoyproxy_protoc_gen_validate", version = "1.0.4.bcr.2")
+bazel_dep(name = "rules_cc", version = "0.0.9")
+bazel_dep(name = "rules_java", version = "5.3.5")
+bazel_dep(name = "rules_go", repo_name = "io_bazel_rules_go", version = "0.46.0")
+bazel_dep(name = "rules_jvm_external", version = "6.0")
+bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
+bazel_dep(name = "xds", repo_name = "com_github_cncf_xds", version = "0.0.0-20240423-555b57e")
+
+maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
+
+maven.install(
+    artifacts = IO_GRPC_GRPC_JAVA_ARTIFACTS,
+    repositories = [
+        "https://repo.maven.apache.org/maven2/",
+    ],
+    strict_visibility = True,
+)
+
+use_repo(maven, "maven")
+
+maven.override(
+    coordinates = "com.google.protobuf:protobuf-java",
+    target = "@com_google_protobuf//:protobuf_java",
+)
+
+maven.override(
+    coordinates = "com.google.protobuf:protobuf-java-util",
+    target = "@com_google_protobuf//:protobuf_java_util",
+)
+
+maven.override(
+    coordinates = "com.google.protobuf:protobuf-javalite",
+    target = "@com_google_protobuf//:protobuf_javalite",
+)
+
+maven.override(
+    coordinates = "io.grpc:grpc-alts",
+    target = "@io_grpc_grpc_java//alts",
+)
+
+maven.override(
+    coordinates = "io.grpc:grpc-api",
+    target = "@io_grpc_grpc_java//api",
+)
+
+maven.override(
+    coordinates = "io.grpc:grpc-auth",
+    target = "@io_grpc_grpc_java//auth",
+)
+
+maven.override(
+    coordinates = "io.grpc:grpc-census",
+    target = "@io_grpc_grpc_java//census",
+)
+
+maven.override(
+    coordinates = "io.grpc:grpc-context",
+    target = "@io_grpc_grpc_java//context",
+)
+
+maven.override(
+    coordinates = "io.grpc:grpc-core",
+    target = "@io_grpc_grpc_java//core:core_maven",
+)
+
+maven.override(
+    coordinates = "io.grpc:grpc-googleapis",
+    target = "@io_grpc_grpc_java//googleapis",
+)
+
+maven.override(
+    coordinates = "io.grpc:grpc-grpclb",
+    target = "@io_grpc_grpc_java//grpclb",
+)
+
+maven.override(
+    coordinates = "io.grpc:grpc-inprocess",
+    target = "@io_grpc_grpc_java//inprocess",
+)
+
+maven.override(
+    coordinates = "io.grpc:grpc-netty",
+    target = "@io_grpc_grpc_java//netty",
+)
+
+maven.override(
+    coordinates = "io.grpc:grpc-netty-shaded",
+    target = "@io_grpc_grpc_java//netty:shaded_maven",
+)
+
+maven.override(
+    coordinates = "io.grpc:grpc-okhttp",
+    target = "@io_grpc_grpc_java//okhttp",
+)
+
+maven.override(
+    coordinates = "io.grpc:grpc-protobuf",
+    target = "@io_grpc_grpc_java//protobuf",
+)
+
+maven.override(
+    coordinates = "io.grpc:grpc-protobuf-lite",
+    target = "@io_grpc_grpc_java//protobuf-lite",
+)
+
+maven.override(
+    coordinates = "io.grpc:grpc-rls",
+    target = "@io_grpc_grpc_java//rls",
+)
+
+maven.override(
+    coordinates = "io.grpc:grpc-services",
+    target = "@io_grpc_grpc_java//services:services_maven",
+)
+
+maven.override(
+    coordinates = "io.grpc:grpc-stub",
+    target = "@io_grpc_grpc_java//stub",
+)
+
+maven.override(
+    coordinates = "io.grpc:grpc-testing",
+    target = "@io_grpc_grpc_java//testing",
+)
+
+maven.override(
+    coordinates = "io.grpc:grpc-xds",
+    target = "@io_grpc_grpc_java//xds:xds_maven",
+)
+
+maven.override(
+    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)
diff --git a/modules/grpc-java/1.69.0/patches/module_dot_bazel.patch b/modules/grpc-java/1.69.0/patches/module_dot_bazel.patch
@@ -0,0 +1,50 @@
+commit f404a428de32492511b106e28bb1d4a2e330ff10
+Author: maleo <[email protected]>
+Date:   Sat Dec 14 12:14:21 2024 +0000
+
+    Use more Bazel module dependencies
+
+diff --git a/MODULE.bazel b/MODULE.bazel
+index 3159f470f..2a63bd732 100644
+--- a/MODULE.bazel
++++ b/MODULE.bazel
+@@ -47,33 +47,21 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
+ # GRPC_DEPS_END
+
+ bazel_dep(name = "bazel_skylib", version = "1.7.1")
+-bazel_dep(name = "googleapis", repo_name = "com_google_googleapis", version = "0.0.0-20240326-1c8d509c5")
++bazel_dep(name = "googleapis", repo_name = "com_google_googleapis", version = "0.0.0-20240819-fe8ba054a")
+ # CEL Spec may be removed when cncf/xds MODULE is no longer using protobuf 27.x
+ bazel_dep(name = "cel-spec", repo_name = "dev_cel", version = "0.15.0")
++bazel_dep(name = "envoy_api", version = "0.0.0-20241214-918efc9")
+-bazel_dep(name = "grpc", repo_name = "com_github_grpc_grpc", version = "1.56.3.bcr.1")
++bazel_dep(name = "grpc", repo_name = "com_github_grpc_grpc", version = "1.69.0")
+ bazel_dep(name = "grpc-proto", repo_name = "io_grpc_grpc_proto", version = "0.0.0-20240627-ec30f58")
++bazel_dep(name = "opencensus-proto", repo_name = "opencensus_proto", version = "0.4.1")
+ bazel_dep(name = "protobuf", repo_name = "com_google_protobuf", version = "23.1")
++bazel_dep(name = "protoc-gen-validate", repo_name = "com_envoyproxy_protoc_gen_validate", version = "1.0.4.bcr.2")
+ bazel_dep(name = "rules_cc", version = "0.0.9")
+ bazel_dep(name = "rules_java", version = "5.3.5")
+ bazel_dep(name = "rules_go", repo_name = "io_bazel_rules_go", version = "0.46.0")
+ 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",
+-)
+-
+-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",
+-    "opencensus_proto",
+-)
++bazel_dep(name = "xds", repo_name = "com_github_cncf_xds", version = "0.0.0-20240423-555b57e")
+
+ maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
+
diff --git a/modules/grpc-java/1.69.0/presubmit.yml b/modules/grpc-java/1.69.0/presubmit.yml
@@ -0,0 +1,9 @@
+matrix:
+  platform: ["debian10", "macos", "ubuntu2004", "windows"]
+  bazel: ["7.x", "8.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.69.0/source.json b/modules/grpc-java/1.69.0/source.json
@@ -0,0 +1,9 @@
+{
+    "integrity": "sha256-XDF48RgZDXP1JGDWcce2/EIkm3tYkNIozkIvLKILGmg=",
+    "strip_prefix": "grpc-java-1.69.0",
+    "url": "https://github.com/grpc/grpc-java/archive/refs/tags/v1.69.0.tar.gz",
+    "patch_strip": 1,
+    "patches": {
+        "module_dot_bazel.patch": "sha256-om3FIHRKoAkKkmJxD5LCVibwqETuWlTgd1cs6M+waz4="
+    }
+}
diff --git a/modules/grpc-java/metadata.json b/modules/grpc-java/metadata.json
@@ -14,7 +14,8 @@
         "1.64.0",
         "1.66.0",
         "1.67.1",
-        "1.68.1"
+        "1.68.1",
+        "1.69.0"
     ],
     "yanked_versions": {}
 }
diff --git a/modules/grpc/1.69.0/MODULE.bazel b/modules/grpc/1.69.0/MODULE.bazel
@@ -0,0 +1,77 @@
+module(
+    name = "grpc",
+    version = "1.69.0",
+    compatibility_level = 1,
+    repo_name = "com_github_grpc_grpc",
+)
+
+bazel_dep(name = "abseil-cpp", version = "20240722.0", repo_name = "com_google_absl")
+bazel_dep(name = "apple_support", version = "1.15.1", repo_name = "build_bazel_apple_support")
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "boringssl", version = "0.20241024.0")
+bazel_dep(name = "c-ares", version = "1.15.0", repo_name = "com_github_cares_cares")
+bazel_dep(name = "envoy_api", version = "0.0.0-20241214-918efc9")
+bazel_dep(name = "google_benchmark", version = "1.8.5", repo_name = "com_github_google_benchmark")
+bazel_dep(name = "googleapis", version = "0.0.0-20240819-fe8ba054a", repo_name = "com_google_googleapis")
+bazel_dep(name = "googletest", version = "1.15.2", repo_name = "com_google_googletest")
+bazel_dep(name = "grpc-java", version = "1.69.0")
+bazel_dep(name = "opencensus-cpp", version = "0.0.0-20230502-50eb5de", repo_name = "io_opencensus_cpp")
+bazel_dep(name = "opentelemetry-cpp", version = "1.16.0", repo_name = "io_opentelemetry_cpp")
+bazel_dep(name = "platforms", version = "0.0.10")
+bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
+bazel_dep(name = "protoc-gen-validate", version = "1.0.4.bcr.2", repo_name = "com_envoyproxy_protoc_gen_validate")
+bazel_dep(name = "re2", version = "2024-07-02", repo_name = "com_googlesource_code_re2")
+bazel_dep(name = "rules_apple", version = "3.5.1", repo_name = "build_bazel_rules_apple")
+bazel_dep(name = "rules_cc", version = "0.0.16")
+bazel_dep(name = "rules_java", version = "7.12.2")
+bazel_dep(name = "rules_proto", version = "6.0.2")
+bazel_dep(name = "xds", version = "0.0.0-20240423-555b57e", repo_name = "com_github_cncf_xds")
+bazel_dep(name = "zlib", version = "1.3.1.bcr.3")
+
+grpc_repo_deps_ext = use_extension("//bazel:grpc_deps.bzl", "grpc_repo_deps_ext")
+use_repo(
+    grpc_repo_deps_ext,
+    "google_cloud_cpp",
+)
+
+switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
+switched_rules.use_languages(
+    cc = True,
+    grpc = True,
+    python = True,
+)
+
+bazel_dep(name = "rules_python", version = "0.37.1")
+
+PYTHON_VERSIONS = [
+    "3.9",
+    "3.10",
+    "3.11",
+    "3.12",
+    "3.13",
+]
+
+python = use_extension("@rules_python//python/extensions:python.bzl", "python")
+
+[
+    python.toolchain(
+        is_default = python_version == PYTHON_VERSIONS[-1],
+        python_version = python_version,
+    )
+    for python_version in PYTHON_VERSIONS
+]
+
+pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
+
+[
+    pip.parse(
+        hub_name = "grpc_python_dependencies",
+        python_version = python_version,
+        requirements_lock = "//:requirements.bazel.txt",
+    )
+    for python_version in PYTHON_VERSIONS
+]
+
+use_repo(pip, "grpc_python_dependencies")
+
+bazel_dep(name = "cython", version = "3.0.11-1")