chore: Fix cargo deny failed checks and de-duplicate crates using workspace shared dependency

Author: bryantbiggs

Cargo.toml

@@ -25,6 +25,8 @@ edition = "2021"
 # Common dependencies for all crates
 [workspace.dependencies]
 async-trait = "0.1.52"
+cgroups-rs = "0.3.4"
+crossbeam = "0.8.1"
 futures = "0.3.19"
 libc = "0.2.112"
 log = {version = "0.4.2", features=["kv_unstable"]}
@@ -37,6 +39,8 @@ prost-build = "0.12"
 prost-types = "0.12"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
+simple_logger = { version = "5.0", default-features = false }
+tempfile = "3.6"
 thiserror = "1.0"
 time = { version = "0.3.29", features = ["serde", "std", "formatting"] }
 tokio = "1.26"

crates/runc-shim/Cargo.toml

@@ -26,7 +26,7 @@ doc = false
 
 [dependencies]
 containerd-shim = { path = "../shim", version = "0.7.1", features = ["async"] }
-crossbeam = "0.8.1"
+crossbeam.workspace = true
 libc.workspace = true
 log.workspace = true
 nix = { workspace = true, features = ["socket", "uio", "term"] }
@@ -44,5 +44,5 @@ futures.workspace = true
 tokio = { workspace = true, features = ["full"] }
 
 [target.'cfg(target_os = "linux")'.dependencies]
-cgroups-rs = "0.3.3"
+cgroups-rs.workspace = true
 nix = { workspace = true, features = ["event"] }

crates/runc/Cargo.toml

@@ -23,10 +23,10 @@ oci-spec.workspace = true
 os_pipe.workspace = true
 path-absolutize = "3.0.11"
 prctl.workspace = true
-rand = "0.8.4"
+rand = "0.8.5"
 serde.workspace = true
 serde_json.workspace = true
-tempfile = "3.6.0"
+tempfile.workspace = true
 thiserror.workspace = true
 time.workspace = true
 uuid.workspace = true

crates/shim-protos/Cargo.toml

@@ -48,7 +48,7 @@ path = "examples/connect-async.rs"
 required-features = ["async"]
 
 [dependencies]
-async-trait = { version = "0.1.48", optional = true }
+async-trait = { workspace = true, optional = true }
 protobuf = "=3.1"
 ttrpc = "0.8"
 
@@ -58,11 +58,9 @@ ttrpc-codegen = "0.4"
 [dev-dependencies]
 ctrlc = { version = "3.0", features = ["termination"] }
 log.workspace = true
-simple_logger = { version = "5.0", default-features = false, features = [
-  "stderr",
-] }
+simple_logger = { workspace = true, features = ["stderr"] }
 tokio = { workspace = true, features = ["full"] }
-crossbeam = "0.8.0" # Used by create_ttrpc_context()
+crossbeam.workspace = true # Used by create_ttrpc_context()
 
 [package.metadata.docs.rs]
 features = ["docs"]

crates/shim/Cargo.toml

@@ -49,7 +49,7 @@ nix = { workspace = true, features = [
 ] }
 oci-spec.workspace = true
 page_size = "0.6.0"
-prctl = "1.0.0"
+prctl.workspace = true
 signal-hook = "0.3.13"
 serde.workspace = true
 serde_json.workspace = true
@@ -68,7 +68,7 @@ signal-hook-tokio = { version = "0.3.1", optional = true, features = [
 tokio = { workspace = true, features = ["full"], optional = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
-cgroups-rs = "0.3.4"
+cgroups-rs.workspace = true
 
 [target.'cfg(unix)'.dependencies]
 command-fds = "0.3.0"
@@ -87,7 +87,7 @@ windows-sys = { version = "0.52.0", features = [
 ] }
 
 [dev-dependencies]
-tempfile = "3.6"
+tempfile.workspace = true
 
 [package.metadata.docs.rs]
 features = ["docs"]

crates/snapshots/Cargo.toml

@@ -30,10 +30,9 @@ tokio = { workspace = true, features = ["sync"] }
 tokio-stream = "0.1.8"
 
 [dev-dependencies]
-async-stream = "0.3.2"
 futures.workspace = true
 log.workspace = true
-simple_logger = { version = "5.0", default-features = false }
+simple_logger.workspace = true
 
 [build-dependencies]
 tonic-build.workspace = true

deny.toml

@@ -58,7 +58,7 @@ ignore = [
 # * Medium - CVSS Score 4.0 - 6.9
 # * High - CVSS Score 7.0 - 8.9
 # * Critical - CVSS Score 9.0 - 10.0
-#severity-threshold = 
+#severity-threshold =
 
 # This section is considered when running `cargo deny check licenses`
 # More documentation for the licenses section can be found here:
@@ -72,6 +72,7 @@ unlicensed = "deny"
 allow = [
     "MIT",
     "Apache-2.0",
+    "BSD-2-Clause",
     "BSD-3-Clause",
 ]
 # List of explictly disallowed licenses
@@ -170,8 +171,8 @@ deny = [
 skip = [
     #{ name = "ansi_term", version = "=0.11.0" },
 ]
-# Similarly to `skip` allows you to skip certain crates during duplicate 
-# detection. Unlike skip, it also includes the entire tree of transitive 
+# Similarly to `skip` allows you to skip certain crates during duplicate
+# detection. Unlike skip, it also includes the entire tree of transitive
 # dependencies starting at the specified crate, up to a certain depth, which is
 # by default infinite
 skip-tree = [

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.71"
+channel = "1.74"
 components = ["rustfmt", "clippy", "llvm-tools"]