diff --git a/Cargo.lock b/Cargo.lock index 4b89cfd57..625331dfa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -300,7 +300,7 @@ dependencies = [ "bitflags 1.3.2", "bytes", "futures-util", - "http", + "http 0.2.11", "http-body", "hyper", "itoa", @@ -326,7 +326,7 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", + "http 0.2.11", "http-body", "mime", "rustversion", @@ -1432,7 +1432,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.11", "indexmap 1.9.3", "slab", "tokio", @@ -1593,13 +1593,24 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-api-problem" version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bce650a2c63171c9d92f95887c8d81154b77385301c8a581b9af96491f52d765" dependencies = [ - "http", + "http 0.2.11", "serde", "serde_json", ] @@ -1611,7 +1622,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.11", "pin-project-lite", ] @@ -1660,7 +1671,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.11", "http-body", "httparse", "httpdate", @@ -1680,7 +1691,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" dependencies = [ "futures-util", - "http", + "http 0.2.11", "hyper", "log", "rustls", @@ -1839,7 +1850,7 @@ dependencies = [ "futures", "git-version", "hex", - "http", + "http 1.0.0", "http-api-problem", "itertools 0.11.0", "janus_aggregator", @@ -1948,7 +1959,7 @@ dependencies = [ "derivative", "futures", "hex", - "http", + "http 1.0.0", "http-api-problem", "janus_aggregator_core", "janus_core", @@ -1992,7 +2003,7 @@ dependencies = [ "backoff", "derivative", "hex-literal", - "http", + "http 1.0.0", "itertools 0.11.0", "janus_core", "janus_messages 0.6.9", @@ -2050,7 +2061,7 @@ dependencies = [ "futures", "hex", "hpke-dispatch", - "http", + "http 1.0.0", "http-api-problem", "janus_core", "janus_messages 0.6.9", @@ -2093,7 +2104,7 @@ dependencies = [ "divviup-client", "futures", "hex", - "http", + "http 1.0.0", "itertools 0.11.0", "janus_aggregator", "janus_aggregator_core", @@ -2302,7 +2313,7 @@ dependencies = [ "either", "futures", "home", - "http", + "http 0.2.11", "http-body", "hyper", "hyper-rustls", @@ -2336,7 +2347,7 @@ checksum = "b5bba93d054786eba7994d03ce522f368ef7d48c88a1826faa28478d85fb63ae" dependencies = [ "chrono", "form_urlencoded", - "http", + "http 0.2.11", "k8s-openapi", "once_cell", "serde", @@ -2692,7 +2703,7 @@ checksum = "f24cda83b20ed2433c68241f918d0f6fdec8b1d43b7a9590ab4420c5095ca930" dependencies = [ "async-trait", "futures-core", - "http", + "http 0.2.11", "opentelemetry", "opentelemetry-proto", "opentelemetry-semantic-conventions", @@ -3393,7 +3404,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.11", "http-body", "hyper", "hyper-rustls", @@ -3428,7 +3439,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "128d55dc93b909e04874b53878316eb687633459706f8fc647de333cc0620caa" dependencies = [ "chrono", - "http", + "http 0.2.11", "thiserror", ] @@ -4669,7 +4680,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.11", "http-body", "hyper", "hyper-timeout", @@ -4696,7 +4707,7 @@ dependencies = [ "base64", "bytes", "h2", - "http", + "http 0.2.11", "http-body", "hyper", "hyper-timeout", @@ -4742,7 +4753,7 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "http", + "http 0.2.11", "http-body", "http-range-header", "mime", @@ -5134,7 +5145,7 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 0.2.11", "httparse", "log", "rand", diff --git a/aggregator/Cargo.toml b/aggregator/Cargo.toml index 4c319fcd0..db4582185 100644 --- a/aggregator/Cargo.toml +++ b/aggregator/Cargo.toml @@ -52,7 +52,7 @@ fixed = { version = "1.24", optional = true } futures = "0.3.30" git-version = "0.3.9" hex = { version = "0.4.3", features = ["serde"], optional = true } -http = "0.2.11" +http = "1.0.0" http-api-problem = "0.57.0" itertools.workspace = true janus_aggregator_api.workspace = true diff --git a/aggregator_core/Cargo.toml b/aggregator_core/Cargo.toml index c9297ebb9..43d56d5ec 100644 --- a/aggregator_core/Cargo.toml +++ b/aggregator_core/Cargo.toml @@ -24,7 +24,7 @@ deadpool-postgres = "0.12.1" derivative.workspace = true futures = "0.3.30" hex = { version = "0.4.3", features = ["serde"], optional = true } -http = "0.2.11" +http = "1.0.0" http-api-problem = "0.57.0" janus_core.workspace = true janus_messages.workspace = true diff --git a/client/Cargo.toml b/client/Cargo.toml index 9bc27de00..5674f5f0f 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -12,7 +12,7 @@ version.workspace = true [dependencies] backoff = { version = "0.4.0", features = ["tokio"] } derivative.workspace = true -http = "0.2.11" +http = "1.0.0" itertools.workspace = true janus_core.workspace = true janus_messages.workspace = true diff --git a/core/Cargo.toml b/core/Cargo.toml index 0f6cc54a2..a04241217 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -41,7 +41,7 @@ fixed = { version = "1.24", optional = true } futures = "0.3.30" hex = "0.4" hpke-dispatch = { version = "0.5.1", features = ["serde"] } -http = "0.2.11" +http = "1.0.0" http-api-problem = "0.57.0" janus_messages.workspace = true kube = { workspace = true, optional = true, features = ["rustls-tls"] } diff --git a/integration_tests/Cargo.toml b/integration_tests/Cargo.toml index f9c1b1cd3..2c62b0ed2 100644 --- a/integration_tests/Cargo.toml +++ b/integration_tests/Cargo.toml @@ -21,7 +21,7 @@ base64.workspace = true clap.workspace = true futures = "0.3.30" hex = "0.4" -http = "0.2" +http = "1.0" itertools.workspace = true janus_aggregator = { workspace = true, features = ["test-util"] } janus_aggregator_core = { workspace = true, features = ["test-util"] }