From 98754fd77172ab3fd5f87d4ffd89b0e1b738dc97 Mon Sep 17 00:00:00 2001
From: Maksym Pavlenko <pavlenko.maksym@gmail.com>
Date: Mon, 13 Mar 2023 09:43:52 -0700
Subject: [PATCH] Update tokio

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
---
 Cargo.toml                    | 7 +++++++
 crates/client/Cargo.toml      | 4 ++--
 crates/runc-shim/Cargo.toml   | 6 +++---
 crates/runc/Cargo.toml        | 8 ++++----
 crates/shim-protos/Cargo.toml | 2 +-
 crates/shim/Cargo.toml        | 8 ++++----
 crates/snapshots/Cargo.toml   | 4 ++--
 7 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 1759d7b..3456f46 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,3 +21,10 @@ license = "Apache-2.0"
 repository = "https://github.com/containerd/rust-extensions"
 homepage = "https://containerd.io"
 edition = "2018"
+
+# Common crate dependencies
+[workspace.dependencies]
+tokio = "1.26"
+tower = "0.4"
+async-trait = "0.1.52"
+futures = "0.3.19"
diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml
index 3cd0fdc..e315120 100644
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -15,8 +15,8 @@ homepage.workspace = true
 tonic = "0.8"
 prost = "0.11"
 prost-types = "0.11"
-tokio = { version = "1.18", optional = true }
-tower = { version = "0.4", optional = true }
+tokio = { workspace = true, optional = true }
+tower = { workspace = true, optional = true }
 
 # tonic v0.8.1 depends on axum-core v0.2.2, which has security vulnerability:
 #  = ID: RUSTSEC-2022-0055
diff --git a/crates/runc-shim/Cargo.toml b/crates/runc-shim/Cargo.toml
index 087b372..be9d3ee 100644
--- a/crates/runc-shim/Cargo.toml
+++ b/crates/runc-shim/Cargo.toml
@@ -33,9 +33,9 @@ oci-spec = "0.6.0"
 crossbeam = "0.8.1"
 
 # Async dependencies
-async-trait = { version = "0.1.51", optional = true }
-tokio = { version = "1.17.0", features = ["full"], optional = true }
-futures = { version = "0.3.21", optional = true }
+async-trait = { workspace = true, optional = true }
+tokio = { workspace = true, features = ["full"], optional = true }
+futures = { workspace = true, optional = true }
 
 containerd-shim = { path = "../shim", version = "0.3.0" }
 runc = { path = "../runc", version = "0.2.0" }
\ No newline at end of file
diff --git a/crates/runc/Cargo.toml b/crates/runc/Cargo.toml
index cb70d82..8a340cc 100644
--- a/crates/runc/Cargo.toml
+++ b/crates/runc/Cargo.toml
@@ -30,7 +30,7 @@ uuid = { version = "1.0.0", features = ["v4"] }
 os_pipe = "1.0.0"
 
 # Async dependencies
-tokio = { version = "1.15.0", features = ["full"], optional = true }
-async-trait = { version = "0.1.52", optional = true }
-futures = { version = "0.3.19", optional = true }
-tokio-pipe = {version="0.2.10", optional = true }
+tokio = { workspace = true, features = ["full"], optional = true }
+async-trait = { workspace = true, optional = true }
+futures = { workspace = true, optional = true }
+tokio-pipe = { version="0.2.10", optional = true }
diff --git a/crates/shim-protos/Cargo.toml b/crates/shim-protos/Cargo.toml
index e5355be..af35588 100644
--- a/crates/shim-protos/Cargo.toml
+++ b/crates/shim-protos/Cargo.toml
@@ -23,7 +23,7 @@ ttrpc-codegen = "0.4"
 ctrlc = { version = "3.0", features = ["termination"] }
 log = "0.4"
 simple_logger = { version = "4.0", default-features = false, features = ["stderr"] }
-tokio = { version = "1.18", features = ["full"] }
+tokio = { workspace = true, features = ["full"] }
 
 [features]
 default = []
diff --git a/crates/shim/Cargo.toml b/crates/shim/Cargo.toml
index e13d175..db682b3 100644
--- a/crates/shim/Cargo.toml
+++ b/crates/shim/Cargo.toml
@@ -38,10 +38,10 @@ regex = "1"
 
 containerd-shim-protos = { path = "../shim-protos", version = "0.2.0" }
 
-async-trait = { version = "0.1.51", optional = true }
-tokio = { version = "1.17.0", features = ["full"], optional = true }
-futures = {version = "0.3.21", optional = true}
-signal-hook-tokio = {version = "0.3.1", optional = true, features = ["futures-v0_3"]}
+async-trait = { workspace = true, optional = true }
+tokio = { workspace = true, features = ["full"], optional = true }
+futures = { workspace = true, optional = true}
+signal-hook-tokio = { version = "0.3.1", optional = true, features = ["futures-v0_3"]}
 
 [target.'cfg(target_os = "linux")'.dependencies]
 cgroups-rs = "0.2.9"
diff --git a/crates/snapshots/Cargo.toml b/crates/snapshots/Cargo.toml
index 671e8ac..451273d 100644
--- a/crates/snapshots/Cargo.toml
+++ b/crates/snapshots/Cargo.toml
@@ -16,7 +16,7 @@ thiserror = "1.0"
 tonic = "0.8"
 prost = "0.11"
 prost-types = "0.11"
-tokio = { version = "1.18", features = ["sync"] }
+tokio = { workspace = true, features = ["sync"] }
 tokio-stream = "0.1.8"
 
 # tonic v0.8.1 depends on axum-core v0.2.2, which has security vulnerability:
@@ -33,7 +33,7 @@ axum-core = ">=0.2.8"
 [dev-dependencies]
 log = "0.4"
 async-stream = "0.3.2"
-futures = "0.3.17"
+futures.workspace = true
 simple_logger = { version  = "4.0", default-features = false }
 
 [build-dependencies]