Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(hyper): define hyper as a workspace dependency #3456

Merged
merged 1 commit into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ debug = 1
lto = true

[workspace.dependencies]
hyper = { version = "0.14", default-features = false }
linkerd2-proxy-api = "0.15.0"
tokio-rustls = { version = "0.26", default-features = false, features = ["ring", "logging"] }
# linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api.git", branch = "main" }
2 changes: 1 addition & 1 deletion hyper-balance/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ publish = false
[dependencies]
futures = { version = "0.3", default-features = false }
http = "0.2"
hyper = { version = "0.14", features = ["deprecated"] }
hyper = { workspace = true, features = ["deprecated"] }
pin-project = "1"
tower = { version = "0.4", default-features = false, features = ["load"] }
tokio = { version = "1", features = ["macros"] }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/admin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ log-streaming = ["linkerd-tracing/stream"]
deflate = { version = "1", optional = true, features = ["gzip"] }
http = "0.2"
http-body = "0.4"
hyper = { version = "0.14", features = ["deprecated", "http1", "http2"] }
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
futures = { version = "0.3", default-features = false }
pprof = { version = "0.14", optional = true, features = ["prost-codec"] }
serde = "1"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ bytes = "1"
drain = { version = "0.1", features = ["retain"] }
http = "0.2"
http-body = "0.4"
hyper = { version = "0.14", features = ["deprecated", "http1", "http2"] }
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
futures = { version = "0.3", default-features = false }
ipnet = "2.10"
prometheus-client = "0.22"
Expand Down
4 changes: 2 additions & 2 deletions linkerd/app/inbound/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ path = "../../proxy/server-policy"
features = ["proto"]

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

[dev-dependencies]
hyper = { version = "0.14", features = ["deprecated", "http1", "http2"] }
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
linkerd-app-test = { path = "../test" }
linkerd-http-metrics = { path = "../../http/metrics", features = ["test-util"] }
linkerd-idle-cache = { path = "../../idle-cache", features = ["test-util"] }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/integration/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ futures = { version = "0.3", default-features = false, features = ["executor"] }
h2 = "0.3"
http = "0.2"
http-body = "0.4"
hyper = { version = "0.14", features = [
hyper = { workspace = true, features = [
"backports",
"deprecated",
"http1",
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/outbound/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ linkerd-tonic-watch = { path = "../../tonic-watch" }
[dev-dependencies]
futures-util = "0.3"
http-body = "0.4"
hyper = { version = "0.14", features = ["backports", "deprecated", "http1", "http2"] }
hyper = { workspace = true, features = ["backports", "deprecated", "http1", "http2"] }
tokio = { version = "1", features = ["macros", "sync", "time"] }
tokio-rustls = { workspace = true }
tokio-test = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ futures = { version = "0.3", default-features = false }
h2 = "0.3"
http = "0.2"
http-body = "0.4"
hyper = { version = "0.14", features = ["deprecated", "http1", "http2"] }
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
linkerd-app-core = { path = "../core" }
linkerd-http-route = { path = "../../http/route", optional = true }
linkerd-identity = { path = "../../identity" }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/http/executor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ HTTP runtime components for Linkerd.
"""

[dependencies]
hyper = { version = "0.14", features = ["deprecated"] }
hyper = { workspace = true, features = ["deprecated"] }
tokio = { version = "1", features = ["rt"] }
tracing = "0.1"
2 changes: 1 addition & 1 deletion linkerd/http/metrics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ bytes = "1"
futures = { version = "0.3", default-features = false }
http = "0.2"
http-body = "0.4"
hyper = { version = "0.14", features = ["deprecated", "http1", "http2"] }
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
parking_lot = "0.12"
pin-project = "1"
tokio = { version = "1", features = ["time"] }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/http/retry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ linkerd-metrics = { path = "../../metrics" }
linkerd-stack = { path = "../../stack" }

[dev-dependencies]
hyper = { version = "0.14", features = ["deprecated"] }
hyper = { workspace = true, features = ["deprecated"] }
linkerd-tracing = { path = "../../tracing", features = ["ansi"] }
tokio = { version = "1", features = ["macros", "rt"] }
2 changes: 1 addition & 1 deletion linkerd/http/upgrade/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ drain = "0.1"
futures = { version = "0.3", default-features = false }
http = "0.2"
http-body = "0.4"
hyper = { version = "0.14", default-features = false, features = ["deprecated", "client"] }
hyper = { workspace = true, default-features = false, features = ["deprecated", "client"] }
pin-project = "1"
tokio = { version = "1", default-features = false }
tower = { version = "0.4", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/metrics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ test_util = []
[dependencies]
deflate = { version = "1", features = ["gzip"] }
http = "0.2"
hyper = { version = "0.14", features = ["deprecated", "http1", "http2"] }
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
linkerd-stack = { path = "../stack", optional = true }
linkerd-system = { path = "../system", optional = true }
parking_lot = "0.12"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/proxy/http/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ h2 = "0.3"
http = "0.2"
http-body = "0.4"
httparse = "1"
hyper = { version = "0.14", features = [
hyper = { workspace = true, features = [
"backports",
"client",
"deprecated",
Expand Down
2 changes: 1 addition & 1 deletion linkerd/proxy/tap/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ publish = false

[dependencies]
http = "0.2"
hyper = { version = "0.14", features = ["backports", "deprecated", "http1", "http2"] }
hyper = { workspace = true, features = ["backports", "deprecated", "http1", "http2"] }
futures = { version = "0.3", default-features = false }
ipnet = "2.10"
linkerd2-proxy-api = { workspace = true, features = ["tap"] }
Expand Down
Loading