diff --git a/compatibility-suite/Cargo.toml b/compatibility-suite/Cargo.toml index 78f79b85..21d78e4a 100644 --- a/compatibility-suite/Cargo.toml +++ b/compatibility-suite/Cargo.toml @@ -15,7 +15,7 @@ lazy_static = "1.4.0" maplit = "1.0.2" pact_models = { version = "~1.2.2" } pact_matching = { version = "1.2.5", path = "../rust/pact_matching" } -pact_mock_server = { version = "1.2.8" } +pact_mock_server = { version = "1.2.9" } pact_verifier = { version = "1.2.2", path = "../rust/pact_verifier" } pact_consumer = { version = "1.2.2", path = "../rust/pact_consumer" } pretty_assertions = "1.4.0" diff --git a/rust/Cargo.lock b/rust/Cargo.lock index d77ac63a..b266c7a3 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -215,34 +215,6 @@ dependencies = [ "syn 2.0.71", ] -[[package]] -name = "axum" -version = "0.6.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" -dependencies = [ - "async-trait", - "axum-core 0.3.4", - "bitflags 1.3.2", - "bytes", - "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "sync_wrapper 0.1.2", - "tower", - "tower-layer", - "tower-service", -] - [[package]] name = "axum" version = "0.7.5" @@ -250,7 +222,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", - "axum-core 0.4.3", + "axum-core", "bytes", "futures-util", "http 1.1.0", @@ -270,23 +242,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "axum-core" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] - [[package]] name = "axum-core" version = "0.4.3" @@ -334,12 +289,6 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - [[package]] name = "beef" version = "0.5.2" @@ -566,12 +515,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - [[package]] name = "constant_time_eq" version = "0.3.0" @@ -1345,18 +1288,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "hyper-timeout" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" -dependencies = [ - "hyper 0.14.30", - "pin-project-lite", - "tokio", - "tokio-io-timeout", -] - [[package]] name = "hyper-timeout" version = "0.5.1" @@ -2030,48 +1961,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" -[[package]] -name = "pact-plugin-driver" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dafb1371bf02e0fa25212061d41cc5cbc4ad1116d1e988a86eede5e5bb338931" -dependencies = [ - "anyhow", - "async-trait", - "backtrace", - "bytes", - "chrono", - "flate2", - "futures-util", - "home", - "indicatif", - "itertools 0.12.1", - "lazy_static", - "log", - "maplit", - "md5", - "os_info", - "pact_models", - "prost 0.12.6", - "prost-types 0.12.6", - "regex", - "reqwest 0.12.5", - "semver", - "serde", - "serde_json", - "sha2", - "sysinfo", - "tar", - "tokio", - "toml", - "tonic 0.11.0", - "tonic-build 0.11.0", - "tracing", - "tracing-core", - "uuid", - "zip 0.6.6", -] - [[package]] name = "pact-plugin-driver" version = "0.7.0" @@ -2094,10 +1983,10 @@ dependencies = [ "md5", "os_info", "pact_models", - "prost 0.13.1", - "prost-types 0.13.1", + "prost", + "prost-types", "regex", - "reqwest 0.12.5", + "reqwest", "semver", "serde", "serde_json", @@ -2106,12 +1995,12 @@ dependencies = [ "tar", "tokio", "toml", - "tonic 0.12.0", - "tonic-build 0.12.0", + "tonic", + "tonic-build", "tracing", "tracing-core", "uuid", - "zip 2.1.3", + "zip", ] [[package]] @@ -2127,7 +2016,7 @@ dependencies = [ "itertools 0.13.0", "lazy_static", "maplit", - "pact-plugin-driver 0.7.0", + "pact-plugin-driver", "pact_matching", "pact_mock_server", "pact_models", @@ -2135,7 +2024,7 @@ dependencies = [ "quickcheck", "rand", "regex", - "reqwest 0.12.5", + "reqwest", "serde", "serde_json", "termsize", @@ -2173,7 +2062,7 @@ dependencies = [ "multipart", "onig", "os_info", - "pact-plugin-driver 0.7.0", + "pact-plugin-driver", "pact_matching", "pact_mock_server", "pact_models", @@ -2185,7 +2074,7 @@ dependencies = [ "rand_regex", "regex", "regex-syntax 0.6.29", - "reqwest 0.12.5", + "reqwest", "rstest 0.19.0", "serde", "serde_json", @@ -2230,12 +2119,12 @@ dependencies = [ "nom", "ntest", "onig", - "pact-plugin-driver 0.7.0", + "pact-plugin-driver", "pact_models", "pretty_assertions", "quickcheck", "rand", - "reqwest 0.12.5", + "reqwest", "rstest 0.19.0", "semver", "serde", @@ -2253,19 +2142,19 @@ dependencies = [ [[package]] name = "pact_mock_server" -version = "1.2.8" +version = "1.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c30ce7d0fb6daf3bd3d60ab0781ca618ac76f53354e48967a48b846f05288cf" +checksum = "392cbfdaa5a60b8edc1f53ae2cad06afce6a32a4f1667c53f4f2e342ed765539" dependencies = [ "anyhow", "bytes", "futures", "hyper 0.14.30", "hyper-rustls 0.24.2", - "itertools 0.12.1", + "itertools 0.13.0", "lazy_static", "maplit", - "pact-plugin-driver 0.6.1", + "pact-plugin-driver", "pact_matching", "pact_models", "rustls 0.21.12", @@ -2313,7 +2202,7 @@ dependencies = [ "rand_regex", "regex", "regex-syntax 0.6.29", - "reqwest 0.11.27", + "reqwest", "rstest 0.19.0", "semver", "serde", @@ -2348,14 +2237,14 @@ dependencies = [ "lazy_static", "maplit", "mime", - "pact-plugin-driver 0.7.0", + "pact-plugin-driver", "pact_consumer", "pact_matching", "pact_models", "pretty_assertions", "quickcheck", "regex", - "reqwest 0.12.5", + "reqwest", "serde", "serde_json", "serde_with", @@ -2385,7 +2274,7 @@ dependencies = [ "pact_models", "pact_verifier", "regex", - "reqwest 0.12.5", + "reqwest", "rstest 0.21.0", "serde_json", "strip-ansi-escapes", @@ -2436,29 +2325,6 @@ dependencies = [ "regex", ] -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core", - "subtle", -] - -[[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest", - "hmac", - "password-hash", - "sha2", -] - [[package]] name = "pbkdf2" version = "0.12.2" @@ -2632,16 +2498,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "prost" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" -dependencies = [ - "bytes", - "prost-derive 0.12.6", -] - [[package]] name = "prost" version = "0.13.1" @@ -2649,28 +2505,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" dependencies = [ "bytes", - "prost-derive 0.13.1", -] - -[[package]] -name = "prost-build" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" -dependencies = [ - "bytes", - "heck", - "itertools 0.12.1", - "log", - "multimap", - "once_cell", - "petgraph", - "prettyplease", - "prost 0.12.6", - "prost-types 0.12.6", - "regex", - "syn 2.0.71", - "tempfile", + "prost-derive", ] [[package]] @@ -2687,26 +2522,13 @@ dependencies = [ "once_cell", "petgraph", "prettyplease", - "prost 0.13.1", - "prost-types 0.13.1", + "prost", + "prost-types", "regex", "syn 2.0.71", "tempfile", ] -[[package]] -name = "prost-derive" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" -dependencies = [ - "anyhow", - "itertools 0.12.1", - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.71", -] - [[package]] name = "prost-derive" version = "0.13.1" @@ -2720,22 +2542,13 @@ dependencies = [ "syn 2.0.71", ] -[[package]] -name = "prost-types" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" -dependencies = [ - "prost 0.12.6", -] - [[package]] name = "prost-types" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cee5168b05f49d4b0ca581206eb14a7b22fafd963efe729ac48eb03266e25cc2" dependencies = [ - "prost 0.13.1", + "prost", ] [[package]] @@ -2951,47 +2764,6 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" -[[package]] -name = "reqwest" -version = "0.11.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" -dependencies = [ - "base64 0.21.7", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", - "hyper-rustls 0.24.2", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls 0.21.12", - "rustls-native-certs 0.6.3", - "rustls-pemfile 1.0.4", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 0.1.2", - "system-configuration", - "tokio", - "tokio-rustls 0.24.1", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg 0.50.0", -] - [[package]] name = "reqwest" version = "0.12.5" @@ -3035,7 +2807,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "winreg 0.52.0", + "winreg", ] [[package]] @@ -3635,27 +3407,6 @@ dependencies = [ "windows", ] -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "tar" version = "0.4.41" @@ -3816,16 +3567,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-macros" version = "2.3.0" @@ -3940,33 +3681,6 @@ dependencies = [ "winnow 0.6.13", ] -[[package]] -name = "tonic" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" -dependencies = [ - "async-stream", - "async-trait", - "axum 0.6.20", - "base64 0.21.7", - "bytes", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", - "hyper-timeout 0.4.1", - "percent-encoding", - "pin-project", - "prost 0.12.6", - "tokio", - "tokio-stream", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tonic" version = "0.12.0" @@ -3975,7 +3689,7 @@ checksum = "f738b6a169a29bca4e39656db89c44a08e09c5b700b896ee9e7459f0652e81dd" dependencies = [ "async-stream", "async-trait", - "axum 0.7.5", + "axum", "base64 0.22.1", "bytes", "h2 0.4.5", @@ -3983,11 +3697,11 @@ dependencies = [ "http-body 1.0.1", "http-body-util", "hyper 1.4.1", - "hyper-timeout 0.5.1", + "hyper-timeout", "hyper-util", "percent-encoding", "pin-project", - "prost 0.13.1", + "prost", "socket2", "tokio", "tokio-stream", @@ -3997,19 +3711,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tonic-build" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2" -dependencies = [ - "prettyplease", - "proc-macro2 1.0.86", - "prost-build 0.12.6", - "quote 1.0.36", - "syn 2.0.71", -] - [[package]] name = "tonic-build" version = "0.12.0" @@ -4018,7 +3719,7 @@ checksum = "690943cc223adcdd67bb597a2e573ead1b88e999ba37528fe8e6356bf44b29b6" dependencies = [ "prettyplease", "proc-macro2 1.0.86", - "prost-build 0.13.1", + "prost-build", "quote 1.0.36", "syn 2.0.71", ] @@ -4626,16 +4327,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "winreg" version = "0.52.0" @@ -4689,26 +4380,6 @@ dependencies = [ "syn 2.0.71", ] -[[package]] -name = "zip" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" -dependencies = [ - "aes", - "byteorder", - "bzip2", - "constant_time_eq 0.1.5", - "crc32fast", - "crossbeam-utils", - "flate2", - "hmac", - "pbkdf2 0.11.0", - "sha1", - "time", - "zstd 0.11.2+zstd.1.5.2", -] - [[package]] name = "zip" version = "2.1.3" @@ -4718,7 +4389,7 @@ dependencies = [ "aes", "arbitrary", "bzip2", - "constant_time_eq 0.3.0", + "constant_time_eq", "crc32fast", "crossbeam-utils", "deflate64", @@ -4728,14 +4399,14 @@ dependencies = [ "indexmap 2.2.6", "lzma-rs", "memchr", - "pbkdf2 0.12.2", + "pbkdf2", "rand", "sha1", "thiserror", "time", "zeroize", "zopfli", - "zstd 0.13.2", + "zstd", ] [[package]] @@ -4752,32 +4423,13 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" -dependencies = [ - "zstd-safe 5.0.2+zstd.1.5.2", -] - [[package]] name = "zstd" version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ - "zstd-safe 7.2.0", -] - -[[package]] -name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" -dependencies = [ - "libc", - "zstd-sys", + "zstd-safe", ] [[package]] diff --git a/rust/pact_consumer/Cargo.toml b/rust/pact_consumer/Cargo.toml index bfe88d0f..86812721 100644 --- a/rust/pact_consumer/Cargo.toml +++ b/rust/pact_consumer/Cargo.toml @@ -31,7 +31,7 @@ itertools = "0.13.0" lazy_static = "1.4.0" maplit = "1.0.2" pact_matching = { version = "~1.2.5", path = "../pact_matching", default-features = false } -pact_mock_server = { version = "~1.2.8", default-features = false } +pact_mock_server = { version = "~1.2.9", default-features = false } pact_models = { version = "~1.2.2", default-features = false } pact-plugin-driver = { version = "~0.7.0", optional = true, default-features = false } regex = "1.10.4" diff --git a/rust/pact_ffi/Cargo.toml b/rust/pact_ffi/Cargo.toml index d4cbcc96..8ac75f14 100644 --- a/rust/pact_ffi/Cargo.toml +++ b/rust/pact_ffi/Cargo.toml @@ -31,7 +31,7 @@ maplit = "1.0.2" multipart = { version = "0.18.0", default-features = false, features = ["client", "mock"] } onig = { version = "6.4.0", default-features = false } pact_matching = { version = "~1.2.5", path = "../pact_matching" } -pact_mock_server = { version = "~1.2.8" } +pact_mock_server = { version = "~1.2.9" } pact_models = { version = "~1.2.2" } pact-plugin-driver = { version = "~0.7.0" } pact_verifier = { version = "~1.2.2", path = "../pact_verifier" } diff --git a/rust/pact_models/Cargo.toml b/rust/pact_models/Cargo.toml index 55fe19a5..c613c41e 100644 --- a/rust/pact_models/Cargo.toml +++ b/rust/pact_models/Cargo.toml @@ -50,7 +50,7 @@ tracing = "0.1.40" # This needs to be the same version across all the libs (i.e. [target.'cfg(not(target_family = "wasm"))'.dependencies] fs2 = "0.4.3" onig = { version = "6.4.0", default-features = false } -reqwest = { version = "0.11.18", default-features = false, features = ["rustls-tls-native-roots", "blocking", "json"] } +reqwest = { version = "0.12.5", default-features = false, features = ["rustls-tls-native-roots", "blocking", "json"] } uuid = { version = "1.3.3", features = ["v4"] } [target.'cfg(target_family = "wasm")'.dependencies]