From 079a603b68a8d5a74bc1614bc35513783e425605 Mon Sep 17 00:00:00 2001 From: Tim Geoghegan Date: Wed, 22 Mar 2023 14:55:14 -0700 Subject: [PATCH] Bump Janus crate versions to 0.4.0 (#1141) * bump to 0.3.1 and work around cargo publish issue (#992) * bump crate versions to 0.3.1 * workaround for cargo dev-dependencies problem To work around a known issue with `cargo publish` ([1]), update all self-dependencies under dev-dependencies to use `path = "."` instead of a versioned crate, as `publish` insists on fetching from crates.io, despite a correctly versioned crate being available locally. [1]: https://github.com/rust-lang/cargo/issues/4242 * Bump Janus crate versions to 0.4.0 * Fix more self-dev-dependencies As in PR#992, we work around a `cargo publish` issue. --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 20 ++++++++++---------- aggregator/Cargo.toml | 2 +- aggregator_core/Cargo.toml | 2 +- core/Cargo.toml | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fef7f4ab7..611e3ec95 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1661,7 +1661,7 @@ checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "janus_aggregator" -version = "0.3.0" +version = "0.3.1" dependencies = [ "anyhow", "assert_matches", @@ -1781,14 +1781,14 @@ dependencies = [ [[package]] name = "janus_build_script_utils" -version = "0.3.0" +version = "0.3.1" dependencies = [ "zstd", ] [[package]] name = "janus_client" -version = "0.3.0" +version = "0.3.1" dependencies = [ "assert_matches", "backoff", @@ -1811,7 +1811,7 @@ dependencies = [ [[package]] name = "janus_collector" -version = "0.3.0" +version = "0.3.1" dependencies = [ "assert_matches", "backoff", @@ -1836,7 +1836,7 @@ dependencies = [ [[package]] name = "janus_core" -version = "0.3.0" +version = "0.3.1" dependencies = [ "assert_matches", "backoff", @@ -1874,7 +1874,7 @@ dependencies = [ [[package]] name = "janus_integration_tests" -version = "0.3.0" +version = "0.3.1" dependencies = [ "anyhow", "backoff", @@ -1906,7 +1906,7 @@ dependencies = [ [[package]] name = "janus_interop_binaries" -version = "0.3.0" +version = "0.3.1" dependencies = [ "anyhow", "backoff", @@ -1945,7 +1945,7 @@ dependencies = [ [[package]] name = "janus_messages" -version = "0.3.0" +version = "0.3.1" dependencies = [ "anyhow", "assert_matches", diff --git a/Cargo.toml b/Cargo.toml index 682cff8f6..0f260c09f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,22 +19,22 @@ homepage = "https://divviup.org" license = "MPL-2.0" repository = "https://github.com/divviup/janus" rust-version = "1.65.0" -version = "0.3.0" +version = "0.4.0" [workspace.dependencies] # Disable default features to disable compatibility with the old `time` crate, and we also don't # (yet) need other default features. # https://docs.rs/chrono/latest/chrono/#duration chrono = { version = "0.4", default-features = false } -janus_aggregator = { version = "0.3", path = "aggregator" } -janus_aggregator_core = { version = "0.3", path = "aggregator_core" } -janus_build_script_utils = { version = "0.3", path = "build_script_utils" } -janus_client = { version = "0.3", path = "client" } -janus_collector = { version = "0.3", path = "collector" } -janus_core = { version = "0.3", path = "core" } -janus_integration_tests = { version = "0.3", path = "integration_tests" } -janus_interop_binaries = { version = "0.3", path = "interop_binaries" } -janus_messages = { version = "0.3", path = "messages" } +janus_aggregator = { version = "0.4", path = "aggregator" } +janus_aggregator_core = { version = "0.4", path = "aggregator_core" } +janus_build_script_utils = { version = "0.4", path = "build_script_utils" } +janus_client = { version = "0.4", path = "client" } +janus_collector = { version = "0.4", path = "collector" } +janus_core = { version = "0.4", path = "core" } +janus_integration_tests = { version = "0.4", path = "integration_tests" } +janus_interop_binaries = { version = "0.4", path = "interop_binaries" } +janus_messages = { version = "0.4", path = "messages" } k8s-openapi = { version = "0.16.0", features = ["v1_24"] } # keep this version in sync with what is referenced by the indirect dependency via `kube` kube = { version = "0.75.0", default-features = false, features = ["client"] } prio = { version = "0.12.0", features = ["multithreaded"] } diff --git a/aggregator/Cargo.toml b/aggregator/Cargo.toml index 54215cfa9..9fae1260b 100644 --- a/aggregator/Cargo.toml +++ b/aggregator/Cargo.toml @@ -102,7 +102,7 @@ itertools = "0.10.5" # lack of support for connecting to servers by IP addresses, which affects many # Kubernetes clusters. Enable the `test-util` feature for various utilities # used in unit tests. -janus_aggregator = { workspace = true, features = ["fpvec_bounded_l2", "kube-openssl", "test-util"] } +janus_aggregator = { path = ".", features = ["fpvec_bounded_l2", "kube-openssl", "test-util"] } janus_aggregator_core = { workspace = true, features = ["test-util"] } mockito = "1.0.0" tempfile = "3.4.0" diff --git a/aggregator_core/Cargo.toml b/aggregator_core/Cargo.toml index 3246e817e..f98455b97 100644 --- a/aggregator_core/Cargo.toml +++ b/aggregator_core/Cargo.toml @@ -61,7 +61,7 @@ uuid = { version = "1.3.0", features = ["v4"] } [dev-dependencies] assert_matches = "1" hyper = "0.14.25" -janus_aggregator_core = { workspace = true, features = ["test-util"] } +janus_aggregator_core = { path = ".", features = ["test-util"] } janus_core = { workspace = true, features = ["test-util"] } serde_test = "1.0.158" tempfile = "3.4.0" diff --git a/core/Cargo.toml b/core/Cargo.toml index 2fe07191c..2329f61fc 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -61,7 +61,7 @@ tracing-subscriber = { version = "0.3", features = ["std", "env-filter", "fmt"], [dev-dependencies] fixed = "1.23" hex = { version = "0.4", features = ["serde"] } # ensure this remains compatible with the non-dev dependency -janus_core = { workspace = true, features = ["test-util"] } +janus_core = { path = ".", features = ["test-util"] } # Enable `kube`'s `openssl-tls` feature (which takes precedence over the # `rustls-tls` feature when creating a default client) to work around rustls's # lack of support for connecting to servers by IP addresses, which affects many