diff --git a/Cargo.lock b/Cargo.lock index 54d1a06c0ac17..7c6d9a558f16e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -124,7 +124,7 @@ source = "git+https://github.com/jorgecarleitao/arrow2.git#0ba4f8e21547ed08b4468 dependencies = [ "ahash", "arrow-format", - "base64", + "base64 0.13.1", "bytemuck", "chrono", "dyn-clone", @@ -266,7 +266,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.6", "libc", "winapi", ] @@ -675,12 +675,49 @@ dependencies = [ [[package]] name = "axum" -version = "0.6.1" -source = "git+https://github.com/tokio-rs/axum.git#978ae6335862b264b4368e01a52177d98c42b2d9" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1304eab461cf02bd70b083ed8273388f9724c549b316ba3d1e213ce0e9e7fb7e" +dependencies = [ + "async-trait", + "axum-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.20.0", + "bitflags", + "bytes", + "futures-util", + "headers", + "http", + "http-body", + "hyper", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sha1", + "sync_wrapper", + "tokio", + "tokio-tungstenite", + "tower", + "tower-http", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum" +version = "0.6.2" +source = "git+https://github.com/tokio-rs/axum.git#607a20dfaca3c04c25542076b818511280d66530" dependencies = [ "async-trait", - "axum-core", - "base64", + "axum-core 0.3.1 (git+https://github.com/tokio-rs/axum.git)", + "base64 0.20.0", "bitflags", "bytes", "futures-util", @@ -711,8 +748,25 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.3.0" -source = "git+https://github.com/tokio-rs/axum.git#978ae6335862b264b4368e01a52177d98c42b2d9" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f487e40dc9daee24d8a1779df88522f159a54a980f99cfbe43db0be0bd3444a8" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.3.1" +source = "git+https://github.com/tokio-rs/axum.git#607a20dfaca3c04c25542076b818511280d66530" dependencies = [ "async-trait", "bytes", @@ -763,6 +817,12 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" + [[package]] name = "base64-simd" version = "0.7.0" @@ -1090,27 +1150,37 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.20" +version = "3.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b71c3ce99b7611011217b366d923f1d0a7e07a92bb2dbf1e84508c673ca3bd" +checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" dependencies = [ - "atty", "bitflags", - "clap_derive", - "clap_lex", + "clap_lex 0.2.2", "indexmap", + "textwrap 0.16.0", +] + +[[package]] +name = "clap" +version = "4.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39" +dependencies = [ + "bitflags", + "clap_derive", + "clap_lex 0.3.1", + "is-terminal", "once_cell", "strsim", "termcolor", - "terminal_size", - "textwrap", + "terminal_size 0.2.3", ] [[package]] name = "clap_derive" -version = "3.2.18" +version = "4.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" dependencies = [ "heck", "proc-macro-error", @@ -1128,6 +1198,15 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "clap_lex" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" +dependencies = [ + "os_str_bytes", +] + [[package]] name = "cmake" version = "0.1.48" @@ -1184,7 +1263,7 @@ dependencies = [ "encode_unicode", "libc", "once_cell", - "terminal_size", + "terminal_size 0.1.17", "unicode-width", "winapi", ] @@ -1333,7 +1412,7 @@ dependencies = [ "atty", "cast", "ciborium", - "clap", + "clap 3.2.23", "criterion-plot", "futures", "itertools", @@ -2371,7 +2450,7 @@ version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6490be71f07a5f62b564bc58e36953f675833df11c7e4a0647bee7a07ca1ec5e" dependencies = [ - "base64", + "base64 0.13.1", "byteorder", "flate2", "nom", @@ -2384,7 +2463,7 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" dependencies = [ - "base64", + "base64 0.13.1", "bitflags", "bytes", "headers-core", @@ -2418,6 +2497,15 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + [[package]] name = "hex" version = "0.4.3" @@ -2660,12 +2748,34 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" +[[package]] +name = "io-lifetimes" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" +dependencies = [ + "libc", + "windows-sys", +] + [[package]] name = "ipnet" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" +[[package]] +name = "is-terminal" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" +dependencies = [ + "hermit-abi 0.2.6", + "io-lifetimes 1.0.4", + "rustix 0.36.6", + "windows-sys", +] + [[package]] name = "itertools" version = "0.10.5" @@ -2728,7 +2838,7 @@ version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09f4f04699947111ec1733e71778d763555737579e44b85844cae8e1940a1828" dependencies = [ - "base64", + "base64 0.13.1", "pem", "ring", "serde", @@ -2755,7 +2865,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d9455388f4977de4d0934efa9f7d36296295537d774574113a20f6082de03da" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "chrono", "http", @@ -2785,7 +2895,7 @@ version = "0.77.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e80db3ca107e89da5f7eae37ea5274e06cefdcf9689d0ebd5ec3575a6f983e4e" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "chrono", "dirs-next", @@ -3063,6 +3173,12 @@ version = "0.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + [[package]] name = "lock_api" version = "0.4.6" @@ -3266,7 +3382,7 @@ version = "0.29.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9006c95034ccf7b903d955f210469119f6c3477fc9c9e7a7845ce38a3e665c2a" dependencies = [ - "base64", + "base64 0.13.1", "bigdecimal", "bindgen", "bitflags", @@ -3302,8 +3418,8 @@ name = "mz" version = "0.0.0" dependencies = [ "anyhow", - "axum", - "clap", + "axum 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 4.0.32", "dirs", "indicatif", "mz-ore", @@ -3505,8 +3621,8 @@ name = "mz-clusterd" version = "0.40.0-dev" dependencies = [ "anyhow", - "axum", - "clap", + "axum 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 4.0.32", "fail", "futures", "mz-alloc", @@ -3538,7 +3654,7 @@ dependencies = [ "anyhow", "async-trait", "bytesize", - "clap", + "clap 4.0.32", "crossbeam-channel", "dec", "differential-dataflow", @@ -3644,12 +3760,12 @@ dependencies = [ "askama", "assert_cmd", "async-trait", - "axum", - "base64", + "axum 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.13.1", "bytes", "cc", "chrono", - "clap", + "clap 4.0.32", "datadriven", "fail", "fallible-iterator", @@ -3801,7 +3917,7 @@ name = "mz-frontegg-auth" version = "0.0.0" dependencies = [ "anyhow", - "base64", + "base64 0.13.1", "derivative", "jsonwebtoken", "mz-ore", @@ -3820,7 +3936,7 @@ version = "0.0.0" dependencies = [ "anyhow", "askama", - "axum", + "axum 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "headers", "include_dir", "mz-ore", @@ -3868,7 +3984,7 @@ version = "0.0.0" dependencies = [ "anyhow", "chrono", - "clap", + "clap 4.0.32", "crossbeam", "mz-avro", "mz-ccsr", @@ -3984,7 +4100,7 @@ dependencies = [ "anyhow", "async-trait", "chrono", - "clap", + "clap 4.0.32", "fail", "futures", "k8s-openapi", @@ -4035,7 +4151,7 @@ version = "0.0.0" dependencies = [ "anyhow", "async-trait", - "clap", + "clap 4.0.32", "futures-core", "http", "humantime", @@ -4061,7 +4177,7 @@ dependencies = [ "atty", "bytes", "chrono", - "clap", + "clap 4.0.32", "console-subscriber", "ctor", "either", @@ -4102,7 +4218,7 @@ dependencies = [ "aws-sdk-kinesis", "aws-types", "bytes", - "clap", + "clap 4.0.32", "futures", "mz-kinesis-util", "mz-ore", @@ -4127,7 +4243,7 @@ dependencies = [ "aws-smithy-http", "aws-smithy-types", "aws-types", - "base64", + "base64 0.13.1", "bytes", "deadpool-postgres", "differential-dataflow", @@ -4164,9 +4280,9 @@ dependencies = [ "anyhow", "async-stream", "async-trait", - "axum", + "axum 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "bytes", - "clap", + "clap 4.0.32", "criterion", "datadriven", "differential-dataflow", @@ -4243,7 +4359,7 @@ version = "0.0.0" dependencies = [ "anyhow", "bytes", - "clap", + "clap 4.0.32", "datadriven", "fallible-iterator", "mz-ore", @@ -4322,7 +4438,7 @@ version = "0.0.0" dependencies = [ "anyhow", "askama", - "axum", + "axum 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace", "bytesize", "cfg-if", @@ -4432,7 +4548,7 @@ dependencies = [ "aws-config", "aws-sdk-s3", "bytefmt", - "clap", + "clap 4.0.32", "futures", "indicatif", "mz-ore", @@ -4472,7 +4588,7 @@ dependencies = [ "anyhow", "async-stream", "async-trait", - "clap", + "clap 4.0.32", "crossbeam-channel", "futures", "http", @@ -4575,7 +4691,7 @@ dependencies = [ "anyhow", "bytes", "chrono", - "clap", + "clap 4.0.32", "fallible-iterator", "futures", "itertools", @@ -4656,7 +4772,7 @@ name = "mz-stash-debug" version = "0.28.0-dev" dependencies = [ "anyhow", - "clap", + "clap 4.0.32", "mz-adapter", "mz-build-info", "mz-ore", @@ -4685,7 +4801,7 @@ dependencies = [ "aws-sdk-sqs", "bytesize", "chrono", - "clap", + "clap 4.0.32", "crossbeam-channel", "csv-core", "datadriven", @@ -4837,7 +4953,7 @@ dependencies = [ "byteorder", "bytes", "chrono", - "clap", + "clap 4.0.32", "flate2", "futures", "globset", @@ -5104,7 +5220,7 @@ version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.6", "libc", ] @@ -5440,7 +5556,7 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9a3b09a20e374558580a4914d3b7d89bd61b954a5a5e1dcbea98753addb1947" dependencies = [ - "base64", + "base64 0.13.1", ] [[package]] @@ -5623,7 +5739,7 @@ name = "postgres-protocol" version = "0.6.4" source = "git+https://github.com/MaterializeInc/rust-postgres#9c9086235344fe794361a9985d97a64b42e61929" dependencies = [ - "base64", + "base64 0.13.1", "byteorder", "bytes", "fallible-iterator", @@ -5812,7 +5928,7 @@ dependencies = [ "byteorder", "hex", "lazy_static", - "rustix", + "rustix 0.35.13", ] [[package]] @@ -5908,7 +6024,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d378290cd658b119ce87621931ef448017ef1a0044d7b681159d779e7e07b8f6" dependencies = [ - "base64", + "base64 0.13.1", "prost", "prost-types", "serde", @@ -6154,7 +6270,7 @@ version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "encoding_rs", "futures-core", @@ -6276,9 +6392,23 @@ checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" dependencies = [ "bitflags", "errno", - "io-lifetimes", + "io-lifetimes 0.7.5", + "libc", + "linux-raw-sys 0.0.46", + "windows-sys", +] + +[[package]] +name = "rustix" +version = "0.36.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes 1.0.4", "libc", - "linux-raw-sys", + "linux-raw-sys 0.1.4", "windows-sys", ] @@ -6629,7 +6759,7 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25bf4a5a814902cd1014dbccfa4d4560fb8432c779471e96e035602519f82eef" dependencies = [ - "base64", + "base64 0.13.1", "chrono", "hex", "indexmap", @@ -7052,15 +7182,31 @@ dependencies = [ "winapi", ] +[[package]] +name = "terminal_size" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907" +dependencies = [ + "rustix 0.36.6", + "windows-sys", +] + [[package]] name = "textwrap" version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" dependencies = [ - "terminal_size", + "terminal_size 0.1.17", ] +[[package]] +name = "textwrap" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" + [[package]] name = "thiserror" version = "1.0.37" @@ -7417,8 +7563,8 @@ checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" dependencies = [ "async-stream", "async-trait", - "axum", - "base64", + "axum 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.13.1", "bytes", "futures-core", "futures-util", @@ -7480,7 +7626,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" dependencies = [ - "base64", + "base64 0.13.1", "bitflags", "bytes", "futures-core", @@ -7639,7 +7785,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" dependencies = [ - "base64", + "base64 0.13.1", "byteorder", "bytes", "http", @@ -7751,7 +7897,7 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b97acb4c28a254fd7a4aeec976c46a7fa404eac4d7c134b30c75144846d7cb8f" dependencies = [ - "base64", + "base64 0.13.1", "chunked_transfer", "log", "native-tls", @@ -8065,14 +8211,14 @@ dependencies = [ "aws-sigv4", "aws-smithy-http", "aws-types", - "axum", - "base64", + "axum 0.6.2 (git+https://github.com/tokio-rs/axum.git)", + "base64 0.13.1", "bstr", "byteorder", "bytes", "cc", "chrono", - "clap", + "clap 4.0.32", "criterion", "crossbeam-channel", "crossbeam-deque", @@ -8141,7 +8287,7 @@ dependencies = [ "smallvec", "socket2", "syn", - "textwrap", + "textwrap 0.15.0", "tikv-jemalloc-sys", "time", "time-macros", @@ -8218,3 +8364,8 @@ dependencies = [ "cc", "libc", ] + +[[patch.unused]] +name = "axum" +version = "0.6.1" +source = "git+https://github.com/tokio-rs/axum.git#978ae6335862b264b4368e01a52177d98c42b2d9" diff --git a/src/clusterd/Cargo.toml b/src/clusterd/Cargo.toml index 1f4def9b44de9..ff66d67032ef3 100644 --- a/src/clusterd/Cargo.toml +++ b/src/clusterd/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] anyhow = "1.0.66" axum = "0.6.1" -clap = { version = "3.2.20", features = ["derive", "env"] } +clap = { version = "4.0.32", features = ["derive", "env"] } fail = { version = "0.5.1", features = ["failpoints"] } futures = "0.3.25" mz-alloc = { path = "../alloc" } diff --git a/src/compute/Cargo.toml b/src/compute/Cargo.toml index 2e079b4300e74..eeb3157b65bec 100644 --- a/src/compute/Cargo.toml +++ b/src/compute/Cargo.toml @@ -10,7 +10,7 @@ publish = false anyhow = "1.0.66" async-trait = "0.1.59" bytesize = "1.1.0" -clap = { version = "3.2.20", features = ["derive", "env"] } +clap = { version = "4.0.32", features = ["derive", "env"] } crossbeam-channel = "0.5.6" dec = { version = "0.4.8", features = ["serde"] } differential-dataflow = { git = "https://github.com/TimelyDataflow/differential-dataflow.git" } diff --git a/src/environmentd/Cargo.toml b/src/environmentd/Cargo.toml index 26a693b9ebace..cd125306fd3b2 100644 --- a/src/environmentd/Cargo.toml +++ b/src/environmentd/Cargo.toml @@ -16,7 +16,7 @@ axum = { version = "0.6.1", features = ["headers", "ws"] } base64 = "0.13.1" bytes = "1.3.0" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.20", features = ["wrap_help", "env", "derive"] } +clap = { version = "4.0.32", features = ["wrap_help", "env", "derive"] } fail = { version = "0.5.1", features = ["failpoints"] } futures = "0.3.25" headers = "0.3.8" diff --git a/src/kafka-util/Cargo.toml b/src/kafka-util/Cargo.toml index 5d8a3cf4dce1e..cae08d3aec14f 100644 --- a/src/kafka-util/Cargo.toml +++ b/src/kafka-util/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] anyhow = "1.0.66" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.20", features = ["derive"] } +clap = { version = "4.0.32", features = ["derive"] } crossbeam = "0.8.2" mz-avro = { path = "../avro" } mz-ccsr = { path = "../ccsr" } diff --git a/src/mz/Cargo.toml b/src/mz/Cargo.toml index 3bdf941a38952..1df311c2b9b5a 100644 --- a/src/mz/Cargo.toml +++ b/src/mz/Cargo.toml @@ -10,7 +10,7 @@ publish = false [dependencies] anyhow = "1.0.66" axum = { version = "0.6.1" } -clap = { version = "3.2.20", features = [ "derive" ] } +clap = { version = "4.0.32", features = [ "derive" ] } dirs = "4.0.0" indicatif = "0.17.2" mz-ore = { path = "../ore", features = ["async"] } diff --git a/src/orchestrator-kubernetes/Cargo.toml b/src/orchestrator-kubernetes/Cargo.toml index 142f1aeee0b7e..ec38ec24a5e66 100644 --- a/src/orchestrator-kubernetes/Cargo.toml +++ b/src/orchestrator-kubernetes/Cargo.toml @@ -10,7 +10,7 @@ publish = false anyhow = "1.0.66" async-trait = "0.1.59" chrono = { version = "0.4.23", default-features = false } -clap = { version = "3.2.20", features = ["derive"] } +clap = { version = "4.0.32", features = ["derive"] } fail = { version = "0.5.1", features = ["failpoints"] } futures = "0.3.25" maplit = "1.0.2" diff --git a/src/orchestrator-tracing/Cargo.toml b/src/orchestrator-tracing/Cargo.toml index a5c632948ec4e..d8e6edd592c18 100644 --- a/src/orchestrator-tracing/Cargo.toml +++ b/src/orchestrator-tracing/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] anyhow = "1.0.66" async-trait = "0.1.59" -clap = { version = "3.2.20", features = ["env", "derive"] } +clap = { version = "4.0.32", features = ["env", "derive"] } futures-core = "0.3.21" http = "0.2.8" humantime = { version = "2.1.0", optional = true } diff --git a/src/ore/Cargo.toml b/src/ore/Cargo.toml index 8c5f308b56492..e9478aceada6e 100644 --- a/src/ore/Cargo.toml +++ b/src/ore/Cargo.toml @@ -18,7 +18,7 @@ anyhow = { version = "1.0.66", optional = true } async-trait = { version = "0.1.59", optional = true } bytes = { version = "1.3.0", optional = true } chrono = { version = "0.4.23", default-features = false, features = ["std"], optional = true } -clap = { version = "3.2.20", features = ["env"], optional = true } +clap = { version = "4.0.32", features = ["env"], optional = true } ctor = { version = "0.1.26", optional = true } either = "1.8.0" futures = { version = "0.3.25", optional = true } diff --git a/src/persist-client/Cargo.toml b/src/persist-client/Cargo.toml index 649c9defd8e79..825df557882ac 100644 --- a/src/persist-client/Cargo.toml +++ b/src/persist-client/Cargo.toml @@ -33,7 +33,7 @@ anyhow = { version = "1.0.66", features = ["backtrace"] } async-stream = "0.3.3" async-trait = "0.1.59" bytes = "1.3.0" -clap = { version = "3.2.20", features = [ "derive" ] } +clap = { version = "4.0.32", features = [ "derive" ] } differential-dataflow = { git = "https://github.com/TimelyDataflow/differential-dataflow.git" } futures = "0.3.25" futures-util = "0.3" @@ -64,7 +64,7 @@ tokio-console = ["mz-ore/tokio-console"] [dev-dependencies] async-trait = "0.1.59" axum = { version = "0.6.1" } -clap = { version = "3.2.20", features = ["derive", "env"] } +clap = { version = "4.0.32", features = ["derive", "env"] } criterion = { version = "0.4.0", features = ["html_reports"] } datadriven = { version = "0.6.0", features = ["async"] } futures-task = "0.3.21" diff --git a/src/pgtest/Cargo.toml b/src/pgtest/Cargo.toml index a3f0f2cd3e9c7..1fcb034281722 100644 --- a/src/pgtest/Cargo.toml +++ b/src/pgtest/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] anyhow = "1.0.66" bytes = "1.3.0" -clap = { version = "3.2.20", features = ["derive"] } +clap = { version = "4.0.32", features = ["derive"] } datadriven = "0.6.0" fallible-iterator = "0.2.0" mz-ore = { path = "../ore", features = ["cli"] } diff --git a/src/s3-datagen/Cargo.toml b/src/s3-datagen/Cargo.toml index d90776cf46f52..a64a267b58f16 100644 --- a/src/s3-datagen/Cargo.toml +++ b/src/s3-datagen/Cargo.toml @@ -11,7 +11,7 @@ anyhow = "1.0.66" aws-config = { version = "0.52.0", default-features = false, features = ["native-tls"] } aws-sdk-s3 = { version = "0.22.0", default-features = false, features = ["native-tls", "rt-tokio"] } bytefmt = "0.1.7" -clap = { version = "3.2.20", features = ["derive"] } +clap = { version = "4.0.32", features = ["derive"] } futures = "0.3.25" indicatif = "0.17.2" mz-ore = { path = "../ore", features = ["cli"] } diff --git a/src/service/Cargo.toml b/src/service/Cargo.toml index d8106ff3e8579..d25f98fffc651 100644 --- a/src/service/Cargo.toml +++ b/src/service/Cargo.toml @@ -10,7 +10,7 @@ publish = false anyhow = "1.0.66" async-stream = "0.3.3" async-trait = "0.1.59" -clap = { version = "3.2.20", features = ["env", "derive"] } +clap = { version = "4.0.32", features = ["env", "derive"] } crossbeam-channel = "0.5.6" futures = "0.3.25" http = "0.2.8" diff --git a/src/sqllogictest/Cargo.toml b/src/sqllogictest/Cargo.toml index fa025c808908f..32160f7b7f595 100644 --- a/src/sqllogictest/Cargo.toml +++ b/src/sqllogictest/Cargo.toml @@ -10,7 +10,7 @@ publish = false anyhow = "1.0.66" bytes = "1.3.0" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.20", features = ["derive"] } +clap = { version = "4.0.32", features = ["derive"] } fallible-iterator = "0.2.0" futures = "0.3.25" itertools = "0.10.5" diff --git a/src/stash-debug/Cargo.toml b/src/stash-debug/Cargo.toml index 4a28a4d426cf6..a0dfa7b10d175 100644 --- a/src/stash-debug/Cargo.toml +++ b/src/stash-debug/Cargo.toml @@ -8,7 +8,7 @@ publish = false [dependencies] anyhow = "1.0.66" -clap = { version = "3.2.20", features = ["derive", "env"] } +clap = { version = "4.0.32", features = ["derive", "env"] } mz-adapter = { path = "../adapter" } mz-build-info = { path = "../build-info" } mz-ore = { path = "../ore" } diff --git a/src/storage/Cargo.toml b/src/storage/Cargo.toml index 6bae6ba9cd4f0..d51f667a3091d 100644 --- a/src/storage/Cargo.toml +++ b/src/storage/Cargo.toml @@ -16,7 +16,7 @@ aws-sdk-s3 = { version = "0.22.0", default-features = false, features = ["native aws-sdk-sqs = { version = "0.22.0", default-features = false, features = ["native-tls", "rt-tokio"] } bytesize = "1.1.0" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.20", features = ["derive", "env"] } +clap = { version = "4.0.32", features = ["derive", "env"] } crossbeam-channel = { version = "0.5.6" } csv-core = { version = "0.1.10" } dec = "0.4.8" diff --git a/src/testdrive/Cargo.toml b/src/testdrive/Cargo.toml index 8121d555475fc..4b7fff15f2979 100644 --- a/src/testdrive/Cargo.toml +++ b/src/testdrive/Cargo.toml @@ -21,7 +21,7 @@ aws-types = { version = "0.52.0", features = ["hardcoded-credentials"] } byteorder = "1.4.3" bytes = "1.3.0" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.20", features = ["derive"] } +clap = { version = "4.0.32", features = ["derive"] } flate2 = "1.0.24" futures = "0.3.25" globset = "0.4.9" diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index 9c4ffe6cd4c76..7ca414b38d94e 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -26,7 +26,7 @@ bstr = { version = "0.2.14", features = ["serde1"] } byteorder = { version = "1.4.3" } bytes = { version = "1.3.0" } chrono = { git = "https://github.com/chronotope/chrono.git", branch = "0.4.x", default-features = false, features = ["alloc", "clock", "serde"] } -clap = { version = "3.2.20", features = ["derive", "env", "wrap_help"] } +clap = { version = "4.0.32", features = ["derive", "env", "wrap_help"] } criterion = { version = "0.4.0", features = ["async_tokio", "html_reports"] } crossbeam-channel = { version = "0.5.6" } crossbeam-deque = { version = "0.8.2" } @@ -124,7 +124,7 @@ byteorder = { version = "1.4.3" } bytes = { version = "1.3.0" } cc = { version = "1.0.78", default-features = false, features = ["parallel"] } chrono = { git = "https://github.com/chronotope/chrono.git", branch = "0.4.x", default-features = false, features = ["alloc", "clock", "serde"] } -clap = { version = "3.2.20", features = ["derive", "env", "wrap_help"] } +clap = { version = "4.0.32", features = ["derive", "env", "wrap_help"] } criterion = { version = "0.4.0", features = ["async_tokio", "html_reports"] } crossbeam-channel = { version = "0.5.6" } crossbeam-deque = { version = "0.8.2" } diff --git a/test/perf-kinesis/Cargo.toml b/test/perf-kinesis/Cargo.toml index 14e7a32ef3f3f..b7006d71a4fcd 100644 --- a/test/perf-kinesis/Cargo.toml +++ b/test/perf-kinesis/Cargo.toml @@ -12,7 +12,7 @@ aws-config = { version = "0.52.0", default-features = false, features = ["native aws-sdk-kinesis = { version = "0.22.0", default-features = false, features = ["native-tls", "rt-tokio"] } aws-types = "0.52.0" bytes = "1.3.0" -clap = { version = "3.2.20", features = ["derive"] } +clap = { version = "4.0.32", features = ["derive"] } futures = "0.3.25" mz-kinesis-util = { path = "../../src/kinesis-util" } mz-ore = { path = "../../src/ore", features = ["async"] }