From cd9a8c22f4964f06875c24cb715d2f6530dff04e Mon Sep 17 00:00:00 2001 From: Pavlos Rontidis Date: Mon, 21 Aug 2023 14:23:25 -0400 Subject: [PATCH 1/3] fix(deps): fix [dev-dependencies] for some libs --- Cargo.lock | 1 + lib/codecs/Cargo.toml | 3 +++ lib/vector-config/Cargo.toml | 2 ++ lib/vector-core/Cargo.toml | 3 ++- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 8732cf28c6c5a..d614cbfc44443 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9730,6 +9730,7 @@ dependencies = [ "url", "vector-config-common", "vector-config-macros", + "vector-core", "vrl", ] diff --git a/lib/codecs/Cargo.toml b/lib/codecs/Cargo.toml index 25b26092ee45d..f94e958e001d9 100644 --- a/lib/codecs/Cargo.toml +++ b/lib/codecs/Cargo.toml @@ -38,6 +38,9 @@ futures = { version = "0.3", default-features = false } indoc = { version = "2", default-features = false } tokio = { version = "1", features = ["test-util"] } similar-asserts = "1.5.0" +similar-asserts = "1.4.2" +vrl = { version = "0.6.0", features = ["cli", "test", "test_framework", "arbitrary"] } +vector-core = { path = "../vector-core", default-features = false, features = ["test"] } [features] syslog = ["dep:syslog_loose"] diff --git a/lib/vector-config/Cargo.toml b/lib/vector-config/Cargo.toml index 71f86425f7df6..9f8fbd9027ca0 100644 --- a/lib/vector-config/Cargo.toml +++ b/lib/vector-config/Cargo.toml @@ -34,3 +34,5 @@ vector-config-macros = { path = "../vector-config-macros" } [dev-dependencies] assert-json-diff = { version = "2", default-features = false } serde_with = { version = "3.3.0", default-features = false, features = ["std", "macros"] } +serde_with = { version = "3.2.0", default-features = false, features = ["std", "macros"] } +vector-core = { path = "../vector-core", default-features = false, features = ["test"] } diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml index efa202d54450e..bfdad007d1c64 100644 --- a/lib/vector-core/Cargo.toml +++ b/lib/vector-core/Cargo.toml @@ -95,7 +95,8 @@ rand = "0.8.5" rand_distr = "0.4.3" tracing-subscriber = { version = "0.3.17", default-features = false, features = ["env-filter", "fmt", "ansi", "registry"] } vector-common = { path = "../vector-common", default-features = false, features = ["test"] } -vrl.workspace = true +vrl = { version = "0.6.0", features = ["cli", "test", "test_framework", "arbitrary"] } + [features] api = ["dep:async-graphql"] From fbc9ce3718717efde3921152fd04ea4f2a724697 Mon Sep 17 00:00:00 2001 From: Pavlos Rontidis Date: Mon, 21 Aug 2023 15:04:59 -0400 Subject: [PATCH 2/3] remove extra newline --- lib/vector-core/Cargo.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml index bfdad007d1c64..cdb242b16ab72 100644 --- a/lib/vector-core/Cargo.toml +++ b/lib/vector-core/Cargo.toml @@ -97,7 +97,6 @@ tracing-subscriber = { version = "0.3.17", default-features = false, features = vector-common = { path = "../vector-common", default-features = false, features = ["test"] } vrl = { version = "0.6.0", features = ["cli", "test", "test_framework", "arbitrary"] } - [features] api = ["dep:async-graphql"] default = [] From 8bc7af0fb327e96adfec389ce68e3aca53a87089 Mon Sep 17 00:00:00 2001 From: Pavlos Rontidis Date: Tue, 22 Aug 2023 11:00:00 -0400 Subject: [PATCH 3/3] fix bad rebase --- lib/codecs/Cargo.toml | 1 - lib/vector-config/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/lib/codecs/Cargo.toml b/lib/codecs/Cargo.toml index f94e958e001d9..a6319f6f7c2e8 100644 --- a/lib/codecs/Cargo.toml +++ b/lib/codecs/Cargo.toml @@ -38,7 +38,6 @@ futures = { version = "0.3", default-features = false } indoc = { version = "2", default-features = false } tokio = { version = "1", features = ["test-util"] } similar-asserts = "1.5.0" -similar-asserts = "1.4.2" vrl = { version = "0.6.0", features = ["cli", "test", "test_framework", "arbitrary"] } vector-core = { path = "../vector-core", default-features = false, features = ["test"] } diff --git a/lib/vector-config/Cargo.toml b/lib/vector-config/Cargo.toml index 9f8fbd9027ca0..147e2be98ea90 100644 --- a/lib/vector-config/Cargo.toml +++ b/lib/vector-config/Cargo.toml @@ -34,5 +34,4 @@ vector-config-macros = { path = "../vector-config-macros" } [dev-dependencies] assert-json-diff = { version = "2", default-features = false } serde_with = { version = "3.3.0", default-features = false, features = ["std", "macros"] } -serde_with = { version = "3.2.0", default-features = false, features = ["std", "macros"] } vector-core = { path = "../vector-core", default-features = false, features = ["test"] }