diff --git a/Cargo.lock b/Cargo.lock index 22b313be2..286bf78d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3315,11 +3315,10 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.5" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d805f96b7e61fce8728f142e213a3eb2f6b10538efff2d637c923efa4bfca048" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" dependencies = [ - "cfg-if", "once_cell", ] @@ -3493,9 +3492,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "7e267c18a719545b481171952a79f8c25c80361463ba44bc7fa9eba7c742ef4f" dependencies = [ "bytes", "futures-core", diff --git a/Cargo.toml b/Cargo.toml index 2e9ae6524..deb072453 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,3 +13,24 @@ codegen-units = 1 [profile.bench] lto = "fat" codegen-units = 1 + +[workspace.dependencies] +bytes = "1.0.0" +tokio-openssl = "0.6.2" +tokio = { version = "1.25.0", features = ["full", "macros"] } +itertools = "0.10.1" +openssl = { version = "0.10.36", features = ["vendored"] } +anyhow = "1.0.42" +serde = { version = "1.0.111", features = ["derive"] } +serde_yaml = "0.9.17" +uuid = { version = "1.0.0", features = ["serde", "v4"] } +reqwest = "0.11.6" +redis = { version = "0.22.0", features = ["tokio-comp", "cluster"] } +cdrs-tokio = { git = "https://github.com/krojew/cdrs-tokio", branch = "8.0-dev" } +cassandra-protocol = { git = "https://github.com/krojew/cdrs-tokio", branch = "8.0-dev" } +tracing = "0.1.15" +tracing-subscriber = { version = "0.3.1", features = ["env-filter", "json"] } +nix = "0.26.0" +serde_json = "1.0" +rcgen = "0.10.0" +subprocess = "0.2.7" diff --git a/shotover-proxy/Cargo.toml b/shotover-proxy/Cargo.toml index e8b0af0f2..cf494dcae 100644 --- a/shotover-proxy/Cargo.toml +++ b/shotover-proxy/Cargo.toml @@ -16,22 +16,22 @@ cassandra-cpp-driver-tests = ["test-helpers/cassandra-cpp-driver-tests"] [dependencies] pretty-hex = "0.3.0" hex = "0.4.3" -tokio = { version = "1.25.0", features = ["full", "macros"] } +tokio.workspace = true tokio-util = { version = "0.7.0" } tokio-stream = "0.1.2" -bytes = "1.0.0" +bytes.workspace = true bytes-utils = "0.1.1" futures = "0.3" async-trait = "0.1.30" clap = { version = "4.0.4", features = ["cargo", "derive"] } derivative = "2.1.1" -itertools = "0.10.1" +itertools.workspace = true rand = { version = "0.8.4" } rand_distr = "0.4.1" cached = "0.42" pin-project-lite = "0.2" -tokio-openssl = "0.6.2" -openssl = { version = "0.10.36", features = ["vendored"] } +tokio-openssl.workspace = true +openssl.workspace = true async-recursion = "1.0" governor = { version = "0.5.0", default-features = false, features = ["std", "jitter", "quanta"] } nonzero_ext = "0.3.0" @@ -40,33 +40,33 @@ split-iter = "0.1.0" # Error handling thiserror = "1.0" -anyhow = "1.0.31" +anyhow.workspace = true backtrace = "0.3.66" # Parsers #cql3-parser = "0.3.1" cql3-parser = { version = "0.3.1", git = "https://github.com/rukai/rust-cql3-parser", branch = "identifier_ref" } -serde = { version = "1.0.111", features = ["derive"] } -serde_json = "1.0" -serde_yaml = "0.9.17" +serde.workspace = true +serde_json.workspace = true +serde_yaml.workspace = true bincode = "1.3.1" num = { version = "0.4.0", features = ["serde"] } -uuid = { version = "1.0.0", features = ["serde", "v4"] } +uuid.workspace = true bigdecimal = {version ="0.3.0", features = ["serde"] } base64 = "0.21.0" #Observability metrics = "0.20.0" metrics-exporter-prometheus = "0.11.0" -tracing = { version = "0.1.15", features = ["release_max_level_info"] } -tracing-subscriber = { version = "0.3.1", features = ["env-filter", "json"] } +tracing.workspace = true +tracing-subscriber.workspace = true tracing-appender = "0.2.0" hyper = { version = "0.14.14", features = ["server"] } halfbrown = "0.1.11" # Transform dependencies redis-protocol = { version = "4.0.1", features = ["decode-mut"] } -cassandra-protocol = { git = "https://github.com/krojew/cdrs-tokio", branch = "8.0-dev" } +cassandra-protocol.workspace = true crc16 = "0.4.0" ordered-float = { version = "3.0.0", features = ["serde"] } @@ -81,7 +81,7 @@ generic-array = { version = "0.14", features = ["serde"] } [dev-dependencies] rayon = "1.5.1" criterion = { git = "https://github.com/shotover/criterion.rs", branch = "0.4.0-bench_with_input_fn", features = ["async_tokio"] } -redis = { version = "0.22.0", features = ["tokio-comp", "cluster"] } +redis.workspace = true pcap = "1.0.0" pktparse = { version = "0.7.0", features = ["serde"] } tls-parser = "0.11.0" @@ -89,9 +89,9 @@ serial_test = "1.0.0" cassandra-cpp = { version = "1.2.0" } test-helpers = { path = "../test-helpers", features = ["cassandra-cpp-driver-tests"] } hex-literal = "0.3.3" -nix = "0.26.0" -reqwest = "0.11.6" -cdrs-tokio = { git = "https://github.com/krojew/cdrs-tokio", branch = "8.0-dev" } +nix.workspace = true +reqwest.workspace = true +cdrs-tokio.workspace = true rstest = "0.16.0" rdkafka = { version = "0.29", features = ["cmake-build"] } diff --git a/test-helpers/Cargo.toml b/test-helpers/Cargo.toml index 93380ff33..f92885ac0 100644 --- a/test-helpers/Cargo.toml +++ b/test-helpers/Cargo.toml @@ -11,26 +11,26 @@ license = "Apache-2.0" cassandra-cpp-driver-tests = ["cassandra-cpp"] [dependencies] -tracing = "0.1.15" -subprocess = "0.2.7" -anyhow = "1.0.42" -rcgen = "0.10.0" -serde_yaml = "0.9.0" +tracing.workspace = true +subprocess.workspace = true regex = "1.7.0" tokio-bin-process = { path = "../tokio-bin-process" } -cdrs-tokio = { git = "https://github.com/krojew/cdrs-tokio", branch = "8.0-dev" } -cassandra-protocol = { git = "https://github.com/krojew/cdrs-tokio", branch = "8.0-dev" } +cdrs-tokio.workspace = true +cassandra-protocol.workspace = true cassandra-cpp = { version = "1.2.0", optional = true } -openssl = { version = "0.10.36", features = ["vendored"] } -bytes = "1.0.0" scylla = { version = "0.7.0", features = ["ssl"] } +openssl.workspace = true +bytes.workspace = true ordered-float = { version = "3.0.0", features = ["serde"] } -tokio = { version = "1.25.0", features = ["full", "macros"] } -uuid = { version = "1.0.0", features = ["serde", "v4"] } -redis = { version = "0.22.0", features = ["tokio-comp", "cluster"] } +tokio.workspace = true +uuid.workspace = true +redis.workspace = true tokio-io-timeout = "1.1.1" -tokio-openssl = "0.6.2" +tokio-openssl.workspace = true inferno = "0.11.13" -itertools = "0.10.1" -reqwest = "0.11.6" -tracing-subscriber = "0.3.16" +itertools.workspace = true +reqwest.workspace = true +tracing-subscriber.workspace = true +serde_yaml.workspace = true +anyhow.workspace = true +rcgen.workspace = true diff --git a/tokio-bin-process/Cargo.toml b/tokio-bin-process/Cargo.toml index 787d3bfcb..4ae635620 100644 --- a/tokio-bin-process/Cargo.toml +++ b/tokio-bin-process/Cargo.toml @@ -8,15 +8,15 @@ license = "Apache-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tracing = "0.1.15" -tracing-subscriber = { version = "0.3.1", features = ["env-filter", "json"] } -subprocess = "0.2.7" -anyhow = "1.0.42" -nix = "0.26.0" -rcgen = "0.10.0" -tokio = { version = "1.25.0", features = ["full", "macros"] } -serde = { version = "1.0.111", features = ["derive"] } -serde_json = "1.0.89" +tracing.workspace = true +tracing-subscriber.workspace = true +subprocess.workspace = true +anyhow.workspace = true +nix.workspace = true +rcgen.workspace = true +tokio.workspace = true +serde.workspace = true +serde_json.workspace = true nu-ansi-term = "0.46.0" -itertools = "0.10.1" +itertools.workspace = true once_cell = "1.16.0"