diff --git a/Cargo.lock b/Cargo.lock index c461b4ed09e5a..4a56bc0835828 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -115,9 +115,9 @@ source = "git+https://github.com/jorgecarleitao/arrow2.git#0ba4f8e21547ed08b4468 dependencies = [ "ahash", "arrow-format", - "base64", + "base64 0.13.1", "bytemuck", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "dyn-clone", "either", "ethnum", @@ -701,12 +701,13 @@ dependencies = [ [[package]] name = "axum" -version = "0.6.1" -source = "git+https://github.com/tokio-rs/axum.git#978ae6335862b264b4368e01a52177d98c42b2d9" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fb79c228270dcf2426e74864cabc94babb5dbab01a4314e702d2f16540e1591" dependencies = [ "async-trait", - "axum-core", - "base64", + "axum-core 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.21.0", "bitflags", "bytes", "futures-util", @@ -735,10 +736,62 @@ dependencies = [ "tower-service", ] +[[package]] +name = "axum" +version = "0.6.10" +source = "git+https://github.com/tokio-rs/axum.git#fe9c4a0b5ba9c86c8b7913c1390962c73d32621c" +dependencies = [ + "async-trait", + "axum-core 0.3.3 (git+https://github.com/tokio-rs/axum.git)", + "base64 0.21.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-layer", + "tower-service", +] + [[package]] name = "axum-core" -version = "0.3.0" -source = "git+https://github.com/tokio-rs/axum.git#978ae6335862b264b4368e01a52177d98c42b2d9" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2f958c80c248b34b9a877a643811be8dbca03ca5ba827f2b63baf3a81e5fc4e" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.3.3" +source = "git+https://github.com/tokio-rs/axum.git#fe9c4a0b5ba9c86c8b7913c1390962c73d32621c" dependencies = [ "async-trait", "bytes", @@ -789,6 +842,12 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + [[package]] name = "base64-simd" version = "0.7.0" @@ -1035,8 +1094,21 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.23" -source = "git+https://github.com/chronotope/chrono.git?branch=0.4.x#a1591e91f3a6af50e3d642039bbed1042f300d5b" +version = "0.4.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +dependencies = [ + "iana-time-zone", + "num-integer", + "num-traits", + "serde", + "winapi", +] + +[[package]] +name = "chrono" +version = "0.4.24" +source = "git+https://github.com/chronotope/chrono.git?branch=0.4.x#daa86a77d36d74f474913fd3b560a40f1424bd77" dependencies = [ "iana-time-zone", "num-integer", @@ -1051,7 +1123,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa48fa079165080f11d7753fd0bc175b7d391f276b965fe4b55bfad67856e463" dependencies = [ - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "chrono-tz-build", "phf", "serde", @@ -2397,7 +2469,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", @@ -2410,7 +2482,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", @@ -2478,9 +2550,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -2524,9 +2596,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.23" +version = "0.14.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" dependencies = [ "bytes", "futures-channel", @@ -2693,9 +2765,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.1" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jobserver" @@ -2744,7 +2816,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", @@ -2771,9 +2843,9 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d9455388f4977de4d0934efa9f7d36296295537d774574113a20f6082de03da" dependencies = [ - "base64", + "base64 0.13.1", "bytes", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "http", "percent-encoding", "serde", @@ -2801,9 +2873,9 @@ version = "0.77.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e80db3ca107e89da5f7eae37ea5274e06cefdcf9689d0ebd5ec3575a6f983e4e" dependencies = [ - "base64", + "base64 0.13.1", "bytes", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "dirs-next", "either", "futures", @@ -2838,7 +2910,7 @@ version = "0.77.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fce686d2fbdaf6cb18d19cdb0692e9485dd9945f79f944b8772bdb2a07e8d39d" dependencies = [ - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "form_urlencoded", "http", "json-patch", @@ -2893,7 +2965,7 @@ version = "1.0.0" source = "git+https://github.com/MaterializeInc/rust-server-sdk#dcda26dad12a871795a6958ef238536c27c67164" dependencies = [ "built", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-channel", "data-encoding", "eventsource-client", @@ -2922,7 +2994,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c27dd31ce69c55fca526d1c22c2dcca96fd0c98e496529d37eeef6c41652173" dependencies = [ "base16ct", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "itertools", "lazy_static", "log", @@ -3212,7 +3284,7 @@ dependencies = [ "libc", "log", "wasi", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -3282,7 +3354,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", @@ -3318,7 +3390,7 @@ name = "mz" version = "0.1.0" dependencies = [ "anyhow", - "axum", + "axum 0.6.7", "clap", "dirs", "indicatif", @@ -3346,7 +3418,7 @@ dependencies = [ "anyhow", "bytes", "bytesize", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "const_format", "criterion", "datadriven", @@ -3436,7 +3508,7 @@ version = "0.7.0" dependencies = [ "anyhow", "byteorder", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "crc32fast", "digest", "enum-kinds", @@ -3570,7 +3642,7 @@ version = "0.0.0" dependencies = [ "anyhow", "async-trait", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "futures", "http", "itertools", @@ -3601,7 +3673,7 @@ name = "mz-clusterd" version = "0.45.0-dev" dependencies = [ "anyhow", - "axum", + "axum 0.6.7", "clap", "fail", "futures", @@ -3674,7 +3746,7 @@ dependencies = [ "async-stream", "async-trait", "bytesize", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "columnation", "differential-dataflow", "futures", @@ -3719,7 +3791,7 @@ name = "mz-controller" version = "0.0.0" dependencies = [ "anyhow", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "differential-dataflow", "futures", "mz-build-info", @@ -3752,12 +3824,12 @@ dependencies = [ "askama", "assert_cmd", "async-trait", - "axum", - "base64", + "axum 0.6.7", + "base64 0.13.1", "bytes", "bytesize", "cc", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "clap", "datadriven", "fail", @@ -3851,7 +3923,7 @@ dependencies = [ "anyhow", "bytes", "bytesize", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "criterion", "csv", "datadriven", @@ -3915,7 +3987,7 @@ name = "mz-frontegg-auth" version = "0.0.0" dependencies = [ "anyhow", - "base64", + "base64 0.13.1", "derivative", "jsonwebtoken", "mz-ore", @@ -3934,7 +4006,7 @@ version = "0.0.0" dependencies = [ "anyhow", "askama", - "axum", + "axum 0.6.7", "headers", "include_dir", "mz-ore", @@ -3952,7 +4024,7 @@ version = "0.0.0" dependencies = [ "anyhow", "byteorder", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "criterion", "differential-dataflow", "itertools", @@ -3981,7 +4053,7 @@ name = "mz-kafka-util" version = "0.0.0" dependencies = [ "anyhow", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "clap", "crossbeam", "mz-avro", @@ -4079,7 +4151,7 @@ dependencies = [ "anyhow", "async-trait", "bytesize", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "derivative", "futures-core", "mz-ore", @@ -4096,7 +4168,7 @@ version = "0.0.0" dependencies = [ "anyhow", "async-trait", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "clap", "fail", "futures", @@ -4121,7 +4193,7 @@ dependencies = [ "anyhow", "async-stream", "async-trait", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "futures", "hex", "itertools", @@ -4172,7 +4244,7 @@ dependencies = [ "async-trait", "atty", "bytes", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "clap", "console-subscriber", "ctor", @@ -4240,7 +4312,7 @@ dependencies = [ "aws-credential-types", "aws-sdk-s3", "aws-types", - "base64", + "base64 0.13.1", "bytes", "deadpool-postgres", "differential-dataflow", @@ -4279,7 +4351,7 @@ dependencies = [ "anyhow", "async-stream", "async-trait", - "axum", + "axum 0.6.7", "bytes", "clap", "criterion", @@ -4344,7 +4416,7 @@ version = "0.0.0" dependencies = [ "byteorder", "bytes", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "dec", "mz-ore", "mz-repr", @@ -4441,7 +4513,7 @@ version = "0.0.0" dependencies = [ "anyhow", "askama", - "axum", + "axum 0.6.7", "backtrace", "bytesize", "cfg-if", @@ -4491,7 +4563,7 @@ dependencies = [ "anyhow", "bitflags", "bytes", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "chrono-tz", "columnation", "criterion", @@ -4535,7 +4607,7 @@ dependencies = [ name = "mz-repr-test-util" version = "0.0.0" dependencies = [ - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "datadriven", "mz-lowertest", "mz-ore", @@ -4627,7 +4699,7 @@ dependencies = [ "aws-arn", "aws-sdk-sts", "bitflags", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "datadriven", "enum-kinds", "globset", @@ -4697,7 +4769,7 @@ version = "0.0.1" dependencies = [ "anyhow", "bytes", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "clap", "fallible-iterator", "futures", @@ -4807,7 +4879,7 @@ dependencies = [ "aws-sdk-s3", "aws-sdk-sqs", "bytesize", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "clap", "crossbeam-channel", "csv-core", @@ -4876,7 +4948,7 @@ dependencies = [ "aws-credential-types", "aws-types", "bytes", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "dec", "derivative", "differential-dataflow", @@ -4932,7 +5004,7 @@ name = "mz-test-util" version = "0.0.0" dependencies = [ "anyhow", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "mz-kafka-util", "mz-ore", "rand", @@ -4960,7 +5032,7 @@ dependencies = [ "aws-types", "byteorder", "bytes", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "clap", "flate2", "futures", @@ -5287,7 +5359,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" dependencies = [ "pathdiff", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -5505,7 +5577,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -5564,7 +5636,7 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9a3b09a20e374558580a4914d3b7d89bd61b954a5a5e1dcbea98753addb1947" dependencies = [ - "base64", + "base64 0.13.1", ] [[package]] @@ -5747,7 +5819,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", @@ -5765,7 +5837,7 @@ version = "0.2.4" source = "git+https://github.com/MaterializeInc/rust-postgres#9c9086235344fe794361a9985d97a64b42e61929" dependencies = [ "bytes", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "fallible-iterator", "postgres-protocol", "serde", @@ -6032,7 +6104,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", @@ -6278,7 +6350,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", @@ -6403,7 +6475,7 @@ dependencies = [ "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -6753,8 +6825,8 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25bf4a5a814902cd1014dbccfa4d4560fb8432c779471e96e035602519f82eef" dependencies = [ - "base64", - "chrono", + "base64 0.13.1", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "hex", "indexmap", "serde", @@ -7187,18 +7259,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" dependencies = [ "proc-macro2", "quote", @@ -7388,9 +7460,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.24.2" +version = "1.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb" +checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" dependencies = [ "autocfg", "bytes", @@ -7404,7 +7476,7 @@ dependencies = [ "socket2", "tokio-macros", "tracing", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -7541,8 +7613,8 @@ checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" dependencies = [ "async-stream", "async-trait", - "axum", - "base64", + "axum 0.6.7", + "base64 0.13.1", "bytes", "futures-core", "futures-util", @@ -7604,7 +7676,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", @@ -7763,7 +7835,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", @@ -7875,7 +7947,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", @@ -8128,47 +8200,71 @@ dependencies = [ "windows_x86_64_msvc", ] +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] name = "winreg" @@ -8189,13 +8285,13 @@ dependencies = [ "aws-sig-auth", "aws-sigv4", "aws-smithy-http", - "axum", - "base64", + "axum 0.6.10", + "base64 0.13.1", "bstr", "byteorder", "bytes", "cc", - "chrono", + "chrono 0.4.24 (git+https://github.com/chronotope/chrono.git?branch=0.4.x)", "clap", "criterion", "crossbeam-channel", @@ -8349,3 +8445,13 @@ dependencies = [ "cc", "libc", ] + +[[patch.unused]] +name = "axum" +version = "0.6.1" +source = "git+https://github.com/tokio-rs/axum.git#978ae6335862b264b4368e01a52177d98c42b2d9" + +[[patch.unused]] +name = "chrono" +version = "0.4.23" +source = "git+https://github.com/chronotope/chrono.git?branch=0.4.x#a1591e91f3a6af50e3d642039bbed1042f300d5b" diff --git a/src/adapter/Cargo.toml b/src/adapter/Cargo.toml index e5de135f1bc60..a32ad727ec114 100644 --- a/src/adapter/Cargo.toml +++ b/src/adapter/Cargo.toml @@ -64,7 +64,7 @@ tokio-stream = "0.1.11" tracing = "0.1.37" tracing-opentelemetry = { git = "https://github.com/MaterializeInc/tracing.git", branch = "v0.1.x" } tracing-subscriber = "0.3.16" -thiserror = "1.0.37" +thiserror = "1.0.39" uncased = "0.9.7" uuid = { version = "1.2.2", features = ["v4"] } workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/cluster-client/Cargo.toml b/src/cluster-client/Cargo.toml index d013f2c9c56e5..a1b5ab0165d6e 100644 --- a/src/cluster-client/Cargo.toml +++ b/src/cluster-client/Cargo.toml @@ -23,7 +23,7 @@ prost = { version = "0.11.3", features = ["no-recursion-limit"] } regex = "1.7.0" serde = { version = "1.0.152", features = ["derive"] } serde_json = "1.0.89" -thiserror = "1.0.37" +thiserror = "1.0.39" tokio = "1.24.2" tokio-stream = "0.1.11" tonic = "0.8.2" diff --git a/src/compute-client/Cargo.toml b/src/compute-client/Cargo.toml index 030e3ceccf4e8..893d189ef12d5 100644 --- a/src/compute-client/Cargo.toml +++ b/src/compute-client/Cargo.toml @@ -38,7 +38,7 @@ prost = { version = "0.11.3", features = ["no-recursion-limit"] } regex = "1.7.0" serde = { version = "1.0.152", features = ["derive"] } serde_json = "1.0.89" -thiserror = "1.0.37" +thiserror = "1.0.39" timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-features = false, features = ["bincode"] } tokio = "1.24.2" tokio-stream = "0.1.11" diff --git a/src/environmentd/Cargo.toml b/src/environmentd/Cargo.toml index 79a399c79af1e..f593094495a62 100644 --- a/src/environmentd/Cargo.toml +++ b/src/environmentd/Cargo.toml @@ -74,7 +74,7 @@ shell-words = "1.1.0" socket2 = "0.4.7" sysctl = "0.5.4" tempfile = "3.2.0" -thiserror = "1.0.37" +thiserror = "1.0.39" tokio = { version = "1.24.2", features = ["sync"] } tokio-openssl = "0.6.3" tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres" } diff --git a/src/frontegg-auth/Cargo.toml b/src/frontegg-auth/Cargo.toml index 36f641340a274..bb99c3b1bb89b 100644 --- a/src/frontegg-auth/Cargo.toml +++ b/src/frontegg-auth/Cargo.toml @@ -14,7 +14,7 @@ jsonwebtoken = "8.2.0" mz-ore = { path = "../ore", features = ["network"] } reqwest = { version = "0.11.13", features = ["json"] } serde = { version = "1.0.152", features = ["derive"] } -thiserror = "1.0.37" +thiserror = "1.0.39" tokio = { version = "1.24.2", features = ["macros"] } tracing = "0.1.37" uuid = { version = "1.2.2", features = ["serde"] } diff --git a/src/kafka-util/Cargo.toml b/src/kafka-util/Cargo.toml index 2695a5cb41a0f..ccd4a91e3a9a8 100644 --- a/src/kafka-util/Cargo.toml +++ b/src/kafka-util/Cargo.toml @@ -21,7 +21,7 @@ rdkafka = { git = "https://github.com/MaterializeInc/rust-rdkafka.git", features serde = { version = "1.0.152", features = ["derive"] } serde_json = "1.0.89" tokio = { version = "1.24.2", features = ["macros", "sync"] } -thiserror = "1.0.37" +thiserror = "1.0.39" tracing = "0.1.37" url = "2.3.1" workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/postgres-util/Cargo.toml b/src/postgres-util/Cargo.toml index b9e8f7ef00fa6..eb9a832961e4a 100644 --- a/src/postgres-util/Cargo.toml +++ b/src/postgres-util/Cargo.toml @@ -19,7 +19,7 @@ postgres-openssl = { git = "https://github.com/MaterializeInc/rust-postgres" } proptest = { git = "https://github.com/MaterializeInc/proptest.git", default-features = false, features = ["std"]} prost = { version = "0.11.3", features = ["no-recursion-limit"] } serde = { version = "1.0.152", features = ["derive"] } -thiserror = "1.0.37" +thiserror = "1.0.39" tokio = { version = "1.24.2", features = ["fs", "rt", "sync"] } tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres" } tracing = "0.1.37" diff --git a/src/repr/Cargo.toml b/src/repr/Cargo.toml index ede9f42f83fda..2067c73cbbded 100644 --- a/src/repr/Cargo.toml +++ b/src/repr/Cargo.toml @@ -47,7 +47,7 @@ url = { version = "2.3.1", features = ["serde"] } uuid = { version = "1.2.2", features = ["serde"] } proptest = { git = "https://github.com/MaterializeInc/proptest.git", default-features = false, features = ["std"] } proptest-derive = { git = "https://github.com/MaterializeInc/proptest.git", features = ["boxed_union"]} -thiserror = "1.0.37" +thiserror = "1.0.39" # for the tracing_ feature tracing = { version = "0.1.37", optional = true } diff --git a/src/sql/Cargo.toml b/src/sql/Cargo.toml index dfc15465870ad..0360c153439c3 100644 --- a/src/sql/Cargo.toml +++ b/src/sql/Cargo.toml @@ -43,7 +43,7 @@ regex = "1.7.0" reqwest = "0.11.13" serde = { version = "1.0.152", features = ["derive"] } serde_json = "1.0.89" -thiserror = "1.0.37" +thiserror = "1.0.39" tokio = { version = "1.24.2", features = ["fs"] } tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres", features = ["serde"] } tracing = "0.1.37" diff --git a/src/storage-client/Cargo.toml b/src/storage-client/Cargo.toml index 1e0dbddfc80cf..a6bdad7ab4db7 100644 --- a/src/storage-client/Cargo.toml +++ b/src/storage-client/Cargo.toml @@ -49,7 +49,7 @@ prost = { version = "0.11.3", features = ["no-recursion-limit"] } rdkafka = { git = "https://github.com/MaterializeInc/rust-rdkafka.git", features = ["cmake-build", "ssl-vendored", "libz-static", "zstd"] } regex = { version = "1.7.0" } serde = { version = "1.0.152", features = ["derive"] } -thiserror = "1.0.37" +thiserror = "1.0.39" timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-features = false, features = ["bincode"] } tokio = { version = "1.24.2", features = ["fs", "rt", "sync", "test-util"] } tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres", features = ["serde"] } diff --git a/src/storage/Cargo.toml b/src/storage/Cargo.toml index 1a953bacab45c..d3b0db2ebf854 100644 --- a/src/storage/Cargo.toml +++ b/src/storage/Cargo.toml @@ -64,7 +64,7 @@ tokio-stream = "0.1.11" tokio-util = { version = "0.7.4", features = ["io"] } tracing = "0.1.37" tracing-subscriber = "0.3.16" -thiserror = { version = "1.0.37" } +thiserror = { version = "1.0.39" } url = { version = "2.3.1", features = ["serde"] } uuid = { version = "1.2.2", features = ["serde", "v4"] } workspace-hack = { version = "0.0.0", path = "../workspace-hack" }