From ecc6ffac13275c5bb32fdb3234a9dd8afdae462f Mon Sep 17 00:00:00 2001 From: katelyn martin Date: Sun, 1 Dec 2024 00:00:00 +0000 Subject: [PATCH] chore(cargo.toml): define h2 as a workspace dependency this commit modifies the workspace manifest, defining h2 as a workspace dependency. no changes to the lockfile are made because this commit does not affect the dependency graph of the project. * linkerd/linkerd2#8733 Signed-off-by: katelyn martin --- Cargo.toml | 1 + linkerd/app/integration/Cargo.toml | 2 +- linkerd/app/test/Cargo.toml | 2 +- linkerd/proxy/http/Cargo.toml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c5b9feb5e9..18359cf05d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -98,6 +98,7 @@ lto = true [workspace.dependencies] bytes = { version = "1" } +h2 = { version = "0.3" } http = { version = "0.2" } http-body = { version = "0.4" } hyper = { version = "0.14", default-features = false } diff --git a/linkerd/app/integration/Cargo.toml b/linkerd/app/integration/Cargo.toml index 133f82f1df..6b615ede73 100644 --- a/linkerd/app/integration/Cargo.toml +++ b/linkerd/app/integration/Cargo.toml @@ -19,7 +19,7 @@ flakey = [] [dependencies] bytes = { workspace = true } futures = { version = "0.3", default-features = false, features = ["executor"] } -h2 = "0.3" +h2 = { workspace = true } http = { workspace = true } http-body = { workspace = true } hyper = { workspace = true, features = [ diff --git a/linkerd/app/test/Cargo.toml b/linkerd/app/test/Cargo.toml index 26548fed01..a58afcef7e 100644 --- a/linkerd/app/test/Cargo.toml +++ b/linkerd/app/test/Cargo.toml @@ -14,7 +14,7 @@ client-policy = ["linkerd-proxy-client-policy", "tonic", "linkerd-http-route"] [dependencies] futures = { version = "0.3", default-features = false } -h2 = "0.3" +h2 = { workspace = true } http = { workspace = true } http-body = { workspace = true } hyper = { workspace = true, features = ["deprecated", "http1", "http2"] } diff --git a/linkerd/proxy/http/Cargo.toml b/linkerd/proxy/http/Cargo.toml index cc1e1f3cc1..5905e94dad 100644 --- a/linkerd/proxy/http/Cargo.toml +++ b/linkerd/proxy/http/Cargo.toml @@ -16,7 +16,7 @@ async-trait = "0.1" bytes = { workspace = true } drain = "0.1" futures = { version = "0.3", default-features = false } -h2 = "0.3" +h2 = { workspace = true } http = { workspace = true } http-body = { workspace = true } httparse = "1"