Skip to content

Commit 037cf5f

Browse files
committed
chore(hyper): define hyper as a workspace dependency
this commit alters various crates' manifests, pointing to a common workspace-level hyper dependency. note that the lockfile is not altered, this commit does *not* affect the version of hyper used, or have any other affect on the dependency graph. this will make future maintenance, upgrading, and patching of our hyper dependency marginally easier. see linkerd/linkerd2#8733 for more information on upgrading to hyper 1.0. Signed-off-by: katelyn martin <[email protected]>
1 parent 0cfbda6 commit 037cf5f

File tree

15 files changed

+16
-15
lines changed

15 files changed

+16
-15
lines changed

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ debug = 1
9797
lto = true
9898

9999
[workspace.dependencies]
100+
hyper = { version = "0.14", default-features = false }
100101
linkerd2-proxy-api = "0.15.0"
101102
tokio-rustls = { version = "0.26", default-features = false, features = ["ring", "logging"] }
102103
# linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api.git", branch = "main" }

hyper-balance/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ publish = false
99
[dependencies]
1010
futures = { version = "0.3", default-features = false }
1111
http = "0.2"
12-
hyper = { version = "0.14", features = ["deprecated"] }
12+
hyper = { workspace = true, features = ["deprecated"] }
1313
pin-project = "1"
1414
tower = { version = "0.4", default-features = false, features = ["load"] }
1515
tokio = { version = "1", features = ["macros"] }

linkerd/app/admin/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ log-streaming = ["linkerd-tracing/stream"]
1818
deflate = { version = "1", optional = true, features = ["gzip"] }
1919
http = "0.2"
2020
http-body = "0.4"
21-
hyper = { version = "0.14", features = ["deprecated", "http1", "http2"] }
21+
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
2222
futures = { version = "0.3", default-features = false }
2323
pprof = { version = "0.14", optional = true, features = ["prost-codec"] }
2424
serde = "1"

linkerd/app/core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ bytes = "1"
1717
drain = { version = "0.1", features = ["retain"] }
1818
http = "0.2"
1919
http-body = "0.4"
20-
hyper = { version = "0.14", features = ["deprecated", "http1", "http2"] }
20+
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
2121
futures = { version = "0.3", default-features = false }
2222
ipnet = "2.10"
2323
prometheus-client = "0.22"

linkerd/app/inbound/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ path = "../../proxy/server-policy"
4545
features = ["proto"]
4646

4747
[target.'cfg(fuzzing)'.dependencies]
48-
hyper = { version = "0.14", features = ["deprecated", "http1", "http2"] }
48+
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
4949
linkerd-app-test = { path = "../test" }
5050
arbitrary = { version = "1", features = ["derive"] }
5151
libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] }
5252

5353
[dev-dependencies]
54-
hyper = { version = "0.14", features = ["deprecated", "http1", "http2"] }
54+
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
5555
linkerd-app-test = { path = "../test" }
5656
linkerd-http-metrics = { path = "../../http/metrics", features = ["test-util"] }
5757
linkerd-idle-cache = { path = "../../idle-cache", features = ["test-util"] }

linkerd/app/integration/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ futures = { version = "0.3", default-features = false, features = ["executor"] }
2222
h2 = "0.3"
2323
http = "0.2"
2424
http-body = "0.4"
25-
hyper = { version = "0.14", features = [
25+
hyper = { workspace = true, features = [
2626
"backports",
2727
"deprecated",
2828
"http1",

linkerd/app/outbound/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ linkerd-tonic-watch = { path = "../../tonic-watch" }
5454
[dev-dependencies]
5555
futures-util = "0.3"
5656
http-body = "0.4"
57-
hyper = { version = "0.14", features = ["backports", "deprecated", "http1", "http2"] }
57+
hyper = { workspace = true, features = ["backports", "deprecated", "http1", "http2"] }
5858
tokio = { version = "1", features = ["macros", "sync", "time"] }
5959
tokio-rustls = { workspace = true }
6060
tokio-test = "0.4"

linkerd/app/test/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ futures = { version = "0.3", default-features = false }
1717
h2 = "0.3"
1818
http = "0.2"
1919
http-body = "0.4"
20-
hyper = { version = "0.14", features = ["deprecated", "http1", "http2"] }
20+
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
2121
linkerd-app-core = { path = "../core" }
2222
linkerd-http-route = { path = "../../http/route", optional = true }
2323
linkerd-identity = { path = "../../identity" }

linkerd/http/executor/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ HTTP runtime components for Linkerd.
1010
"""
1111

1212
[dependencies]
13-
hyper = { version = "0.14", features = ["deprecated"] }
13+
hyper = { workspace = true, features = ["deprecated"] }
1414
tokio = { version = "1", features = ["rt"] }
1515
tracing = "0.1"

linkerd/http/metrics/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ bytes = "1"
1414
futures = { version = "0.3", default-features = false }
1515
http = "0.2"
1616
http-body = "0.4"
17-
hyper = { version = "0.14", features = ["deprecated", "http1", "http2"] }
17+
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
1818
parking_lot = "0.12"
1919
pin-project = "1"
2020
tokio = { version = "1", features = ["time"] }

0 commit comments

Comments
 (0)