Upgrade to Axum 0.6.4

Now that tokio-rs/axum#1598 has been included in a release, we can resume tracking the official releases.
MaterializeInc · Feb 8, 2023 · bafb3e2 · bafb3e2
1 parent 06a2a95
commit bafb3e2
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 38 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -109,7 +109,6 @@ debug = 1
 #
 # The reasons for each of these overrides are listed in deny.toml.
 [patch.crates-io]
-axum = { git = "https://github.com/tokio-rs/axum.git" }
 chrono = { git = "https://github.com/chronotope/chrono.git", branch = "0.4.x" }
 csv = { git = "https://github.com/BurntSushi/rust-csv.git" }
 csv-core = { git = "https://github.com/BurntSushi/rust-csv.git" }

diff --git a/deny.toml b/deny.toml
@@ -146,10 +146,6 @@ license-files = [
 unknown-git = "deny"
 unknown-registry = "deny"
 allow-git = [
-    # Waiting on https://github.com/tokio-rs/axum/pull/1598 to make it into a
-    # release.
-    "https://github.com/tokio-rs/axum.git",
-
     # Waiting for a new release of strip-ansi-escapes that avoids the indirect
     # dependency on arrayvec v0.5.2 via a dependency on vte v0.10.1.
     "https://github.com/alacritty/vte",

diff --git a/src/clusterd/Cargo.toml b/src/clusterd/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 
 [dependencies]
 anyhow = "1.0.66"
-axum = "0.6.1"
+axum = "0.6.4"
 clap = { version = "3.2.20", features = ["derive", "env"] }
 fail = { version = "0.5.1", features = ["failpoints"] }
 futures = "0.3.25"

diff --git a/src/environmentd/Cargo.toml b/src/environmentd/Cargo.toml
@@ -12,7 +12,7 @@ publish = false
 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"] }
+axum = { version = "0.6.4", features = ["headers", "ws"] }
 base64 = "0.13.1"
 bytes = "1.3.0"
 bytesize = "1.1.0"

diff --git a/src/http-util/Cargo.toml b/src/http-util/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 [dependencies]
 askama = { version = "0.11.1", default-features = false, features = ["config", "serde-json"] }
 anyhow = "1.0.66"
-axum = { version = "0.6.1", features = ["headers"] }
+axum = { version = "0.6.4", features = ["headers"] }
 headers = "0.3.8"
 serde = "1.0.152"
 serde_json = { version = "1.0.89" }

diff --git a/src/mz/Cargo.toml b/src/mz/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 
 [dependencies]
 anyhow = "1.0.66"
-axum = { version = "0.6.1" }
+axum = { version = "0.6.4" }
 clap = { version = "3.2.20", features = [ "derive" ] }
 dirs = "4.0.0"
 indicatif = "0.17.2"

diff --git a/src/persist-client/Cargo.toml b/src/persist-client/Cargo.toml
@@ -62,7 +62,7 @@ tokio-console = ["mz-ore/tokio-console"]
 
 [dev-dependencies]
 async-trait = "0.1.59"
-axum = { version = "0.6.1" }
+axum = { version = "0.6.4" }
 clap = { version = "3.2.20", features = ["derive", "env"] }
 criterion = { version = "0.4.0", features = ["html_reports"] }
 datadriven = { version = "0.6.0", features = ["async"] }

diff --git a/src/prof/Cargo.toml b/src/prof/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 [dependencies]
 askama = { version = "0.11.1", default-features = false, features = ["config", "serde-json"] }
 anyhow = "1.0.66"
-axum = { version = "0.6.1", features = ["headers"] }
+axum = { version = "0.6.4", features = ["headers"] }
 backtrace = "0.3.66"
 bytesize = "1.1.0"
 cfg-if = "1.0.0"

diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml
@@ -20,7 +20,7 @@ aws-sdk-sts = { version = "0.23.0", default-features = false, features = ["nativ
 aws-sig-auth = { version = "0.53.0", default-features = false, features = ["sign-eventstream"] }
 aws-sigv4 = { version = "0.53.0", features = ["sign-eventstream"] }
 aws-smithy-http = { version = "0.53.1", default-features = false, features = ["event-stream", "rt-tokio"] }
-axum = { git = "https://github.com/tokio-rs/axum.git", features = ["headers", "ws"] }
+axum = { version = "0.6.4", features = ["headers", "ws"] }
 base64 = { version = "0.13.1", features = ["alloc"] }
 bstr = { version = "0.2.14", features = ["serde1"] }
 byteorder = { version = "1.4.3" }
@@ -117,7 +117,7 @@ aws-sdk-sts = { version = "0.23.0", default-features = false, features = ["nativ
 aws-sig-auth = { version = "0.53.0", default-features = false, features = ["sign-eventstream"] }
 aws-sigv4 = { version = "0.53.0", features = ["sign-eventstream"] }
 aws-smithy-http = { version = "0.53.1", default-features = false, features = ["event-stream", "rt-tokio"] }
-axum = { git = "https://github.com/tokio-rs/axum.git", features = ["headers", "ws"] }
+axum = { version="0.6.4", features = ["headers", "ws"] }
 base64 = { version = "0.13.1", features = ["alloc"] }
 bstr = { version = "0.2.14", features = ["serde1"] }
 byteorder = { version = "1.4.3" }