diff --git a/MODULE.bazel b/MODULE.bazel
index 626e1f15f03..7b683ad1e05 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -29,8 +29,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "protobuf",
-    version = "28.2",
-    repo_name = "com_google_protobuf",
+    version = "29.0-rc1",
 )
 bazel_dep(
     name = "bazel_skylib",
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
index 5d0dfd45f1d..c6546afe902 100644
--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
@@ -26,6 +26,7 @@
     "https://bcr.bazel.build/modules/bazel_features/1.1.0/MODULE.bazel": "cfd42ff3b815a5f39554d97182657f8c4b9719568eb7fded2b9135f084bf760b",
     "https://bcr.bazel.build/modules/bazel_features/1.1.1/MODULE.bazel": "27b8c79ef57efe08efccbd9dd6ef70d61b4798320b8d3c134fd571f78963dbcd",
     "https://bcr.bazel.build/modules/bazel_features/1.11.0/MODULE.bazel": "f9382337dd5a474c3b7d334c2f83e50b6eaedc284253334cf823044a26de03e8",
+    "https://bcr.bazel.build/modules/bazel_features/1.15.0/MODULE.bazel": "d38ff6e517149dc509406aca0db3ad1efdd890a85e049585b7234d04238e2a4d",
     "https://bcr.bazel.build/modules/bazel_features/1.17.0/MODULE.bazel": "039de32d21b816b47bd42c778e0454217e9c9caac4a3cf8e15c7231ee3ddee4d",
     "https://bcr.bazel.build/modules/bazel_features/1.17.0/source.json": "4b0f9407970b57adb203bd6c23d6361cbcc8ab3273456ad06ca75675b1648b41",
     "https://bcr.bazel.build/modules/bazel_features/1.4.1/MODULE.bazel": "e45b6bb2350aff3e442ae1111c555e27eac1d915e77775f6fdc4b351b758b5d7",
@@ -39,6 +40,7 @@
     "https://bcr.bazel.build/modules/bazel_skylib/1.4.2/MODULE.bazel": "3bd40978e7a1fac911d5989e6b09d8f64921865a45822d8b09e815eaa726a651",
     "https://bcr.bazel.build/modules/bazel_skylib/1.5.0/MODULE.bazel": "32880f5e2945ce6a03d1fbd588e9198c0a959bb42297b2cfaf1685b7bc32e138",
     "https://bcr.bazel.build/modules/bazel_skylib/1.6.1/MODULE.bazel": "8fdee2dbaace6c252131c00e1de4b165dc65af02ea278476187765e1a617b917",
+    "https://bcr.bazel.build/modules/bazel_skylib/1.7.0/MODULE.bazel": "0db596f4563de7938de764cc8deeabec291f55e8ec15299718b93c4423e9796d",
     "https://bcr.bazel.build/modules/bazel_skylib/1.7.1/MODULE.bazel": "3120d80c5861aa616222ec015332e5f8d3171e062e3e804a2a0253e1be26e59b",
     "https://bcr.bazel.build/modules/bazel_skylib/1.7.1/source.json": "f121b43eeefc7c29efbd51b83d08631e2347297c95aac9764a701f2a6a2bb953",
     "https://bcr.bazel.build/modules/buildifier_prebuilt/6.0.0.1/MODULE.bazel": "5d23708e6a5527ab4f151da7accabc22808cb5fb579c8cc4cd4a292da57a5c97",
@@ -75,8 +77,8 @@
     "https://bcr.bazel.build/modules/protobuf/21.7/MODULE.bazel": "a5a29bb89544f9b97edce05642fac225a808b5b7be74038ea3640fae2f8e66a7",
     "https://bcr.bazel.build/modules/protobuf/23.1/MODULE.bazel": "88b393b3eb4101d18129e5db51847cd40a5517a53e81216144a8c32dfeeca52a",
     "https://bcr.bazel.build/modules/protobuf/24.4/MODULE.bazel": "7bc7ce5f2abf36b3b7b7c8218d3acdebb9426aeb35c2257c96445756f970eb12",
-    "https://bcr.bazel.build/modules/protobuf/28.2/MODULE.bazel": "c0c8e51757df486d0314fa290e174d707bad4a6c2aa5ccb08a4b4abd76a23e90",
-    "https://bcr.bazel.build/modules/protobuf/28.2/source.json": "31a22dd0dd25b579257b0c5821b527a9bc987b7c16cf111fbf31704c2786651b",
+    "https://bcr.bazel.build/modules/protobuf/29.0-rc1/MODULE.bazel": "7e7dc42d874612b9393207be2598ec6e2307ac1258619bb223e20f69d14d7289",
+    "https://bcr.bazel.build/modules/protobuf/29.0-rc1/source.json": "f0e9ee022c0fc22a05950bf8e8c61fa2165a2a44898f2a7d0b300716674e75d4",
     "https://bcr.bazel.build/modules/protobuf/3.19.0/MODULE.bazel": "6b5fbb433f760a99a22b18b6850ed5784ef0e9928a72668b66e4d7ccd47db9b0",
     "https://bcr.bazel.build/modules/protobuf/3.19.2/MODULE.bazel": "532ffe5f2186b69fdde039efe6df13ba726ff338c6bc82275ad433013fa10573",
     "https://bcr.bazel.build/modules/protobuf/3.19.6/MODULE.bazel": "9233edc5e1f2ee276a60de3eaa47ac4132302ef9643238f23128fea53ea12858",
@@ -113,6 +115,7 @@
     "https://bcr.bazel.build/modules/rules_java/6.0.0/MODULE.bazel": "8a43b7df601a7ec1af61d79345c17b31ea1fedc6711fd4abfd013ea612978e39",
     "https://bcr.bazel.build/modules/rules_java/6.5.2/MODULE.bazel": "1d440d262d0e08453fa0c4d8f699ba81609ed0e9a9a0f02cd10b3e7942e61e31",
     "https://bcr.bazel.build/modules/rules_java/7.1.0/MODULE.bazel": "30d9135a2b6561c761bd67bd4990da591e6bdc128790ce3e7afd6a3558b2fb64",
+    "https://bcr.bazel.build/modules/rules_java/7.10.0/MODULE.bazel": "530c3beb3067e870561739f1144329a21c851ff771cd752a49e06e3dc9c2e71a",
     "https://bcr.bazel.build/modules/rules_java/7.11.1/MODULE.bazel": "b4782e019dd0b0151bd49fd8929136fd4441f527eb208fbd991b77e480b7236e",
     "https://bcr.bazel.build/modules/rules_java/7.12.1/MODULE.bazel": "0a2ebb53b48a6eb092aef24b36db23294d4d3ebf96bff02b0ccc962bdc70717d",
     "https://bcr.bazel.build/modules/rules_java/7.12.1/source.json": "2ab5ceabe9d87a773fa44e4cce42c950e34ff6d2f5164e7413088542fa4f1f3e",
@@ -122,6 +125,7 @@
     "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/MODULE.bazel": "a56b85e418c83eb1839819f0b515c431010160383306d13ec21959ac412d2fe7",
     "https://bcr.bazel.build/modules/rules_jvm_external/5.1/MODULE.bazel": "33f6f999e03183f7d088c9be518a63467dfd0be94a11d0055fe2d210f89aa909",
     "https://bcr.bazel.build/modules/rules_jvm_external/5.2/MODULE.bazel": "d9351ba35217ad0de03816ef3ed63f89d411349353077348a45348b096615036",
+    "https://bcr.bazel.build/modules/rules_jvm_external/6.3/MODULE.bazel": "c998e060b85f71e00de5ec552019347c8bca255062c990ac02d051bb80a38df0",
     "https://bcr.bazel.build/modules/rules_jvm_external/6.4/MODULE.bazel": "e859f460f0fcebbee0af2ac65a38c952eedb60612956395ba414fdf78babae2f",
     "https://bcr.bazel.build/modules/rules_jvm_external/6.4/source.json": "752c79441c87f8945b1aeddbde2864661e2ca594c82700b8c2d4550d080070d9",
     "https://bcr.bazel.build/modules/rules_kotlin/1.9.6/MODULE.bazel": "d269a01a18ee74d0335450b10f62c9ed81f2321d7958a2934e44272fe82dcef3",
@@ -701,84 +705,6 @@
         "recordedRepoMappingEntries": []
       }
     },
-    "@@rules_bazel_integration_test~//:extensions.bzl%bazel_binaries": {
-      "general": {
-        "bzlTransitiveDigest": "ruMfvWwZzwPPkk+exdpYAe94RD+4erzc4ePrZ08MuKc=",
-        "usagesDigest": "NOmZNyUfHK4TOR2tGFP4OfRYOHmgVVZiVibKj0w/wws=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "build_bazel_bazel_7_2_1": {
-            "bzlFile": "@@rules_bazel_integration_test~//bazel_integration_test/private:bazel_binaries.bzl",
-            "ruleClassName": "bazel_binary",
-            "attributes": {
-              "version": "7.2.1",
-              "bazelisk": "@bazel_binaries_bazelisk//:bazelisk"
-            }
-          },
-          "build_bazel_bazel_5_4_1": {
-            "bzlFile": "@@rules_bazel_integration_test~//bazel_integration_test/private:bazel_binaries.bzl",
-            "ruleClassName": "bazel_binary",
-            "attributes": {
-              "version": "5.4.1",
-              "bazelisk": "@bazel_binaries_bazelisk//:bazelisk"
-            }
-          },
-          "build_bazel_bazel_6_5_0": {
-            "bzlFile": "@@rules_bazel_integration_test~//bazel_integration_test/private:bazel_binaries.bzl",
-            "ruleClassName": "bazel_binary",
-            "attributes": {
-              "version": "6.5.0",
-              "bazelisk": "@bazel_binaries_bazelisk//:bazelisk"
-            }
-          },
-          "bazel_binaries_bazelisk": {
-            "bzlFile": "@@rules_bazel_integration_test~//bazel_integration_test/private:bazel_binaries.bzl",
-            "ruleClassName": "bazelisk_binary",
-            "attributes": {
-              "version": "1.18.0"
-            }
-          },
-          "bazel_binaries": {
-            "bzlFile": "@@rules_bazel_integration_test~//bazel_integration_test/bzlmod:bazel_binaries.bzl",
-            "ruleClassName": "_bazel_binaries_helper",
-            "attributes": {
-              "version_to_repo": {
-                "5.4.1": "build_bazel_bazel_5_4_1",
-                "6.5.0": "build_bazel_bazel_6_5_0",
-                "7.2.1": "build_bazel_bazel_7_2_1"
-              },
-              "current_version": "7.2.1"
-            }
-          }
-        },
-        "moduleExtensionMetadata": {
-          "explicitRootModuleDirectDeps": [],
-          "explicitRootModuleDirectDevDeps": [
-            "bazel_binaries_bazelisk",
-            "build_bazel_bazel_5_4_1",
-            "build_bazel_bazel_6_5_0",
-            "build_bazel_bazel_7_2_1",
-            "bazel_binaries"
-          ],
-          "useAllRepos": "NO",
-          "reproducible": false
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "rules_bazel_integration_test~",
-            "bazel_skylib",
-            "bazel_skylib~"
-          ],
-          [
-            "rules_bazel_integration_test~",
-            "cgrindel_bazel_starlib",
-            "cgrindel_bazel_starlib~"
-          ]
-        ]
-      }
-    },
     "@@rules_buf~//buf:extensions.bzl%ext": {
       "general": {
         "bzlTransitiveDigest": "gmPmM7QT5Jez2VVFcwbbMf/QWSRag+nJ1elFJFFTcn0=",
@@ -995,7 +921,7 @@
     "@@rules_rust~//rust:extensions.bzl%rust": {
       "general": {
         "bzlTransitiveDigest": "hZ5xYerIbbeKW9kuWlCaJhzSpXT6mVaOCL7qFyNtU8Y=",
-        "usagesDigest": "NdRlK3VAWziNngvGI/L5ZlYt0dQKHyo20r++0i/MOwM=",
+        "usagesDigest": "XafKqlRkEoMJrbRoTbVHhS15MREL5ZA24YClLeMBtxM=",
         "recordedFileInputs": {},
         "recordedDirentsInputs": {},
         "envVariables": {},
diff --git a/aspect/testing/rules/BUILD b/aspect/testing/rules/BUILD
index 51be48b4505..9d79fc56132 100644
--- a/aspect/testing/rules/BUILD
+++ b/aspect/testing/rules/BUILD
@@ -30,7 +30,7 @@ java_binary(
         ":intellij_aspect_test_fixture_java_proto",
         "//aspect/testing:guava",
         "//proto:intellij_ide_info_java_proto",
-        "@com_google_protobuf//:protobuf_java",
+        "@protobuf//:protobuf_java",
     ],
 )
 
@@ -72,7 +72,7 @@ java_binary(
         ":fast_build_aspect_test_fixture_java_proto",
         "//aspect/testing:guava",
         "//proto:fast_build_info_java_proto",
-        "@com_google_protobuf//:protobuf_java",
+        "@protobuf//:protobuf_java",
     ],
 )
 
diff --git a/aspect/testing/tests/src/com/google/idea/blaze/aspect/go/go_proto_library/BUILD b/aspect/testing/tests/src/com/google/idea/blaze/aspect/go/go_proto_library/BUILD
index 2f17a56ba5d..9a9b164fa4c 100644
--- a/aspect/testing/tests/src/com/google/idea/blaze/aspect/go/go_proto_library/BUILD
+++ b/aspect/testing/tests/src/com/google/idea/blaze/aspect/go/go_proto_library/BUILD
@@ -1,6 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
-load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@protobuf//bazel:proto_library.bzl", "proto_library")
+
 load(
     "//aspect/testing/rules:intellij_aspect_test_fixture.bzl",
     "intellij_aspect_test_fixture",
@@ -10,7 +11,7 @@ proto_library(
     name = "fooproto_proto",
     srcs = ["fooserver.proto"],
     visibility = ["//visibility:public"],
-    deps = ["@com_google_protobuf//:empty_proto"],
+    deps = ["@protobuf//:empty_proto"],
 )
 
 go_proto_library(
diff --git a/maven_install.json b/maven_install.json
index f9f562ef5d6..66dc0889b91 100755
--- a/maven_install.json
+++ b/maven_install.json
@@ -1,12 +1,29 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": -526329695,
-  "__RESOLVED_ARTIFACTS_HASH": 727686239,
+  "__INPUT_ARTIFACTS_HASH": -1240425253,
+  "__RESOLVED_ARTIFACTS_HASH": 845674967,
   "conflict_resolution": {
+    "com.google.code.gson:gson:2.8.9": "com.google.code.gson:gson:2.10.1",
     "com.google.errorprone:error_prone_annotations:2.20.0": "com.google.errorprone:error_prone_annotations:2.23.0",
-    "net.bytebuddy:byte-buddy:1.14.0": "net.bytebuddy:byte-buddy:1.14.10"
+    "com.google.errorprone:error_prone_annotations:2.5.1": "com.google.errorprone:error_prone_annotations:2.23.0",
+    "com.google.guava:guava:32.0.1-jre": "com.google.guava:guava:33.0.0-jre",
+    "com.google.truth:truth:1.1.2": "com.google.truth:truth:1.1.5",
+    "net.bytebuddy:byte-buddy:1.14.0": "net.bytebuddy:byte-buddy:1.14.10",
+    "org.mockito:mockito-core:4.3.1": "org.mockito:mockito-core:5.8.0"
   },
   "artifacts": {
+    "biz.aQute.bnd:biz.aQute.bnd.util": {
+      "shasums": {
+        "jar": "65b5bd4a0fab16812f1800c98ff74a038f37a38bfe899af382efed4efdc1e3e1"
+      },
+      "version": "6.4.0"
+    },
+    "biz.aQute.bnd:biz.aQute.bndlib": {
+      "shasums": {
+        "jar": "357145074872f9dbf67e629fcd237e6152707e575d735df4535282f9f588d2d8"
+      },
+      "version": "6.4.0"
+    },
     "com.google.auto.value:auto-value": {
       "shasums": {
         "jar": "f3c438d1f82904bbcb452084d488b660f3c7488e9274c3a58f049e121632d434"
@@ -19,6 +36,48 @@
       },
       "version": "1.10.2"
     },
+    "com.google.caliper:caliper": {
+      "shasums": {
+        "jar": "d54e1bfdbe9359a79e175c217b8d472555cf20da9c5c0a18bdb1ea7db979ed8e"
+      },
+      "version": "1.0-beta-3"
+    },
+    "com.google.caliper:caliper-api": {
+      "shasums": {
+        "jar": "374f0c6c0c1f8784cb69d885e1dcbb7498c34ca20369e0597264568530642928"
+      },
+      "version": "1.0-beta-3"
+    },
+    "com.google.caliper:caliper-core": {
+      "shasums": {
+        "jar": "514deac8f8b09dd4262733e0a4406a333208c899dc7ea726b03600b9bb94f192"
+      },
+      "version": "1.0-beta-3"
+    },
+    "com.google.caliper:caliper-runner": {
+      "shasums": {
+        "jar": "3ab58890aa01343361adedf859500d280f67813df0cedfcd165b169533b9b1fa"
+      },
+      "version": "1.0-beta-3"
+    },
+    "com.google.caliper:caliper-util": {
+      "shasums": {
+        "jar": "6e9af500c7020450dfdb5003d09501d512d395f431c54c7ee8f79e712463fe66"
+      },
+      "version": "1.0-beta-3"
+    },
+    "com.google.caliper:caliper-worker": {
+      "shasums": {
+        "jar": "315d8e51df1f60551645a0e3bf2c504d2c79762f688e6f728eb9d1d9cd9a491b"
+      },
+      "version": "1.0-beta-3"
+    },
+    "com.google.caliper:caliper-worker-jvm": {
+      "shasums": {
+        "jar": "e14e1ecfdf939c82abdb902105be41ff3f83c18cb968116232015f2662d065a4"
+      },
+      "version": "1.0-beta-3"
+    },
     "com.google.code.findbugs:jsr305": {
       "shasums": {
         "jar": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7"
@@ -31,6 +90,24 @@
       },
       "version": "2.10.1"
     },
+    "com.google.code.java-allocation-instrumenter:java-allocation-instrumenter": {
+      "shasums": {
+        "jar": "1ef5535a8bd41cf3072469f381b9ee6ab28275311a7499f53d6e52adf976fef0"
+      },
+      "version": "3.3.0"
+    },
+    "com.google.dagger:dagger": {
+      "shasums": {
+        "jar": "329d4340f24c4f5717af016c097e90668bfea2a5376e6aa9964b01cef3fd241a"
+      },
+      "version": "2.22.1"
+    },
+    "com.google.dagger:dagger-producers": {
+      "shasums": {
+        "jar": "f834a0082014213a68ff06a0f048d750178d02196c58b0b15beb367d32b97e35"
+      },
+      "version": "2.22.1"
+    },
     "com.google.errorprone:error_prone_annotations": {
       "shasums": {
         "jar": "ec6f39f068b6ff9ac323c68e28b9299f8c0a80ca512dccb1d4a70f40ac3ec054"
@@ -61,6 +138,12 @@
       },
       "version": "33.0.0-jre"
     },
+    "com.google.guava:guava-testlib": {
+      "shasums": {
+        "jar": "c97511849a5e085280f106df2b059566febd280b118d33d6a9e068d238100b63"
+      },
+      "version": "32.0.1-jre"
+    },
     "com.google.guava:listenablefuture": {
       "shasums": {
         "jar": "b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99"
@@ -91,6 +174,60 @@
       },
       "version": "1.3.0"
     },
+    "com.squareup.okhttp:okhttp": {
+      "shasums": {
+        "jar": "88ac9fd1bb51f82bcc664cc1eb9c225c90dc4389d660231b4cc737bebfe7d0aa"
+      },
+      "version": "2.7.5"
+    },
+    "com.squareup.okio:okio": {
+      "shasums": {
+        "jar": "114bdc1f47338a68bcbc95abf2f5cdc72beeec91812f2fcd7b521c1937876266"
+      },
+      "version": "1.6.0"
+    },
+    "com.sun.jersey:jersey-client": {
+      "shasums": {
+        "jar": "639c825c5db580f8115bf49ffc893093526d2ed1079fbc929b6a5fbd0b2eda40"
+      },
+      "version": "1.19.4"
+    },
+    "com.sun.jersey:jersey-core": {
+      "shasums": {
+        "jar": "64b03198e0264849d0fc341857ebcc9c882b1909a2dc35a0972fe7d901b826e5"
+      },
+      "version": "1.19.4"
+    },
+    "info.picocli:picocli": {
+      "shasums": {
+        "jar": "b0a5159e926de8084ff066025142270443533656bc599b8bb31d14d11fd138a4"
+      },
+      "version": "4.6.3"
+    },
+    "javax.annotation:javax.annotation-api": {
+      "shasums": {
+        "jar": "e04ba5195bcd555dc95650f7cc614d151e4bcd52d29a10b8aa2197f3ab89ab9b"
+      },
+      "version": "1.3.2"
+    },
+    "javax.inject:javax.inject": {
+      "shasums": {
+        "jar": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff"
+      },
+      "version": "1"
+    },
+    "javax.ws.rs:jsr311-api": {
+      "shasums": {
+        "jar": "ab1534b73b5fa055808e6598a5e73b599ccda28c3159c3c0908977809422ee4a"
+      },
+      "version": "1.1.1"
+    },
+    "joda-time:joda-time": {
+      "shasums": {
+        "jar": "dd8e7c92185a678d1b7b933f31209b6203c8ffa91e9880475a1be0346b9617e3"
+      },
+      "version": "2.10.10"
+    },
     "junit:junit": {
       "shasums": {
         "jar": "8e495b634469d64fb8acfa3495a065cbacc8a0fff55ce1e31007be4c16dc57d3"
@@ -151,14 +288,183 @@
       },
       "version": "1.3.0"
     },
+    "org.osgi:org.osgi.dto": {
+      "shasums": {
+        "jar": "cb75f3c7e48e5a31a31df22e26873346f5bf659e2dcab2369e031e4850d2ff43"
+      },
+      "version": "1.0.0"
+    },
+    "org.osgi:org.osgi.framework": {
+      "shasums": {
+        "jar": "ec194b7871af27681716ff05259319a5c3c9b9727e8000e9e832499b93484b4e"
+      },
+      "version": "1.8.0"
+    },
+    "org.osgi:org.osgi.resource": {
+      "shasums": {
+        "jar": "81fc50f1f1d38a4af28e131907d4afe213249aab05060484edca0e60c4af9b4a"
+      },
+      "version": "1.0.0"
+    },
+    "org.osgi:org.osgi.service.log": {
+      "shasums": {
+        "jar": "ff6710c4856d32684cf3ebdc45248f41036ff734f2b03bbc08c4609a61fecfa0"
+      },
+      "version": "1.3.0"
+    },
+    "org.osgi:org.osgi.service.repository": {
+      "shasums": {
+        "jar": "c5553e95b459529192433486d4c4cc22ff45a2eae4968484f9f717319264a532"
+      },
+      "version": "1.1.0"
+    },
+    "org.osgi:org.osgi.util.function": {
+      "shasums": {
+        "jar": "208819c7c71690c15a6bb8b187474e7f9d0147946b680182a62b9f222ae014ec"
+      },
+      "version": "1.2.0"
+    },
+    "org.osgi:org.osgi.util.promise": {
+      "shasums": {
+        "jar": "fef86e64f584d012a16a0306160764f6179663b90988a226c4641b920f3a4b36"
+      },
+      "version": "1.2.0"
+    },
+    "org.osgi:org.osgi.util.tracker": {
+      "shasums": {
+        "jar": "7d78c2cc9bcb6421c24f17aa097866ce8d9115c219a4f8d6cc753bc4dfb97efa"
+      },
+      "version": "1.5.4"
+    },
+    "org.osgi:osgi.annotation": {
+      "shasums": {
+        "jar": "a0e8a4c362bd3600812f37b0ea45fba966c7bc049d01fed56a09ecc74082759e"
+      },
+      "version": "8.0.1"
+    },
     "org.ow2.asm:asm": {
       "shasums": {
         "jar": "b62e84b5980729751b0458c534cf1366f727542bb8d158621335682a460f0353"
       },
       "version": "9.5"
+    },
+    "org.ow2.asm:asm-analysis": {
+      "shasums": {
+        "jar": "be922aae60ff1ff1768e8e6544a38a7f92bd0a6d6b0b9791f94955d1bd453de2"
+      },
+      "version": "7.2"
+    },
+    "org.ow2.asm:asm-commons": {
+      "shasums": {
+        "jar": "0e86b8b179c5fb223d1a880a0ff4960b6978223984b94e62e71135f2d8ea3558"
+      },
+      "version": "7.2"
+    },
+    "org.ow2.asm:asm-tree": {
+      "shasums": {
+        "jar": "c063f5a67fa03cdc9bd79fd1c2ea6816cc4a19473ecdfbd9e9153b408c6f2656"
+      },
+      "version": "7.2"
+    },
+    "org.ow2.asm:asm-util": {
+      "shasums": {
+        "jar": "6e24913b021ffacfe8e7e053d6e0ccc731941148cfa078d4f1ed3d96904530f8"
+      },
+      "version": "7.2"
+    },
+    "org.slf4j:slf4j-api": {
+      "shasums": {
+        "jar": "18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79"
+      },
+      "version": "1.7.25"
     }
   },
   "dependencies": {
+    "biz.aQute.bnd:biz.aQute.bndlib": [
+      "biz.aQute.bnd:biz.aQute.bnd.util",
+      "org.osgi:org.osgi.dto",
+      "org.osgi:org.osgi.framework",
+      "org.osgi:org.osgi.resource",
+      "org.osgi:org.osgi.service.log",
+      "org.osgi:org.osgi.service.repository",
+      "org.osgi:org.osgi.util.function",
+      "org.osgi:org.osgi.util.promise",
+      "org.osgi:org.osgi.util.tracker",
+      "org.slf4j:slf4j-api"
+    ],
+    "com.google.caliper:caliper": [
+      "com.google.caliper:caliper-core",
+      "com.google.caliper:caliper-runner",
+      "com.google.caliper:caliper-worker-jvm",
+      "com.google.code.java-allocation-instrumenter:java-allocation-instrumenter",
+      "com.google.dagger:dagger",
+      "com.google.guava:guava",
+      "com.sun.jersey:jersey-client"
+    ],
+    "com.google.caliper:caliper-api": [
+      "com.google.guava:guava",
+      "joda-time:joda-time"
+    ],
+    "com.google.caliper:caliper-core": [
+      "com.google.auto.value:auto-value-annotations",
+      "com.google.caliper:caliper-api",
+      "com.google.caliper:caliper-util",
+      "com.google.dagger:dagger",
+      "com.google.guava:guava",
+      "com.squareup.okhttp:okhttp",
+      "joda-time:joda-time"
+    ],
+    "com.google.caliper:caliper-runner": [
+      "com.google.caliper:caliper-api",
+      "com.google.caliper:caliper-core",
+      "com.google.caliper:caliper-util",
+      "com.google.dagger:dagger",
+      "com.google.dagger:dagger-producers",
+      "com.google.guava:guava",
+      "com.squareup.okhttp:okhttp",
+      "joda-time:joda-time"
+    ],
+    "com.google.caliper:caliper-util": [
+      "com.google.code.gson:gson",
+      "com.google.dagger:dagger",
+      "com.google.guava:guava",
+      "joda-time:joda-time"
+    ],
+    "com.google.caliper:caliper-worker": [
+      "com.google.caliper:caliper-api",
+      "com.google.caliper:caliper-core",
+      "com.google.caliper:caliper-util",
+      "com.google.dagger:dagger",
+      "com.google.guava:guava",
+      "com.squareup.okhttp:okhttp",
+      "joda-time:joda-time"
+    ],
+    "com.google.caliper:caliper-worker-jvm": [
+      "com.google.caliper:caliper-core",
+      "com.google.caliper:caliper-worker",
+      "com.google.code.java-allocation-instrumenter:java-allocation-instrumenter",
+      "com.google.dagger:dagger",
+      "com.google.guava:guava",
+      "com.sun.jersey:jersey-client"
+    ],
+    "com.google.code.java-allocation-instrumenter:java-allocation-instrumenter": [
+      "com.google.guava:guava",
+      "javax.annotation:javax.annotation-api",
+      "org.ow2.asm:asm",
+      "org.ow2.asm:asm-analysis",
+      "org.ow2.asm:asm-commons",
+      "org.ow2.asm:asm-tree",
+      "org.ow2.asm:asm-util"
+    ],
+    "com.google.dagger:dagger": [
+      "javax.inject:javax.inject"
+    ],
+    "com.google.dagger:dagger-producers": [
+      "com.google.dagger:dagger",
+      "com.google.guava:guava",
+      "javax.inject:javax.inject",
+      "org.checkerframework:checker-compat-qual"
+    ],
     "com.google.flogger:flogger": [
       "org.checkerframework:checker-compat-qual"
     ],
@@ -174,6 +480,14 @@
       "com.google.j2objc:j2objc-annotations",
       "org.checkerframework:checker-qual"
     ],
+    "com.google.guava:guava-testlib": [
+      "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"
+    ],
     "com.google.truth.extensions:truth-java8-extension": [
       "com.google.truth:truth",
       "org.checkerframework:checker-qual"
@@ -186,6 +500,15 @@
       "org.checkerframework:checker-qual",
       "org.ow2.asm:asm"
     ],
+    "com.squareup.okhttp:okhttp": [
+      "com.squareup.okio:okio"
+    ],
+    "com.sun.jersey:jersey-client": [
+      "com.sun.jersey:jersey-core"
+    ],
+    "com.sun.jersey:jersey-core": [
+      "javax.ws.rs:jsr311-api"
+    ],
     "junit:junit": [
       "org.hamcrest:hamcrest-core"
     ],
@@ -193,9 +516,190 @@
       "net.bytebuddy:byte-buddy",
       "net.bytebuddy:byte-buddy-agent",
       "org.objenesis:objenesis"
+    ],
+    "org.osgi:org.osgi.util.function": [
+      "org.osgi:osgi.annotation"
+    ],
+    "org.osgi:org.osgi.util.promise": [
+      "org.osgi:org.osgi.util.function",
+      "org.osgi:osgi.annotation"
+    ],
+    "org.osgi:org.osgi.util.tracker": [
+      "org.osgi:osgi.annotation"
+    ],
+    "org.ow2.asm:asm-analysis": [
+      "org.ow2.asm:asm-tree"
+    ],
+    "org.ow2.asm:asm-commons": [
+      "org.ow2.asm:asm",
+      "org.ow2.asm:asm-analysis",
+      "org.ow2.asm:asm-tree"
+    ],
+    "org.ow2.asm:asm-tree": [
+      "org.ow2.asm:asm"
+    ],
+    "org.ow2.asm:asm-util": [
+      "org.ow2.asm:asm",
+      "org.ow2.asm:asm-analysis",
+      "org.ow2.asm:asm-tree"
     ]
   },
   "packages": {
+    "biz.aQute.bnd:biz.aQute.bnd.util": [
+      "aQute.bnd.classfile",
+      "aQute.bnd.classfile.builder",
+      "aQute.bnd.classfile.preview",
+      "aQute.bnd.exceptions",
+      "aQute.bnd.memoize",
+      "aQute.bnd.result",
+      "aQute.bnd.signatures",
+      "aQute.bnd.stream",
+      "aQute.bnd.unmodifiable",
+      "aQute.lib.io",
+      "aQute.lib.stringrover",
+      "aQute.libg.glob"
+    ],
+    "biz.aQute.bnd:biz.aQute.bndlib": [
+      "aQute.bnd.annotation",
+      "aQute.bnd.annotation.baseline",
+      "aQute.bnd.annotation.component",
+      "aQute.bnd.annotation.headers",
+      "aQute.bnd.annotation.jpms",
+      "aQute.bnd.annotation.licenses",
+      "aQute.bnd.annotation.metatype",
+      "aQute.bnd.annotation.plugin",
+      "aQute.bnd.annotation.service",
+      "aQute.bnd.annotation.spi",
+      "aQute.bnd.annotation.xml",
+      "aQute.bnd.apiguardian.api",
+      "aQute.bnd.aspectj.plugin",
+      "aQute.bnd.build",
+      "aQute.bnd.build.api",
+      "aQute.bnd.build.model",
+      "aQute.bnd.build.model.clauses",
+      "aQute.bnd.build.model.conversions",
+      "aQute.bnd.buildtool",
+      "aQute.bnd.bundle.annotations",
+      "aQute.bnd.cdi",
+      "aQute.bnd.classindex",
+      "aQute.bnd.compatibility",
+      "aQute.bnd.component",
+      "aQute.bnd.component.annotations",
+      "aQute.bnd.component.error",
+      "aQute.bnd.connection.settings",
+      "aQute.bnd.differ",
+      "aQute.bnd.exporter.executable",
+      "aQute.bnd.exporter.runbundles",
+      "aQute.bnd.filerepo",
+      "aQute.bnd.header",
+      "aQute.bnd.help",
+      "aQute.bnd.help.instructions",
+      "aQute.bnd.http",
+      "aQute.bnd.junit",
+      "aQute.bnd.make",
+      "aQute.bnd.make.calltree",
+      "aQute.bnd.make.component",
+      "aQute.bnd.make.coverage",
+      "aQute.bnd.make.metatype",
+      "aQute.bnd.maven",
+      "aQute.bnd.maven.support",
+      "aQute.bnd.metatype",
+      "aQute.bnd.metatype.annotations",
+      "aQute.bnd.obr",
+      "aQute.bnd.osgi",
+      "aQute.bnd.osgi.eclipse",
+      "aQute.bnd.osgi.repository",
+      "aQute.bnd.osgi.resource",
+      "aQute.bnd.plugin.ant",
+      "aQute.bnd.plugin.eclipse",
+      "aQute.bnd.plugin.git",
+      "aQute.bnd.plugin.gradle",
+      "aQute.bnd.plugin.jpms",
+      "aQute.bnd.plugin.maven",
+      "aQute.bnd.plugin.spi",
+      "aQute.bnd.print",
+      "aQute.bnd.properties",
+      "aQute.bnd.remoteworkspace.client",
+      "aQute.bnd.remoteworkspace.server",
+      "aQute.bnd.resource.repository",
+      "aQute.bnd.service",
+      "aQute.bnd.service.action",
+      "aQute.bnd.service.classparser",
+      "aQute.bnd.service.clipboard",
+      "aQute.bnd.service.diff",
+      "aQute.bnd.service.export",
+      "aQute.bnd.service.extension",
+      "aQute.bnd.service.externalplugin",
+      "aQute.bnd.service.generate",
+      "aQute.bnd.service.library",
+      "aQute.bnd.service.lifecycle",
+      "aQute.bnd.service.maven",
+      "aQute.bnd.service.message",
+      "aQute.bnd.service.progress",
+      "aQute.bnd.service.release",
+      "aQute.bnd.service.remotelaunch",
+      "aQute.bnd.service.remoteworkspace",
+      "aQute.bnd.service.reporter",
+      "aQute.bnd.service.repository",
+      "aQute.bnd.service.resolve.hook",
+      "aQute.bnd.service.specifications",
+      "aQute.bnd.service.url",
+      "aQute.bnd.service.verifier",
+      "aQute.bnd.signing",
+      "aQute.bnd.url",
+      "aQute.bnd.util.dto",
+      "aQute.bnd.util.home",
+      "aQute.bnd.util.repository",
+      "aQute.bnd.version",
+      "aQute.bnd.version.maven",
+      "aQute.bnd.xmlattribute",
+      "aQute.lib.aspects",
+      "aQute.lib.base64",
+      "aQute.lib.collections",
+      "aQute.lib.concurrent.serial",
+      "aQute.lib.concurrentinit",
+      "aQute.lib.converter",
+      "aQute.lib.date",
+      "aQute.lib.deployer",
+      "aQute.lib.fileset",
+      "aQute.lib.filter",
+      "aQute.lib.formatter",
+      "aQute.lib.hex",
+      "aQute.lib.hierarchy",
+      "aQute.lib.io",
+      "aQute.lib.json",
+      "aQute.lib.link",
+      "aQute.lib.manifest",
+      "aQute.lib.mavenpasswordobfuscator",
+      "aQute.lib.persistentmap",
+      "aQute.lib.redirect",
+      "aQute.lib.settings",
+      "aQute.lib.specinterface",
+      "aQute.lib.spring",
+      "aQute.lib.stringrover",
+      "aQute.lib.strings",
+      "aQute.lib.tag",
+      "aQute.lib.utf8properties",
+      "aQute.lib.watcher",
+      "aQute.lib.xml",
+      "aQute.lib.xpath",
+      "aQute.lib.zip",
+      "aQute.libg.command",
+      "aQute.libg.cryptography",
+      "aQute.libg.filelock",
+      "aQute.libg.generics",
+      "aQute.libg.glob",
+      "aQute.libg.gzip",
+      "aQute.libg.ints",
+      "aQute.libg.map",
+      "aQute.libg.qtokens",
+      "aQute.libg.reporter",
+      "aQute.libg.reporter.slf4j",
+      "aQute.libg.sed",
+      "aQute.libg.tuple",
+      "aQute.libg.uri",
+      "aQute.service.reporter"
+    ],
     "com.google.auto.value:auto-value": [
       "autovalue.shaded.com.google.auto.common",
       "autovalue.shaded.com.google.auto.service",
@@ -279,6 +783,48 @@
       "com.google.auto.value.extension.serializable",
       "com.google.auto.value.extension.toprettystring"
     ],
+    "com.google.caliper:caliper": [
+      "com.google.caliper.runner",
+      "com.google.caliper.runner.instrument",
+      "com.google.caliper.runner.resultprocessor"
+    ],
+    "com.google.caliper:caliper-api": [
+      "com.google.caliper",
+      "com.google.caliper.api",
+      "com.google.caliper.model"
+    ],
+    "com.google.caliper:caliper-core": [
+      "com.google.caliper.bridge",
+      "com.google.caliper.core",
+      "com.google.caliper.memory"
+    ],
+    "com.google.caliper:caliper-runner": [
+      "com.google.caliper.runner",
+      "com.google.caliper.runner.config",
+      "com.google.caliper.runner.experiment",
+      "com.google.caliper.runner.instrument",
+      "com.google.caliper.runner.options",
+      "com.google.caliper.runner.resultprocessor",
+      "com.google.caliper.runner.server",
+      "com.google.caliper.runner.target",
+      "com.google.caliper.runner.worker",
+      "com.google.caliper.runner.worker.dryrun",
+      "com.google.caliper.runner.worker.targetinfo",
+      "com.google.caliper.runner.worker.trial"
+    ],
+    "com.google.caliper:caliper-util": [
+      "com.google.caliper.json",
+      "com.google.caliper.util"
+    ],
+    "com.google.caliper:caliper-worker": [
+      "com.google.caliper.worker",
+      "com.google.caliper.worker.connection",
+      "com.google.caliper.worker.handler",
+      "com.google.caliper.worker.instrument"
+    ],
+    "com.google.caliper:caliper-worker-jvm": [
+      "com.google.caliper.worker"
+    ],
     "com.google.code.findbugs:jsr305": [
       "javax.annotation",
       "javax.annotation.concurrent",
@@ -295,6 +841,48 @@
       "com.google.gson.reflect",
       "com.google.gson.stream"
     ],
+    "com.google.code.java-allocation-instrumenter:java-allocation-instrumenter": [
+      "com.google.monitoring.runtime.instrumentation",
+      "com.google.monitoring.runtime.instrumentation.asm",
+      "com.google.monitoring.runtime.instrumentation.asm.commons",
+      "com.google.monitoring.runtime.instrumentation.asm.signature",
+      "com.google.monitoring.runtime.instrumentation.asm.tree",
+      "com.google.monitoring.runtime.instrumentation.asm.tree.analysis",
+      "com.google.monitoring.runtime.instrumentation.asm.util",
+      "com.google.monitoring.runtime.instrumentation.checker.nullness.compatqual",
+      "com.google.monitoring.runtime.instrumentation.common.annotations",
+      "com.google.monitoring.runtime.instrumentation.common.base",
+      "com.google.monitoring.runtime.instrumentation.common.base.internal",
+      "com.google.monitoring.runtime.instrumentation.common.cache",
+      "com.google.monitoring.runtime.instrumentation.common.collect",
+      "com.google.monitoring.runtime.instrumentation.common.escape",
+      "com.google.monitoring.runtime.instrumentation.common.eventbus",
+      "com.google.monitoring.runtime.instrumentation.common.graph",
+      "com.google.monitoring.runtime.instrumentation.common.hash",
+      "com.google.monitoring.runtime.instrumentation.common.html",
+      "com.google.monitoring.runtime.instrumentation.common.io",
+      "com.google.monitoring.runtime.instrumentation.common.math",
+      "com.google.monitoring.runtime.instrumentation.common.net",
+      "com.google.monitoring.runtime.instrumentation.common.primitives",
+      "com.google.monitoring.runtime.instrumentation.common.reflect",
+      "com.google.monitoring.runtime.instrumentation.common.util.concurrent",
+      "com.google.monitoring.runtime.instrumentation.common.xml",
+      "com.google.monitoring.runtime.instrumentation.errorprone.annotations",
+      "com.google.monitoring.runtime.instrumentation.errorprone.annotations.concurrent",
+      "com.google.monitoring.runtime.instrumentation.j2objc.annotations",
+      "com.google.thirdparty.publicsuffix"
+    ],
+    "com.google.dagger:dagger": [
+      "dagger",
+      "dagger.internal",
+      "dagger.multibindings"
+    ],
+    "com.google.dagger:dagger-producers": [
+      "dagger.producers",
+      "dagger.producers.internal",
+      "dagger.producers.monitoring",
+      "dagger.producers.monitoring.internal"
+    ],
     "com.google.errorprone:error_prone_annotations": [
       "com.google.errorprone.annotations",
       "com.google.errorprone.annotations.concurrent"
@@ -333,6 +921,16 @@
       "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.suites",
+      "com.google.common.collect.testing.testers",
+      "com.google.common.escape.testing",
+      "com.google.common.testing",
+      "com.google.common.util.concurrent.testing"
+    ],
     "com.google.j2objc:j2objc-annotations": [
       "com.google.j2objc.annotations"
     ],
@@ -346,6 +944,78 @@
       "difflib",
       "difflib.myers"
     ],
+    "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"
+    ],
+    "com.sun.jersey:jersey-client": [
+      "com.sun.jersey.api.client",
+      "com.sun.jersey.api.client.async",
+      "com.sun.jersey.api.client.config",
+      "com.sun.jersey.api.client.filter",
+      "com.sun.jersey.client.impl",
+      "com.sun.jersey.client.impl.async",
+      "com.sun.jersey.client.proxy",
+      "com.sun.jersey.client.urlconnection",
+      "com.sun.ws.rs.ext"
+    ],
+    "com.sun.jersey:jersey-core": [
+      "com.sun.jersey.api.provider.jaxb",
+      "com.sun.jersey.api.representation",
+      "com.sun.jersey.api.uri",
+      "com.sun.jersey.core.header",
+      "com.sun.jersey.core.header.reader",
+      "com.sun.jersey.core.impl.provider.entity",
+      "com.sun.jersey.core.impl.provider.header",
+      "com.sun.jersey.core.impl.provider.xml",
+      "com.sun.jersey.core.osgi",
+      "com.sun.jersey.core.provider",
+      "com.sun.jersey.core.provider.jaxb",
+      "com.sun.jersey.core.reflection",
+      "com.sun.jersey.core.spi.component",
+      "com.sun.jersey.core.spi.component.ioc",
+      "com.sun.jersey.core.spi.factory",
+      "com.sun.jersey.core.spi.scanning",
+      "com.sun.jersey.core.spi.scanning.uri",
+      "com.sun.jersey.core.util",
+      "com.sun.jersey.impl",
+      "com.sun.jersey.localization",
+      "com.sun.jersey.spi",
+      "com.sun.jersey.spi.inject",
+      "com.sun.jersey.spi.service"
+    ],
+    "info.picocli:picocli": [
+      "picocli"
+    ],
+    "javax.annotation:javax.annotation-api": [
+      "javax.annotation",
+      "javax.annotation.security",
+      "javax.annotation.sql"
+    ],
+    "javax.inject:javax.inject": [
+      "javax.inject"
+    ],
+    "javax.ws.rs:jsr311-api": [
+      "javax.ws.rs",
+      "javax.ws.rs.core",
+      "javax.ws.rs.ext"
+    ],
+    "joda-time:joda-time": [
+      "org.joda.time",
+      "org.joda.time.base",
+      "org.joda.time.chrono",
+      "org.joda.time.convert",
+      "org.joda.time.field",
+      "org.joda.time.format",
+      "org.joda.time.tz"
+    ],
     "junit:junit": [
       "junit.extensions",
       "junit.framework",
@@ -551,27 +1221,107 @@
     "org.opentest4j:opentest4j": [
       "org.opentest4j"
     ],
+    "org.osgi:org.osgi.dto": [
+      "org.osgi.dto"
+    ],
+    "org.osgi:org.osgi.framework": [
+      "org.osgi.framework",
+      "org.osgi.framework.dto",
+      "org.osgi.framework.hooks.bundle",
+      "org.osgi.framework.hooks.resolver",
+      "org.osgi.framework.hooks.service",
+      "org.osgi.framework.hooks.weaving",
+      "org.osgi.framework.launch",
+      "org.osgi.framework.namespace",
+      "org.osgi.framework.startlevel",
+      "org.osgi.framework.startlevel.dto",
+      "org.osgi.framework.wiring",
+      "org.osgi.framework.wiring.dto"
+    ],
+    "org.osgi:org.osgi.resource": [
+      "org.osgi.resource",
+      "org.osgi.resource.dto"
+    ],
+    "org.osgi:org.osgi.service.log": [
+      "org.osgi.service.log"
+    ],
+    "org.osgi:org.osgi.service.repository": [
+      "org.osgi.service.repository"
+    ],
+    "org.osgi:org.osgi.util.function": [
+      "org.osgi.util.function"
+    ],
+    "org.osgi:org.osgi.util.promise": [
+      "org.osgi.util.promise"
+    ],
+    "org.osgi:org.osgi.util.tracker": [
+      "org.osgi.util.tracker"
+    ],
+    "org.osgi:osgi.annotation": [
+      "org.osgi.annotation.bundle",
+      "org.osgi.annotation.versioning"
+    ],
     "org.ow2.asm:asm": [
       "org.objectweb.asm",
       "org.objectweb.asm.signature"
+    ],
+    "org.ow2.asm:asm-analysis": [
+      "org.objectweb.asm.tree.analysis"
+    ],
+    "org.ow2.asm:asm-commons": [
+      "org.objectweb.asm.commons"
+    ],
+    "org.ow2.asm:asm-tree": [
+      "org.objectweb.asm.tree"
+    ],
+    "org.ow2.asm:asm-util": [
+      "org.objectweb.asm.util"
+    ],
+    "org.slf4j:slf4j-api": [
+      "org.slf4j",
+      "org.slf4j.event",
+      "org.slf4j.helpers",
+      "org.slf4j.spi"
     ]
   },
   "repositories": {
     "https://repo1.maven.org/maven2/": [
+      "biz.aQute.bnd:biz.aQute.bnd.util",
+      "biz.aQute.bnd:biz.aQute.bndlib",
       "com.google.auto.value:auto-value",
       "com.google.auto.value:auto-value-annotations",
+      "com.google.caliper:caliper",
+      "com.google.caliper:caliper-api",
+      "com.google.caliper:caliper-core",
+      "com.google.caliper:caliper-runner",
+      "com.google.caliper:caliper-util",
+      "com.google.caliper:caliper-worker",
+      "com.google.caliper:caliper-worker-jvm",
       "com.google.code.findbugs:jsr305",
       "com.google.code.gson:gson",
+      "com.google.code.java-allocation-instrumenter:java-allocation-instrumenter",
+      "com.google.dagger:dagger",
+      "com.google.dagger:dagger-producers",
       "com.google.errorprone:error_prone_annotations",
       "com.google.flogger:flogger",
       "com.google.flogger:flogger-system-backend",
       "com.google.guava:failureaccess",
       "com.google.guava:guava",
+      "com.google.guava:guava-testlib",
       "com.google.guava:listenablefuture",
       "com.google.j2objc:j2objc-annotations",
       "com.google.truth.extensions:truth-java8-extension",
       "com.google.truth:truth",
       "com.googlecode.java-diff-utils:diffutils",
+      "com.squareup.okhttp:okhttp",
+      "com.squareup.okio:okio",
+      "com.sun.jersey:jersey-client",
+      "com.sun.jersey:jersey-core",
+      "info.picocli:picocli",
+      "javax.annotation:javax.annotation-api",
+      "javax.inject:javax.inject",
+      "javax.ws.rs:jsr311-api",
+      "joda-time:joda-time",
       "junit:junit",
       "net.bytebuddy:byte-buddy",
       "net.bytebuddy:byte-buddy-agent",
@@ -582,7 +1332,21 @@
       "org.mockito:mockito-core",
       "org.objenesis:objenesis",
       "org.opentest4j:opentest4j",
-      "org.ow2.asm:asm"
+      "org.osgi:org.osgi.dto",
+      "org.osgi:org.osgi.framework",
+      "org.osgi:org.osgi.resource",
+      "org.osgi:org.osgi.service.log",
+      "org.osgi:org.osgi.service.repository",
+      "org.osgi:org.osgi.util.function",
+      "org.osgi:org.osgi.util.promise",
+      "org.osgi:org.osgi.util.tracker",
+      "org.osgi:osgi.annotation",
+      "org.ow2.asm:asm",
+      "org.ow2.asm:asm-analysis",
+      "org.ow2.asm:asm-commons",
+      "org.ow2.asm:asm-tree",
+      "org.ow2.asm:asm-util",
+      "org.slf4j:slf4j-api"
     ]
   },
   "services": {
@@ -609,6 +1373,78 @@
         "com.google.auto.value.processor.AutoValueBuilderProcessor",
         "com.google.auto.value.processor.AutoValueProcessor"
       ]
+    },
+    "com.sun.jersey:jersey-core": {
+      "com.sun.jersey.spi.HeaderDelegateProvider": [
+        "com.sun.jersey.core.impl.provider.header.CacheControlProvider",
+        "com.sun.jersey.core.impl.provider.header.CookieProvider",
+        "com.sun.jersey.core.impl.provider.header.DateProvider",
+        "com.sun.jersey.core.impl.provider.header.EntityTagProvider",
+        "com.sun.jersey.core.impl.provider.header.LocaleProvider",
+        "com.sun.jersey.core.impl.provider.header.MediaTypeProvider",
+        "com.sun.jersey.core.impl.provider.header.NewCookieProvider",
+        "com.sun.jersey.core.impl.provider.header.StringProvider",
+        "com.sun.jersey.core.impl.provider.header.URIProvider"
+      ],
+      "com.sun.jersey.spi.inject.InjectableProvider": [
+        "com.sun.jersey.core.impl.provider.xml.DocumentBuilderFactoryProvider",
+        "com.sun.jersey.core.impl.provider.xml.SAXParserContextProvider",
+        "com.sun.jersey.core.impl.provider.xml.TransformerFactoryProvider",
+        "com.sun.jersey.core.impl.provider.xml.XMLStreamReaderContextProvider"
+      ],
+      "javax.ws.rs.ext.MessageBodyReader": [
+        "com.sun.jersey.core.impl.provider.entity.ByteArrayProvider",
+        "com.sun.jersey.core.impl.provider.entity.DataSourceProvider",
+        "com.sun.jersey.core.impl.provider.entity.DocumentProvider",
+        "com.sun.jersey.core.impl.provider.entity.EntityHolderReader",
+        "com.sun.jersey.core.impl.provider.entity.FileProvider",
+        "com.sun.jersey.core.impl.provider.entity.FormMultivaluedMapProvider",
+        "com.sun.jersey.core.impl.provider.entity.FormProvider",
+        "com.sun.jersey.core.impl.provider.entity.InputStreamProvider",
+        "com.sun.jersey.core.impl.provider.entity.MimeMultipartProvider",
+        "com.sun.jersey.core.impl.provider.entity.ReaderProvider",
+        "com.sun.jersey.core.impl.provider.entity.RenderedImageProvider",
+        "com.sun.jersey.core.impl.provider.entity.SourceProvider$DOMSourceReader",
+        "com.sun.jersey.core.impl.provider.entity.SourceProvider$SAXSourceReader",
+        "com.sun.jersey.core.impl.provider.entity.SourceProvider$StreamSourceReader",
+        "com.sun.jersey.core.impl.provider.entity.StringProvider",
+        "com.sun.jersey.core.impl.provider.entity.XMLJAXBElementProvider$App",
+        "com.sun.jersey.core.impl.provider.entity.XMLJAXBElementProvider$General",
+        "com.sun.jersey.core.impl.provider.entity.XMLJAXBElementProvider$Text",
+        "com.sun.jersey.core.impl.provider.entity.XMLListElementProvider$App",
+        "com.sun.jersey.core.impl.provider.entity.XMLListElementProvider$General",
+        "com.sun.jersey.core.impl.provider.entity.XMLListElementProvider$Text",
+        "com.sun.jersey.core.impl.provider.entity.XMLRootElementProvider$App",
+        "com.sun.jersey.core.impl.provider.entity.XMLRootElementProvider$General",
+        "com.sun.jersey.core.impl.provider.entity.XMLRootElementProvider$Text",
+        "com.sun.jersey.core.impl.provider.entity.XMLRootObjectProvider$App",
+        "com.sun.jersey.core.impl.provider.entity.XMLRootObjectProvider$General",
+        "com.sun.jersey.core.impl.provider.entity.XMLRootObjectProvider$Text"
+      ],
+      "javax.ws.rs.ext.MessageBodyWriter": [
+        "com.sun.jersey.core.impl.provider.entity.ByteArrayProvider",
+        "com.sun.jersey.core.impl.provider.entity.DataSourceProvider",
+        "com.sun.jersey.core.impl.provider.entity.DocumentProvider",
+        "com.sun.jersey.core.impl.provider.entity.FileProvider",
+        "com.sun.jersey.core.impl.provider.entity.FormMultivaluedMapProvider",
+        "com.sun.jersey.core.impl.provider.entity.FormProvider",
+        "com.sun.jersey.core.impl.provider.entity.InputStreamProvider",
+        "com.sun.jersey.core.impl.provider.entity.MimeMultipartProvider",
+        "com.sun.jersey.core.impl.provider.entity.ReaderProvider",
+        "com.sun.jersey.core.impl.provider.entity.RenderedImageProvider",
+        "com.sun.jersey.core.impl.provider.entity.SourceProvider$SourceWriter",
+        "com.sun.jersey.core.impl.provider.entity.StreamingOutputProvider",
+        "com.sun.jersey.core.impl.provider.entity.StringProvider",
+        "com.sun.jersey.core.impl.provider.entity.XMLJAXBElementProvider$App",
+        "com.sun.jersey.core.impl.provider.entity.XMLJAXBElementProvider$General",
+        "com.sun.jersey.core.impl.provider.entity.XMLJAXBElementProvider$Text",
+        "com.sun.jersey.core.impl.provider.entity.XMLListElementProvider$App",
+        "com.sun.jersey.core.impl.provider.entity.XMLListElementProvider$General",
+        "com.sun.jersey.core.impl.provider.entity.XMLListElementProvider$Text",
+        "com.sun.jersey.core.impl.provider.entity.XMLRootElementProvider$App",
+        "com.sun.jersey.core.impl.provider.entity.XMLRootElementProvider$General",
+        "com.sun.jersey.core.impl.provider.entity.XMLRootElementProvider$Text"
+      ]
     }
   },
   "version": "2"
diff --git a/proto/BUILD b/proto/BUILD
index b6ac6c54ebe..52099ffd458 100644
--- a/proto/BUILD
+++ b/proto/BUILD
@@ -129,6 +129,6 @@ java_library(
         "//third_party/bazel/src/main/protobuf:build_java_proto",
         "//third_party/bazel/src/main/protobuf:command_line_java_proto",
         "//third_party/bazel/src/main/protobuf:deps_java_proto",
-        "@com_google_protobuf//:protobuf_java",
+        "@protobuf//:protobuf_java",
     ],
 )
diff --git a/querysync/java/com/google/idea/blaze/qsync/artifacts/BUILD b/querysync/java/com/google/idea/blaze/qsync/artifacts/BUILD
index 195bbdbcfeb..d1f69d755ec 100644
--- a/querysync/java/com/google/idea/blaze/qsync/artifacts/BUILD
+++ b/querysync/java/com/google/idea/blaze/qsync/artifacts/BUILD
@@ -15,7 +15,7 @@ java_library(
         "//shared:exception",
         "//third_party/auto_value",
         "@com_google_guava_guava//jar",
-        "@com_google_protobuf//:protobuf_java",
+        "@protobuf//:protobuf_java",
         "@jsr305_annotations//jar",
     ],
 )
diff --git a/querysync/java/com/google/idea/blaze/qsync/deps/BUILD b/querysync/java/com/google/idea/blaze/qsync/deps/BUILD
index 3f7bce293a5..2004a298e0c 100644
--- a/querysync/java/com/google/idea/blaze/qsync/deps/BUILD
+++ b/querysync/java/com/google/idea/blaze/qsync/deps/BUILD
@@ -20,7 +20,7 @@ java_library(
         "//shared:vcs",
         "//third_party/auto_value",
         "@com_google_guava_guava//jar",
-        "@com_google_protobuf//:protobuf_java",
+        "@protobuf//:protobuf_java",
         "@error_prone_annotations//jar",
     ],
 )
diff --git a/querysync/java/com/google/idea/blaze/qsync/project/BUILD b/querysync/java/com/google/idea/blaze/qsync/project/BUILD
index 5e68b757126..fcc77ec1fd6 100644
--- a/querysync/java/com/google/idea/blaze/qsync/project/BUILD
+++ b/querysync/java/com/google/idea/blaze/qsync/project/BUILD
@@ -65,7 +65,7 @@ java_library(
         "//shared:vcs",
         "//third_party/auto_value",
         "@com_google_guava_guava//jar",
-        "@com_google_protobuf//:protobuf_java",
+        "@protobuf//:protobuf_java",
         "@error_prone_annotations//jar",
         "@jsr305_annotations//jar",
     ],
diff --git a/shared/java/com/google/idea/blaze/common/proto/BUILD b/shared/java/com/google/idea/blaze/common/proto/BUILD
index fd6ddc1cefd..a310eb7dc73 100644
--- a/shared/java/com/google/idea/blaze/common/proto/BUILD
+++ b/shared/java/com/google/idea/blaze/common/proto/BUILD
@@ -7,6 +7,6 @@ java_library(
     deps = [
         "//shared/java/com/google/idea/blaze/common",
         "@com_google_guava_guava//jar",
-        "@com_google_protobuf//:protobuf_java",
+        "@protobuf//:protobuf_java",
     ],
 )
diff --git a/third_party/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD b/third_party/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD
index 29bf00eb76c..cb602cc32de 100644
--- a/third_party/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD
+++ b/third_party/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD
@@ -1,5 +1,5 @@
-load("@rules_java//java:defs.bzl", "java_proto_library")
-load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library")
+load("@protobuf//bazel:proto_library.bzl", "proto_library")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -24,8 +24,8 @@ proto_library(
         "//third_party/bazel/src/main/protobuf:command_line_proto",
         "//third_party/bazel/src/main/protobuf:failure_details_proto",
         "//third_party/bazel/src/main/protobuf:invocation_policy_proto",
-        "@com_google_protobuf//:any_proto",
-        "@com_google_protobuf//:duration_proto",
-        "@com_google_protobuf//:timestamp_proto",
+        "@protobuf//:any_proto",
+        "@protobuf//:duration_proto",
+        "@protobuf//:timestamp_proto",
     ],
 )
diff --git a/third_party/bazel/src/main/java/com/google/devtools/build/lib/packages/metrics/BUILD b/third_party/bazel/src/main/java/com/google/devtools/build/lib/packages/metrics/BUILD
index da0c95efd6b..cf34ef8803f 100644
--- a/third_party/bazel/src/main/java/com/google/devtools/build/lib/packages/metrics/BUILD
+++ b/third_party/bazel/src/main/java/com/google/devtools/build/lib/packages/metrics/BUILD
@@ -1,4 +1,6 @@
-load("@rules_java//java:defs.bzl", "java_library", "java_proto_library")
+load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library")
+load("@protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_java//java:defs.bzl", "java_library")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -35,7 +37,7 @@ proto_library(
     name = "package_metrics_proto",
     srcs = ["package_metrics.proto"],
     deps = [
-        "@com_google_protobuf//:duration_proto",
+        "@protobuf//:duration_proto",
     ],
 )
 
@@ -50,7 +52,7 @@ proto_library(
     name = "package_load_metrics_proto",
     srcs = ["package_load_metrics.proto"],
     deps = [
-        "@com_google_protobuf//:duration_proto",
+        "@protobuf//:duration_proto",
     ],
 )
 
diff --git a/third_party/bazel/src/main/java/com/google/devtools/build/lib/starlarkdebug/proto/BUILD b/third_party/bazel/src/main/java/com/google/devtools/build/lib/starlarkdebug/proto/BUILD
index 0d573330880..be89a430f45 100644
--- a/third_party/bazel/src/main/java/com/google/devtools/build/lib/starlarkdebug/proto/BUILD
+++ b/third_party/bazel/src/main/java/com/google/devtools/build/lib/starlarkdebug/proto/BUILD
@@ -1,5 +1,5 @@
-load("@rules_java//java:defs.bzl", "java_proto_library")
-load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library")
+load("@protobuf//bazel:proto_library.bzl", "proto_library")
 
 package(default_visibility = ["//src:__subpackages__"])
 
diff --git a/third_party/bazel/src/main/protobuf/BUILD b/third_party/bazel/src/main/protobuf/BUILD
index 3c399b2c428..3d666f85588 100644
--- a/third_party/bazel/src/main/protobuf/BUILD
+++ b/third_party/bazel/src/main/protobuf/BUILD
@@ -1,5 +1,6 @@
-load("@rules_proto//proto:defs.bzl", "proto_library")
-load("@rules_python//python:proto.bzl", "py_proto_library")
+load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
+load("@protobuf//bazel:proto_library.bzl", "proto_library")
+load("@protobuf//bazel:py_proto_library.bzl", "py_proto_library")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -61,12 +62,12 @@ java_proto_library(
 
 java_proto_library(
     name = "any_java_proto",
-    deps = ["@com_google_protobuf//:any_proto"],
+    deps = ["@protobuf//:any_proto"],
 )
 
 java_proto_library(
     name = "wrappers_java_proto",
-    deps = ["@com_google_protobuf//:wrappers_proto"],
+    deps = ["@protobuf//:wrappers_proto"],
 )
 
 proto_library(
@@ -74,7 +75,7 @@ proto_library(
     srcs = ["command_server.proto"],
     deps = [
         ":failure_details_proto",
-        "@com_google_protobuf//:any_proto",
+        "@protobuf//:any_proto",
     ],
 )
 
@@ -86,7 +87,7 @@ java_proto_library(
 proto_library(
     name = "failure_details_proto",
     srcs = ["failure_details.proto"],
-    deps = ["@com_google_protobuf//:descriptor_proto"],
+    deps = ["@protobuf//:descriptor_proto"],
 )
 
 java_proto_library(
@@ -170,10 +171,10 @@ proto_library(
     name = "remote_execution_log_proto",
     srcs = ["remote_execution_log.proto"],
     deps = [
-        "@com_google_protobuf//:timestamp_proto",
-        "@googleapis//:google_bytestream_bytestream_proto",
-        "@googleapis//:google_longrunning_operations_proto",
-        "@googleapis//:google_rpc_status_proto",
+        "@googleapis//google/bytestream:bytestream_proto",
+        "@googleapis//google/longrunning:operations_proto",
+        "@googleapis//google/rpc:status_proto",
+        "@protobuf//:timestamp_proto",
         "@remoteapis//:build_bazel_remote_execution_v2_remote_execution_proto",
     ],
 )
@@ -207,8 +208,8 @@ proto_library(
     name = "bazel_output_service_proto",
     srcs = ["bazel_output_service.proto"],
     deps = [
-        "@com_google_protobuf//:any_proto",
-        "@googleapis//:google_rpc_status_proto",
+        "@googleapis//google/rpc:status_proto",
+        "@protobuf//:any_proto",
     ],
 )
 
@@ -244,8 +245,8 @@ proto_library(
     name = "spawn_proto",
     srcs = ["spawn.proto"],
     deps = [
-        "@com_google_protobuf//:duration_proto",
-        "@com_google_protobuf//:timestamp_proto",
+        "@protobuf//:duration_proto",
+        "@protobuf//:timestamp_proto",
     ],
 )