define workspace dependencies in workspace

so that we no longer have to (or forget to) bump the version in multiple places.

notable changes:
- outdated versions have been unified
- proxmox-metrics -> proxmox-async no longer uses explicit empty features
  (proxmox-async doesn't provide any anyway)
- proxmox-subscription -> proxmox-http no longer uses explicit default_features
  = false (proxmox-http has an empty default feature anyway)
- missing path dependencies added (mainly proxmox-rest-server)

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/Cargo.toml b/Cargo.toml
index f0f2efc340973b4e1507fdbc5e1e34bdc9128b8b..b7dcbb6b4482009daa08e0b397e176c2b699b54a 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -57,3 +57,18 @@ tokio = "1.6"
 tokio-openssl = "0.6.1"
 url = "2.2"
 zstd = { version = "0.6", features = [ "bindgen" ] }
+
+# workspace dependencies
+proxmox-api-macro = { version = "1.0.3", path = "proxmox-api-macro" }
+proxmox-async = { version = "0.4.1", path = "proxmox-async" }
+proxmox-compression = { version = "0.1.1", path = "proxmox-compression" }
+proxmox-http = { version = "0.7", path = "proxmox-http" }
+proxmox-io = { version = "1.0.0", path = "proxmox-io" }
+proxmox-lang = { version = "1.1", path = "proxmox-lang" }
+proxmox-router = { version = "1.3.0", path = "proxmox-router" }
+proxmox-schema = { version = "1.3.3", path = "proxmox-schema" }
+proxmox-serde = { version = "0.1.1", path = "proxmox-serde", features = [ "serde_json" ] }
+proxmox-sortable-macro = { version = "0.1.2", path = "proxmox-sortable-macro" }
+proxmox-sys = { version = "0.4", path = "proxmox-sys" }
+proxmox-time = { version = "1.1", path = "proxmox-time" }
+proxmox-uuid = { version = "1", path = "proxmox-uuid" }

diff --git a/proxmox-async/Cargo.toml b/proxmox-async/Cargo.toml
index 3a9b46bcd88a6138110a52475eac348d61f99bb8..5d96a924c4f6c9fe3a646bd4daf32b3315795df0 100644 (file)
--- a/proxmox-async/Cargo.toml
+++ b/proxmox-async/Cargo.toml
@@ -16,8 +16,8 @@ lazy_static.workspace = true
 pin-utils = "0.1.0"
 tokio = { workspace = true, features = [ "net", "rt", "rt-multi-thread", "sync"] }
 
-proxmox-io = { path = "../proxmox-io", version = "1", features = [ "tokio" ] }
-proxmox-lang = { path = "../proxmox-lang", version = "1.1" }
+proxmox-io = { workspace = true, features = [ "tokio" ] }
+proxmox-lang.workspace = true
 
 [dev-dependencies]
 tokio = { workspace = true, features = [ "macros" ] }

diff --git a/proxmox-compression/Cargo.toml b/proxmox-compression/Cargo.toml
index 6a3ad96a0bf83d24fc1c9510806532613905eb2c..abf167abdb42d42f4de1b8d21f4abe49065f08ec 100644 (file)
--- a/proxmox-compression/Cargo.toml
+++ b/proxmox-compression/Cargo.toml
@@ -22,9 +22,9 @@ walkdir = "2"
 tar = "0.4"
 zstd.workspace = true
 
-proxmox-time = { path = "../proxmox-time", version = "1" }
-proxmox-io = { path = "../proxmox-io", version = "1", features = [ "tokio" ] }
-proxmox-lang = { path = "../proxmox-lang", version = "1.1" }
+proxmox-time.workspace = true
+proxmox-io = { workspace = true, features = [ "tokio" ] }
+proxmox-lang.workspace = true
 
 [dev-dependencies]
 tokio = { workspace = true, features = [ "macros" ] }

diff --git a/proxmox-http/Cargo.toml b/proxmox-http/Cargo.toml
index eadb9dbff65fb2907384063fde7827a2651d5e3f..08a1aad1846708dd0029b32a6bd5540057f0da95 100644 (file)
--- a/proxmox-http/Cargo.toml
+++ b/proxmox-http/Cargo.toml
@@ -22,10 +22,10 @@ tokio-openssl = { workspace = true, optional = true }
 ureq = { version = "2.4", features = ["native-certs"], optional = true }
 url = { workspace = true, optional = true }
 
-proxmox-async = { path = "../proxmox-async", optional = true, version = "0.4.1" }
-proxmox-sys = { path = "../proxmox-sys", optional = true, version = "0.4" }
-proxmox-io = { path = "../proxmox-io", optional = true, version = "1.0.0" }
-proxmox-lang = { path = "../proxmox-lang", optional = true, version = "1.1" }
+proxmox-async = { workspace = true, optional = true }
+proxmox-sys = { workspace = true, optional = true }
+proxmox-io = { workspace = true, optional = true }
+proxmox-lang = { workspace = true, optional = true }
 
 [features]
 default = []

diff --git a/proxmox-metrics/Cargo.toml b/proxmox-metrics/Cargo.toml
index 9967cdc82b104099bd97a0d5f0e0676ee9bc3394..7c2556fe40aa50a02918e78a8069cf081ea6f2bf 100644 (file)
--- a/proxmox-metrics/Cargo.toml
+++ b/proxmox-metrics/Cargo.toml
@@ -19,5 +19,5 @@ serde.workspace = true
 serde_json.workspace = true
 tokio = { workspace = true, features = [ "net", "sync" ] }
 
-proxmox-async = { path = "../proxmox-async", features = [], version = "0.4" }
-proxmox-http = { path = "../proxmox-http", features = [ "client" ], version = "0.7" }
+proxmox-async.workspace = true
+proxmox-http = { workspace = true, features = [ "client" ] }

diff --git a/proxmox-rest-server/Cargo.toml b/proxmox-rest-server/Cargo.toml
index 70b02cc60eae6a448e23b9e2e5e8d74b4ae5d9c8..1cc87181d1b500909acb2ff120c1d8270ad85d4f 100644 (file)
--- a/proxmox-rest-server/Cargo.toml
+++ b/proxmox-rest-server/Cargo.toml
@@ -10,7 +10,7 @@ description = "REST server implementation"
 exclude.workspace = true
 
 [dev-dependencies]
-proxmox-schema = { version = "1.3.1", features = [ "api-macro" ] }
+proxmox-schema = { workspace = true, features = [ "api-macro" ] }
 tokio = { workspace = true, features = [ "rt-multi-thread", "signal", "process" ] }
 
 [dependencies]
@@ -34,13 +34,12 @@ tokio-stream = "0.1.0"
 tower-service = "0.3.0"
 url.workspace = true
 
-#proxmox = "0.15.3"
-proxmox-async = "0.4"
-proxmox-compression = "0.1.1"
-proxmox-io = "1"
-proxmox-lang = "1.1"
-proxmox-http = { version = "0.7", features = [ "client" ] }
-proxmox-router = "1.3.0"
-proxmox-schema = { version = "1.3.1", features = [ "api-macro", "upid-api-impl" ] }
-proxmox-time = "1"
-proxmox-sys = { version = "0.4", features = [ "logrotate", "timer" ] }
+proxmox-async.workspace = true
+proxmox-compression.workspace = true
+proxmox-io.workspace = true
+proxmox-lang.workspace = true
+proxmox-http = { workspace = true, features = [ "client" ] }
+proxmox-router.workspace = true
+proxmox-schema = { workspace = true, features = [ "api-macro", "upid-api-impl" ] }
+proxmox-time.workspace = true
+proxmox-sys = { workspace = true, features = [ "logrotate", "timer" ] }

diff --git a/proxmox-router/Cargo.toml b/proxmox-router/Cargo.toml
index f4ad0482339a75afb4b99045287c1ef8100f91f1..c91fdfd8096f23449f3e6f8955a72e722cab2ca2 100644 (file)
--- a/proxmox-router/Cargo.toml
+++ b/proxmox-router/Cargo.toml
@@ -25,9 +25,9 @@ tokio = { workspace = true, features = [], optional = true }
 rustyline = { version = "9", optional = true }
 libc = { workspace = true, optional = true }
 
-proxmox-lang = { path = "../proxmox-lang", version = "1.1" }
-proxmox-schema = { path = "../proxmox-schema", version = "1.1" }
-proxmox-async = { path = "../proxmox-async", version = "0.4.1" }
+proxmox-lang.workspace = true
+proxmox-schema.workspace = true
+proxmox-async.workspace = true
 
 [features]
 default = [ "cli", "server" ]

diff --git a/proxmox-schema/Cargo.toml b/proxmox-schema/Cargo.toml
index 9fdc85a535e3481408f40909fb55f5b587ea8fb4..fa48e706252508e3376b35d387adafbd67d7d066 100644 (file)
--- a/proxmox-schema/Cargo.toml
+++ b/proxmox-schema/Cargo.toml
@@ -21,12 +21,12 @@ textwrap = "0.16"
 libc = { workspace = true, optional = true }
 nix = { workspace = true, optional = true }
 
-proxmox-api-macro = { path = "../proxmox-api-macro", optional = true, version = "1.0.3" }
+proxmox-api-macro = { workspace = true, optional = true }
 
 [dev-dependencies]
 url.workspace = true
 serde = { workspace = true, features = [ "derive" ] }
-proxmox-api-macro = { path = "../proxmox-api-macro", version = "1.0.3" }
+proxmox-api-macro.workspace = true
 
 [features]
 default = []

diff --git a/proxmox-section-config/Cargo.toml b/proxmox-section-config/Cargo.toml
index 8f3077638d30dcee594cf9c6e63b4d96824a2275..5d33b7a63e8786b2b43166dcfe1b14ada422e2d9 100644 (file)
--- a/proxmox-section-config/Cargo.toml
+++ b/proxmox-section-config/Cargo.toml
@@ -15,6 +15,6 @@ hex.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 
-proxmox-schema = { path = "../proxmox-schema", version = "1.1" }
+proxmox-schema.workspace = true
 # FIXME: remove!
-proxmox-lang = { path = "../proxmox-lang", version = "1.1" }
+proxmox-lang.workspace = true

diff --git a/proxmox-serde/Cargo.toml b/proxmox-serde/Cargo.toml
index 879b191186704fd4b4fbf404e6dea7bb91bcb12e..b4e2eb2873d62a538c02576835ba019fd0b75f23 100644 (file)
--- a/proxmox-serde/Cargo.toml
+++ b/proxmox-serde/Cargo.toml
@@ -15,7 +15,7 @@ base64.workspace = true
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true, optional = true }
 
-proxmox-time = { path = "../proxmox-time", version = "1.0.0" }
+proxmox-time.workspace = true
 
 [dev-dependencies]
 serde_json.workspace = true

diff --git a/proxmox-shared-memory/Cargo.toml b/proxmox-shared-memory/Cargo.toml
index f2b473c090e63f4f133413a7fccff9b36a12711c..51908930d9470f29981fb23a7e31c29f1fc03989 100644 (file)
--- a/proxmox-shared-memory/Cargo.toml
+++ b/proxmox-shared-memory/Cargo.toml
@@ -14,4 +14,4 @@ anyhow.workspace = true
 libc.workspace = true
 nix.workspace = true
 
-proxmox-sys = { path = "../proxmox-sys", version = "0.4" }
+proxmox-sys.workspace = true

diff --git a/proxmox-subscription/Cargo.toml b/proxmox-subscription/Cargo.toml
index 9ecc39e5483bffdfb003d18d594540265eab9a0a..a624c6c3d8299dd9bc858de7238d6bcbb5cf7354 100644 (file)
--- a/proxmox-subscription/Cargo.toml
+++ b/proxmox-subscription/Cargo.toml
@@ -19,12 +19,12 @@ regex = "1.5"
 serde.workspace = true
 serde_json.workspace = true
 
-proxmox-http = { path = "../proxmox-http", version = "0.7", default_features = false, features = ["client-trait", "http-helpers"] }
-proxmox-serde = { path = "../proxmox-serde", version = "0.1.1", features = ["serde_json"]}
-proxmox-sys = { path = "../proxmox-sys", version = "0.4" }
-proxmox-time = { path = "../proxmox-time", version = "1.1" }
+proxmox-http = { workspace = true, features = ["client-trait", "http-helpers"] }
+proxmox-serde.workspace = true
+proxmox-sys.workspace = true
+proxmox-time.workspace = true
 
-proxmox-schema = { path = "../proxmox-schema", version = "1.3.3", features = ["api-macro"], optional = true }
+proxmox-schema = { workspace = true, features = ["api-macro"], optional = true }
 
 [features]
 default = []

diff --git a/proxmox-sys/Cargo.toml b/proxmox-sys/Cargo.toml
index 66d068b80a641e4cc655890403d9b09be2e9bcb5..ab7283fa4cabb0e5d9d02db13e27cfbdeabdcc23 100644 (file)
--- a/proxmox-sys/Cargo.toml
+++ b/proxmox-sys/Cargo.toml
@@ -22,11 +22,11 @@ serde = { workspace = true, features = [ "derive" ] }
 zstd = { workspace = true, optional = true}
 
 # Macro crates:
-proxmox-sortable-macro = { path = "../proxmox-sortable-macro", optional = true, version = "0.1.2" }
+proxmox-sortable-macro = { workspace = true, optional = true }
 
-proxmox-io = { path = "../proxmox-io", version = "1.0.0" }
-proxmox-lang = { path = "../proxmox-lang", version = "1.1" }
-proxmox-time = { path = "../proxmox-time", version = "1.0.0" }
+proxmox-io.workspace = true
+proxmox-lang.workspace = true
+proxmox-time.workspace = true
 
 [features]
 default = []

diff --git a/proxmox-tfa/Cargo.toml b/proxmox-tfa/Cargo.toml
index eba2a1e97007e5a4cc6ccab853c7ecd26938a8ad..496d0161662287191fd751f7d9b9ff0496e1ca56 100644 (file)
--- a/proxmox-tfa/Cargo.toml
+++ b/proxmox-tfa/Cargo.toml
@@ -21,12 +21,12 @@ serde_plain = "1.0"
 serde_json = { workspace = true, optional = true }
 libc = { workspace = true, optional = true }
 url.workspace = true
-
-proxmox-schema = { version = "1", path = "../proxmox-schema", features = [ "api-macro" ], optional = true }
-proxmox-time = { version = "1", path = "../proxmox-time", optional = true }
-proxmox-uuid = { version = "1", path = "../proxmox-uuid", optional = true }
 webauthn-rs = { version = "0.3", optional = true }
 
+proxmox-schema = { workspace = true, features = [ "api-macro" ], optional = true }
+proxmox-time = { workspace = true, optional = true }
+proxmox-uuid = { workspace = true, optional = true }
+
 [features]
 default = []
 u2f = [ "dep:libc", "dep:serde_json", "serde/derive" ]