diff --git a/Cargo.lock b/Cargo.lock index 2c60faf2240e7..c4535a7b1c914 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -782,7 +782,7 @@ dependencies = [ "bytes 1.5.0", "hex", "http 0.2.9", - "hyper", + "hyper 0.14.27", "ring 0.16.20", "time", "tokio", @@ -827,7 +827,7 @@ dependencies = [ "aws-types", "bytes 1.5.0", "http 0.2.9", - "http-body", + "http-body 0.4.5", "lazy_static", "percent-encoding", "pin-project-lite", @@ -974,7 +974,7 @@ dependencies = [ "bytes-utils", "fastrand 1.9.0", "http 0.2.9", - "http-body", + "http-body 0.4.5", "once_cell", "percent-encoding", "regex", @@ -1139,7 +1139,7 @@ dependencies = [ "crc32fast", "hex", "http 0.2.9", - "http-body", + "http-body 0.4.5", "md-5", "pin-project-lite", "sha1", @@ -1160,8 +1160,8 @@ dependencies = [ "bytes 1.5.0", "fastrand 1.9.0", "http 0.2.9", - "http-body", - "hyper", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-rustls 0.23.2", "hyper-tls", "lazy_static", @@ -1193,8 +1193,8 @@ dependencies = [ "bytes-utils", "futures-core", "http 0.2.9", - "http-body", - "hyper", + "http-body 0.4.5", + "hyper 0.14.27", "once_cell", "percent-encoding", "pin-project-lite", @@ -1211,7 +1211,7 @@ dependencies = [ "aws-smithy-types", "bytes 1.5.0", "http 0.2.9", - "http-body", + "http-body 0.4.5", "pin-project-lite", "tower", "tracing 0.1.40", @@ -1290,13 +1290,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", - "axum-core", + "axum-core 0.3.4", "bitflags 1.3.2", "bytes 1.5.0", "futures-util", "http 0.2.9", - "http-body", - "hyper", + "http-body 0.4.5", + "hyper 0.14.27", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "202651474fe73c62d9e0a56c6133f7a0ff1dc1c8cf7a5b03381af2a26553ac9d" +dependencies = [ + "async-trait", + "axum-core 0.4.1", + "bytes 1.5.0", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", + "hyper-util", "itoa", "matchit", "memchr", @@ -1322,13 +1350,33 @@ dependencies = [ "bytes 1.5.0", "futures-util", "http 0.2.9", - "http-body", + "http-body 0.4.5", "mime", "rustversion", "tower-layer", "tower-service", ] +[[package]] +name = "axum-core" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77cb22c689c44d4c07b0ab44ebc25d69d8ae601a2f28fb8d672d344178fa17aa" +dependencies = [ + "async-trait", + "bytes 1.5.0", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper", + "tower-layer", + "tower-service", +] + [[package]] name = "azure_core" version = "0.17.0" @@ -1609,7 +1657,7 @@ dependencies = [ "hex", "home", "http 0.2.9", - "hyper", + "hyper 0.14.27", "hyper-rustls 0.24.2", "hyperlocal", "log", @@ -4182,6 +4230,29 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes 1.5.0", + "http 1.0.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" +dependencies = [ + "bytes 1.5.0", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "pin-project-lite", +] + [[package]] name = "http-range-header" version = "0.3.1" @@ -4249,7 +4320,7 @@ dependencies = [ "futures-util", "h2 0.3.22", "http 0.2.9", - "http-body", + "http-body 0.4.5", "httparse", "httpdate", "itoa", @@ -4261,6 +4332,25 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "403f9214f3e703236b221f1a9cd88ec8b4adfa5296de01ab96216361f4692f56" +dependencies = [ + "bytes 1.5.0", + "futures-channel", + "futures-util", + "h2 0.4.0", + "http 1.0.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "tokio", +] + [[package]] name = "hyper-openssl" version = "0.9.2" @@ -4268,7 +4358,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6ee5d7a8f718585d1c3c61dfde28ef5b0bb14734b4db13f5ada856cdc6c612b" dependencies = [ "http 0.2.9", - "hyper", + "hyper 0.14.27", "linked_hash_set", "once_cell", "openssl", @@ -4289,7 +4379,7 @@ dependencies = [ "futures 0.3.29", "headers", "http 0.2.9", - "hyper", + "hyper 0.14.27", "openssl", "tokio", "tokio-openssl", @@ -4303,7 +4393,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ "http 0.2.9", - "hyper", + "hyper 0.14.27", "log", "rustls 0.20.9", "rustls-native-certs", @@ -4319,7 +4409,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.9", - "hyper", + "hyper 0.14.27", "log", "rustls 0.21.8", "rustls-native-certs", @@ -4333,7 +4423,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper", + "hyper 0.14.27", "pin-project-lite", "tokio", "tokio-io-timeout", @@ -4346,12 +4436,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes 1.5.0", - "hyper", + "hyper 0.14.27", "native-tls", "tokio", "tokio-native-tls", ] +[[package]] +name = "hyper-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ca339002caeb0d159cc6e023dff48e199f081e42fa039895c7c6f38b37f2e9d" +dependencies = [ + "bytes 1.5.0", + "futures-channel", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "hyper 1.0.1", + "pin-project-lite", + "socket2 0.5.5", + "tokio", + "tower", + "tower-service", + "tracing 0.1.40", +] + [[package]] name = "hyperlocal" version = "0.8.0" @@ -4360,7 +4470,7 @@ checksum = "0fafdf7b2b2de7c9784f76e02c0935e65a8117ec3b768644379983ab333ac98c" dependencies = [ "futures-util", "hex", - "hyper", + "hyper 0.14.27", "pin-project", "tokio", ] @@ -4806,8 +4916,8 @@ dependencies = [ "either", "futures 0.3.29", "http 0.2.9", - "http-body", - "hyper", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-openssl", "hyper-timeout", "jsonpath_lib", @@ -7474,8 +7584,8 @@ dependencies = [ "futures-util", "h2 0.3.22", "http 0.2.9", - "http-body", - "hyper", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-rustls 0.24.2", "hyper-tls", "ipnet", @@ -9267,15 +9377,15 @@ checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ "async-stream", "async-trait", - "axum", + "axum 0.6.20", "base64 0.21.5", "bytes 1.5.0", "futures-core", "futures-util", "h2 0.3.22", "http 0.2.9", - "http-body", - "hyper", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-timeout", "percent-encoding", "pin-project", @@ -9298,14 +9408,14 @@ checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" dependencies = [ "async-stream", "async-trait", - "axum", + "axum 0.6.20", "base64 0.21.5", "bytes 1.5.0", "flate2", "h2 0.3.22", "http 0.2.9", - "http-body", - "hyper", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-timeout", "percent-encoding", "pin-project", @@ -9381,7 +9491,7 @@ dependencies = [ "futures-core", "futures-util", "http 0.2.9", - "http-body", + "http-body 0.4.5", "http-range-header", "mime", "pin-project-lite", @@ -9983,7 +10093,7 @@ dependencies = [ "aws-smithy-http-tower", "aws-smithy-types", "aws-types", - "axum", + "axum 0.7.2", "azure_core", "azure_identity", "azure_storage", @@ -10027,9 +10137,9 @@ dependencies = [ "hickory-proto", "hostname", "http 0.2.9", - "http-body", + "http-body 0.4.5", "http-serde", - "hyper", + "hyper 0.14.27", "hyper-openssl", "hyper-proxy", "indexmap 2.1.0", @@ -10630,7 +10740,7 @@ dependencies = [ "futures-util", "headers", "http 0.2.9", - "hyper", + "hyper 0.14.27", "log", "mime", "mime_guess", @@ -11045,7 +11155,7 @@ dependencies = [ "futures 0.3.29", "futures-timer", "http-types", - "hyper", + "hyper 0.14.27", "log", "once_cell", "regex", diff --git a/Cargo.toml b/Cargo.toml index 02ab8436775ea..92d418edead83 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -235,7 +235,7 @@ greptimedb-client = { git = "https://github.com/GreptimeTeam/greptimedb-client-r arc-swap = { version = "1.6", default-features = false, optional = true } async-compression = { version = "0.4.5", default-features = false, features = ["tokio", "gzip", "zstd"], optional = true } apache-avro = { version = "0.16.0", default-features = false, optional = true } -axum = { version = "0.6.20", default-features = false } +axum = { version = "0.7.2", default-features = false } base64 = { version = "0.21.5", default-features = false, optional = true } bloomy = { version = "1.2.0", default-features = false, optional = true } bollard = { version = "0.15.0", default-features = false, features = ["ssl", "chrono"], optional = true }