diff --git a/MODULE.bazel b/MODULE.bazel
index bf32036840..6f0620fcde 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -262,7 +262,6 @@ protobuf_maven_dev.install(
 use_repo(protobuf_maven_dev, "protobuf_maven_dev")
 
 bazel_dep(name = "googletest", version = "1.17.0.bcr.2", dev_dependency = True)
-bazel_dep(name = "rules_buf", version = "0.3.0", dev_dependency = True)
 bazel_dep(name = "rules_testing", version = "0.9.0", dev_dependency = True)
 bazel_dep(
     name = "abseil-py",
@@ -302,18 +301,6 @@ archive_override(
     urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v25.0/protobuf-25.0.tar.gz"],
 )
 
-bazel_dep(name = "com_google_protobuf_previous_release", version = "33.0", dev_dependency = True)
-archive_override(
-    module_name = "com_google_protobuf_previous_release",
-    integrity = "sha256-y8U2BkcGtijc/lB77zhu8+IhTVY2V2EilvF4GqFV7gc=",
-    patch_strip = 1,
-    patches = [
-        "@com_google_protobuf//:patches/protobuf_v33/0001-Update-module-name.patch",
-    ],
-    strip_prefix = "protobuf-33.0",
-    urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v33.0/protobuf-33.0.tar.gz"],
-)
-
 # Register C++ toolchains for cross-compilation. These are used for compiling release binaries of
 # protoc and the Python extension. They are disabled unless --//toolchain:release=true is passed.
 register_toolchains(
diff --git a/WORKSPACE b/WORKSPACE
index 9b1b344042..c05fe00f5a 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -262,29 +262,6 @@ http_archive(
     url = "https://github.com/bazelbuild/rules_testing/releases/download/v0.9.0/rules_testing-v0.9.0.tar.gz",
 )
 
-# For checking breaking changes to well-known types from the previous release version.
-http_archive(
-    name = "com_google_protobuf_previous_release",
-    integrity = "sha256-EKDVjzmhqQnpXgDougtbHcZNApl/dBFRlTorNln254w=",
-    strip_prefix = "protobuf-29.0",
-    urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v29.0/protobuf-29.0.tar.gz"],
-)
-
-http_archive(
-    name = "rules_buf",
-    integrity = "sha256-Hr64Q/CaYr0E3ptAjEOgdZd1yc+cBjp7OG1wzuf3DIs=",
-    strip_prefix = "rules_buf-0.3.0",
-    urls = [
-        "https://github.com/bufbuild/rules_buf/archive/refs/tags/v0.3.0.zip",
-    ],
-)
-
-load("@rules_buf//buf:repositories.bzl", "rules_buf_dependencies", "rules_buf_toolchains")
-
-rules_buf_dependencies()
-
-rules_buf_toolchains(version = "v1.32.1")
-
 register_toolchains(
     "//toolchain:osx-x86_64-toolchain",
     "//toolchain:osx-aarch_64-toolchain",
diff --git a/compatibility/BUILD.bazel b/compatibility/BUILD.bazel
index a08376a1dc..18d65461f8 100644
--- a/compatibility/BUILD.bazel
+++ b/compatibility/BUILD.bazel
@@ -1,4 +1,3 @@
-load("@rules_buf//buf:defs.bzl", "buf_breaking_test")
 load("@rules_java//java:java_library.bzl", "java_library")
 
 # Simple build tests for compatibility of gencode from previous major versions
@@ -23,122 +22,3 @@ java_library(
     visibility = ["//java/core:__pkg__"],
     deps = ["@com_google_protobuf_v25//java/core"],
 )
-
-# Breaking change detection for well-known types and descriptor.proto.
-buf_breaking_test(
-    name = "any_proto_breaking",
-    against = "@com_google_protobuf_previous_release//:any_proto",
-    config = ":buf.yaml",
-    targets = ["//:any_proto"],
-)
-
-buf_breaking_test(
-    name = "api_proto_breaking",
-    against = "@com_google_protobuf_previous_release//:api_proto",
-    config = ":buf.yaml",
-    targets = ["//:api_proto"],
-)
-
-buf_breaking_test(
-    name = "descriptor_proto_breaking",
-    against = "@com_google_protobuf_previous_release//:descriptor_proto",
-    config = ":buf.yaml",
-    targets = ["//:descriptor_proto"],
-)
-
-buf_breaking_test(
-    name = "duration_proto_breaking",
-    against = "@com_google_protobuf_previous_release//:duration_proto",
-    config = ":buf.yaml",
-    targets = ["//:duration_proto"],
-)
-
-buf_breaking_test(
-    name = "empty_proto_breaking",
-    against = "@com_google_protobuf_previous_release//:empty_proto",
-    config = ":buf.yaml",
-    targets = ["//:empty_proto"],
-)
-
-buf_breaking_test(
-    name = "field_mask_proto_breaking",
-    against = "@com_google_protobuf_previous_release//:field_mask_proto",
-    config = ":buf.yaml",
-    targets = ["//:field_mask_proto"],
-)
-
-buf_breaking_test(
-    name = "source_context_proto_breaking",
-    against = "@com_google_protobuf_previous_release//:source_context_proto",
-    config = ":buf.yaml",
-    targets = ["//:source_context_proto"],
-)
-
-buf_breaking_test(
-    name = "struct_proto_breaking",
-    against = "@com_google_protobuf_previous_release//:struct_proto",
-    config = ":buf.yaml",
-    targets = ["//:struct_proto"],
-)
-
-buf_breaking_test(
-    name = "timestamp_proto_breaking",
-    against = "@com_google_protobuf_previous_release//:timestamp_proto",
-    config = ":buf.yaml",
-    targets = ["//:timestamp_proto"],
-)
-
-buf_breaking_test(
-    name = "type_proto_breaking",
-    against = "@com_google_protobuf_previous_release//:type_proto",
-    config = ":buf.yaml",
-    targets = ["//:type_proto"],
-)
-
-buf_breaking_test(
-    name = "wrappers_proto_breaking",
-    against = "@com_google_protobuf_previous_release//:wrappers_proto",
-    config = ":buf.yaml",
-    targets = ["//:wrappers_proto"],
-)
-
-buf_breaking_test(
-    name = "compiler_plugin_proto_breaking",
-    against = "@com_google_protobuf_previous_release//:compiler_plugin_proto",
-    config = ":buf.yaml",
-    targets = ["//:compiler_plugin_proto"],
-)
-
-buf_breaking_test(
-    name = "cpp_features_proto_breaking",
-    against = "@com_google_protobuf_previous_release//:cpp_features_proto",
-    config = ":buf.yaml",
-    targets = ["//:cpp_features_proto"],
-)
-
-buf_breaking_test(
-    name = "java_features_proto_breaking",
-    against = "@com_google_protobuf_previous_release//:java_features_proto",
-    config = ":buf.yaml",
-    targets = ["//:java_features_proto"],
-)
-
-test_suite(
-    name = "proto_breaking",
-    tests = [
-        "any_proto_breaking",
-        "api_proto_breaking",
-        "compiler_plugin_proto_breaking",
-        "cpp_features_proto_breaking",
-        "descriptor_proto_breaking",
-        "duration_proto_breaking",
-        "empty_proto_breaking",
-        "field_mask_proto_breaking",
-        "java_features_proto_breaking",
-        "source_context_proto_breaking",
-        "struct_proto_breaking",
-        "timestamp_proto_breaking",
-        "type_proto_breaking",
-        "wrappers_proto_breaking",
-    ],
-)
diff --git a/compatibility/buf.yaml b/compatibility/buf.yaml
deleted file mode 100644
index c126332f30..0000000000
--- a/compatibility/buf.yaml
+++ /dev/null
@@ -1 +0,0 @@
-version: v1
diff --git a/maven_install.json b/maven_install.json
index d4a8caad1b..e2d10b7b25 100644
--- a/maven_install.json
+++ b/maven_install.json
@@ -1,11 +1,52 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": 1681618567,
-  "__RESOLVED_ARTIFACTS_HASH": -1085701786,
+  "__INPUT_ARTIFACTS_HASH": 1484601935,
+  "__RESOLVED_ARTIFACTS_HASH": -938129940,
   "conflict_resolution": {
-    "com.google.errorprone:error_prone_annotations:2.5.1": "com.google.errorprone:error_prone_annotations:2.18.0"
+    "com.google.code.gson:gson:2.8.9": "com.google.code.gson:gson:2.11.0",
+    "com.google.errorprone:error_prone_annotations:2.5.1": "com.google.errorprone:error_prone_annotations:2.28.0",
+    "com.google.guava:failureaccess:1.0.1": "com.google.guava:failureaccess:1.0.2",
+    "com.google.guava:guava:32.0.1-jre": "com.google.guava:guava:33.2.1-android",
+    "com.google.j2objc:j2objc-annotations:2.8": "com.google.j2objc:j2objc-annotations:3.0.0",
+    "io.opencensus:opencensus-api:0.31.0": "io.opencensus:opencensus-api:0.31.1"
   },
   "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": "d982eda20835e301dcbeec4d083289a44fdd06e9a35ce18449054f4ffd3f099f"
+      },
+      "version": "1.23.0"
+    },
+    "com.google.auth:google-auth-library-oauth2-http": {
+      "shasums": {
+        "jar": "f2bf739509b5f3697cb1bf33ff9dc27e8fc886cedb2f6376a458263f793ed133"
+      },
+      "version": "1.23.0"
+    },
+    "com.google.auto.value:auto-value": {
+      "shasums": {
+        "jar": "aaf8d637bfed3c420436b9facf1b7a88d12c8785374e4202382783005319c2c3"
+      },
+      "version": "1.11.0"
+    },
+    "com.google.auto.value:auto-value-annotations": {
+      "shasums": {
+        "jar": "5a055ce4255333b3346e1a8703da5bf8ff049532286fdcd31712d624abe111dd"
+      },
+      "version": "1.11.0"
+    },
     "com.google.code.findbugs:jsr305": {
       "shasums": {
         "jar": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7"
@@ -14,27 +55,27 @@
     },
     "com.google.code.gson:gson": {
       "shasums": {
-        "jar": "d3999291855de495c94c743761b8ab5176cfeabe281a5ab0d8e8d45326fd703e"
+        "jar": "57928d6e5a6edeb2abd3770a8f95ba44dce45f3b23b7a9dc2b309c581552a78b"
       },
-      "version": "2.8.9"
+      "version": "2.11.0"
     },
     "com.google.errorprone:error_prone_annotations": {
       "shasums": {
-        "jar": "9e6814cb71816988a4fd1b07a993a8f21bb7058d522c162b1de849e19bea54ae"
+        "jar": "f3fc8a3a0a4020706a373b00e7f57c2512dd26d1f83d28c7d38768f8682b231e"
       },
-      "version": "2.18.0"
+      "version": "2.28.0"
     },
     "com.google.guava:failureaccess": {
       "shasums": {
-        "jar": "a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26"
+        "jar": "8a8f81cf9b359e3f6dfa691a1e776985c061ef2f223c9b2c80753e1b458e8064"
       },
-      "version": "1.0.1"
+      "version": "1.0.2"
     },
     "com.google.guava:guava": {
       "shasums": {
-        "jar": "bd7fa227591fb8509677d0d1122cf95158f3b8a9f45653f58281d879f6dc48c5"
+        "jar": "6b55fbe6ffee621454c03df7bea720d189789e136391a524e29506ff40654180"
       },
-      "version": "32.0.1-jre"
+      "version": "33.2.1-android"
     },
     "com.google.guava:listenablefuture": {
       "shasums": {
@@ -42,20 +83,274 @@
       },
       "version": "9999.0-empty-to-avoid-conflict-with-guava"
     },
+    "com.google.http-client:google-http-client": {
+      "shasums": {
+        "jar": "60aca7428c5a1ff3655b70541a98ff3d70dded48ac1324dae1af39f1b61914af"
+      },
+      "version": "1.43.3"
+    },
+    "com.google.http-client:google-http-client-gson": {
+      "shasums": {
+        "jar": "e31a4edcb9c83954a2587e14fa2f3f8f4aad56152381b3321a3bd0bcae03fa26"
+      },
+      "version": "1.43.3"
+    },
     "com.google.j2objc:j2objc-annotations": {
       "shasums": {
-        "jar": "f02a95fa1a5e95edb3ed859fd0fb7df709d121a35290eff8b74dce2ab7f4d6ed"
+        "jar": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64"
       },
-      "version": "2.8"
+      "version": "3.0.0"
+    },
+    "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": "14c297bc64ca8bc15b6baf67f160627e4562ec91624797e312e907b431113508"
+      },
+      "version": "1.4.2"
+    },
+    "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": "f1474d47f4b6b001558ad27b952e35eda5cc7146788877fc52938c6eba24b382"
+      },
+      "version": "0.31.1"
+    },
+    "io.opencensus:opencensus-contrib-grpc-metrics": {
+      "shasums": {
+        "jar": "b28fc72490edd49c4c40a3c216b709200833fb361f7f602f1c7c9a527f7b7f63"
+      },
+      "version": "0.31.0"
+    },
+    "io.opencensus:opencensus-contrib-http-util": {
+      "shasums": {
+        "jar": "3ea995b55a4068be22989b70cc29a4d788c2d328d1d50613a7a9afd13fdd2d0a"
+      },
+      "version": "0.31.1"
+    },
+    "io.perfmark:perfmark-api": {
+      "shasums": {
+        "jar": "c7b478503ec524e55df19b424d46d27c8a68aeb801664fadd4f069b71f52d0f6"
+      },
+      "version": "0.27.0"
+    },
+    "junit:junit": {
+      "shasums": {
+        "jar": "8e495b634469d64fb8acfa3495a065cbacc8a0fff55ce1e31007be4c16dc57d3"
+      },
+      "version": "4.13.2"
+    },
+    "org.apache.httpcomponents:httpclient": {
+      "shasums": {
+        "jar": "c8bc7e1c51a6d4ce72f40d2ebbabf1c4b68bfe76e732104b04381b493478e9d6"
+      },
+      "version": "4.5.14"
+    },
+    "org.apache.httpcomponents:httpcore": {
+      "shasums": {
+        "jar": "6c9b3dd142a09dc468e23ad39aad6f75a0f2b85125104469f026e52a474e464f"
+      },
+      "version": "4.4.16"
+    },
+    "org.apache.tomcat:annotations-api": {
+      "shasums": {
+        "jar": "253829d3c12b7381d1044fc22c6436cff025fe0d459e4a329413e560a7d0dd13"
+      },
+      "version": "6.0.53"
     },
     "org.checkerframework:checker-qual": {
       "shasums": {
-        "jar": "e316255bbfcd9fe50d165314b85abb2b33cb2a66a93c491db648e498a82c2de1"
+        "jar": "ccaedd33af0b7894d9f2f3b644f4d19e43928e32902e61ac4d10777830f5aac7"
       },
-      "version": "3.33.0"
+      "version": "3.42.0"
+    },
+    "org.codehaus.mojo:animal-sniffer-annotations": {
+      "shasums": {
+        "jar": "c720e6e5bcbe6b2f48ded75a47bccdb763eede79d14330102e0d352e3d89ed92"
+      },
+      "version": "1.24"
+    },
+    "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": "3c6fac2424db3d4a853b669f4e3d1d9c3c552235e19a319673f887083c2303a1"
+      },
+      "version": "9.6"
     }
   },
   "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.errorprone:error_prone_annotations",
+      "com.google.guava:guava",
+      "com.google.http-client:google-http-client",
+      "com.google.http-client:google-http-client-gson"
+    ],
+    "com.google.code.gson:gson": [
+      "com.google.errorprone:error_prone_annotations"
+    ],
     "com.google.guava:guava": [
       "com.google.code.findbugs:jsr305",
       "com.google.errorprone:error_prone_annotations",
@@ -63,9 +358,241 @@
       "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.errorprone:error_prone_annotations",
+      "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.net.ltgt.gradle.incap",
+      "autovalue.shaded.org.checkerframework.checker.nullness.qual",
+      "autovalue.shaded.org.checkerframework.framework.qual",
+      "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",
@@ -109,9 +636,273 @@
       "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",
@@ -139,34 +930,209 @@
       "org.checkerframework.common.reflection.qual",
       "org.checkerframework.common.returnsreceiver.qual",
       "org.checkerframework.common.subtyping.qual",
-      "org.checkerframework.common.util.report.qual",
+      "org.checkerframework.common.util.count.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.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.j2objc:j2objc-annotations",
-      "org.checkerframework:checker-qual"
-    ],
     "https://repo.maven.apache.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",
-      "org.checkerframework:checker-qual"
+      "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://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"
     ]
   },
-  "services": {},
+  "services": {
+    "com.google.auto.value:auto-value": {
+      "com.google.auto.value.extension.AutoValueExtension": [
+        "com.google.auto.value.extension.memoized.processor.MemoizeExtension",
+        "com.google.auto.value.extension.serializable.processor.SerializableAutoValueExtension",
+        "com.google.auto.value.extension.toprettystring.processor.ToPrettyStringExtension"
+      ],
+      "com.google.auto.value.extension.serializable.serializer.interfaces.SerializerExtension": [
+        "com.google.auto.value.extension.serializable.serializer.impl.ImmutableListSerializerExtension",
+        "com.google.auto.value.extension.serializable.serializer.impl.ImmutableMapSerializerExtension",
+        "com.google.auto.value.extension.serializable.serializer.impl.OptionalSerializerExtension"
+      ],
+      "javax.annotation.processing.Processor": [
+        "com.google.auto.value.extension.memoized.processor.MemoizedValidator",
+        "com.google.auto.value.extension.toprettystring.processor.ToPrettyStringValidator",
+        "com.google.auto.value.processor.AutoAnnotationProcessor",
+        "com.google.auto.value.processor.AutoBuilderProcessor",
+        "com.google.auto.value.processor.AutoOneOfProcessor",
+        "com.google.auto.value.processor.AutoValueBuilderProcessor",
+        "com.google.auto.value.processor.AutoValueProcessor"
+      ]
+    },
+    "io.netty:netty-common": {
+      "reactor.blockhound.integration.BlockHoundIntegration": [
+        "io.netty.util.internal.Hidden$NettyBlockHoundIntegration"
+      ]
+    }
+  },
   "version": "2"
 }
diff --git a/patches/protobuf_v33/0001-Update-module-name.patch b/patches/protobuf_v33/0001-Update-module-name.patch
deleted file mode 100644
index a6580c4c93..0000000000
--- a/patches/protobuf_v33/0001-Update-module-name.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/MODULE.bazel
-+++ b/MODULE.bazel
-@@ -5,3 +5,3 @@
- module(
--    name = "protobuf",
-+    name = "com_google_protobuf_previous_release",
-     version = "33.0",  # Automatically updated on release
-@@ -293,13 +293,1 @@
- )
--
--bazel_dep(name = "com_google_protobuf_previous_release", version = "29.0", dev_dependency = True)
--archive_override(
--    module_name = "com_google_protobuf_previous_release",
--    integrity = "sha256-EKDVjzmhqQnpXgDougtbHcZNApl/dBFRlTorNln254w=",
--    patch_strip = 1,
--    patches = [
--        "@com_google_protobuf//:patches/protobuf_v29/0001-Update-module-name.patch",
--    ],
--    strip_prefix = "protobuf-29.0",
--    urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v29.0/protobuf-29.0.tar.gz"],
--)