Skip to content

Commit

Permalink
Don't pin tower patch version in Cargo.toml
Browse files Browse the repository at this point in the history
Leads to unnecessary churn, since we pin in Cargo.lock.

Signed-off-by: Oliver Gould <[email protected]>
  • Loading branch information
olix0r committed Feb 17, 2022
1 parent bdb4da9 commit dc6ef6e
Show file tree
Hide file tree
Showing 20 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion hyper-balance/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ futures = { version = "0.3", default-features = false }
http = "0.2"
hyper = "0.14"
pin-project = "1"
tower = { version = "0.4.12", default-features = false, features = ["load"] }
tower = { version = "0.4", default-features = false, features = ["load"] }
tokio = { version = "1", features = ["macros"] }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ thiserror = "1.0"
tokio = { version = "1", features = ["rt"] }
tokio-stream = { version = "0.1.8", features = ["time", "sync"] }
tonic = { version = "0.6", default-features = false, features = ["prost"] }
tower = "0.4.12"
tower = "0.4"
tracing = "0.1.30"
4 changes: 2 additions & 2 deletions linkerd/app/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@ linkerd-trace-context = { path = "../../trace-context" }
regex = "1.5.4"
serde_json = "1"
thiserror = "1.0"
tokio = { version = "1", features = ["macros", "sync", "parking_lot"]}
tokio = { version = "1", features = ["macros", "sync", "parking_lot"] }
tokio-stream = { version = "0.1.8", features = ["time"] }
tonic = { version = "0.6", default-features = false, features = ["prost"] }
tracing = "0.1.30"
parking_lot = "0.12"
pin-project = "1"

[dependencies.tower]
version = "0.4.12"
version = "0.4"
default-features = false
features = [
"buffer",
Expand Down
4 changes: 2 additions & 2 deletions linkerd/app/gateway/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ linkerd-app-inbound = { path = "../inbound" }
linkerd-app-outbound = { path = "../outbound" }
thiserror = "1.0"
tokio = { version = "1", features = ["sync"] }
tower = { version = "0.4.12", default-features = false }
tower = { version = "0.4", default-features = false }
tracing = "0.1.30"

[dev-dependencies]
tokio = { version = "1", features = ["rt", "macros"] }
tokio-test = "0.4"
tower = { version = "0.4.12", default-features = false, features = ["util"] }
tower = { version = "0.4", default-features = false, features = ["util"] }
tower-test = "0.4"
linkerd-app-test = { path = "../test" }
2 changes: 1 addition & 1 deletion linkerd/app/inbound/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ parking_lot = "0.12"
thiserror = "1.0"
tokio = { version = "1", features = ["sync"] }
tonic = { version = "0.6", default-features = false }
tower = { version = "0.4.12", features = ["util"] }
tower = { version = "0.4", features = ["util"] }
tracing = "0.1.30"

[target.'cfg(fuzzing)'.dependencies]
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 @@ -38,7 +38,7 @@ tokio = { version = "1", features = ["io-util", "net", "rt", "macros"] }
tokio-stream = { version = "0.1.8", features = ["sync"] }
tokio-rustls = "0.23.2"
rustls-pemfile = "0.3.0"
tower = { version = "0.4.12", default-features = false }
tower = { version = "0.4", default-features = false }
tonic = { version = "0.6", default-features = false }
tracing = "0.1.30"
tracing-subscriber = { version = "0.3", default-features = false, features = ["fmt", "std"] }
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 @@ -26,7 +26,7 @@ linkerd-retry = { path = "../../retry" }
parking_lot = "0.12"
thiserror = "1.0"
tokio = { version = "1", features = ["sync"] }
tower = { version = "0.4.12", features = ["util"] }
tower = { version = "0.4", features = ["util"] }
tracing = "0.1.30"
pin-project = "1"

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 @@ -23,7 +23,7 @@ regex = "1"
tokio = { version = "1", features = ["io-util", "net", "rt", "sync"] }
tokio-test = "0.4"
tokio-stream = { version = "0.1.8", features = ["sync"] }
tower = { version = "0.4.12", default-features = false }
tower = { version = "0.4", default-features = false }
tracing = "0.1.30"
thiserror = "1"

Expand Down
2 changes: 1 addition & 1 deletion linkerd/detect/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ linkerd-io = { path = "../io" }
linkerd-stack = { path = "../stack" }
tokio = { version = "1", features = ["time"] }
thiserror = "1.0"
tower = "0.4.12"
tower = "0.4"
tracing = "0.1.30"
2 changes: 1 addition & 1 deletion linkerd/http-classify/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ publish = false
http = "0.2"
linkerd-error = { path = "../error" }
linkerd-stack = { path = "../stack" }
tower = { version = "0.4.12", default-features = false }
tower = { version = "0.4", default-features = false }
2 changes: 1 addition & 1 deletion linkerd/proxy/api-resolve/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ http-body = "0.4"
pin-project = "1"
prost = "0.9"
tonic = { version = "0.6", default-features = false }
tower = { version = "0.4.12", default-features = false }
tower = { version = "0.4", default-features = false }
tracing = "0.1.30"
4 changes: 2 additions & 2 deletions linkerd/proxy/discover/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ linkerd-proxy-core = { path = "../core" }
linkerd-stack = { path = "../../stack" }
tokio = { version = "1", features = ["rt", "sync", "time"] }
tokio-util = "0.7"
tower = { version = "0.4.12", features = ["discover"] }
tower = { version = "0.4", features = ["discover"] }
tracing = "0.1.30"
pin-project = "1"

[dev-dependencies]
async-stream = "0.3"
tokio = { version = "1", features = ["macros"] }
tower = { version = "0.4.12", default-features = false, features = ["discover", "util"]}
tower = { version = "0.4", default-features = false, features = ["discover", "util"]}
2 changes: 1 addition & 1 deletion linkerd/proxy/dns-resolve/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ linkerd-dns = { path = "../../dns" }
linkerd-proxy-core = { path = "../core" }
linkerd-stack = { path = "../../stack" }
tokio = { version = "1", features = ["sync"] }
tokio-stream = { version = "0.1.8", features = ["sync"]}
tokio-stream = { version = "0.1.8", features = ["sync"] }
tower = "0.4.12"
tracing = "0.1.30"
2 changes: 1 addition & 1 deletion linkerd/proxy/http/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ linkerd-stack = { path = "../../stack" }
rand = "0.8"
thiserror = "1.0"
tokio = { version = "1", features = ["time", "rt"] }
tower = { version = "0.4.12", default-features = false, features = ["balance", "load", "discover"] }
tower = { version = "0.4", default-features = false, features = ["balance", "load", "discover"] }
tracing = "0.1.30"
try-lock = "0.2"
pin-project = "1"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/proxy/resolve/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ futures = { version = "0.3", default-features = false }
linkerd-error = { path = "../../error" }
linkerd-proxy-core = { path = "../core" }
thiserror = "1.0"
tower = "0.4.12"
tower = "0.4"
tracing = "0.1"
pin-project = "1"
4 changes: 2 additions & 2 deletions linkerd/proxy/tap/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ linkerd-tls = { path = "../../tls" }
parking_lot = "0.12"
rand = { version = "0.8" }
thiserror = "1.0"
tokio = { version = "1", features = ["time"]}
tower = { version = "0.4.12", default-features = false }
tokio = { version = "1", features = ["time"] }
tower = { version = "0.4", default-features = false }
tonic = { version = "0.6", default-features = false }
tracing = "0.1.30"
pin-project = "1"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/proxy/tcp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ linkerd-error = { path = "../../error" }
linkerd-stack = { path = "../../stack" }
rand = "0.8"
tokio = { version = "1" }
tower = { version = "0.4.12", default-features = false, features = ["balance", "load", "discover"] }
tower = { version = "0.4", default-features = false, features = ["balance", "load", "discover"] }
pin-project = "1"
2 changes: 1 addition & 1 deletion linkerd/reconnect/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ publish = false
linkerd-error = { path = "../error" }
linkerd-stack = { path = "../stack" }
futures = { version = "0.3", default-features = false }
tower = { version = "0.4.12", default-features = false }
tower = { version = "0.4", default-features = false }
tracing = "0.1.30"
pin-project = "1"

Expand Down
2 changes: 1 addition & 1 deletion linkerd/service-profiles/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ regex = "1.5.4"
tokio = { version = "1", features = ["macros", "rt", "sync", "time"] }
tokio-stream = { version = "0.1", features = ["sync"] }
tonic = { version = "0.6", default-features = false }
tower = { version = "0.4.12", features = [ "ready-cache", "retry", "util"] }
tower = { version = "0.4", features = [ "ready-cache", "retry", "util"] }
thiserror = "1"
tracing = "0.1.30"
pin-project = "1"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/stack/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ parking_lot = "0.12"
pin-project = "1"
thiserror = "1"
tokio = { version = "1", features = ["time"] }
tower = { version = "0.4.12", features = ["filter", "util"] }
tower = { version = "0.4", features = ["filter", "util"] }
tracing = "0.1"

[dev-dependencies]
Expand Down

0 comments on commit dc6ef6e

Please sign in to comment.