From ec85c7ba86f52706e18c91e639b2e2bc6eb76094 Mon Sep 17 00:00:00 2001
From: Simon Stewart <simon_stewart@apple.com>
Date: Fri, 7 Feb 2025 10:46:26 +0000
Subject: [PATCH] Drop support for workspace-based builds (#321)

---
 .github/workflows/workspace_based.yaml        |   39 -
 BUILD.bazel                                   |   31 -
 MODULE.bazel                                  |   76 +-
 examples/gazelle/.bazelversion                |    1 +
 examples/gazelle/MODULE.bazel                 |   32 +-
 examples/gazelle/maven_install.json           | 1160 ++++++++++++++---
 examples/tests_and_lints/MODULE.bazel         |    5 +-
 examples/workspace-based/.bazelrc             |   11 -
 examples/workspace-based/.bazelversion        |    1 -
 examples/workspace-based/BUILD.bazel          |   24 -
 examples/workspace-based/README.md            |   19 -
 examples/workspace-based/WORKSPACE            |   77 --
 examples/workspace-based/java/BUILD.bazel     |    0
 .../workspace-based/java/maven_install.json   |  289 ----
 .../bazelcontrib/rulesjvm/example/Main.java   |    9 -
 .../rulesjvm/example/FailingTest.java         |   13 -
 .../rulesjvm/example/PassingTest.java         |   13 -
 .../examples/tests_and_lints/ExampleTest.java |    8 -
 gazelle_setup.bzl                             |   18 -
 go.mod                                        |   42 +-
 go.sum                                        |  232 +---
 java/gazelle/BUILD.bazel                      |   38 +-
 java/gazelle/javaconfig/BUILD.bazel           |    2 +-
 java/gazelle/javaconfig/codegen/BUILD.bazel   |    2 +-
 java/gazelle/lang.go                          |    2 +-
 java/gazelle/private/bazel/BUILD.bazel        |    2 +-
 java/gazelle/private/java/BUILD.bazel         |    2 +-
 java/gazelle/private/javaparser/BUILD.bazel   |    4 +-
 .../gazelle/java/javaparser/v0/BUILD.bazel    |   13 +-
 java/gazelle/private/logconfig/BUILD.bazel    |    2 +-
 java/gazelle/private/maven/BUILD.bazel        |    6 +-
 .../private/maven/multiset/BUILD.bazel        |    2 +-
 java/gazelle/private/proto/BUILD.bazel        |    2 +-
 .../gazelle/private/servermanager/BUILD.bazel |    6 +-
 .../private/sorted_multiset/BUILD.bazel       |    2 +-
 java/gazelle/private/sorted_set/BUILD.bazel   |    2 +-
 java/gazelle/private/types/BUILD.bazel        |    2 +-
 .../src/main/proto/example/hello/BUILD.out    |    2 +-
 java/private/BUILD.bazel                      |   10 -
 java/private/non-module-deps.bzl              |   10 -
 repositories.bzl                              |  196 ---
 setup.bzl                                     |   19 -
 tools/update-dependencies.sh                  |    2 +-
 43 files changed, 1098 insertions(+), 1330 deletions(-)
 delete mode 100644 .github/workflows/workspace_based.yaml
 create mode 120000 examples/gazelle/.bazelversion
 delete mode 100644 examples/workspace-based/.bazelrc
 delete mode 100644 examples/workspace-based/.bazelversion
 delete mode 100644 examples/workspace-based/BUILD.bazel
 delete mode 100644 examples/workspace-based/README.md
 delete mode 100644 examples/workspace-based/WORKSPACE
 delete mode 100644 examples/workspace-based/java/BUILD.bazel
 delete mode 100644 examples/workspace-based/java/maven_install.json
 delete mode 100644 examples/workspace-based/java/src/com/github/bazelcontrib/rulesjvm/example/Main.java
 delete mode 100644 examples/workspace-based/java/test/com/github/bazelcontrib/rulesjvm/example/FailingTest.java
 delete mode 100644 examples/workspace-based/java/test/com/github/bazelcontrib/rulesjvm/example/PassingTest.java
 delete mode 100644 examples/workspace-based/src/test/com/github/bazel_contrib/contrib_rules_jvm/examples/tests_and_lints/ExampleTest.java
 delete mode 100644 gazelle_setup.bzl
 delete mode 100644 java/private/non-module-deps.bzl
 delete mode 100644 repositories.bzl
 delete mode 100644 setup.bzl

diff --git a/.github/workflows/workspace_based.yaml b/.github/workflows/workspace_based.yaml
deleted file mode 100644
index bb6766eb..00000000
--- a/.github/workflows/workspace_based.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: Workspace-based
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-jobs:
-  examples:
-    strategy:
-      matrix:
-        runs-on:
-          - ubuntu-latest
-
-    runs-on: ${{ matrix.runs-on }}
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: bazel-contrib/setup-bazel@0.8.5
-        with:
-          # Avoid downloading Bazel every time.
-          bazelisk-cache: true
-          # Store build cache per workflow.
-          disk-cache: true
-          # Share repository cache between workflows.
-          repository-cache: true
-
-      - name: Run Gazelle
-        run: (cd examples/workspace-based && bazel --bazelrc=../../.github/workflows/ci.bazelrc run gazelle)
-
-      - name: Execute the lint tests
-        run: (cd examples/workspace-based && bazel --bazelrc=../../.github/workflows/ci.bazelrc test --test_tag_filters=lint //...)
-
-      - name: Execute the passing test
-        run: (cd examples/workspace-based && bazel --bazelrc=../../.github/workflows/ci.bazelrc test //java/test/com/github/bazelcontrib/rulesjvm/example:PassingTest)
diff --git a/BUILD.bazel b/BUILD.bazel
index 5f7eead3..5b907f47 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1,5 +1,4 @@
 load("@bazel_gazelle//:def.bzl", "DEFAULT_LANGUAGES", "gazelle", "gazelle_binary")
-load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier")
 
 buildifier(
@@ -47,33 +46,3 @@ gazelle_binary(
 gazelle(
     name = "gazelle_go",
 )
-
-bzl_library(
-    name = "repositories",
-    srcs = ["repositories.bzl"],
-    visibility = ["//visibility:public"],
-    deps = [
-        "//java/private:zip_repository",
-        "@bazel_tools//tools/build_defs/repo:http.bzl",
-        "@bazel_tools//tools/build_defs/repo:utils.bzl",
-    ],
-)
-
-bzl_library(
-    name = "setup",
-    srcs = ["setup.bzl"],
-    visibility = ["//visibility:public"],
-    deps = [
-        "@apple_rules_lint//lint:implementation",
-        "@contrib_rules_jvm_deps//:defs",
-    ],
-)
-
-bzl_library(
-    name = "gazelle_setup",
-    srcs = ["gazelle_setup.bzl"],
-    visibility = ["//visibility:public"],
-    deps = [
-        "//third_party/go:repositories",
-    ],
-)
diff --git a/MODULE.bazel b/MODULE.bazel
index d08f7ac5..dfff141f 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -11,65 +11,19 @@ PROTOBUF_VERSION = "21.7"
 # The java packages are published to maven under a different versioning scheme.
 PROTOBUF_JAVA_VERSION = "3.{}".format(PROTOBUF_VERSION)
 
-bazel_dep(
-    name = "apple_rules_lint",
-    version = "0.4.0",
-)
-bazel_dep(
-    name = "bazel_skylib",
-    version = "1.7.1",
-)
-
-bazel_dep(
-    name = "bazel_skylib_gazelle_plugin",
-    version = "1.7.1",
-    dev_dependency = True,
-)
-
-bazel_dep(
-    name = "gazelle",
-    version = "0.39.1",
-    repo_name = "bazel_gazelle",
-)
-bazel_dep(
-    name = "protobuf",
-    version = "27.2",
-    repo_name = "com_google_protobuf",
-)
-bazel_dep(
-    name = "rules_cc",
-    version = "0.0.11",
-)
-bazel_dep(
-    name = "rules_go",
-    version = "0.50.1",
-    repo_name = "io_bazel_rules_go",
-)
-bazel_dep(
-    name = "rules_java",
-    version = "7.12.1",
-)
-bazel_dep(
-    name = "rules_jvm_external",
-    version = "6.6",
-)
-bazel_dep(
-    name = "rules_proto",
-    version = "6.0.2",
-)
-
-bazel_dep(
-    name = "stardoc",
-    version = "0.7.1",
-    dev_dependency = True,
-    repo_name = "io_bazel_stardoc",
-)
-
-non_module_deps = use_extension("//java/private:non-module-deps.bzl", "non_module_deps")
-use_repo(
-    non_module_deps,
-    "io_grpc_grpc_java",
-)
+bazel_dep(name = "apple_rules_lint", version = "0.4.0")
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "grpc-java", version = "1.69.0")
+bazel_dep(name = "gazelle", version = "0.42.0", repo_name = "bazel_gazelle")
+bazel_dep(name = "protobuf", version = "29.1", repo_name = "com_google_protobuf")
+bazel_dep(name = "rules_cc", version = "0.0.16")
+bazel_dep(name = "rules_go", version = "0.52.0")
+bazel_dep(name = "rules_java", version = "7.12.2")
+bazel_dep(name = "rules_jvm_external", version = "6.6")
+bazel_dep(name = "rules_proto", version = "7.0.2")
+
+bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.7.1", dev_dependency = True)
+bazel_dep(name = "stardoc", version = "0.7.1", dev_dependency = True, repo_name = "io_bazel_stardoc")
 
 linter = use_extension("@apple_rules_lint//lint:extensions.bzl", "linter")
 linter.register(name = "java-checkstyle")
@@ -246,8 +200,8 @@ use_repo(
     "contrib_rules_jvm_tests",
 )
 
-go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")
-go_sdk.download(version = "1.21.5")
+go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
+go_sdk.download(version = "1.23.6")
 
 go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
 go_deps.from_file(go_mod = "//:go.mod")
diff --git a/examples/gazelle/.bazelversion b/examples/gazelle/.bazelversion
new file mode 120000
index 00000000..96cf9496
--- /dev/null
+++ b/examples/gazelle/.bazelversion
@@ -0,0 +1 @@
+../../.bazelversion
\ No newline at end of file
diff --git a/examples/gazelle/MODULE.bazel b/examples/gazelle/MODULE.bazel
index 7f0ebbc1..b3a29dd2 100644
--- a/examples/gazelle/MODULE.bazel
+++ b/examples/gazelle/MODULE.bazel
@@ -3,23 +3,15 @@ module(
     version = "0.0.0",
 )
 
-bazel_dep(
-    name = "contrib_rules_jvm",
-    version = "0.0.0",
-)
+bazel_dep(name = "contrib_rules_jvm", version = "0.0.0")
 local_path_override(
     module_name = "contrib_rules_jvm",
     path = "../..",
 )
 
-bazel_dep(
-    name = "bazel_skylib",
-    version = "1.5.0",
-)
-bazel_dep(
-    name = "rules_jvm_external",
-    version = "6.2",
-)
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "gazelle", version = "0.42.0")
+bazel_dep(name = "rules_jvm_external", version = "6.6")
 
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 maven.install(
@@ -33,18 +25,4 @@ maven.install(
     fetch_sources = True,
     lock_file = "//:maven_install.json",
 )
-use_repo(
-    maven,
-    "maven",
-    "unpinned_maven",
-)
-
-bazel_dep(
-    name = "gazelle",
-    version = "0.36.0",
-)
-git_override(
-    module_name = "gazelle",
-    commit = "ba2ce367a545e0bdd74a7abca40ef5e0a0cb8dcb",
-    remote = "https://github.com/bazelbuild/bazel-gazelle.git",
-)
+use_repo(maven, "maven")
diff --git a/examples/gazelle/maven_install.json b/examples/gazelle/maven_install.json
index daa5dd0f..7dd62913 100644
--- a/examples/gazelle/maven_install.json
+++ b/examples/gazelle/maven_install.json
@@ -1,17 +1,54 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": -1398194552,
-  "__RESOLVED_ARTIFACTS_HASH": -192296212,
+  "__INPUT_ARTIFACTS_HASH": -1118307956,
+  "__RESOLVED_ARTIFACTS_HASH": 1842158235,
   "conflict_resolution": {
-    "com.google.errorprone:error_prone_annotations:2.3.2": "com.google.errorprone:error_prone_annotations:2.11.0"
+    "com.google.guava:failureaccess:1.0.1": "com.google.guava:failureaccess:1.0.2",
+    "io.opencensus:opencensus-api:0.31.0": "io.opencensus:opencensus-api:0.31.1",
+    "org.checkerframework:checker-qual:3.12.0": "org.checkerframework:checker-qual:3.43.0"
   },
   "artifacts": {
+    "com.google.android:annotations": {
+      "shasums": {
+        "jar": "ba734e1e84c09d615af6a09d33034b4f0442f8772dec120efb376d86a565ae15",
+        "sources": "e9b667aa958df78ea1ad115f7bbac18a5869c3128b1d5043feb360b0cfce9d40"
+      },
+      "version": "4.1.1.4"
+    },
+    "com.google.api.grpc:proto-google-common-protos": {
+      "shasums": {
+        "jar": "43ec7807459aaa4012e838a1be4ef2d590cf233305da60af5b54f08ec8cf2302",
+        "sources": "6954ee2057e201eda9584edcbb9e781649e15a808adaef87942f1f539a2f6551"
+      },
+      "version": "2.48.0"
+    },
+    "com.google.auth:google-auth-library-credentials": {
+      "shasums": {
+        "jar": "5dbf1207d14e093f67995f457cb69c3cf49bed1364150b23465e09acada65d96",
+        "sources": "edc2499f614f01050b044b046789d28079302e8f9af141bca00ba71188b7c5e4"
+      },
+      "version": "1.24.1"
+    },
+    "com.google.auth:google-auth-library-oauth2-http": {
+      "shasums": {
+        "jar": "88a75cd4448ea2f3b46e48a89497a6cf0985a5fa4e21274af4940e07f59f6eaf",
+        "sources": "0c91f45329bb9acc5db7aca708ae57f4501e1ce6b18c1c7aa5967b19b7e57294"
+      },
+      "version": "1.24.1"
+    },
+    "com.google.auto.value:auto-value": {
+      "shasums": {
+        "jar": "aaf8d637bfed3c420436b9facf1b7a88d12c8785374e4202382783005319c2c3",
+        "sources": "4bff06fe077d68f964bd5e05f020ed78fd7870730441e403a2eb306360c4890a"
+      },
+      "version": "1.11.0"
+    },
     "com.google.auto.value:auto-value-annotations": {
       "shasums": {
-        "jar": "fedd59b0b4986c342f6ab2d182f2a4ee9fceb2c7e2d5bdc4dc764c92394a23d3",
-        "sources": "41dbbed2cc92e72fe61e622f715735b05db45dcc49a1276619781b6e19e7a91f"
+        "jar": "5a055ce4255333b3346e1a8703da5bf8ff049532286fdcd31712d624abe111dd",
+        "sources": "d7941e5f19bb38afcfa85350d57e5245856c23c98c2bbe32f6d31b5577f2bc33"
       },
-      "version": "1.7.4"
+      "version": "1.11.0"
     },
     "com.google.code.findbugs:jsr305": {
       "shasums": {
@@ -22,38 +59,31 @@
     },
     "com.google.code.gson:gson": {
       "shasums": {
-        "jar": "d3999291855de495c94c743761b8ab5176cfeabe281a5ab0d8e8d45326fd703e",
-        "sources": "ba5bddb1a89eb721fcca39f3b34294532060f851e2407a82d82134a41eec4719"
+        "jar": "57928d6e5a6edeb2abd3770a8f95ba44dce45f3b23b7a9dc2b309c581552a78b",
+        "sources": "49a853f71bc874ee1898a4ad5009b57d0c536e5a998b3890253ffbf4b7276ad3"
       },
-      "version": "2.8.9"
+      "version": "2.11.0"
     },
     "com.google.errorprone:error_prone_annotations": {
       "shasums": {
-        "jar": "721cb91842b46fa056847d104d5225c8b8e1e8b62263b993051e1e5a0137b7ec",
-        "sources": "31a8f1bd791fb22c606af95049062a3c8252ce4b1b17555d00dc609e6371101d"
+        "jar": "144f3aefbd6e27daec55d3753b2c6b13c1afdaf0cf04816cdb564588ed92f1bd",
+        "sources": "8a05d3e543d7cbefb8e035edc9a92d1b5562d36761754f4d881ae66186c49de1"
       },
-      "version": "2.11.0"
+      "version": "2.30.0"
     },
     "com.google.guava:failureaccess": {
       "shasums": {
-        "jar": "a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26",
-        "sources": "092346eebbb1657b51aa7485a246bf602bb464cc0b0e2e1c7e7201fadce1e98f"
+        "jar": "8a8f81cf9b359e3f6dfa691a1e776985c061ef2f223c9b2c80753e1b458e8064",
+        "sources": "dd3bfa5e2ec5bc5397efb2c3cef044c192313ff77089573667ff97a60c6978e0"
       },
-      "version": "1.0.1"
+      "version": "1.0.2"
     },
     "com.google.guava:guava": {
       "shasums": {
-        "jar": "a42edc9cab792e39fe39bb94f3fca655ed157ff87a8af78e1d6ba5b07c4a00ab",
-        "sources": "8ab1853cdaf936ec88be80c17302b7c20abafbd4f54d4fb54d7011c529e3a44a"
+        "jar": "2c3e41d1b380f2044d257947a3aa82dabf3ae4b978622745254aa18b6cf89ab0",
+        "sources": "1933a9fb7ee8535749600d7298fa9511589631010e90907db8459797c31238ca"
       },
-      "version": "31.1-jre"
-    },
-    "com.google.guava:guava-testlib": {
-      "shasums": {
-        "jar": "aadc71b10d5c3ac474dd16be84cfb18d257e584d1e0a59f8cab64ef4376226ce",
-        "sources": "7149659f8966197dcd91a42183349f862d3973f8e65efe6d03e678464fa13bfd"
-      },
-      "version": "31.1-jre"
+      "version": "33.3.1-android"
     },
     "com.google.guava:listenablefuture": {
       "shasums": {
@@ -62,19 +92,220 @@
       },
       "version": "9999.0-empty-to-avoid-conflict-with-guava"
     },
+    "com.google.http-client:google-http-client": {
+      "shasums": {
+        "jar": "390618d7b51704240b8fd28e1230fa35d220f93f4b4ba80f63e38db00dacb09e",
+        "sources": "9419537a2973195619b43f76be92388b1e37a785503717d76afff5764884ebc2"
+      },
+      "version": "1.44.2"
+    },
+    "com.google.http-client:google-http-client-gson": {
+      "shasums": {
+        "jar": "1119b66685195310375b717de2215d6c5d14fa8ed9f57e07b4fecd461e7b9db7",
+        "sources": "3bac061bdac5c5c67713b8db689a1d6342afcb07a87c2f7285dffc1729fc4825"
+      },
+      "version": "1.44.2"
+    },
     "com.google.j2objc:j2objc-annotations": {
       "shasums": {
-        "jar": "21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b",
-        "sources": "ba4df669fec153fa4cd0ef8d02c6d3ef0702b7ac4cabe080facf3b6e490bb972"
+        "jar": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64",
+        "sources": "bd60019a0423c3a025ef6ab24fe0761f5f45ffb48a8cca74a01b678de1105d38"
       },
-      "version": "1.3"
+      "version": "3.0.0"
+    },
+    "com.google.protobuf:protobuf-java": {
+      "shasums": {
+        "jar": "8540247fad9e06baefa8fb45eb313802d019f485f14300e0f9d6b556ed88e753",
+        "sources": "d686e802329e42954e72e9b3b148b67eeb4f6f3ed327abc4508b79fda4937c3b"
+      },
+      "version": "3.25.5"
+    },
+    "com.google.re2j:re2j": {
+      "shasums": {
+        "jar": "4f657af51ab8bb0909bcc3eb40862d26125af8cbcf92aaaba595fed77f947bc0",
+        "sources": "ddc3b47bb1e556ac4c0d02c9d8ff18f3260198b76b720567a70eed0a03d3fed6"
+      },
+      "version": "1.7"
     },
     "com.google.truth:truth": {
       "shasums": {
-        "jar": "a85e03b8b6ae8780f060cfded9500a3d1b5f52808f99a2ea6da9c683313c7518",
-        "sources": "a98b2f82af388484dfe1b2b859c3c05a28fcae000fc532ef0155e1814fa3af05"
+        "jar": "14c297bc64ca8bc15b6baf67f160627e4562ec91624797e312e907b431113508",
+        "sources": "9e6e49a3d2eefcadc0294878cb19fa6c6da305f2939c422f3cbd8caf9efe80bb"
       },
-      "version": "1.1.2"
+      "version": "1.4.2"
+    },
+    "com.squareup.okhttp:okhttp": {
+      "shasums": {
+        "jar": "88ac9fd1bb51f82bcc664cc1eb9c225c90dc4389d660231b4cc737bebfe7d0aa",
+        "sources": "edfafce3b9abb0fc31b5c72cc5f533516a08f7b86754138f36595a6837746ddf"
+      },
+      "version": "2.7.5"
+    },
+    "com.squareup.okio:okio": {
+      "shasums": {
+        "jar": "a27f091d34aa452e37227e2cfa85809f29012a8ef2501a9b5a125a978e4fcbc1",
+        "sources": "4f255d11829d7e1949be042efa70f933650a7d929e68d594c1608f97884a0535"
+      },
+      "version": "2.10.0"
+    },
+    "commons-codec:commons-codec": {
+      "shasums": {
+        "jar": "e599d5318e97aa48f42136a2927e6dfa4e8881dff0e6c8e3109ddbbff51d7b7d",
+        "sources": "901cb5d1f7c2877017c95d3c5efd5a497738d0162ef72cdf58e9cb13f50b2e9c"
+      },
+      "version": "1.11"
+    },
+    "io.grpc:grpc-api": {
+      "shasums": {
+        "jar": "bdcefde43d7c542e748adb7b2bccc46db16313ba86ab46f8ba3b54677c7c5883",
+        "sources": "23d0d4bb5eed8cf0b5732ab96c815028071e2b3537bd39f5dfe0c8f16731e74c"
+      },
+      "version": "1.60.1"
+    },
+    "io.grpc:grpc-context": {
+      "shasums": {
+        "jar": "4ab6efb9cbadc88f8dc723ada3a61785da367697373d4432aef5222312aa70f6",
+        "sources": "90655e7ff0d7ee867fbdf7c6ac6db13ef9b339f4e8e3af15665f5a98101f9674"
+      },
+      "version": "1.60.1"
+    },
+    "io.netty:netty-buffer": {
+      "shasums": {
+        "jar": "46d74e79125aacc055c31f18152fdc5d4a569aa8d60091203d0baa833973ac3c",
+        "sources": "b4e7d5c0d3cbbed2bfc2c26922e6e8989330e7d2ec653a39ab40635d24ee5850"
+      },
+      "version": "4.1.110.Final"
+    },
+    "io.netty:netty-codec": {
+      "shasums": {
+        "jar": "9eccce9a8d827bb8ce84f9c3183fec58bd1c96a51010cf711297746034af3701",
+        "sources": "da6a146add7a60a96ee363d59db2fc79d4858d0c73ec9afe995a13f4bbd4a110"
+      },
+      "version": "4.1.110.Final"
+    },
+    "io.netty:netty-codec-http": {
+      "shasums": {
+        "jar": "dc0d6af5054630a70ff0ef354f20aa7a6e46738c9fc5636ed3d4fe77e38bd48d",
+        "sources": "b03b477f0607bbb6693ea1de41e4db3dbec1de616bea6feeba096fbf9fca1209"
+      },
+      "version": "4.1.110.Final"
+    },
+    "io.netty:netty-codec-http2": {
+      "shasums": {
+        "jar": "b546c75445a487bb7bcd5a94779caecce33582cf7be31b8b39fc0e65b1ee26fc",
+        "sources": "555279bfb4ddd1fede5afaced0973bc763a6b643de7c6b006280f79d92e30889"
+      },
+      "version": "4.1.110.Final"
+    },
+    "io.netty:netty-codec-socks": {
+      "shasums": {
+        "jar": "976052a3c9bb280bc6d99f3a29e6404677cf958c3de05b205093d38c006b880c",
+        "sources": "aedb4ffb91584e1b60d4c64f96c6033c204fcbca64b97ebf895df05ec6700dd3"
+      },
+      "version": "4.1.110.Final"
+    },
+    "io.netty:netty-common": {
+      "shasums": {
+        "jar": "9851ec66548b9e0d41164ce98943cdd4bbe305f68ddbd24eae52e4501a0d7b1a",
+        "sources": "ca8799963fdfc712f0b87120f1b6a5e728444eeb41feaf2ecca52435b03bf099"
+      },
+      "version": "4.1.110.Final"
+    },
+    "io.netty:netty-handler": {
+      "shasums": {
+        "jar": "d5a08d7de364912e4285968de4d4cce3f01da4bb048d5c6937e5f2af1f8e148a",
+        "sources": "3e8186c75527436a7fb99d0686cf138676df9498724aa787f7894d2ad6c4caa6"
+      },
+      "version": "4.1.110.Final"
+    },
+    "io.netty:netty-handler-proxy": {
+      "shasums": {
+        "jar": "ad54ab4fe9c47ef3e723d71251126db53e8db543871adb9eafc94446539eff52",
+        "sources": "b1411f4864e9f76d435aca6adfe93bf8745718e1c0e1b7d73d0d1926e2e92a8a"
+      },
+      "version": "4.1.110.Final"
+    },
+    "io.netty:netty-resolver": {
+      "shasums": {
+        "jar": "a2e9b4ae7caa92fc5bd747e11d1dec20d81b18fc00959554302244ac5c56ce70",
+        "sources": "792d057545fc3f1aa72c5571f6caf44d4166527322003cfb7b621c15bcd8d9e7"
+      },
+      "version": "4.1.110.Final"
+    },
+    "io.netty:netty-tcnative-boringssl-static": {
+      "shasums": {
+        "jar": "bb8349bda3ba043c09f5c732c5b2d47f18ac4dafce248cb850cfbd0599e5ba01",
+        "linux-aarch_64": "9fd6f905bce8472ca9e24f8728962b91b9319c84fcbb618ab87f6b9774c063ed",
+        "linux-x86_64": "45ce55b49f4c16de65278d9f4608a9f06460f290f1e3b4fc3f2452866519d618",
+        "osx-aarch_64": "834d3df2f9eb3aa08d49326409c454e2f9c75a49c3f0454b7cab64619b1614dc",
+        "osx-x86_64": "3a16b7ca4e891f9ad51e9ae9eb167c5e81d7f55a0001edf2471b693f4f8c12e1",
+        "sources": null,
+        "windows-x86_64": "855d930366fae9bec3872569975959e1e31dd752dffc9f925eae8436f933e11a"
+      },
+      "version": "2.0.65.Final"
+    },
+    "io.netty:netty-tcnative-classes": {
+      "shasums": {
+        "jar": "84ef0241ada1b4ed92785e10c16edbeb063348959a3b0ef740712badd09fa128",
+        "sources": "054c5f7b4228630227cdf312301a0e9c4cf34b33a1d1bbd842556ea5d3cbf465"
+      },
+      "version": "2.0.65.Final"
+    },
+    "io.netty:netty-transport": {
+      "shasums": {
+        "jar": "a42dd68390ca14b4ff2d40628a096c76485b4adb7c19602d5289321a0669e704",
+        "sources": "8b30a2af314e828040b7736f2134192fcf932e9f34756c6e6168753dfae32cb5"
+      },
+      "version": "4.1.110.Final"
+    },
+    "io.netty:netty-transport-classes-epoll": {
+      "shasums": {
+        "jar": "8e59cec67de3b9f8afe4eccec11ed8ce4423948eeaf4ca512bf69324052ed510",
+        "sources": "77ddaafe69b00258c8c342c98b76a7fef14e0f91124780b24e49ee49be9b896a"
+      },
+      "version": "4.1.110.Final"
+    },
+    "io.netty:netty-transport-native-epoll": {
+      "shasums": {
+        "linux-x86_64": "dcd60c6b3076af307ab877201a136e1f1066c9be809aaed827391a23909f9135",
+        "sources": "156c8e44e9034fc82eff318b125391f456ae519c06c6a2001a4b20c0bd5abd6b"
+      },
+      "version": "4.1.110.Final"
+    },
+    "io.netty:netty-transport-native-unix-common": {
+      "shasums": {
+        "jar": "51717bb7471141950390c6713a449fdb1054d07e60737ee7dda7083796cdee48",
+        "sources": "05c3989c61518b7dd6225a445401d1e8a9508a0d99a839847dac373e305e784d"
+      },
+      "version": "4.1.110.Final"
+    },
+    "io.opencensus:opencensus-api": {
+      "shasums": {
+        "jar": "f1474d47f4b6b001558ad27b952e35eda5cc7146788877fc52938c6eba24b382",
+        "sources": "6748d57aaae81995514ad3e2fb11a95aa88e158b3f93450288018eaccf31e86b"
+      },
+      "version": "0.31.1"
+    },
+    "io.opencensus:opencensus-contrib-grpc-metrics": {
+      "shasums": {
+        "jar": "b28fc72490edd49c4c40a3c216b709200833fb361f7f602f1c7c9a527f7b7f63",
+        "sources": "c45a239e4c4fa4ad564018c0ba0a94d669dbc9b1ed561fc0464b79ebb3c0d6e3"
+      },
+      "version": "0.31.0"
+    },
+    "io.opencensus:opencensus-contrib-http-util": {
+      "shasums": {
+        "jar": "3ea995b55a4068be22989b70cc29a4d788c2d328d1d50613a7a9afd13fdd2d0a",
+        "sources": "d55afd5f96dc724bd903a77a38b0a344d0e59f02a64b9ab2f32618bc582ea924"
+      },
+      "version": "0.31.1"
+    },
+    "io.perfmark:perfmark-api": {
+      "shasums": {
+        "jar": "c7b478503ec524e55df19b424d46d27c8a68aeb801664fadd4f069b71f52d0f6",
+        "sources": "311551ab29cf51e5a8abee6a019e88dee47d1ea71deb9fcd3649db9c51b237bc"
+      },
+      "version": "0.27.0"
     },
     "junit:junit": {
       "shasums": {
@@ -83,19 +314,26 @@
       },
       "version": "4.13.2"
     },
-    "net.bytebuddy:byte-buddy": {
+    "org.apache.httpcomponents:httpclient": {
+      "shasums": {
+        "jar": "c8bc7e1c51a6d4ce72f40d2ebbabf1c4b68bfe76e732104b04381b493478e9d6",
+        "sources": "55b01f9f4cbec9ac646866a4b64b176570d79e293a556796b5b0263d047ef8e6"
+      },
+      "version": "4.5.14"
+    },
+    "org.apache.httpcomponents:httpcore": {
       "shasums": {
-        "jar": "d2e46555699e70361b5471a7e142f9c67855bba6907a285177ebd8ad973775d8",
-        "sources": "94a6f5d7d8491ca7541f2da90bac4f084e04264112e936334493b2c2f094455d"
+        "jar": "6c9b3dd142a09dc468e23ad39aad6f75a0f2b85125104469f026e52a474e464f",
+        "sources": "705f8cf3671093b6c1db16bbf6971a7ef400e3819784f1af53e5bc3e67b5a9a0"
       },
-      "version": "1.12.7"
+      "version": "4.4.16"
     },
-    "net.bytebuddy:byte-buddy-agent": {
+    "org.apache.tomcat:annotations-api": {
       "shasums": {
-        "jar": "73d84bb6e8e8980e674d796a29063f510ceb527c6f8c912a08a13e236be05c71",
-        "sources": "a6d5b1157061231f61c833f1cc76c71287947c75b4064404a47f01f6e970c544"
+        "jar": "253829d3c12b7381d1044fc22c6436cff025fe0d459e4a329413e560a7d0dd13",
+        "sources": null
       },
-      "version": "1.12.7"
+      "version": "6.0.53"
     },
     "org.apiguardian:apiguardian-api": {
       "shasums": {
@@ -106,10 +344,17 @@
     },
     "org.checkerframework:checker-qual": {
       "shasums": {
-        "jar": "ff10785ac2a357ec5de9c293cb982a2cbb605c0309ea4cc1cb9b9bc6dbe7f3cb",
-        "sources": "fd99a45195ed893803624d1030387056a96601013f5e61ccabd79abb4ddfa876"
+        "jar": "3fbc2e98f05854c3df16df9abaa955b91b15b3ecac33623208ed6424640ef0f6",
+        "sources": "d6bdee58964cd05aabfca4e44947d3cbdada6bf617ed618b62b3b0d5a21de339"
       },
-      "version": "3.12.0"
+      "version": "3.43.0"
+    },
+    "org.codehaus.mojo:animal-sniffer-annotations": {
+      "shasums": {
+        "jar": "c720e6e5bcbe6b2f48ded75a47bccdb763eede79d14330102e0d352e3d89ed92",
+        "sources": "4270ce5531ed0f12e4234e08f240ef3b45ee3ceeb16e28d44abc61c12cf522ca"
+      },
+      "version": "1.24"
     },
     "org.hamcrest:hamcrest-core": {
       "shasums": {
@@ -118,6 +363,27 @@
       },
       "version": "1.3"
     },
+    "org.jetbrains.kotlin:kotlin-stdlib": {
+      "shasums": {
+        "jar": "b8ab1da5cdc89cb084d41e1f28f20a42bd431538642a5741c52bbfae3fa3e656",
+        "sources": "87f030b500d243f67ef25c3601daee17655ea9c82cb4916637f7b4f8bdd0a165"
+      },
+      "version": "1.4.20"
+    },
+    "org.jetbrains.kotlin:kotlin-stdlib-common": {
+      "shasums": {
+        "jar": "a7112c9b3cefee418286c9c9372f7af992bd1e6e030691d52f60cb36dbec8320",
+        "sources": "2ee47b54b4a20257d2ec73ddf34c44f72f4c7f6e5625b1a13de77c115a0e2afc"
+      },
+      "version": "1.4.20"
+    },
+    "org.jetbrains:annotations": {
+      "shasums": {
+        "jar": "ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478",
+        "sources": "42a5e144b8e81d50d6913d1007b695e62e614705268d8cf9f13dbdc478c2c68e"
+      },
+      "version": "13.0"
+    },
     "org.junit.jupiter:junit-jupiter-api": {
       "shasums": {
         "jar": "1808ee87e0f718cd6e25f3b75afc17956ac8a3edc48c7e9bab9f19f9a79e3801",
@@ -160,20 +426,6 @@
       },
       "version": "1.8.2"
     },
-    "org.mockito:mockito-core": {
-      "shasums": {
-        "jar": "148de2c6928365db29443ca12d35c930d9f481172b934fdd801d1cb1409ea83a",
-        "sources": "7d530f39577843b16f6dba2c49846f07101f3ce734ac8caef4ba932f6527f1f6"
-      },
-      "version": "4.3.1"
-    },
-    "org.objenesis:objenesis": {
-      "shasums": {
-        "jar": "03d960bd5aef03c653eb000413ada15eb77cdd2b8e4448886edf5692805e35f3",
-        "sources": "56a7987f5746bd809c363e29055c41f5472a086b0e0e32248693e064d10bc306"
-      },
-      "version": "3.2"
-    },
     "org.opentest4j:opentest4j": {
       "shasums": {
         "jar": "58812de60898d976fb81ef3b62da05c6604c18fd4a249f5044282479fc286af2",
@@ -183,13 +435,28 @@
     },
     "org.ow2.asm:asm": {
       "shasums": {
-        "jar": "0df97574914aee92fd349d0cb4e00f3345d45b2c239e0bb50f0a90ead47888e0",
-        "sources": "829bc5eb0ccd705a7c8afbf7cdc4b7e9a9f733d3a1a954b9afffd99c8e063366"
+        "jar": "3c6fac2424db3d4a853b669f4e3d1d9c3c552235e19a319673f887083c2303a1",
+        "sources": "2b6e12f0da3d065ba628a024a8851ab0d5b5d3501dacfcc18769243250f4f77e"
       },
-      "version": "9.0"
+      "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",
@@ -198,13 +465,20 @@
       "com.google.j2objc:j2objc-annotations",
       "org.checkerframework:checker-qual"
     ],
-    "com.google.guava:guava-testlib": [
+    "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",
-      "junit:junit",
-      "org.checkerframework:checker-qual"
+      "io.grpc:grpc-context",
+      "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",
@@ -214,9 +488,152 @@
       "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.grpc:grpc-context": [
+      "io.grpc:grpc-api"
+    ],
+    "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",
+      "org.apache.httpcomponents:httpcore"
+    ],
+    "org.jetbrains.kotlin:kotlin-stdlib": [
+      "org.jetbrains.kotlin:kotlin-stdlib-common",
+      "org.jetbrains:annotations"
+    ],
     "org.junit.jupiter:junit-jupiter-api": [
       "org.apiguardian:apiguardian-api",
       "org.junit.platform:junit-platform-commons",
@@ -242,21 +659,76 @@
     "org.junit.platform:junit-platform-reporting": [
       "org.apiguardian:apiguardian-api",
       "org.junit.platform:junit-platform-launcher"
-    ],
-    "org.mockito:mockito-core": [
-      "net.bytebuddy:byte-buddy",
-      "net.bytebuddy:byte-buddy-agent",
-      "org.objenesis:objenesis"
     ]
   },
-  "skipped": [
-    "com.google.guava:listenablefuture:jar:sources"
-  ],
   "packages": {
+    "com.google.android:annotations": [
+      "android.annotation"
+    ],
+    "com.google.api.grpc:proto-google-common-protos": [
+      "com.google.api",
+      "com.google.apps.card.v1",
+      "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.shopping.type",
+      "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.serializable",
+      "com.google.auto.value.extension.toprettystring"
     ],
     "com.google.code.findbugs:jsr305": [
       "javax.annotation",
@@ -301,21 +773,183 @@
       "com.google.common.xml",
       "com.google.thirdparty.publicsuffix"
     ],
-    "com.google.guava:guava-testlib": [
-      "com.google.common.collect.testing",
-      "com.google.common.collect.testing.features",
-      "com.google.common.collect.testing.google",
-      "com.google.common.collect.testing.testers",
-      "com.google.common.escape.testing",
-      "com.google.common.testing",
-      "com.google.common.util.concurrent.testing"
+    "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"
+    ],
+    "io.grpc:grpc-api": [
+      "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",
@@ -350,52 +984,57 @@
       "org.junit.runners.parameterized",
       "org.junit.validator"
     ],
-    "net.bytebuddy:byte-buddy": [
-      "net.bytebuddy",
-      "net.bytebuddy.agent.builder",
-      "net.bytebuddy.asm",
-      "net.bytebuddy.build",
-      "net.bytebuddy.description",
-      "net.bytebuddy.description.annotation",
-      "net.bytebuddy.description.enumeration",
-      "net.bytebuddy.description.field",
-      "net.bytebuddy.description.method",
-      "net.bytebuddy.description.modifier",
-      "net.bytebuddy.description.type",
-      "net.bytebuddy.dynamic",
-      "net.bytebuddy.dynamic.loading",
-      "net.bytebuddy.dynamic.scaffold",
-      "net.bytebuddy.dynamic.scaffold.inline",
-      "net.bytebuddy.dynamic.scaffold.subclass",
-      "net.bytebuddy.implementation",
-      "net.bytebuddy.implementation.attribute",
-      "net.bytebuddy.implementation.auxiliary",
-      "net.bytebuddy.implementation.bind",
-      "net.bytebuddy.implementation.bind.annotation",
-      "net.bytebuddy.implementation.bytecode",
-      "net.bytebuddy.implementation.bytecode.assign",
-      "net.bytebuddy.implementation.bytecode.assign.primitive",
-      "net.bytebuddy.implementation.bytecode.assign.reference",
-      "net.bytebuddy.implementation.bytecode.collection",
-      "net.bytebuddy.implementation.bytecode.constant",
-      "net.bytebuddy.implementation.bytecode.member",
-      "net.bytebuddy.jar.asm",
-      "net.bytebuddy.jar.asm.commons",
-      "net.bytebuddy.jar.asm.signature",
-      "net.bytebuddy.matcher",
-      "net.bytebuddy.pool",
-      "net.bytebuddy.utility",
-      "net.bytebuddy.utility.dispatcher",
-      "net.bytebuddy.utility.nullability",
-      "net.bytebuddy.utility.privilege",
-      "net.bytebuddy.utility.visitor"
-    ],
-    "net.bytebuddy:byte-buddy-agent": [
-      "net.bytebuddy.agent",
-      "net.bytebuddy.agent.utility.nullability"
-    ],
-    "net.bytebuddy:byte-buddy:jar:sources": [
-      "net.bytebuddy.build"
+    "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.apiguardian:apiguardian-api": [
       "org.apiguardian.api"
@@ -413,6 +1052,7 @@
       "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",
@@ -426,16 +1066,55 @@
       "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.junit.jupiter:junit-jupiter-api": [
       "org.junit.jupiter.api",
       "org.junit.jupiter.api.condition",
@@ -485,84 +1164,6 @@
       "org.junit.platform.reporting.legacy",
       "org.junit.platform.reporting.legacy.xml"
     ],
-    "org.mockito:mockito-core": [
-      "org.mockito",
-      "org.mockito.codegen",
-      "org.mockito.configuration",
-      "org.mockito.creation.instance",
-      "org.mockito.exceptions.base",
-      "org.mockito.exceptions.misusing",
-      "org.mockito.exceptions.stacktrace",
-      "org.mockito.exceptions.verification",
-      "org.mockito.exceptions.verification.junit",
-      "org.mockito.exceptions.verification.opentest4j",
-      "org.mockito.hamcrest",
-      "org.mockito.internal",
-      "org.mockito.internal.configuration",
-      "org.mockito.internal.configuration.injection",
-      "org.mockito.internal.configuration.injection.filter",
-      "org.mockito.internal.configuration.injection.scanner",
-      "org.mockito.internal.configuration.plugins",
-      "org.mockito.internal.creation",
-      "org.mockito.internal.creation.bytebuddy",
-      "org.mockito.internal.creation.instance",
-      "org.mockito.internal.creation.proxy",
-      "org.mockito.internal.creation.settings",
-      "org.mockito.internal.creation.util",
-      "org.mockito.internal.debugging",
-      "org.mockito.internal.exceptions",
-      "org.mockito.internal.exceptions.stacktrace",
-      "org.mockito.internal.exceptions.util",
-      "org.mockito.internal.framework",
-      "org.mockito.internal.hamcrest",
-      "org.mockito.internal.handler",
-      "org.mockito.internal.invocation",
-      "org.mockito.internal.invocation.finder",
-      "org.mockito.internal.invocation.mockref",
-      "org.mockito.internal.junit",
-      "org.mockito.internal.listeners",
-      "org.mockito.internal.matchers",
-      "org.mockito.internal.matchers.apachecommons",
-      "org.mockito.internal.matchers.text",
-      "org.mockito.internal.progress",
-      "org.mockito.internal.reporting",
-      "org.mockito.internal.runners",
-      "org.mockito.internal.runners.util",
-      "org.mockito.internal.session",
-      "org.mockito.internal.stubbing",
-      "org.mockito.internal.stubbing.answers",
-      "org.mockito.internal.stubbing.defaultanswers",
-      "org.mockito.internal.util",
-      "org.mockito.internal.util.collections",
-      "org.mockito.internal.util.concurrent",
-      "org.mockito.internal.util.io",
-      "org.mockito.internal.util.reflection",
-      "org.mockito.internal.verification",
-      "org.mockito.internal.verification.api",
-      "org.mockito.internal.verification.argumentmatching",
-      "org.mockito.internal.verification.checkers",
-      "org.mockito.invocation",
-      "org.mockito.junit",
-      "org.mockito.listeners",
-      "org.mockito.mock",
-      "org.mockito.plugins",
-      "org.mockito.quality",
-      "org.mockito.session",
-      "org.mockito.stubbing",
-      "org.mockito.verification"
-    ],
-    "org.objenesis:objenesis": [
-      "org.objenesis",
-      "org.objenesis.instantiator",
-      "org.objenesis.instantiator.android",
-      "org.objenesis.instantiator.annotations",
-      "org.objenesis.instantiator.basic",
-      "org.objenesis.instantiator.gcj",
-      "org.objenesis.instantiator.perc",
-      "org.objenesis.instantiator.sun",
-      "org.objenesis.instantiator.util",
-      "org.objenesis.strategy"
-    ],
     "org.opentest4j:opentest4j": [
       "org.opentest4j"
     ],
@@ -573,8 +1174,18 @@
   },
   "repositories": {
     "https://repo1.maven.org/maven2/": [
+      "com.google.android:annotations",
+      "com.google.android:annotations:jar:sources",
+      "com.google.api.grpc:proto-google-common-protos",
+      "com.google.api.grpc:proto-google-common-protos:jar:sources",
+      "com.google.auth:google-auth-library-credentials",
+      "com.google.auth:google-auth-library-credentials:jar:sources",
+      "com.google.auth:google-auth-library-oauth2-http",
+      "com.google.auth:google-auth-library-oauth2-http:jar:sources",
+      "com.google.auto.value:auto-value",
       "com.google.auto.value:auto-value-annotations",
       "com.google.auto.value:auto-value-annotations:jar:sources",
+      "com.google.auto.value:auto-value:jar:sources",
       "com.google.code.findbugs:jsr305",
       "com.google.code.findbugs:jsr305:jar:sources",
       "com.google.code.gson:gson",
@@ -584,26 +1195,93 @@
       "com.google.guava:failureaccess",
       "com.google.guava:failureaccess:jar:sources",
       "com.google.guava:guava",
-      "com.google.guava:guava-testlib",
-      "com.google.guava:guava-testlib:jar:sources",
       "com.google.guava:guava:jar:sources",
       "com.google.guava:listenablefuture",
+      "com.google.http-client:google-http-client",
+      "com.google.http-client:google-http-client-gson",
+      "com.google.http-client:google-http-client-gson:jar:sources",
+      "com.google.http-client:google-http-client:jar:sources",
       "com.google.j2objc:j2objc-annotations",
       "com.google.j2objc:j2objc-annotations:jar:sources",
+      "com.google.protobuf:protobuf-java",
+      "com.google.protobuf:protobuf-java:jar:sources",
+      "com.google.re2j:re2j",
+      "com.google.re2j:re2j:jar:sources",
       "com.google.truth:truth",
       "com.google.truth:truth:jar:sources",
+      "com.squareup.okhttp:okhttp",
+      "com.squareup.okhttp:okhttp:jar:sources",
+      "com.squareup.okio:okio",
+      "com.squareup.okio:okio:jar:sources",
+      "commons-codec:commons-codec",
+      "commons-codec:commons-codec:jar:sources",
+      "io.grpc:grpc-api",
+      "io.grpc:grpc-api:jar:sources",
+      "io.grpc:grpc-context",
+      "io.grpc:grpc-context:jar:sources",
+      "io.netty:netty-buffer",
+      "io.netty:netty-buffer:jar:sources",
+      "io.netty:netty-codec",
+      "io.netty:netty-codec-http",
+      "io.netty:netty-codec-http2",
+      "io.netty:netty-codec-http2:jar:sources",
+      "io.netty:netty-codec-http:jar:sources",
+      "io.netty:netty-codec-socks",
+      "io.netty:netty-codec-socks:jar:sources",
+      "io.netty:netty-codec:jar:sources",
+      "io.netty:netty-common",
+      "io.netty:netty-common:jar:sources",
+      "io.netty:netty-handler",
+      "io.netty:netty-handler-proxy",
+      "io.netty:netty-handler-proxy:jar:sources",
+      "io.netty:netty-handler:jar:sources",
+      "io.netty:netty-resolver",
+      "io.netty:netty-resolver:jar:sources",
+      "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-classes:jar:sources",
+      "io.netty:netty-transport",
+      "io.netty:netty-transport-classes-epoll",
+      "io.netty:netty-transport-classes-epoll:jar:sources",
+      "io.netty:netty-transport-native-epoll:jar:linux-x86_64",
+      "io.netty:netty-transport-native-epoll:jar:sources",
+      "io.netty:netty-transport-native-unix-common",
+      "io.netty:netty-transport-native-unix-common:jar:sources",
+      "io.netty:netty-transport:jar:sources",
+      "io.opencensus:opencensus-api",
+      "io.opencensus:opencensus-api:jar:sources",
+      "io.opencensus:opencensus-contrib-grpc-metrics",
+      "io.opencensus:opencensus-contrib-grpc-metrics:jar:sources",
+      "io.opencensus:opencensus-contrib-http-util",
+      "io.opencensus:opencensus-contrib-http-util:jar:sources",
+      "io.perfmark:perfmark-api",
+      "io.perfmark:perfmark-api:jar:sources",
       "junit:junit",
       "junit:junit:jar:sources",
-      "net.bytebuddy:byte-buddy",
-      "net.bytebuddy:byte-buddy-agent",
-      "net.bytebuddy:byte-buddy-agent:jar:sources",
-      "net.bytebuddy:byte-buddy:jar:sources",
+      "org.apache.httpcomponents:httpclient",
+      "org.apache.httpcomponents:httpclient:jar:sources",
+      "org.apache.httpcomponents:httpcore",
+      "org.apache.httpcomponents:httpcore:jar:sources",
+      "org.apache.tomcat:annotations-api",
       "org.apiguardian:apiguardian-api",
       "org.apiguardian:apiguardian-api:jar:sources",
       "org.checkerframework:checker-qual",
       "org.checkerframework:checker-qual:jar:sources",
+      "org.codehaus.mojo:animal-sniffer-annotations",
+      "org.codehaus.mojo:animal-sniffer-annotations:jar:sources",
       "org.hamcrest:hamcrest-core",
       "org.hamcrest:hamcrest-core:jar:sources",
+      "org.jetbrains.kotlin:kotlin-stdlib",
+      "org.jetbrains.kotlin:kotlin-stdlib-common",
+      "org.jetbrains.kotlin:kotlin-stdlib-common:jar:sources",
+      "org.jetbrains.kotlin:kotlin-stdlib:jar:sources",
+      "org.jetbrains:annotations",
+      "org.jetbrains:annotations:jar:sources",
       "org.junit.jupiter:junit-jupiter-api",
       "org.junit.jupiter:junit-jupiter-api:jar:sources",
       "org.junit.jupiter:junit-jupiter-engine",
@@ -616,15 +1294,69 @@
       "org.junit.platform:junit-platform-launcher:jar:sources",
       "org.junit.platform:junit-platform-reporting",
       "org.junit.platform:junit-platform-reporting:jar:sources",
-      "org.mockito:mockito-core",
-      "org.mockito:mockito-core:jar:sources",
-      "org.objenesis:objenesis",
-      "org.objenesis:objenesis:jar:sources",
       "org.opentest4j:opentest4j",
       "org.opentest4j:opentest4j:jar:sources",
       "org.ow2.asm:asm",
       "org.ow2.asm:asm:jar:sources"
     ]
   },
+  "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"
+      ]
+    },
+    "io.netty:netty-common:jar:sources": {
+      "reactor.blockhound.integration.BlockHoundIntegration": [
+        "io.netty.util.internal.Hidden$NettyBlockHoundIntegration"
+      ]
+    },
+    "org.junit.jupiter:junit-jupiter-engine": {
+      "org.junit.platform.engine.TestEngine": [
+        "org.junit.jupiter.engine.JupiterTestEngine"
+      ]
+    },
+    "org.junit.jupiter:junit-jupiter-engine:jar:sources": {
+      "org.junit.platform.engine.TestEngine": [
+        "org.junit.jupiter.engine.JupiterTestEngine"
+      ]
+    },
+    "org.junit.platform:junit-platform-launcher": {
+      "org.junit.platform.launcher.TestExecutionListener": [
+        "org.junit.platform.launcher.listeners.UniqueIdTrackingListener"
+      ]
+    },
+    "org.junit.platform:junit-platform-launcher:jar:sources": {
+      "org.junit.platform.launcher.TestExecutionListener": [
+        "org.junit.platform.launcher.listeners.UniqueIdTrackingListener"
+      ]
+    }
+  },
+  "skipped": [
+    "com.google.guava:listenablefuture:jar:sources",
+    "io.netty:netty-tcnative-boringssl-static:jar:sources",
+    "org.apache.tomcat:annotations-api:jar:sources"
+  ],
   "version": "2"
 }
diff --git a/examples/tests_and_lints/MODULE.bazel b/examples/tests_and_lints/MODULE.bazel
index c83a4b6b..5935ee2a 100644
--- a/examples/tests_and_lints/MODULE.bazel
+++ b/examples/tests_and_lints/MODULE.bazel
@@ -5,7 +5,7 @@ module(
 
 bazel_dep(
     name = "apple_rules_lint",
-    version = "0.3.2",
+    version = "0.4.0",
 )
 bazel_dep(
     name = "contrib_rules_jvm",
@@ -18,7 +18,7 @@ local_path_override(
 
 bazel_dep(
     name = "rules_jvm_external",
-    version = "6.0",
+    version = "6.6",
 )
 
 linter = use_extension("@apple_rules_lint//lint:extensions.bzl", "linter")
@@ -45,5 +45,4 @@ maven.install(
 use_repo(
     maven,
     "maven",
-    "unpinned_maven",
 )
diff --git a/examples/workspace-based/.bazelrc b/examples/workspace-based/.bazelrc
deleted file mode 100644
index 1dc93ccb..00000000
--- a/examples/workspace-based/.bazelrc
+++ /dev/null
@@ -1,11 +0,0 @@
-common --noenable_bzlmod
-
-build --java_runtime_version=remotejdk_17
-build --java_language_version=17
-build --tool_java_runtime_version=remotejdk_17
-build --tool_java_language_version=17
-
-# Make sure we get something helpful when tests fail
-test --verbose_failures
-test --test_output=errors
-
diff --git a/examples/workspace-based/.bazelversion b/examples/workspace-based/.bazelversion
deleted file mode 100644
index f22d756d..00000000
--- a/examples/workspace-based/.bazelversion
+++ /dev/null
@@ -1 +0,0 @@
-6.5.0
diff --git a/examples/workspace-based/BUILD.bazel b/examples/workspace-based/BUILD.bazel
deleted file mode 100644
index 1e915ac0..00000000
--- a/examples/workspace-based/BUILD.bazel
+++ /dev/null
@@ -1,24 +0,0 @@
-load("@bazel_gazelle//:def.bzl", "DEFAULT_LANGUAGES", "gazelle", "gazelle_binary")
-
-# We can choose where the `maven_install` lock file is read from
-#
-# gazelle:java_maven_install_file java/maven_install.json
-
-# And this maps common types to the ones from `contrib_rules_jvm`. By
-# doing this we can use the integration with `apple_rules_lint`.
-#
-# gazelle:map_kind java_binary java_binary @contrib_rules_jvm//java:defs.bzl
-# gazelle:map_kind java_library java_library @contrib_rules_jvm//java:defs.bzl
-# gazelle:map_kind java_test java_test @contrib_rules_jvm//java:defs.bzl
-
-gazelle(
-    name = "gazelle",
-    gazelle = ":gazelle_bin",
-)
-
-gazelle_binary(
-    name = "gazelle_bin",
-    languages = DEFAULT_LANGUAGES + [
-        "@contrib_rules_jvm//java/gazelle",
-    ],
-)
diff --git a/examples/workspace-based/README.md b/examples/workspace-based/README.md
deleted file mode 100644
index ac270c29..00000000
--- a/examples/workspace-based/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Example Workspace-based project
-
-This is a small example of using the `gazelle` java plugin with a
-simple source repository.
-
-## Steps to use
-
- 1. Run `bazel test //...` and notice that there's almost no tests.
- 1. `bazel run gazelle` and find the new `BUILD.bazel` files that are created
- 1. `bazel test //...`
-
-The final run of `bazel test` will fail, as one of the example tests
-is written so it won't pass. Try fixing it!
-
-This example also shows how you can make use of the linters that are
-supplied with `contrib_rules_jvm`. There are directives in the
-top-level `BUILD.bazel` that tell the gazelle plugin to use the macros
-from `contrib_rules_jvm` and not just `rules_java`. The configuration
-of the linters can be found in the `WORKSPACE` file.
diff --git a/examples/workspace-based/WORKSPACE b/examples/workspace-based/WORKSPACE
deleted file mode 100644
index f161438c..00000000
--- a/examples/workspace-based/WORKSPACE
+++ /dev/null
@@ -1,77 +0,0 @@
-workspace(name = "contrib_rules_jvm_workspace_example")
-
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-local_repository(
-    name = "contrib_rules_jvm",
-    path = "../..",
-)
-
-load("@contrib_rules_jvm//:repositories.bzl", "contrib_rules_jvm_deps", "contrib_rules_jvm_gazelle_deps")
-
-contrib_rules_jvm_deps()
-
-load("@apple_rules_lint//lint:setup.bzl", "lint_setup")
-
-lint_setup({
-    "java-checkstyle": "@contrib_rules_jvm//java:checkstyle-default-config",
-    "java-pmd": "@contrib_rules_jvm//java:pmd-config",
-    "java-spotbugs": "@contrib_rules_jvm//java:spotbugs-default-config",
-})
-
-load("@contrib_rules_jvm//:setup.bzl", "contrib_rules_jvm_setup")
-
-contrib_rules_jvm_setup()
-
-load("@rules_jvm_external//:defs.bzl", "maven_install")
-
-maven_install(
-    artifacts = [
-        "com.google.guava:guava:33.3.1-jre",
-        "org.junit.jupiter:junit-jupiter-engine:5.8.2",
-        "org.junit.jupiter:junit-jupiter-api:5.8.2",
-        "org.junit.platform:junit-platform-launcher:1.8.2",
-        "org.junit.platform:junit-platform-reporting:1.8.2",
-    ],
-    maven_install_json = "//java:maven_install.json",
-    repositories = [
-        "https://repo1.maven.org/maven2",
-    ],
-)
-
-load("@maven//:defs.bzl", "pinned_maven_install")
-
-pinned_maven_install()
-
-http_archive(
-    name = "io_bazel_rules_go",
-    integrity = "sha256-M6zErg9wUC20uJPJ/B3Xqb+ZjCPn/yxFF3QdQEmpdvg=",
-    urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.48.0/rules_go-v0.48.0.zip",
-        "https://github.com/bazelbuild/rules_go/releases/download/v0.48.0/rules_go-v0.48.0.zip",
-    ],
-)
-
-http_archive(
-    name = "bazel_gazelle",
-    integrity = "sha256-12v3pg/YsFBEQJDfooN6Tq+YKeEWVhjuNdzspcvfWNU=",
-    urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.37.0/bazel-gazelle-v0.37.0.tar.gz",
-        "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.37.0/bazel-gazelle-v0.37.0.tar.gz",
-    ],
-)
-
-load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
-load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
-
-contrib_rules_jvm_gazelle_deps()
-
-load("@contrib_rules_jvm//:gazelle_setup.bzl", "contrib_rules_jvm_gazelle_setup")
-
-contrib_rules_jvm_gazelle_setup()
-
-go_rules_dependencies()
-
-go_register_toolchains(version = "1.23.2")
-
-gazelle_dependencies()
diff --git a/examples/workspace-based/java/BUILD.bazel b/examples/workspace-based/java/BUILD.bazel
deleted file mode 100644
index e69de29b..00000000
diff --git a/examples/workspace-based/java/maven_install.json b/examples/workspace-based/java/maven_install.json
deleted file mode 100644
index 355f7d38..00000000
--- a/examples/workspace-based/java/maven_install.json
+++ /dev/null
@@ -1,289 +0,0 @@
-{
-  "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": 1198363139,
-  "__RESOLVED_ARTIFACTS_HASH": -862895559,
-  "artifacts": {
-    "com.google.code.findbugs:jsr305": {
-      "shasums": {
-        "jar": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7"
-      },
-      "version": "3.0.2"
-    },
-    "com.google.errorprone:error_prone_annotations": {
-      "shasums": {
-        "jar": "f3fc8a3a0a4020706a373b00e7f57c2512dd26d1f83d28c7d38768f8682b231e"
-      },
-      "version": "2.28.0"
-    },
-    "com.google.guava:failureaccess": {
-      "shasums": {
-        "jar": "8a8f81cf9b359e3f6dfa691a1e776985c061ef2f223c9b2c80753e1b458e8064"
-      },
-      "version": "1.0.2"
-    },
-    "com.google.guava:guava": {
-      "shasums": {
-        "jar": "4bf0e2c5af8e4525c96e8fde17a4f7307f97f8478f11c4c8e35a0e3298ae4e90"
-      },
-      "version": "33.3.1-jre"
-    },
-    "com.google.guava:listenablefuture": {
-      "shasums": {
-        "jar": "b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99"
-      },
-      "version": "9999.0-empty-to-avoid-conflict-with-guava"
-    },
-    "com.google.j2objc:j2objc-annotations": {
-      "shasums": {
-        "jar": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64"
-      },
-      "version": "3.0.0"
-    },
-    "org.apiguardian:apiguardian-api": {
-      "shasums": {
-        "jar": "b509448ac506d607319f182537f0b35d71007582ec741832a1f111e5b5b70b38"
-      },
-      "version": "1.1.2"
-    },
-    "org.checkerframework:checker-qual": {
-      "shasums": {
-        "jar": "3fbc2e98f05854c3df16df9abaa955b91b15b3ecac33623208ed6424640ef0f6"
-      },
-      "version": "3.43.0"
-    },
-    "org.junit.jupiter:junit-jupiter-api": {
-      "shasums": {
-        "jar": "1808ee87e0f718cd6e25f3b75afc17956ac8a3edc48c7e9bab9f19f9a79e3801"
-      },
-      "version": "5.8.2"
-    },
-    "org.junit.jupiter:junit-jupiter-engine": {
-      "shasums": {
-        "jar": "753b7726cdd158bb34cedb94c161e2291896f47832a1e9eda53d970020a8184e"
-      },
-      "version": "5.8.2"
-    },
-    "org.junit.platform:junit-platform-commons": {
-      "shasums": {
-        "jar": "d2e015fca7130e79af2f4608dc54415e4b10b592d77333decb4b1a274c185050"
-      },
-      "version": "1.8.2"
-    },
-    "org.junit.platform:junit-platform-engine": {
-      "shasums": {
-        "jar": "0b7d000f8c3e8e5f7d6b819649936e7b9938314e87c8f983805218ea57567e59"
-      },
-      "version": "1.8.2"
-    },
-    "org.junit.platform:junit-platform-launcher": {
-      "shasums": {
-        "jar": "822156409fd83e682e4c5199b3460054299b538a058c2c6d0f5c9b6a5bdb7594"
-      },
-      "version": "1.8.2"
-    },
-    "org.junit.platform:junit-platform-reporting": {
-      "shasums": {
-        "jar": "d28048333b378d166f9ad38c2a8e34ac0fa1a29cc016cb279df53c8b54628fc3"
-      },
-      "version": "1.8.2"
-    },
-    "org.opentest4j:opentest4j": {
-      "shasums": {
-        "jar": "58812de60898d976fb81ef3b62da05c6604c18fd4a249f5044282479fc286af2"
-      },
-      "version": "1.2.0"
-    }
-  },
-  "dependencies": {
-    "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"
-    ],
-    "org.junit.jupiter:junit-jupiter-api": [
-      "org.apiguardian:apiguardian-api",
-      "org.junit.platform:junit-platform-commons",
-      "org.opentest4j:opentest4j"
-    ],
-    "org.junit.jupiter:junit-jupiter-engine": [
-      "org.apiguardian:apiguardian-api",
-      "org.junit.jupiter:junit-jupiter-api",
-      "org.junit.platform:junit-platform-engine"
-    ],
-    "org.junit.platform:junit-platform-commons": [
-      "org.apiguardian:apiguardian-api"
-    ],
-    "org.junit.platform:junit-platform-engine": [
-      "org.apiguardian:apiguardian-api",
-      "org.junit.platform:junit-platform-commons",
-      "org.opentest4j:opentest4j"
-    ],
-    "org.junit.platform:junit-platform-launcher": [
-      "org.apiguardian:apiguardian-api",
-      "org.junit.platform:junit-platform-engine"
-    ],
-    "org.junit.platform:junit-platform-reporting": [
-      "org.apiguardian:apiguardian-api",
-      "org.junit.platform:junit-platform-launcher"
-    ]
-  },
-  "packages": {
-    "com.google.code.findbugs:jsr305": [
-      "javax.annotation",
-      "javax.annotation.concurrent",
-      "javax.annotation.meta"
-    ],
-    "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.j2objc:j2objc-annotations": [
-      "com.google.j2objc.annotations"
-    ],
-    "org.apiguardian:apiguardian-api": [
-      "org.apiguardian.api"
-    ],
-    "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.count.report.qual",
-      "org.checkerframework.common.value.qual",
-      "org.checkerframework.dataflow.qual",
-      "org.checkerframework.framework.qual"
-    ],
-    "org.junit.jupiter:junit-jupiter-api": [
-      "org.junit.jupiter.api",
-      "org.junit.jupiter.api.condition",
-      "org.junit.jupiter.api.extension",
-      "org.junit.jupiter.api.extension.support",
-      "org.junit.jupiter.api.function",
-      "org.junit.jupiter.api.io",
-      "org.junit.jupiter.api.parallel"
-    ],
-    "org.junit.jupiter:junit-jupiter-engine": [
-      "org.junit.jupiter.engine",
-      "org.junit.jupiter.engine.config",
-      "org.junit.jupiter.engine.descriptor",
-      "org.junit.jupiter.engine.discovery",
-      "org.junit.jupiter.engine.discovery.predicates",
-      "org.junit.jupiter.engine.execution",
-      "org.junit.jupiter.engine.extension",
-      "org.junit.jupiter.engine.support"
-    ],
-    "org.junit.platform:junit-platform-commons": [
-      "org.junit.platform.commons",
-      "org.junit.platform.commons.annotation",
-      "org.junit.platform.commons.function",
-      "org.junit.platform.commons.logging",
-      "org.junit.platform.commons.support",
-      "org.junit.platform.commons.util"
-    ],
-    "org.junit.platform:junit-platform-engine": [
-      "org.junit.platform.engine",
-      "org.junit.platform.engine.discovery",
-      "org.junit.platform.engine.reporting",
-      "org.junit.platform.engine.support.config",
-      "org.junit.platform.engine.support.descriptor",
-      "org.junit.platform.engine.support.discovery",
-      "org.junit.platform.engine.support.filter",
-      "org.junit.platform.engine.support.hierarchical"
-    ],
-    "org.junit.platform:junit-platform-launcher": [
-      "org.junit.platform.launcher",
-      "org.junit.platform.launcher.core",
-      "org.junit.platform.launcher.listeners",
-      "org.junit.platform.launcher.listeners.discovery",
-      "org.junit.platform.launcher.listeners.session",
-      "org.junit.platform.launcher.tagexpression"
-    ],
-    "org.junit.platform:junit-platform-reporting": [
-      "org.junit.platform.reporting.legacy",
-      "org.junit.platform.reporting.legacy.xml"
-    ],
-    "org.opentest4j:opentest4j": [
-      "org.opentest4j"
-    ]
-  },
-  "repositories": {
-    "https://repo1.maven.org/maven2/": [
-      "com.google.code.findbugs:jsr305",
-      "com.google.errorprone:error_prone_annotations",
-      "com.google.guava:failureaccess",
-      "com.google.guava:guava",
-      "com.google.guava:listenablefuture",
-      "com.google.j2objc:j2objc-annotations",
-      "org.apiguardian:apiguardian-api",
-      "org.checkerframework:checker-qual",
-      "org.junit.jupiter:junit-jupiter-api",
-      "org.junit.jupiter:junit-jupiter-engine",
-      "org.junit.platform:junit-platform-commons",
-      "org.junit.platform:junit-platform-engine",
-      "org.junit.platform:junit-platform-launcher",
-      "org.junit.platform:junit-platform-reporting",
-      "org.opentest4j:opentest4j"
-    ]
-  },
-  "services": {
-    "org.junit.jupiter:junit-jupiter-engine": {
-      "org.junit.platform.engine.TestEngine": [
-        "org.junit.jupiter.engine.JupiterTestEngine"
-      ]
-    },
-    "org.junit.platform:junit-platform-launcher": {
-      "org.junit.platform.launcher.TestExecutionListener": [
-        "org.junit.platform.launcher.listeners.UniqueIdTrackingListener"
-      ]
-    }
-  },
-  "version": "2"
-}
diff --git a/examples/workspace-based/java/src/com/github/bazelcontrib/rulesjvm/example/Main.java b/examples/workspace-based/java/src/com/github/bazelcontrib/rulesjvm/example/Main.java
deleted file mode 100644
index 3a7c00b9..00000000
--- a/examples/workspace-based/java/src/com/github/bazelcontrib/rulesjvm/example/Main.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.github.bazelcontrib.rulesjvm.example;
-
-import com.google.common.base.Joiner;
-
-public class Main {
-  public static void main(String[] args) {
-    System.out.println(Joiner.on(" ").join("Hello,", "World!"));
-  }
-}
diff --git a/examples/workspace-based/java/test/com/github/bazelcontrib/rulesjvm/example/FailingTest.java b/examples/workspace-based/java/test/com/github/bazelcontrib/rulesjvm/example/FailingTest.java
deleted file mode 100644
index 4441e701..00000000
--- a/examples/workspace-based/java/test/com/github/bazelcontrib/rulesjvm/example/FailingTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.github.bazelcontrib.rulesjvm.example;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.junit.jupiter.api.Test;
-
-public class FailingTest {
-
-  @Test
-  public void passingText() {
-    assertEquals("one", "two");
-  }
-}
diff --git a/examples/workspace-based/java/test/com/github/bazelcontrib/rulesjvm/example/PassingTest.java b/examples/workspace-based/java/test/com/github/bazelcontrib/rulesjvm/example/PassingTest.java
deleted file mode 100644
index 53147863..00000000
--- a/examples/workspace-based/java/test/com/github/bazelcontrib/rulesjvm/example/PassingTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.github.bazelcontrib.rulesjvm.example;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.junit.jupiter.api.Test;
-
-public class PassingTest {
-
-  @Test
-  public void passingText() {
-    assertEquals("one", "one");
-  }
-}
diff --git a/examples/workspace-based/src/test/com/github/bazel_contrib/contrib_rules_jvm/examples/tests_and_lints/ExampleTest.java b/examples/workspace-based/src/test/com/github/bazel_contrib/contrib_rules_jvm/examples/tests_and_lints/ExampleTest.java
deleted file mode 100644
index e6ff0e3d..00000000
--- a/examples/workspace-based/src/test/com/github/bazel_contrib/contrib_rules_jvm/examples/tests_and_lints/ExampleTest.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.github.bazel_contrib.contrib_rules_jvm.examples.tests_and_lints;
-
-import org.junit.jupiter.api.Test;
-
-public class ExampleTest {
-  @Test
-  public void passes() {}
-}
diff --git a/gazelle_setup.bzl b/gazelle_setup.bzl
deleted file mode 100644
index 76adb56b..00000000
--- a/gazelle_setup.bzl
+++ /dev/null
@@ -1,18 +0,0 @@
-load("@bazel_features//:deps.bzl", "bazel_features_deps")
-load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
-load("@io_grpc_grpc_java//:repositories.bzl", "io_grpc_grpc_proto")
-load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
-load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
-load("@rules_proto//proto:setup.bzl", "rules_proto_setup")
-load("@rules_python//python:repositories.bzl", "py_repositories")
-load("//third_party/go:repositories.bzl", "go_deps")
-
-def contrib_rules_jvm_gazelle_setup():
-    bazel_features_deps()
-    rules_pkg_dependencies()
-    protobuf_deps()
-    py_repositories()
-    rules_proto_dependencies()
-    rules_proto_setup()
-    io_grpc_grpc_proto()
-    go_deps()
diff --git a/go.mod b/go.mod
index e553686e..fa52f36c 100644
--- a/go.mod
+++ b/go.mod
@@ -1,35 +1,39 @@
 module github.com/bazel-contrib/rules_jvm
 
-go 1.21
+go 1.22.9
+
+toolchain go1.22.12
 
 require (
 	github.com/aristanetworks/goarista v0.0.0-20220328143245-64c8d3945829
-	github.com/bazelbuild/bazel-gazelle v0.34.0
-	github.com/bazelbuild/buildtools v0.0.0-20231115204819-d4c9dccdfbb1
-	github.com/bazelbuild/rules_go v0.43.0
-	github.com/google/btree v1.1.2
+	github.com/bazelbuild/bazel-gazelle v0.42.0
+	github.com/bazelbuild/buildtools v0.0.0-20250204160707-ad48c76ab9b5
+	github.com/bazelbuild/rules_go v0.52.0
+	github.com/google/btree v1.1.3
 	github.com/google/go-cmp v0.6.0
-	github.com/google/uuid v1.1.2
-	github.com/hashicorp/golang-lru v0.5.4
-	github.com/rs/zerolog v1.26.1
+	github.com/google/uuid v1.6.0
+	github.com/hashicorp/golang-lru v1.0.2
+	github.com/rs/zerolog v1.33.0
 	github.com/sergi/go-diff v1.2.0
 	github.com/stretchr/testify v1.7.0
-	go.starlark.net v0.0.0-20210223155950-e043a3d3c984
-	golang.org/x/tools v0.14.0
+	go.starlark.net v0.0.0-20250205221240-492d3672b3f4
+	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d
 	golang.org/x/tools/go/vcs v0.1.0-deprecated
-	google.golang.org/grpc v1.50.0
+	google.golang.org/grpc v1.70.0
 )
 
 require (
-	github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
+	github.com/bmatcuk/doublestar/v4 v4.7.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	golang.org/x/mod v0.13.0 // indirect
-	golang.org/x/net v0.16.0 // indirect
-	golang.org/x/sys v0.13.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
-	google.golang.org/genproto v0.0.0-20210921142501-181ce0d877f6 // indirect
-	google.golang.org/protobuf v1.28.0 // indirect
+	golang.org/x/mod v0.23.0 // indirect
+	golang.org/x/net v0.34.0 // indirect
+	golang.org/x/sync v0.11.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250204164813-702378808489 // indirect
+	google.golang.org/protobuf v1.36.5 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
 )
diff --git a/go.sum b/go.sum
index c6e2d717..6c479f0b 100644
--- a/go.sum
+++ b/go.sum
@@ -1,199 +1,95 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/aristanetworks/goarista v0.0.0-20220328143245-64c8d3945829 h1:xnu1MpGNjnEooJ8lWa3YiU3330zMZISReAosjpZpLzg=
 github.com/aristanetworks/goarista v0.0.0-20220328143245-64c8d3945829/go.mod h1:FmFEhIzCEWoI0WuuZDSWCu25zCNW/X4Czla0ls/HSrs=
-github.com/bazelbuild/bazel-gazelle v0.34.0 h1:YHkwssgvCXDRU7sLCq1kGqaGYO9pKNR1Wku7UT2LhoY=
-github.com/bazelbuild/bazel-gazelle v0.34.0/go.mod h1:3wXzAC5rTs8eTQ+t+eTqleUE9W4dDComgXgqDjnI5s4=
-github.com/bazelbuild/buildtools v0.0.0-20231115204819-d4c9dccdfbb1 h1:2Gc2Q6hVR1SJ8bBI9Ybzoggp8u/ED2WkM4MfvEIn9+c=
-github.com/bazelbuild/buildtools v0.0.0-20231115204819-d4c9dccdfbb1/go.mod h1:689QdV3hBP7Vo9dJMmzhoYIyo/9iMhEmHkJcnaPRCbo=
-github.com/bazelbuild/rules_go v0.43.0 h1:Q+vDhH4yzafZ0xHBT0JEVawb+1nDHUXhjvWTqSGCCyU=
-github.com/bazelbuild/rules_go v0.43.0/go.mod h1:TFLfii8e49kTgn329knh1lsJFKdxyp/hKlWObY66xwY=
-github.com/bmatcuk/doublestar/v4 v4.6.1 h1:FH9SifrbvJhnlQpztAx++wlkk70QBf0iBWDwNy7PA4I=
-github.com/bmatcuk/doublestar/v4 v4.6.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/bazelbuild/bazel-gazelle v0.42.0 h1:BpkUzE3H2l6buJYFTKgzVMecJimQgWwYud25qVIx0SQ=
+github.com/bazelbuild/bazel-gazelle v0.42.0/go.mod h1:SRCc60YGZ27y+BqLzQ+nMh249+FyZz7YtX/V2ng+/z4=
+github.com/bazelbuild/buildtools v0.0.0-20250204160707-ad48c76ab9b5 h1:ls2GvHSkr+EXNZBBGVrPewx3nc54YBHCHd6v4BOlz9g=
+github.com/bazelbuild/buildtools v0.0.0-20250204160707-ad48c76ab9b5/go.mod h1:PLNUetjLa77TCCziPsz0EI8a6CUxgC+1jgmWv0H25tg=
+github.com/bazelbuild/rules_go v0.52.0 h1:+ozpngVAW67pCAwfhepaXSSrG3yHcj8K9hNAxSYBno4=
+github.com/bazelbuild/rules_go v0.52.0/go.mod h1:M+YrupNArA7OiTlv++rFUgQ6Sm+ZXbQ5HPUj0cGa0us=
+github.com/bmatcuk/doublestar/v4 v4.7.1 h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q=
+github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
+github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
+github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
+github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
-github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
+github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
+github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
-github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c=
+github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
-github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.26.1 h1:/ihwxqH+4z8UxyI70wM1z9yCvkWcfz/a3mj48k/Zngc=
-github.com/rs/zerolog v1.26.1/go.mod h1:/wSSJWX7lVrsOwlbyTRSOJvqRlc+WjWlfes+CiJ+tmc=
+github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
+github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
 github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
 github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
-github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-go.starlark.net v0.0.0-20210223155950-e043a3d3c984 h1:xwwDQW5We85NaTk2APgoN9202w/l0DVGp+GZMfsrh7s=
-go.starlark.net v0.0.0-20210223155950-e043a3d3c984/go.mod h1:t3mmBBPzAVvK0L0n1drDmrQsJ8FoIx4INCqVMTr/Zo0=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
-golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.16.0 h1:7eBu7KsSvFDtSXUIDbh3aqlK4DPsZ1rByC8PFfBThos=
-golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
-golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
-golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
+go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U=
+go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg=
+go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M=
+go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8=
+go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4=
+go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU=
+go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU=
+go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ=
+go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM=
+go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8=
+go.starlark.net v0.0.0-20250205221240-492d3672b3f4 h1:eBP+boBfJoGU3irqbxGTcTlKcbNwJCOdbmsnDq56nak=
+go.starlark.net v0.0.0-20250205221240-492d3672b3f4/go.mod h1:YKMCv9b1WrfWmeqdV5MAuEHWsu5iC+fe6kYl2sQjdI8=
+golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
+golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
+golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
+golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
+golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
+golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/tools/go/vcs v0.1.0-deprecated h1:cOIJqWBl99H1dH5LWizPa+0ImeeJq3t3cJjaeOWUAL4=
 golang.org/x/tools/go/vcs v0.1.0-deprecated/go.mod h1:zUrvATBAvEI9535oC0yWYsLsHIV4Z7g63sNPVMtuBy8=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20210921142501-181ce0d877f6 h1:2ncG/LajxmrclaZH+ppVi02rQxz4eXYJzGHdFN4Y9UA=
-google.golang.org/genproto v0.0.0-20210921142501-181ce0d877f6/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
-google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.50.0 h1:fPVVDxY9w++VjTZsYvXWqEf9Rqar/e+9zYfxKK+W+YU=
-google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
-google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250204164813-702378808489 h1:5bKytslY8ViY0Cj/ewmRtrWHW64bNF03cAatUUFCdFI=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250204164813-702378808489/go.mod h1:8BS3B93F/U1juMFq9+EDk+qOT5CO1R9IzXxG3PTqiRk=
+google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ=
+google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw=
+google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
+google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/java/gazelle/BUILD.bazel b/java/gazelle/BUILD.bazel
index 2ea896f5..12eafeb9 100644
--- a/java/gazelle/BUILD.bazel
+++ b/java/gazelle/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
+load("@rules_go//go:def.bzl", "go_library", "go_test")
 
 # gazelle:exclude def.bzl
 
@@ -23,13 +23,13 @@ go_library(
         "//java/gazelle/private/sorted_multiset",
         "//java/gazelle/private/sorted_set",
         "//java/gazelle/private/types",
-        "@bazel_gazelle//config:go_default_library",
-        "@bazel_gazelle//label:go_default_library",
-        "@bazel_gazelle//language:go_default_library",
-        "@bazel_gazelle//language/proto:go_default_library",
-        "@bazel_gazelle//repo:go_default_library",
-        "@bazel_gazelle//resolve:go_default_library",
-        "@bazel_gazelle//rule:go_default_library",
+        "@bazel_gazelle//config",
+        "@bazel_gazelle//label",
+        "@bazel_gazelle//language",
+        "@bazel_gazelle//language/proto",
+        "@bazel_gazelle//repo",
+        "@bazel_gazelle//resolve",
+        "@bazel_gazelle//rule",
         "@com_github_bazelbuild_buildtools//build",
         "@com_github_hashicorp_golang_lru//:golang-lru",
         "@com_github_rs_zerolog//:zerolog",
@@ -50,16 +50,16 @@ go_test(
         "//java/gazelle/javaconfig",
         "//java/gazelle/private/sorted_set",
         "//java/gazelle/private/types",
-        "@bazel_gazelle//config:go_default_library",
-        "@bazel_gazelle//label:go_default_library",
-        "@bazel_gazelle//language:go_default_library",
-        "@bazel_gazelle//language/proto:go_default_library",
-        "@bazel_gazelle//pathtools:go_default_library",
-        "@bazel_gazelle//repo:go_default_library",
-        "@bazel_gazelle//resolve:go_default_library",
-        "@bazel_gazelle//rule:go_default_library",
-        "@bazel_gazelle//testtools:go_default_library",
-        "@bazel_gazelle//walk:go_default_library",
+        "@bazel_gazelle//config",
+        "@bazel_gazelle//label",
+        "@bazel_gazelle//language",
+        "@bazel_gazelle//language/proto",
+        "@bazel_gazelle//pathtools",
+        "@bazel_gazelle//repo",
+        "@bazel_gazelle//resolve",
+        "@bazel_gazelle//rule",
+        "@bazel_gazelle//testtools",
+        "@bazel_gazelle//walk",
         "@com_github_bazelbuild_buildtools//build",
         "@com_github_google_go_cmp//cmp",
         "@com_github_rs_zerolog//:zerolog",
@@ -84,8 +84,6 @@ bzl_library(
     visibility = ["//visibility:public"],
     deps = [
         "//third_party/go:repositories",
-        # "@contrib_rules_jvm_deps//:compat",
         "@contrib_rules_jvm_deps//:defs",
-        # "@io_grpc_grpc_java//:repositories",
     ],
 )
diff --git a/java/gazelle/javaconfig/BUILD.bazel b/java/gazelle/javaconfig/BUILD.bazel
index bb2b756f..3c4467e7 100644
--- a/java/gazelle/javaconfig/BUILD.bazel
+++ b/java/gazelle/javaconfig/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
+load("@rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
     name = "javaconfig",
diff --git a/java/gazelle/javaconfig/codegen/BUILD.bazel b/java/gazelle/javaconfig/codegen/BUILD.bazel
index abb50625..f8a4392e 100644
--- a/java/gazelle/javaconfig/codegen/BUILD.bazel
+++ b/java/gazelle/javaconfig/codegen/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
+load("@rules_go//go:def.bzl", "go_binary", "go_library")
 
 go_library(
     name = "codegen_lib",
diff --git a/java/gazelle/lang.go b/java/gazelle/lang.go
index c293d8eb..52371952 100644
--- a/java/gazelle/lang.go
+++ b/java/gazelle/lang.go
@@ -133,7 +133,7 @@ func (l javaLang) Kinds() map[string]rule.KindInfo {
 
 var baseJavaLoads = []rule.LoadInfo{
 	{
-		Name: "@io_grpc_grpc_java//:java_grpc_library.bzl",
+		Name: "@grpc-java//:java_grpc_library.bzl",
 		Symbols: []string{
 			"java_grpc_library",
 		},
diff --git a/java/gazelle/private/bazel/BUILD.bazel b/java/gazelle/private/bazel/BUILD.bazel
index 0114a601..0bfcc799 100644
--- a/java/gazelle/private/bazel/BUILD.bazel
+++ b/java/gazelle/private/bazel/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library")
+load("@rules_go//go:def.bzl", "go_library")
 
 go_library(
     name = "bazel",
diff --git a/java/gazelle/private/java/BUILD.bazel b/java/gazelle/private/java/BUILD.bazel
index c657de7d..22f655c2 100644
--- a/java/gazelle/private/java/BUILD.bazel
+++ b/java/gazelle/private/java/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
+load("@rules_go//go:def.bzl", "go_library", "go_test")
 
 # gazelle:exclude testdata
 
diff --git a/java/gazelle/private/javaparser/BUILD.bazel b/java/gazelle/private/javaparser/BUILD.bazel
index d15a4e1c..780b1466 100644
--- a/java/gazelle/private/javaparser/BUILD.bazel
+++ b/java/gazelle/private/javaparser/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library")
+load("@rules_go//go:def.bzl", "go_library")
 
 go_library(
     name = "javaparser",
@@ -7,7 +7,7 @@ go_library(
     visibility = ["//java/gazelle:__subpackages__"],
     deps = [
         "//java/gazelle/private/java",
-        "//java/gazelle/private/javaparser/proto/gazelle/java/javaparser/v0:javaparser",
+        "//java/gazelle/private/javaparser/proto/gazelle/java/javaparser/v0:gazelle_java_build_v0_go_proto",
         "//java/gazelle/private/servermanager",
         "//java/gazelle/private/sorted_multiset",
         "//java/gazelle/private/sorted_set",
diff --git a/java/gazelle/private/javaparser/proto/gazelle/java/javaparser/v0/BUILD.bazel b/java/gazelle/private/javaparser/proto/gazelle/java/javaparser/v0/BUILD.bazel
index d4757269..93338e0b 100644
--- a/java/gazelle/private/javaparser/proto/gazelle/java/javaparser/v0/BUILD.bazel
+++ b/java/gazelle/private/javaparser/proto/gazelle/java/javaparser/v0/BUILD.bazel
@@ -1,6 +1,5 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library")
-load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
-load("@io_grpc_grpc_java//:java_grpc_library.bzl", "java_grpc_library")
+load("@grpc-java//:java_grpc_library.bzl", "java_grpc_library")
+load("@rules_go//proto:def.bzl", "go_proto_library")
 load("@rules_java//java:defs.bzl", "java_library", "java_proto_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 
@@ -15,17 +14,11 @@ proto_library(
 
 go_proto_library(
     name = "gazelle_java_build_v0_go_proto",
-    compilers = ["@io_bazel_rules_go//proto:go_grpc"],
+    compilers = ["@rules_go//proto:go_grpc"],
     importpath = "github.com/bazel-contrib/rules_jvm/java/gazelle/private/javaparser/proto/gazelle/java/javaparser/v0",
     proto = ":gazelle_java_build_v0_proto",
 )
 
-go_library(
-    name = "javaparser",
-    embed = [":gazelle_java_build_v0_go_proto"],
-    importpath = "github.com/bazel-contrib/rules_jvm/java/gazelle/private/javaparser/proto/gazelle/java/javaparser/v0",
-)
-
 java_proto_library(
     name = "gazelle_java_build_v0_java_proto",
     deps = [":gazelle_java_build_v0_proto"],
diff --git a/java/gazelle/private/logconfig/BUILD.bazel b/java/gazelle/private/logconfig/BUILD.bazel
index cb5b4e5a..6a4f72fb 100644
--- a/java/gazelle/private/logconfig/BUILD.bazel
+++ b/java/gazelle/private/logconfig/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library")
+load("@rules_go//go:def.bzl", "go_library")
 
 go_library(
     name = "logconfig",
diff --git a/java/gazelle/private/maven/BUILD.bazel b/java/gazelle/private/maven/BUILD.bazel
index 3291e12c..8426d570 100644
--- a/java/gazelle/private/maven/BUILD.bazel
+++ b/java/gazelle/private/maven/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
+load("@rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
     name = "maven",
@@ -14,7 +14,7 @@ go_library(
         "//java/gazelle/private/bazel",
         "//java/gazelle/private/maven/multiset",
         "//java/gazelle/private/types",
-        "@bazel_gazelle//label:go_default_library",
+        "@bazel_gazelle//label",
         "@com_github_rs_zerolog//:zerolog",
     ],
 )
@@ -31,7 +31,7 @@ go_test(
     embed = [":maven"],
     deps = [
         "//java/gazelle/private/types",
-        "@bazel_gazelle//label:go_default_library",
+        "@bazel_gazelle//label",
         "@com_github_rs_zerolog//:zerolog",
         "@com_github_stretchr_testify//require",
     ],
diff --git a/java/gazelle/private/maven/multiset/BUILD.bazel b/java/gazelle/private/maven/multiset/BUILD.bazel
index a05e0596..14b7a2fa 100644
--- a/java/gazelle/private/maven/multiset/BUILD.bazel
+++ b/java/gazelle/private/maven/multiset/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
+load("@rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
     name = "multiset",
diff --git a/java/gazelle/private/proto/BUILD.bazel b/java/gazelle/private/proto/BUILD.bazel
index adb364ae..f8e5ac96 100644
--- a/java/gazelle/private/proto/BUILD.bazel
+++ b/java/gazelle/private/proto/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
+load("@rules_go//go:def.bzl", "go_library", "go_test")
 
 # gazelle:exclude testdata
 
diff --git a/java/gazelle/private/servermanager/BUILD.bazel b/java/gazelle/private/servermanager/BUILD.bazel
index 63f03aef..44ad2482 100644
--- a/java/gazelle/private/servermanager/BUILD.bazel
+++ b/java/gazelle/private/servermanager/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library")
+load("@rules_go//go:def.bzl", "go_library")
 
 go_library(
     name = "servermanager",
@@ -7,8 +7,8 @@ go_library(
     importpath = "github.com/bazel-contrib/rules_jvm/java/gazelle/private/servermanager",
     visibility = ["//java/gazelle:__subpackages__"],
     deps = [
-        "//java/gazelle/private/javaparser/proto/gazelle/java/javaparser/v0:javaparser",
-        "@io_bazel_rules_go//go/runfiles:go_default_library",
+        "//java/gazelle/private/javaparser/proto/gazelle/java/javaparser/v0:gazelle_java_build_v0_go_proto",
         "@org_golang_google_grpc//:grpc",
+        "@rules_go//go/runfiles",
     ],
 )
diff --git a/java/gazelle/private/sorted_multiset/BUILD.bazel b/java/gazelle/private/sorted_multiset/BUILD.bazel
index ec92ef36..6c5ff0a7 100644
--- a/java/gazelle/private/sorted_multiset/BUILD.bazel
+++ b/java/gazelle/private/sorted_multiset/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
+load("@rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
     name = "sorted_multiset",
diff --git a/java/gazelle/private/sorted_set/BUILD.bazel b/java/gazelle/private/sorted_set/BUILD.bazel
index 6466bcfd..9f0d4081 100644
--- a/java/gazelle/private/sorted_set/BUILD.bazel
+++ b/java/gazelle/private/sorted_set/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
+load("@rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
     name = "sorted_set",
diff --git a/java/gazelle/private/types/BUILD.bazel b/java/gazelle/private/types/BUILD.bazel
index cef4ef07..f2be73d5 100644
--- a/java/gazelle/private/types/BUILD.bazel
+++ b/java/gazelle/private/types/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
+load("@rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
     name = "types",
diff --git a/java/gazelle/testdata/grpc/src/main/proto/example/hello/BUILD.out b/java/gazelle/testdata/grpc/src/main/proto/example/hello/BUILD.out
index e8d629a5..deca134f 100644
--- a/java/gazelle/testdata/grpc/src/main/proto/example/hello/BUILD.out
+++ b/java/gazelle/testdata/grpc/src/main/proto/example/hello/BUILD.out
@@ -1,4 +1,4 @@
-load("@io_grpc_grpc_java//:java_grpc_library.bzl", "java_grpc_library")
+load("@grpc-java//:java_grpc_library.bzl", "java_grpc_library")
 load("@rules_java//java:defs.bzl", "java_library", "java_proto_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 
diff --git a/java/private/BUILD.bazel b/java/private/BUILD.bazel
index 405e50cb..8208548a 100644
--- a/java/private/BUILD.bazel
+++ b/java/private/BUILD.bazel
@@ -83,16 +83,6 @@ bzl_library(
     deps = ["@bazel_tools//tools/build_defs/repo:utils.bzl"],
 )
 
-bzl_library(
-    name = "non-module-deps",
-    srcs = ["non-module-deps.bzl"],
-    visibility = ["//java:__subpackages__"],
-    deps = [
-        "@bazel_tools//tools/build_defs/repo:http.bzl",
-        "@bazel_tools//tools/build_defs/repo:utils.bzl",
-    ],
-)
-
 bzl_library(
     name = "checkstyle_config",
     srcs = ["checkstyle_config.bzl"],
diff --git a/java/private/non-module-deps.bzl b/java/private/non-module-deps.bzl
deleted file mode 100644
index 6a7ea875..00000000
--- a/java/private/non-module-deps.bzl
+++ /dev/null
@@ -1,10 +0,0 @@
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
-load("//:repositories.bzl", "io_grpc_grpc_java")
-
-def _non_module_dependencies_impl(mctx):
-    io_grpc_grpc_java()
-
-non_module_deps = module_extension(
-    implementation = _non_module_dependencies_impl,
-)
diff --git a/repositories.bzl b/repositories.bzl
deleted file mode 100644
index 42f3cee2..00000000
--- a/repositories.bzl
+++ /dev/null
@@ -1,196 +0,0 @@
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
-load("//java/private:zip_repository.bzl", "zip_repository")
-load("//third_party:protobuf_version.bzl", "PROTOBUF_VERSION")
-
-def contrib_rules_jvm_deps():
-    # We need the latest version of `rules_license`, but many of our deps pull in an older version
-    maybe(
-        http_archive,
-        name = "rules_license",
-        urls = [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_license/releases/download/1.0.0/rules_license-1.0.0.tar.gz",
-            "https://github.com/bazelbuild/rules_license/releases/download/1.0.0/rules_license-1.0.0.tar.gz",
-        ],
-        sha256 = "26d4021f6898e23b82ef953078389dd49ac2b5618ac564ade4ef87cced147b38",
-    )
-
-    maybe(
-        http_archive,
-        name = "apple_rules_lint",
-        strip_prefix = "apple_rules_lint-0.4.0",
-        sha256 = "483ea03d73d5fb33275d029da8d36811243fc32dfa4dc73a43acbb6f4b1af621",
-        url = "https://github.com/apple/apple_rules_lint/releases/download/0.4.0/apple_rules_lint-0.4.0.tar.gz",
-    )
-
-    maybe(
-        http_archive,
-        name = "bazel_skylib",
-        sha256 = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f",
-        url = "https://github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz",
-    )
-
-    maybe(
-        http_archive,
-        name = "com_google_protobuf",
-        sha256 = "75be42bd736f4df6d702a0e4e4d30de9ee40eac024c4b845d17ae4cc831fe4ae",
-        strip_prefix = "protobuf-{}".format(PROTOBUF_VERSION),
-        urls = ["https://github.com/protocolbuffers/protobuf/archive/v{}.tar.gz".format(PROTOBUF_VERSION)],
-    )
-
-    # The `rules_java` major version is tied to the major version of Bazel that it supports,
-    # so this is different from the version in the MODULE file.
-    major_version = native.bazel_version.partition(".")[0]
-    if major_version == "5":
-        maybe(
-            http_archive,
-            name = "rules_java",
-            urls = [
-                "https://github.com/bazelbuild/rules_java/releases/download/5.5.1/rules_java-5.5.1.tar.gz",
-            ],
-            sha256 = "73b88f34dc251bce7bc6c472eb386a6c2b312ed5b473c81fe46855c248f792e0",
-        )
-
-    elif major_version == "6":
-        maybe(
-            http_archive,
-            name = "rules_java",
-            urls = [
-                "https://github.com/bazelbuild/rules_java/releases/download/6.5.2/rules_java-6.5.2.tar.gz",
-            ],
-            sha256 = "16bc94b1a3c64f2c36ceecddc9e09a643e80937076b97e934b96a8f715ed1eaa",
-        )
-
-    else:
-        maybe(
-            http_archive,
-            name = "rules_java",
-            urls = [
-                "https://github.com/bazelbuild/rules_java/releases/download/7.12.1/rules_java-7.12.1.tar.gz",
-            ],
-            sha256 = "dfbadbb37a79eb9e1cc1e156ecb8f817edf3899b28bc02410a6c1eb88b1a6862",
-        )
-
-    maybe(
-        zip_repository,
-        name = "contrib_rules_jvm_deps",
-        path = "@contrib_rules_jvm//java/private:contrib_rules_jvm_deps.zip",
-    )
-
-    # This is required by `rules_jvm_external`
-    maybe(
-        http_archive,
-        name = "bazel_features",
-        sha256 = "b4b145c19e08fd48337f53c383db46398d0a810002907ff0c590762d926e05be",
-        strip_prefix = "bazel_features-1.18.0",
-        url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.18.0/bazel_features-v1.18.0.tar.gz",
-    )
-
-    # Required by the frozen deps as this is referenced from the build file in the zips we ship
-    maybe(
-        http_archive,
-        name = "rules_shell",
-        sha256 = "d8cd4a3a91fc1dc68d4c7d6b655f09def109f7186437e3f50a9b60ab436a0c53",
-        strip_prefix = "rules_shell-0.3.0",
-        url = "https://github.com/bazelbuild/rules_shell/releases/download/v0.3.0/rules_shell-v0.3.0.tar.gz",
-    )
-
-    maybe(
-        http_archive,
-        name = "rules_jvm_external",
-        sha256 = "3a4d56357851cf5b0dae538b3f3e0612a4f58925dfb3cadb2e0c4e87d51e629e",
-        strip_prefix = "rules_jvm_external-6.5",
-        url = "https://github.com/bazel-contrib/rules_jvm_external/releases/download/6.5/rules_jvm_external-6.5.tar.gz",
-    )
-
-def contrib_rules_jvm_gazelle_deps():
-    io_grpc_grpc_java()
-
-    http_archive(
-        name = "googleapis",
-        sha256 = "9d1a930e767c93c825398b8f8692eca3fe353b9aaadedfbcf1fca2282c85df88",
-        strip_prefix = "googleapis-64926d52febbf298cb82a8f472ade4a3969ba922",
-        urls = [
-            "https://github.com/googleapis/googleapis/archive/64926d52febbf298cb82a8f472ade4a3969ba922.zip",
-        ],
-    )
-
-    maybe(
-        http_archive,
-        name = "bazel_gazelle",
-        sha256 = "b760f7fe75173886007f7c2e616a21241208f3d90e8657dc65d36a771e916b6a",
-        url = "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.39.1/bazel-gazelle-v0.39.1.tar.gz",
-    )
-
-    maybe(
-        http_archive,
-        name = "com_github_bazelbuild_buildtools",
-        sha256 = "061472b3e8b589fb42233f0b48798d00cf9dee203bd39502bd294e6b050bc6c2",
-        strip_prefix = "buildtools-7.1.0",
-        url = "https://github.com/bazelbuild/buildtools/archive/refs/tags/v7.1.0.tar.gz",
-    )
-
-    maybe(
-        http_archive,
-        name = "io_bazel_rules_go",
-        sha256 = "f4a9314518ca6acfa16cc4ab43b0b8ce1e4ea64b81c38d8a3772883f153346b8",
-        url = "https://github.com/bazelbuild/rules_go/releases/download/v0.50.1/rules_go-v0.50.1.zip",
-    )
-
-    maybe(
-        http_archive,
-        name = "rules_proto",
-        sha256 = "6fb6767d1bef535310547e03247f7518b03487740c11b6c6adb7952033fe1295",
-        strip_prefix = "rules_proto-6.0.2",
-        url = "https://github.com/bazelbuild/rules_proto/releases/download/6.0.2/rules_proto-6.0.2.tar.gz",
-    )
-
-    # We need to expand the contents of `@rules_proto//proto:repositories.bzl" here so
-    # we can continue the two-step initialisation process
-    maybe(
-        http_archive,
-        name = "rules_cc",
-        sha256 = "4aeb102efbcfad509857d7cb9c5456731e8ce566bfbf2960286a2ec236796cc3",
-        strip_prefix = "rules_cc-2f8c04c04462ab83c545ab14c0da68c3b4c96191",
-        urls = [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/2f8c04c04462ab83c545ab14c0da68c3b4c96191.tar.gz",
-            "https://github.com/bazelbuild/rules_cc/archive/2f8c04c04462ab83c545ab14c0da68c3b4c96191.tar.gz",
-        ],
-    )
-
-    maybe(
-        http_archive,
-        name = "rules_python",
-        sha256 = "d70cd72a7a4880f0000a6346253414825c19cdd40a28289bdf67b8e6480edff8",
-        strip_prefix = "rules_python-0.28.0",
-        url = "https://github.com/bazelbuild/rules_python/releases/download/0.28.0/rules_python-0.28.0.tar.gz",
-    )
-
-    # And other repos we need, apparently
-
-    maybe(
-        http_archive,
-        name = "bazel_features",
-        sha256 = "3646ffd447753490b77d2380fa63f4d55dd9722e565d84dfda01536b48e183da",
-        strip_prefix = "bazel_features-1.19.0",
-        url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.19.0/bazel_features-v1.19.0.tar.gz",
-    )
-
-    maybe(
-        http_archive,
-        name = "rules_pkg",
-        urls = [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/1.0.1/rules_pkg-1.0.1.tar.gz",
-            "https://github.com/bazelbuild/rules_pkg/releases/download/1.0.1/rules_pkg-1.0.1.tar.gz",
-        ],
-        sha256 = "d20c951960ed77cb7b341c2a59488534e494d5ad1d30c4818c736d57772a9fef",
-    )
-
-def io_grpc_grpc_java():
-    maybe(
-        http_archive,
-        name = "io_grpc_grpc_java",
-        sha256 = "17dd91014032a147c978ae99582fddd950f5444388eae700cf51eda0326ad2f9",
-        strip_prefix = "grpc-java-1.56.1",
-        urls = ["https://github.com/grpc/grpc-java/archive/v1.56.1.tar.gz"],
-    )
diff --git a/setup.bzl b/setup.bzl
deleted file mode 100644
index 8f405038..00000000
--- a/setup.bzl
+++ /dev/null
@@ -1,19 +0,0 @@
-load("@apple_rules_lint//lint:setup.bzl", "ruleset_lint_setup")
-load("@bazel_features//:deps.bzl", "bazel_features_deps")
-load("@contrib_rules_jvm_deps//:compat.bzl", "compat_repositories")
-load("@contrib_rules_jvm_deps//:defs.bzl", "pinned_maven_install")
-load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")
-
-def contrib_rules_jvm_setup():
-    bazel_features_deps()
-    ruleset_lint_setup()
-
-    # When using bazel 5, we have undefined toolchains from rules_java. This should be fine to skip, since we only need
-    # it for the `JavaInfo` definition.
-    major_version = native.bazel_version.partition(".")[0]
-    if major_version != "5":
-        rules_java_dependencies()
-        rules_java_toolchains()
-
-    pinned_maven_install()
-    compat_repositories()
diff --git a/tools/update-dependencies.sh b/tools/update-dependencies.sh
index 3ccc3d94..37699aad 100755
--- a/tools/update-dependencies.sh
+++ b/tools/update-dependencies.sh
@@ -7,7 +7,7 @@ REPIN=1 bazel run @contrib_rules_jvm_tests//:pin
 bazel run //tools:freeze-deps
 
 # And now the Go bits
-bazel run @io_bazel_rules_go//go -- mod tidy
+bazel run @rules_go//go -- mod tidy
 bazel run //:buildifier
 
 ./tools/format.sh