diff --git a/Cargo.lock b/Cargo.lock index 512ba45b4..5f1306700 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -102,7 +102,7 @@ dependencies = [ "encoding_rs", "flate2", "futures-core", - "h2", + "h2 0.3.26", "http 0.2.9", "httparse", "httpdate", @@ -436,6 +436,12 @@ dependencies = [ "syn 2.0.85", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "atty" version = "0.2.14" @@ -1523,6 +1529,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.0.0", + "indexmap 2.6.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "hamcrest2" version = "0.3.0" @@ -1639,6 +1664,19 @@ dependencies = [ "http 1.0.0", ] +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "pin-project-lite", +] + [[package]] name = "http-range" version = "0.1.5" @@ -1673,7 +1711,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.9", "http-body 0.4.5", "httparse", @@ -1694,8 +1732,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75" dependencies = [ "bytes", + "futures-channel", + "futures-util", + "h2 0.4.6", "http 1.0.0", "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", "pin-project-lite", "tokio", ] @@ -1727,6 +1771,22 @@ dependencies = [ "tokio-native-tls", ] +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "hyper 1.1.0", + "pin-project-lite", + "socket2 0.5.3", + "tokio", +] + [[package]] name = "iana-time-zone" version = "0.1.57" @@ -2094,20 +2154,26 @@ dependencies = [ [[package]] name = "mockito" -version = "0.31.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80f9fece9bd97ab74339fe19f4bcaf52b76dcc18e5364c7977c1838f76b38de9" +checksum = "652cd6d169a36eaf9d1e6bce1a221130439a966d7f27858af66a33a66e9c4ee2" dependencies = [ "assert-json-diff", + "bytes", "colored", - "httparse", - "lazy_static", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.1.0", + "hyper-util", "log", "rand 0.8.5", "regex", "serde_json", "serde_urlencoded", "similar", + "tokio", ] [[package]] @@ -2853,7 +2919,7 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.9", "http-body 0.4.5", "hyper 0.14.28", diff --git a/cincinnati/Cargo.toml b/cincinnati/Cargo.toml index 17aa48dce..fcdf7c111 100644 --- a/cincinnati/Cargo.toml +++ b/cincinnati/Cargo.toml @@ -47,7 +47,7 @@ similar = { version = "2.6.0", optional = true } thiserror = "1.0" [dev-dependencies] -mockito = "0.31.1" +mockito = "1.6.1" serde_json = "1.0.109" memchr = "^2.7" pretty_assertions = "1.4.1" diff --git a/policy-engine/Cargo.toml b/policy-engine/Cargo.toml index d64018601..da9e3219e 100644 --- a/policy-engine/Cargo.toml +++ b/policy-engine/Cargo.toml @@ -38,4 +38,4 @@ built = { version = "^0.7.4", features = [ "git2" ]} [dev-dependencies] tokio = { version = "1.33", features = [ "rt-multi-thread" ] } memchr = "^2.7" -mockito = "0.31.1" +mockito = "1.6.1"