From 694100fbbb9172ea60d616a6a36272f6823b1142 Mon Sep 17 00:00:00 2001 From: Ronald Holshausen Date: Tue, 23 Apr 2024 10:51:11 +1000 Subject: [PATCH] chore: Update pact_models to 1.2.0 --- compatibility-suite/Cargo.lock | 8 +- compatibility-suite/Cargo.toml | 2 +- rust/Cargo.lock | 123 +++++---------------------- rust/Cargo.toml | 1 - rust/pact_cli/Cargo.toml | 2 +- rust/pact_consumer/Cargo.toml | 4 +- rust/pact_ffi/Cargo.toml | 4 +- rust/pact_matching/Cargo.toml | 4 +- rust/pact_mock_server/Cargo.toml | 4 +- rust/pact_mock_server_cli/Cargo.toml | 2 +- rust/pact_verifier/Cargo.toml | 4 +- rust/pact_verifier_cli/Cargo.toml | 2 +- rust/pact_wasm/Cargo.toml | 2 +- 13 files changed, 38 insertions(+), 124 deletions(-) diff --git a/compatibility-suite/Cargo.lock b/compatibility-suite/Cargo.lock index aa6270f9b..3c315939a 100644 --- a/compatibility-suite/Cargo.lock +++ b/compatibility-suite/Cargo.lock @@ -1926,9 +1926,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pact-plugin-driver" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b90c953a1686e315043516d7996310cf98d5cd4ed8ec16bd1a142934796101" +checksum = "dafb1371bf02e0fa25212061d41cc5cbc4ad1116d1e988a86eede5e5bb338931" dependencies = [ "anyhow", "async-trait", @@ -2058,9 +2058,9 @@ dependencies = [ [[package]] name = "pact_models" -version = "1.1.18" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bac0a22137e661623246c4da170f3123ff9ead87644d1d16ceb6604c5752440" +checksum = "bf3bf784d5fc22d0332041fa8f9dd9992e0ce2b22236462847ca1b1377297e10" dependencies = [ "anyhow", "ariadne", diff --git a/compatibility-suite/Cargo.toml b/compatibility-suite/Cargo.toml index f273f4b13..5a04f8c2f 100644 --- a/compatibility-suite/Cargo.toml +++ b/compatibility-suite/Cargo.toml @@ -13,7 +13,7 @@ futures = "0.3.29" itertools = "0.12.1" lazy_static = "1.4.0" maplit = "1.0.2" -pact_models = { version = "~1.1.18" } +pact_models = { version = "~1.2.0" } pact_matching = { version = "1.1.9", path = "../rust/pact_matching" } pact_mock_server = { version = "1.2.6", path = "../rust/pact_mock_server" } pact_verifier = { version = "1.1.0", path = "../rust/pact_verifier" } diff --git a/rust/Cargo.lock b/rust/Cargo.lock index bd8f088c2..0148a49a4 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1867,9 +1867,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pact-plugin-driver" -version = "0.5.2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3129f385b5a3c100ea66f3efc7865186a0581585ca9704178d3b775657fff1d" +checksum = "dafb1371bf02e0fa25212061d41cc5cbc4ad1116d1e988a86eede5e5bb338931" dependencies = [ "anyhow", "async-trait", @@ -1886,49 +1886,7 @@ dependencies = [ "maplit", "md5", "os_info", - "pact_models 1.1.18", - "prost", - "prost-types", - "regex", - "reqwest 0.11.27", - "semver", - "serde", - "serde_json", - "sha2", - "sysinfo", - "tar", - "tokio", - "toml", - "tonic 0.10.2", - "tonic-build 0.10.2", - "tracing", - "tracing-core", - "uuid", - "zip", -] - -[[package]] -name = "pact-plugin-driver" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b90c953a1686e315043516d7996310cf98d5cd4ed8ec16bd1a142934796101" -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 1.1.18", + "pact_models 1.2.0", "prost", "prost-types", "regex", @@ -1941,8 +1899,8 @@ dependencies = [ "tar", "tokio", "toml", - "tonic 0.11.0", - "tonic-build 0.11.0", + "tonic", + "tonic-build", "tracing", "tracing-core", "uuid", @@ -1962,10 +1920,10 @@ dependencies = [ "itertools 0.12.1", "lazy_static", "maplit", - "pact-plugin-driver 0.6.0", + "pact-plugin-driver", "pact_matching", "pact_mock_server", - "pact_models 1.1.18", + "pact_models 1.2.0", "pretty_assertions", "quickcheck", "rand", @@ -2006,10 +1964,10 @@ dependencies = [ "multipart", "onig", "os_info", - "pact-plugin-driver 0.5.2", + "pact-plugin-driver", "pact_matching", "pact_mock_server", - "pact_models 1.1.18", + "pact_models 1.2.0", "pact_verifier", "panic-message", "pretty_assertions", @@ -2062,8 +2020,8 @@ dependencies = [ "nom", "ntest", "onig", - "pact-plugin-driver 0.6.0", - "pact_models 1.1.18", + "pact-plugin-driver", + "pact_models 1.2.0", "pretty_assertions", "quickcheck", "rand", @@ -2097,9 +2055,9 @@ dependencies = [ "itertools 0.12.1", "lazy_static", "maplit", - "pact-plugin-driver 0.6.0", + "pact-plugin-driver", "pact_matching", - "pact_models 1.1.18", + "pact_models 1.2.0", "quickcheck", "reqwest 0.12.4", "rustls 0.21.11", @@ -2135,7 +2093,7 @@ dependencies = [ "maplit", "pact_matching", "pact_mock_server", - "pact_models 1.1.18", + "pact_models 1.2.0", "quickcheck", "rand", "regex", @@ -2155,9 +2113,9 @@ dependencies = [ [[package]] name = "pact_models" -version = "1.1.18" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bac0a22137e661623246c4da170f3123ff9ead87644d1d16ceb6604c5752440" +checksum = "bf3bf784d5fc22d0332041fa8f9dd9992e0ce2b22236462847ca1b1377297e10" dependencies = [ "anyhow", "ariadne", @@ -2259,10 +2217,10 @@ dependencies = [ "lazy_static", "maplit", "mime", - "pact-plugin-driver 0.6.0", + "pact-plugin-driver", "pact_consumer", "pact_matching", - "pact_models 1.1.18", + "pact_models 1.2.0", "pretty_assertions", "quickcheck", "regex", @@ -2292,7 +2250,7 @@ dependencies = [ "junit-report", "log", "maplit", - "pact_models 1.1.18", + "pact_models 1.2.0", "pact_verifier", "regex", "reqwest 0.11.27", @@ -2746,7 +2704,6 @@ version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ - "async-compression", "base64 0.21.7", "bytes", "encoding_rs", @@ -2774,12 +2731,10 @@ dependencies = [ "system-configuration", "tokio", "tokio-rustls 0.24.1", - "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-streams", "web-sys", "winreg 0.50.0", ] @@ -3724,33 +3679,6 @@ dependencies = [ "winnow 0.6.6", ] -[[package]] -name = "tonic" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" -dependencies = [ - "async-stream", - "async-trait", - "axum", - "base64 0.21.7", - "bytes", - "h2", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.28", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost", - "tokio", - "tokio-stream", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tonic" version = "0.11.0" @@ -3778,19 +3706,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tonic-build" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" -dependencies = [ - "prettyplease", - "proc-macro2 1.0.81", - "prost-build", - "quote 1.0.36", - "syn 2.0.60", -] - [[package]] name = "tonic-build" version = "0.11.0" diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 52aa271dc..8025d6c49 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -10,4 +10,3 @@ resolver = "2" [patch.crates-io] onig = { git = "https://github.com/rust-onig/rust-onig", default-features = false } -#pact_models = { path = "pact_models" } diff --git a/rust/pact_cli/Cargo.toml b/rust/pact_cli/Cargo.toml index ea9a37b0e..184b0b838 100644 --- a/rust/pact_cli/Cargo.toml +++ b/rust/pact_cli/Cargo.toml @@ -17,7 +17,7 @@ exclude = [ clap = "2.31.2" serde_json = "1.0" serde = "1.0" -pact_models = { version = "~1.1.18", path = "../pact_models" } +pact_models = { version = "~1.2.0", path = "../pact_models" } pact_matching = { version = "~1.1.10", path = "../pact_matching" } anyhow = "1.0.40" log = "0.4.14" diff --git a/rust/pact_consumer/Cargo.toml b/rust/pact_consumer/Cargo.toml index 6d1ce532f..19c19da6e 100644 --- a/rust/pact_consumer/Cargo.toml +++ b/rust/pact_consumer/Cargo.toml @@ -31,8 +31,8 @@ lazy_static = "1.4.0" maplit = "1.0.2" pact_matching = { version = "~1.2.1", path = "../pact_matching", default-features = false } pact_mock_server = { version = "~1.2.6", path = "../pact_mock_server", default-features = false } -pact_models = { version = "~1.1.18", default-features = false } -pact-plugin-driver = { version = "~0.6.0", optional = true, default-features = false } +pact_models = { version = "~1.2.0", default-features = false } +pact-plugin-driver = { version = "~0.6.1", optional = true, default-features = false } regex = "1.10.4" serde_json = "1.0.115" tokio = { version = "1.37.0", features = ["full"] } diff --git a/rust/pact_ffi/Cargo.toml b/rust/pact_ffi/Cargo.toml index 9df0c521b..ed8a9fa41 100644 --- a/rust/pact_ffi/Cargo.toml +++ b/rust/pact_ffi/Cargo.toml @@ -32,8 +32,8 @@ multipart = { version = "0.18.0", default-features = false, features = ["client" onig = { version = "6.4.0", default-features = false } pact_matching = { version = "~1.2.1", path = "../pact_matching" } pact_mock_server = { version = "~1.2.6", path = "../pact_mock_server" } -pact_models = { version = "~1.1.18" } -pact-plugin-driver = { version = "~0.5.1" } +pact_models = { version = "~1.2.0" } +pact-plugin-driver = { version = "~0.6.1" } pact_verifier = { version = "~1.2.0", path = "../pact_verifier" } panic-message = "0.3.0" rand = "0.8.5" diff --git a/rust/pact_matching/Cargo.toml b/rust/pact_matching/Cargo.toml index fab503a89..08946b358 100644 --- a/rust/pact_matching/Cargo.toml +++ b/rust/pact_matching/Cargo.toml @@ -40,8 +40,8 @@ mime = "0.3.17" multer = { version = "3.0.0", features = ["all"], optional = true } nom = "7.1.3" onig = { version = "6.4.0", default-features = false } -pact_models = { version = "~1.1.18", default-features = false } -pact-plugin-driver = { version = "~0.6.0", optional = true, default-features = false } +pact_models = { version = "~1.2.0", default-features = false } +pact-plugin-driver = { version = "~0.6.1", optional = true, default-features = false } rand = "0.8.5" reqwest = { version = "0.12.3", default-features = false, features = ["rustls-tls-native-roots", "json"] } semver = "1.0.22" diff --git a/rust/pact_mock_server/Cargo.toml b/rust/pact_mock_server/Cargo.toml index 47e4aefdd..8fa991959 100644 --- a/rust/pact_mock_server/Cargo.toml +++ b/rust/pact_mock_server/Cargo.toml @@ -31,8 +31,8 @@ itertools = "0.12.1" lazy_static = "1.4.0" maplit = "1.0.2" pact_matching = { version = "~1.2.1", path = "../pact_matching", default-features = false } -pact_models = { version = "~1.1.18", default-features = false } -pact-plugin-driver = { version = "~0.6.0", optional = true, default-features = false } +pact_models = { version = "~1.2.0", default-features = false } +pact-plugin-driver = { version = "~0.6.1", optional = true, default-features = false } rustls = { version = "~0.21.10", optional = true } rustls-pemfile = { version = "1.0.4", optional = true } serde = { version = "1.0.197", features = ["derive"] } diff --git a/rust/pact_mock_server_cli/Cargo.toml b/rust/pact_mock_server_cli/Cargo.toml index d1c5665de..50212c9f4 100644 --- a/rust/pact_mock_server_cli/Cargo.toml +++ b/rust/pact_mock_server_cli/Cargo.toml @@ -33,7 +33,7 @@ log = "0.4.20" lazy_static = "1.4.0" pact_matching = { version = "~1.2.1", path = "../pact_matching", default-features = false } pact_mock_server = { version = "~1.2.6", path = "../pact_mock_server", default-features = false } -pact_models = { version = "~1.1.18", default-features = false } +pact_models = { version = "~1.2.0", default-features = false } rand = "0.8.5" regex = "1.10.2" reqwest = { version = "0.11.23", default-features = false, features = ["rustls-tls-native-roots", "blocking", "json"] } diff --git a/rust/pact_verifier/Cargo.toml b/rust/pact_verifier/Cargo.toml index be3dbc23f..3c0f0bd90 100644 --- a/rust/pact_verifier/Cargo.toml +++ b/rust/pact_verifier/Cargo.toml @@ -36,8 +36,8 @@ lazy_static = "1.4.0" maplit = "1.0.2" mime = "0.3.17" pact_matching = { version = "~1.2.1", path = "../pact_matching", default-features = false } -pact_models = { version = "~1.1.18", default-features = false } -pact-plugin-driver = { version = "~0.6.0", optional = true, default-features = false } +pact_models = { version = "~1.2.0", default-features = false } +pact-plugin-driver = { version = "~0.6.1", optional = true, default-features = false } regex = "1.10.4" reqwest = { version = "0.12.3", default-features = false, features = ["rustls-tls-native-roots", "blocking", "json"] } serde = "1.0.197" diff --git a/rust/pact_verifier_cli/Cargo.toml b/rust/pact_verifier_cli/Cargo.toml index 106a948ae..24db12136 100644 --- a/rust/pact_verifier_cli/Cargo.toml +++ b/rust/pact_verifier_cli/Cargo.toml @@ -29,7 +29,7 @@ env_logger = "0.11.2" junit-report = { version = "0.8.3", optional = true } log = "0.4.20" maplit = "1.0.2" -pact_models = { version = "~1.1.18", default-features = false } +pact_models = { version = "~1.2.0", default-features = false } pact_verifier = { version = "~1.2.0", path = "../pact_verifier", default-features = false } regex = "1.10.2" reqwest = { version = "0.11.23", default-features = false, features = ["rustls-tls-native-roots", "blocking", "json"] } diff --git a/rust/pact_wasm/Cargo.toml b/rust/pact_wasm/Cargo.toml index 743e79a4e..12cf27727 100644 --- a/rust/pact_wasm/Cargo.toml +++ b/rust/pact_wasm/Cargo.toml @@ -18,7 +18,7 @@ exclude = [ crate-type = ["cdylib", "rlib"] [dependencies] -pact_models = { version = "~1.1.18", path = "../pact_models" } +pact_models = { version = "~1.2.0", path = "../pact_models" } wasm-bindgen = "0.2.79" console_error_panic_hook = "0.1.7" console_log = { version = "0.2.0", features = ["color"] }