Skip to content

Commit 783aec9

Browse files
SamirTalwarhasura-bot
authored andcommitted
Move all dependency versions into the workspace file. (#734)
This keeps versions in one place so we can more easily ensure we upgrade crates together. V3_GIT_ORIGIN_REV_ID: 6a929bb6196c19a1f66a768585b669127035e9be
1 parent cf84e32 commit 783aec9

File tree

20 files changed

+259
-199
lines changed

20 files changed

+259
-199
lines changed

v3/Cargo.toml

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,79 @@ used_underscore_binding = "allow"
4242

4343
[workspace.lints.rustdoc]
4444
private_intra_doc_links = "allow"
45+
46+
[workspace.dependencies]
47+
ndc-models = { git = "https://github.com/hasura/ndc-spec.git", rev = "aa8ad48e42aefd9e585a4c923bebfd56eee40204" }
48+
49+
anyhow = "1"
50+
apollo-parser = "0.7"
51+
async-graphql-parser = "7"
52+
async-recursion = "1"
53+
axum = "0.6"
54+
base64 = "0.22"
55+
bincode = "1"
56+
bson = "2"
57+
build-data = "0.2"
58+
bytes = "1"
59+
clap = "4"
60+
convert_case = "0.6"
61+
cookie = "0.18"
62+
criterion = "0.5"
63+
darling = "0.20"
64+
derive_more = "0.99"
65+
diffy = "0.4"
66+
env_logger = "0.11"
67+
expect-test = "1"
68+
futures-util = "0.3"
69+
goldenfile = "1"
70+
graphql-parser = "0.4"
71+
http = "0.2"
72+
human_bytes = "0.4"
73+
indexmap = "2"
74+
insta = "1"
75+
json_value_merge = "2"
76+
jsonptr = "0.4"
77+
jsonwebkey = "0.3"
78+
jsonwebtoken = "8"
79+
lazy_static = "1"
80+
lexical-core = "0.8"
81+
mockito = { version = "1", default-features = false }
82+
nonempty = "0.10"
83+
openssl = "0.10"
84+
opentelemetry = "0.22"
85+
opentelemetry-contrib = "0.14"
86+
opentelemetry-http = "0.11"
87+
opentelemetry-otlp = "0.15"
88+
opentelemetry-semantic-conventions = "0.14"
89+
opentelemetry-zipkin = "0.20"
90+
opentelemetry_sdk = "0.22"
91+
postcard = "1"
92+
pretty_assertions = "1"
93+
proc-macro2 = "1"
94+
quote = "1"
95+
rand = "0.8"
96+
ref-cast = "1"
97+
regex = "1"
98+
reqwest = "0.11"
99+
rmp-serde = "1"
100+
schemars = "0.8"
101+
serde = "1"
102+
serde_json = "1"
103+
serde_path_to_error = "0.1"
104+
serde_with = "3"
105+
sha2 = "0.10"
106+
similar-asserts = "1"
107+
smol_str = "0.1"
108+
strum = "0.26"
109+
strum_macros = "0.26"
110+
syn = "2"
111+
test-each = "0.2"
112+
thiserror = "1"
113+
tokio = "1"
114+
tokio-test = "0.4"
115+
tower = "0.4"
116+
tower-http = "0.4"
117+
tracing = "0.1"
118+
tracing-subscriber = "0.3"
119+
transitive = "0.5"
120+
url = "2"

v3/crates/auth/dev-auth-webhook/Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ bench = false
1212
[dependencies]
1313
tracing-util = { path = "../../utils/tracing-util" }
1414

15-
anyhow = "1"
16-
axum = "0.6.20"
17-
http = "0.2"
18-
serde_json = "1.0.117"
19-
tokio = { version = "1.38.0", features = ["full"] }
20-
tracing = "0.1.40"
21-
tower-http = { version = "0.4.4", features = ["trace"] }
15+
anyhow = { workspace = true }
16+
axum = { workspace = true }
17+
http = { workspace = true }
18+
serde_json = { workspace = true }
19+
tokio = { workspace = true, features = ["full"] }
20+
tracing = { workspace = true }
21+
tower-http = { workspace = true, features = ["trace"] }

v3/crates/auth/hasura-authn-core/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ bench = false
1111
lang-graphql = { path = "../../lang-graphql" }
1212
open-dds = { path = "../../open-dds" }
1313

14-
axum = "0.6.20"
15-
http = "0.2"
16-
schemars = "0.8.20"
17-
serde = "1.0.203"
18-
thiserror = "1.0"
14+
axum = { workspace = true }
15+
http = { workspace = true }
16+
schemars = { workspace = true }
17+
serde = { workspace = true }
18+
thiserror = { workspace = true }
1919

2020
[dev-dependencies]
21-
pretty_assertions = "1.3.0"
21+
pretty_assertions = { workspace = true }
2222

2323
[lints]
2424
workspace = true

v3/crates/auth/hasura-authn-jwt/Cargo.toml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,24 @@ lang-graphql = { path = "../../lang-graphql" }
1313
open-dds = { path = "../../open-dds" }
1414
tracing-util = { path = "../../utils/tracing-util"}
1515

16-
axum = "0.6.20"
17-
cookie = "0.18.1"
16+
axum = { workspace = true }
17+
cookie = { workspace = true }
1818
jsonptr = { version = "0.4.0" }
19-
jsonwebtoken = "8.3.0"
20-
lazy_static = "1.4.0"
21-
reqwest = { version = "0.11.8", features = ["json"] }
22-
schemars = { version = "0.8.20", features = ["url"] }
23-
serde = { version = "1.0.203", features = ["derive"] }
24-
serde_json = "1.0.117"
25-
thiserror = "1.0"
26-
url = "2.4.1"
19+
jsonwebtoken = { workspace = true }
20+
lazy_static = { workspace = true }
21+
reqwest = { workspace = true, features = ["json"] }
22+
schemars = { workspace = true, features = ["url"] }
23+
serde = { workspace = true, features = ["derive"] }
24+
serde_json = { workspace = true }
25+
thiserror = { workspace = true }
26+
url = { workspace = true }
2727

2828
[dev-dependencies]
29-
anyhow = "1"
30-
jsonwebkey = { version = "0.3.5", features = ["generate", "jsonwebtoken","pkcs-convert"] }
31-
mockito = {version = "1.1.0", default-features = false, features = []}
32-
openssl = "0.10.64"
33-
tokio = { version = "1.38.0", features = ["macros"] }
29+
anyhow = { workspace = true }
30+
jsonwebkey = { workspace = true, features = ["generate", "jsonwebtoken","pkcs-convert"] }
31+
mockito = { workspace = true }
32+
openssl = { workspace = true }
33+
tokio = { workspace = true, features = ["macros"] }
3434

3535
[lints]
3636
workspace = true

v3/crates/auth/hasura-authn-webhook/Cargo.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ lang-graphql = { path = "../../lang-graphql" }
1313
open-dds = { path = "../../open-dds" }
1414
tracing-util = { path = "../../utils/tracing-util" }
1515

16-
axum = "0.6.9"
17-
lazy_static = "1.4.0"
18-
reqwest = { version = "0.11.8", features = ["json"] }
19-
schemars = { version = "0.8.20", features = ["smol_str", "url"] }
20-
serde = "1.0.203"
21-
serde_json = "1.0.117"
22-
thiserror = "1.0"
16+
axum = { workspace = true }
17+
lazy_static = { workspace = true }
18+
reqwest = { workspace = true, features = ["json"] }
19+
schemars = { workspace = true, features = ["smol_str", "url"] }
20+
serde = { workspace = true }
21+
serde_json = { workspace = true }
22+
thiserror = { workspace = true }
2323

2424
[dev-dependencies]
25-
mockito = { version = "1.1.0", default-features = false, features = [] }
26-
rand = "0.8.5"
27-
tokio = "1.38.0"
25+
mockito = { workspace = true }
26+
rand = { workspace = true }
27+
tokio = { workspace = true }
2828

2929
[lints]
3030
workspace = true

v3/crates/custom-connector/Cargo.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ path = "src/main.rs"
1313
bench = false
1414

1515
[dependencies]
16-
anyhow = "1"
17-
axum = { version = "0.6", features = ["http2"] }
18-
env_logger = "0.11"
19-
indexmap = "2"
20-
ndc-models = { git = "https://github.com/hasura/ndc-spec.git", rev = "aa8ad48e42aefd9e585a4c923bebfd56eee40204" }
21-
regex = "1"
22-
serde_json = { version = "1", features = ["preserve_order"] }
23-
serde = "1"
24-
sha2 = "0.10.8"
25-
tokio = { version = "1", features = ["full"] }
16+
anyhow = { workspace = true }
17+
axum = { workspace = true, features = ["http2"] }
18+
env_logger = { workspace = true }
19+
indexmap = { workspace = true }
20+
ndc-models = { workspace = true }
21+
regex = { workspace = true }
22+
serde_json = { workspace = true, features = ["preserve_order"] }
23+
serde = { workspace = true }
24+
sha2 = { workspace = true }
25+
tokio = { workspace = true, features = ["full"] }
2626

2727
[lints]
2828
workspace = true

v3/crates/engine/Cargo.toml

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -30,36 +30,31 @@ schema = { path = "../schema" }
3030
tracing-util = { path = "../utils/tracing-util" }
3131
metadata-resolve = {path = "../metadata-resolve" }
3232

33-
anyhow = "1"
34-
axum = { version = "0.6.20" }
35-
base64 = "0.22.1"
36-
bincode = "1.3.3"
37-
clap = { version = "4", features = ["derive", "env"] }
38-
json_value_merge = "2.0"
39-
reqwest = { version = "0.11", features = ["json", "multipart"] }
40-
schemars = { version = "0.8.20", features = ["smol_str"] }
41-
serde = "1.0.203"
42-
serde_json = "1.0.117"
43-
serde_path_to_error = "0.1.14"
44-
thiserror = "1.0"
45-
tokio = { version = "1.38.0", features = [
46-
"macros",
47-
"parking_lot",
48-
"rt-multi-thread",
49-
"signal",
50-
] }
51-
tower = "0.4"
52-
tower-http = { version = "0.4", features = ["trace", "cors", "fs"] }
33+
anyhow = { workspace = true }
34+
axum = { workspace = true }
35+
base64 = { workspace = true }
36+
bincode = { workspace = true }
37+
clap = { workspace = true, features = ["derive", "env"] }
38+
json_value_merge = { workspace = true }
39+
reqwest = { workspace = true, features = ["json", "multipart"] }
40+
schemars = { workspace = true, features = ["smol_str"] }
41+
serde = { workspace = true }
42+
serde_json = { workspace = true }
43+
serde_path_to_error = { workspace = true }
44+
thiserror = { workspace = true }
45+
tokio = { workspace = true, features = ["macros", "parking_lot", "rt-multi-thread", "signal"] }
46+
tower = { workspace = true }
47+
tower-http = { workspace = true, features = ["trace", "cors", "fs"] }
5348

5449
# Dependencies to build and run build.rs file
5550
[build-dependencies]
56-
build-data = "0.2.1" # To set short commit-sha at build time
51+
build-data = { workspace = true } # To set short commit-sha at build time
5752

5853
[dev-dependencies]
59-
criterion = { version = "0.5", features = ["html_reports", "async_tokio"] }
60-
goldenfile = "1.7.1"
61-
pretty_assertions = "1.3.0"
62-
tokio-test = "0.4.2"
54+
criterion = { workspace = true, features = ["html_reports", "async_tokio"] }
55+
goldenfile = { workspace = true }
56+
pretty_assertions = { workspace = true }
57+
tokio-test = { workspace = true }
6358

6459
[package.metadata.cargo-machete]
6560
ignored = [

v3/crates/execute/Cargo.toml

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -21,34 +21,29 @@ tracing-util = { path = "../utils/tracing-util" }
2121
metadata-resolve = {path = "../metadata-resolve" }
2222
futures-ext = { path = "../utils/futures-ext" }
2323

24-
async-recursion = "1.1.1"
25-
axum = { version = "0.6.20" }
26-
base64 = "0.22.1"
27-
bytes = "1.6.0"
28-
derive_more = "0.99.17"
29-
futures-util = "0.3"
30-
indexmap = { version = "2", features = ["serde"] }
31-
ndc-models = { git = "https://github.com/hasura/ndc-spec.git", rev = "aa8ad48e42aefd9e585a4c923bebfd56eee40204" }
32-
nonempty = "0.10"
33-
reqwest = { version = "0.11", features = ["json", "multipart"] }
34-
schemars = { version = "0.8.20", features = ["smol_str"] }
35-
serde = "1.0.203"
36-
serde_json = "1.0.117"
37-
thiserror = "1.0"
38-
tokio = { version = "1.38.0", features = [
39-
"macros",
40-
"parking_lot",
41-
"rt-multi-thread",
42-
"signal",
43-
] }
44-
transitive = "0.5.0"
45-
url = "2.4.1"
24+
async-recursion = { workspace = true }
25+
axum = { workspace = true }
26+
base64 = { workspace = true }
27+
bytes = { workspace = true }
28+
derive_more = { workspace = true }
29+
futures-util = { workspace = true }
30+
indexmap = { workspace = true, features = ["serde"] }
31+
ndc-models = { workspace = true }
32+
nonempty = { workspace = true }
33+
reqwest = { workspace = true, features = ["json", "multipart"] }
34+
schemars = { workspace = true, features = ["smol_str"] }
35+
serde = { workspace = true }
36+
serde_json = { workspace = true }
37+
thiserror = { workspace = true }
38+
tokio = { workspace = true, features = ["macros", "parking_lot", "rt-multi-thread", "signal"] }
39+
transitive = { workspace = true }
40+
url = { workspace = true }
4641

4742
[dev-dependencies]
48-
criterion = { version = "0.5", features = ["html_reports", "async_tokio"] }
49-
goldenfile = "1.7.1"
50-
mockito = { version = "1.1.0", default-features = false, features = [] }
51-
pretty_assertions = "1.3.0"
43+
criterion = { workspace = true, features = ["html_reports", "async_tokio"] }
44+
goldenfile = { workspace = true }
45+
mockito = { workspace = true }
46+
pretty_assertions = { workspace = true }
5247

5348
[lints]
5449
workspace = true

v3/crates/lang-graphql/Cargo.toml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -26,33 +26,33 @@ harness = false
2626
[dependencies]
2727
recursion_limit_macro = { path = "../utils/recursion_limit_macro" }
2828

29-
axum = "0.6.20"
30-
http = "0.2"
31-
indexmap = { version = "2", features = ["serde"] }
32-
lexical-core = "0.8"
33-
nonempty = { version = "0.10", features = ["serialize"] }
34-
schemars = { version = "0.8.20", features = ["smol_str"] }
35-
serde = "1.0.203"
36-
serde_json = "1.0.117"
37-
serde_with = "3.8.1"
38-
smol_str = "0.1.23"
39-
thiserror = "1.0"
40-
lazy_static = "1.4.0"
29+
axum = { workspace = true }
30+
http = { workspace = true }
31+
indexmap = { workspace = true, features = ["serde"] }
32+
lexical-core = { workspace = true }
33+
nonempty = { workspace = true, features = ["serialize"] }
34+
schemars = { workspace = true, features = ["smol_str"] }
35+
serde = { workspace = true }
36+
serde_json = { workspace = true }
37+
serde_with = { workspace = true }
38+
smol_str = { workspace = true }
39+
thiserror = { workspace = true }
40+
lazy_static = { workspace = true }
4141

4242
[dev-dependencies]
43-
anyhow = "1"
44-
apollo-parser = "0.7"
45-
async-graphql-parser = "7.0"
46-
bincode = "1.3.3"
47-
bson = "2.11.0"
48-
criterion = { version = "0.5", features = ["html_reports"] }
49-
diffy = "0.4.0"
50-
expect-test = "1.5"
51-
graphql-parser = "0.4"
52-
human_bytes = "0.4.1"
53-
postcard = { version = "1.0.4", features = ["use-std"] }
54-
pretty_assertions = "1.3.0"
55-
rmp-serde = "1.3.0"
43+
anyhow = { workspace = true }
44+
apollo-parser = { workspace = true }
45+
async-graphql-parser = { workspace = true }
46+
bincode = { workspace = true }
47+
bson = { workspace = true }
48+
criterion = { workspace = true, features = ["html_reports"] }
49+
diffy = { workspace = true }
50+
expect-test = { workspace = true }
51+
graphql-parser = { workspace = true }
52+
human_bytes = { workspace = true }
53+
postcard = { workspace = true, features = ["use-std"] }
54+
pretty_assertions = { workspace = true }
55+
rmp-serde = { workspace = true }
5656

5757
[lints]
5858
workspace = true

0 commit comments

Comments
 (0)