diff --git a/editoast/Cargo.lock b/editoast/Cargo.lock index abedfb885da..da6e4462144 100644 --- a/editoast/Cargo.lock +++ b/editoast/Cargo.lock @@ -454,8 +454,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" dependencies = [ "async-trait", - "axum-core", - "axum-macros", + "axum-core 0.4.5", "bytes", "futures-util", "http 1.2.0", @@ -464,10 +463,9 @@ dependencies = [ "hyper 1.5.2", "hyper-util", "itoa", - "matchit", + "matchit 0.7.3", "memchr", "mime", - "multer", "percent-encoding", "pin-project-lite", "rustversion", @@ -483,6 +481,35 @@ dependencies = [ "tracing", ] +[[package]] +name = "axum" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d6fd624c75e18b3b4c6b9caf42b1afe24437daaee904069137d8bab077be8b8" +dependencies = [ + "axum-core 0.5.0", + "axum-macros", + "bytes", + "futures-util", + "http 1.2.0", + "http-body 1.0.1", + "http-body-util", + "itoa", + "matchit 0.8.4", + "memchr", + "mime", + "multer", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper 1.0.2", + "tower 0.5.2", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "axum-core" version = "0.4.5" @@ -504,14 +531,34 @@ dependencies = [ "tracing", ] +[[package]] +name = "axum-core" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df1362f362fd16024ae199c1970ce98f9661bf5ef94b9808fee734bc3698b733" +dependencies = [ + "bytes", + "futures-util", + "http 1.2.0", + "http-body 1.0.1", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 1.0.2", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "axum-extra" version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c794b30c904f0a1c2fb7740f7df7f7972dfaa14ef6f57cb6178dc63e5dca2f04" dependencies = [ - "axum", - "axum-core", + "axum 0.7.9", + "axum-core 0.4.5", "bytes", "futures-util", "headers", @@ -528,9 +575,9 @@ dependencies = [ [[package]] name = "axum-macros" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce" +checksum = "604fde5e028fea851ce1d8570bbdc034bec850d157f7569d10f347d06808c05c" dependencies = [ "proc-macro2", "quote", @@ -546,7 +593,7 @@ dependencies = [ "anyhow", "assert-json-diff", "auto-future", - "axum", + "axum 0.7.9", "bytes", "bytesize", "cookie", @@ -572,7 +619,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04637ce1dedc9d655e5a566ded972e1cc48967282719ea7cd1ef338257cf1d3c" dependencies = [ - "axum", + "axum 0.7.9", "futures-core", "futures-util", "http 1.2.0", @@ -1239,7 +1286,7 @@ dependencies = [ "anyhow", "async-std", "async-trait", - "axum", + "axum 0.8.1", "axum-extra", "axum-test", "axum-tracing-opentelemetry", @@ -2627,6 +2674,12 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +[[package]] +name = "matchit" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" + [[package]] name = "md-5" version = "0.10.6" @@ -4102,7 +4155,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd34f36fe4c5ba9654417139a9b3a20d2e1de6012ee678ad14d240c22c78d8d6" dependencies = [ - "axum", + "axum 0.7.9", "futures 0.3.31", "percent-encoding", "serde", @@ -4652,7 +4705,7 @@ checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" dependencies = [ "async-stream", "async-trait", - "axum", + "axum 0.7.9", "base64 0.22.1", "bytes", "h2 0.4.7", diff --git a/editoast/Cargo.toml b/editoast/Cargo.toml index 70d6615c0f1..f7c1d9f502d 100644 --- a/editoast/Cargo.toml +++ b/editoast/Cargo.toml @@ -94,7 +94,7 @@ uuid = { version = "1.11.0", features = ["serde", "v4"] } [dependencies] anyhow = "1.0" async-trait = "0.1.84" -axum = { version = "0.7.9", default-features = false, features = [ +axum = { version = "0.8.1", default-features = false, features = [ "multipart", "tracing", ] } @@ -197,7 +197,7 @@ validator = { version = "0.19.0", features = ["derive"] } [dev-dependencies] async-std = { version = "1.13.0", features = ["attributes", "tokio1"] } -axum = { version = "0.7.9", default-features = false, features = [ +axum = { version = "0.8.1", default-features = false, features = [ "macros", "multipart", "tracing",