From 29181c7a0e2ef372a24738a86b7c68a70b75e33e Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Tue, 7 Mar 2023 12:40:49 +0100
Subject: [PATCH] use workspace dependencies

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
 Cargo.toml        | 27 +++++++++++++++++++++++++++
 Makefile          |  1 +
 pmg-rs/Cargo.toml | 38 +++++++++++++++++++-------------------
 pve-rs/Cargo.toml | 44 ++++++++++++++++++++++----------------------
 4 files changed, 69 insertions(+), 41 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index b49a5912..fc260b77 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,6 +5,33 @@ members = [
     "pmg-rs",
 ]
 
+[workspace.dependencies]
+anyhow = "1.0"
+base32 = "0.4"
+base64 = "0.13"
+env_logger = "0.9"
+hex = "0.4"
+http = "0.2.7"
+libc = "0.2"
+nix = "0.26"
+openssl = "0.10.40"
+serde = "1.0"
+serde_bytes = "0.11"
+serde_json = "1.0"
+url = "2"
+
+perlmod = { version = "0.13", features = [ "exporter" ] }
+
+proxmox-acme-rs = { version = "0.4", features = ["client"] }
+proxmox-apt = "0.9"
+proxmox-http = { version = "0.8", features = ["client-sync", "client-trait"] }
+proxmox-openid = "0.9.8"
+proxmox-resource-scheduling = "0.1"
+proxmox-subscription = "0.3"
+proxmox-sys = "0.4.2"
+proxmox-tfa = { version = "3", features = ["api"] }
+proxmox-time = "1.1.3"
+
 [patch.crates-io]
 # proxmox-tfa requires -time and -uuid as well, so enable *all* or *none* of them
 #proxmox-tfa = { path = "../proxmox/proxmox-tfa" }
diff --git a/Makefile b/Makefile
index 0a0befbd..00bb32b6 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,7 @@ build:
 	rm -rf build
 	mkdir build
 	echo system >build/rust-toolchain
+	cp -a ./Cargo.toml ./build
 	cp -a ./scripts ./build
 	cp -a ./common ./build
 	cp -a ./pve-rs ./build
diff --git a/pmg-rs/Cargo.toml b/pmg-rs/Cargo.toml
index 2d9ea296..f751d657 100644
--- a/pmg-rs/Cargo.toml
+++ b/pmg-rs/Cargo.toml
@@ -19,24 +19,24 @@ exclude = [
 crate-type = [ "cdylib" ]
 
 [dependencies]
-anyhow = "1.0"
-env_logger = "0.9"
-hex = "0.4"
-http = "0.2.7"
-libc = "0.2"
-nix = "0.26"
-openssl = "0.10.40"
-serde = "1.0"
-serde_bytes = "0.11.3"
-serde_json = "1.0"
-url = "2"
+anyhow.workspace = true
+env_logger.workspace = true
+hex.workspace = true
+http.workspace = true
+libc.workspace = true
+nix.workspace = true
+openssl.workspace = true
+serde.workspace = true
+serde_bytes.workspace = true
+serde_json.workspace = true
+url.workspace = true
 
-perlmod = { version = "0.13", features = [ "exporter" ] }
+perlmod.workspace = true
 
-proxmox-acme-rs = { version = "0.4", features = ["client"] }
-proxmox-apt = "0.9"
-proxmox-http = { version = "0.7", features = ["client-sync", "client-trait"] }
-proxmox-subscription = "0.3"
-proxmox-sys = "0.4.2"
-proxmox-tfa = { version = "2.1", features = ["api"] }
-proxmox-time = "1.1.3"
+proxmox-acme-rs.workspace = true
+proxmox-apt.workspace = true
+proxmox-http.workspace = true
+proxmox-subscription.workspace = true
+proxmox-sys.workspace = true
+proxmox-tfa.workspace = true
+proxmox-time.workspace = true
diff --git a/pve-rs/Cargo.toml b/pve-rs/Cargo.toml
index 6c921c46..807b6782 100644
--- a/pve-rs/Cargo.toml
+++ b/pve-rs/Cargo.toml
@@ -15,27 +15,27 @@ exclude = [
 crate-type = [ "cdylib" ]
 
 [dependencies]
-anyhow = "1.0"
-base32 = "0.4"
-base64 = "0.13"
-env_logger = "0.9"
-hex = "0.4"
-http = "0.2.7"
-libc = "0.2"
-nix = "0.26"
-openssl = "0.10.40"
-serde = "1.0"
-serde_bytes = "0.11"
-serde_json = "1.0"
-url = "2"
+anyhow.workspace = true
+base32.workspace = true
+base64.workspace = true
+env_logger.workspace = true
+hex.workspace = true
+http.workspace = true
+libc.workspace = true
+nix.workspace = true
+openssl.workspace = true
+serde.workspace = true
+serde_bytes.workspace = true
+serde_json.workspace = true
+url.workspace = true
 
-perlmod = { version = "0.13", features = [ "exporter" ] }
+perlmod.workspace = true
 
-proxmox-apt = "0.9"
-proxmox-http = { version = "0.7", features = ["client-sync", "client-trait"] }
-proxmox-openid = "0.9.8"
-proxmox-resource-scheduling = "0.1"
-proxmox-subscription = "0.3"
-proxmox-sys = "0.4.2"
-proxmox-tfa = { version = "2.1", features = ["api"] }
-proxmox-time = "1.1.3"
+proxmox-apt.workspace = true
+proxmox-http.workspace = true
+proxmox-openid.workspace = true
+proxmox-resource-scheduling.workspace = true
+proxmox-subscription.workspace = true
+proxmox-sys.workspace = true
+proxmox-tfa.workspace = true
+proxmox-time.workspace = true