diff --git a/Cargo.lock b/Cargo.lock index fb2d80c602a41..d18b6a4c274a8 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", @@ -671,11 +671,11 @@ dependencies = [ [[package]] name = "axum" version = "0.6.1" -source = "git+https://github.com/tokio-rs/axum.git#71e83291e18056556a242d9e504911c0bfb1a917" +source = "git+https://github.com/tokio-rs/axum.git#978ae6335862b264b4368e01a52177d98c42b2d9" dependencies = [ "async-trait", "axum-core", - "base64", + "base64 0.13.1", "bitflags", "bytes", "futures-util", @@ -707,7 +707,7 @@ dependencies = [ [[package]] name = "axum-core" version = "0.3.0" -source = "git+https://github.com/tokio-rs/axum.git#71e83291e18056556a242d9e504911c0bfb1a917" +source = "git+https://github.com/tokio-rs/axum.git#978ae6335862b264b4368e01a52177d98c42b2d9" dependencies = [ "async-trait", "bytes", @@ -758,6 +758,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 = "base64ct" version = "1.5.1" @@ -2345,7 +2351,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", @@ -2358,7 +2364,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", @@ -2702,7 +2708,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", @@ -2729,7 +2735,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", @@ -2759,7 +2765,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", @@ -3246,7 +3252,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", @@ -3607,7 +3613,7 @@ dependencies = [ "assert_cmd", "async-trait", "axum", - "base64", + "base64 0.20.0", "bytes", "cc", "chrono", @@ -3765,7 +3771,7 @@ name = "mz-frontegg-auth" version = "0.0.0" dependencies = [ "anyhow", - "base64", + "base64 0.20.0", "derivative", "jsonwebtoken", "mz-ore", @@ -4089,7 +4095,7 @@ dependencies = [ "aws-smithy-http", "aws-smithy-types", "aws-types", - "base64", + "base64 0.20.0", "bytes", "deadpool-postgres", "differential-dataflow", @@ -5393,7 +5399,7 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9a3b09a20e374558580a4914d3b7d89bd61b954a5a5e1dcbea98753addb1947" dependencies = [ - "base64", + "base64 0.13.1", ] [[package]] @@ -5576,7 +5582,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", @@ -5861,7 +5867,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", @@ -6117,7 +6123,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", @@ -6592,7 +6598,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", @@ -7371,7 +7377,7 @@ dependencies = [ "async-stream", "async-trait", "axum", - "base64", + "base64 0.13.1", "bytes", "futures-core", "futures-util", @@ -7433,7 +7439,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", @@ -7592,7 +7598,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", @@ -7703,7 +7709,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", @@ -8018,7 +8024,7 @@ dependencies = [ "aws-smithy-http", "aws-types", "axum", - "base64", + "base64 0.20.0", "bstr", "byteorder", "bytes", diff --git a/src/environmentd/Cargo.toml b/src/environmentd/Cargo.toml index d2bb87cd51155..c9a2ef2b8f33c 100644 --- a/src/environmentd/Cargo.toml +++ b/src/environmentd/Cargo.toml @@ -13,7 +13,7 @@ anyhow = "1.0.66" askama = { version = "0.11.1", default-features = false, features = ["config", "serde-json"] } async-trait = "0.1.59" axum = { version = "0.6.1", features = ["headers", "ws"] } -base64 = "0.13.1" +base64 = "0.20.0" bytes = "1.3.0" chrono = { version = "0.4.23", default-features = false, features = ["std"] } clap = { version = "3.2.20", features = ["wrap_help", "env", "derive"] } diff --git a/src/frontegg-auth/Cargo.toml b/src/frontegg-auth/Cargo.toml index 1d7580eb6f1b1..20f10a2728297 100644 --- a/src/frontegg-auth/Cargo.toml +++ b/src/frontegg-auth/Cargo.toml @@ -8,7 +8,7 @@ publish = false [dependencies] anyhow = "1.0.66" -base64 = "0.13.1" +base64 = "0.20.0" derivative = "2.2.0" jsonwebtoken = "8.2.0" mz-ore = { path = "../ore", features = ["network"] } diff --git a/src/persist/Cargo.toml b/src/persist/Cargo.toml index 997d266de7c77..6546e9b92a05e 100644 --- a/src/persist/Cargo.toml +++ b/src/persist/Cargo.toml @@ -27,7 +27,7 @@ aws-sdk-s3 = { version = "0.21.0", default-features = false, features = ["native aws-smithy-http = "0.51.0" aws-smithy-types = "0.51.0" aws-types = { version = "0.51.0", features = ["hardcoded-credentials"] } -base64 = "0.13.1" +base64 = "0.20.0" bytes = "1.3.0" deadpool-postgres = "0.10.3" differential-dataflow = { git = "https://github.com/TimelyDataflow/differential-dataflow.git" } diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index f43fc29cf5876..8023d41673a44 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -21,7 +21,7 @@ aws-sigv4 = { version = "0.51.0", features = ["aws-smithy-eventstream", "bytes", aws-smithy-http = { version = "0.51.0", default-features = false, features = ["aws-smithy-eventstream", "event-stream", "rt-tokio", "tokio", "tokio-util"] } aws-types = { version = "0.51.0", default-features = false, features = ["hardcoded-credentials"] } axum = { git = "https://github.com/tokio-rs/axum.git", features = ["form", "headers", "http1", "json", "matched-path", "original-uri", "query", "tokio", "tower-log", "ws"] } -base64 = { version = "0.13.1", features = ["alloc", "std"] } +base64 = { version = "0.20.0", features = ["alloc", "std"] } bstr = { version = "0.2.14", features = ["lazy_static", "regex-automata", "serde", "serde1", "serde1-nostd", "std", "unicode"] } byteorder = { version = "1.4.3", features = ["std"] } bytes = { version = "1.3.0", features = ["std"] } @@ -120,7 +120,7 @@ aws-sigv4 = { version = "0.51.0", features = ["aws-smithy-eventstream", "bytes", aws-smithy-http = { version = "0.51.0", default-features = false, features = ["aws-smithy-eventstream", "event-stream", "rt-tokio", "tokio", "tokio-util"] } aws-types = { version = "0.51.0", default-features = false, features = ["hardcoded-credentials"] } axum = { git = "https://github.com/tokio-rs/axum.git", features = ["form", "headers", "http1", "json", "matched-path", "original-uri", "query", "tokio", "tower-log", "ws"] } -base64 = { version = "0.13.1", features = ["alloc", "std"] } +base64 = { version = "0.20.0", features = ["alloc", "std"] } bstr = { version = "0.2.14", features = ["lazy_static", "regex-automata", "serde", "serde1", "serde1-nostd", "std", "unicode"] } byteorder = { version = "1.4.3", features = ["std"] } bytes = { version = "1.3.0", features = ["std"] }