From f78dd2dd4ad7ae2736994cb900b733d430bcf991 Mon Sep 17 00:00:00 2001 From: William Brown Date: Tue, 1 Aug 2023 15:34:33 +1000 Subject: [PATCH] Resolve issue with publishing --- Cargo.lock | 34 +++++++++++++++++----------------- Cargo.toml | 6 +++--- libs/profiles/Cargo.toml | 2 +- server/core/Cargo.toml | 2 +- server/daemon/Cargo.toml | 2 +- server/lib/Cargo.toml | 2 +- server/testkit/Cargo.toml | 2 +- tools/cli/Cargo.toml | 2 +- tools/orca/Cargo.toml | 2 +- unix_integration/Cargo.toml | 2 +- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1683a7f1a..2e0bda235 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -980,11 +980,11 @@ dependencies = [ "fs2", "futures", "is-terminal", + "kanidm_build_profiles", "kanidm_lib_file_permissions", "kanidm_proto", "kanidm_utils_users", "kanidmd_core", - "profiles", "reqwest", "sd-notify", "serde", @@ -2133,6 +2133,16 @@ dependencies = [ "uuid", ] +[[package]] +name = "kanidm_build_profiles" +version = "1.1.0-beta.13" +dependencies = [ + "base64 0.21.2", + "git2", + "serde", + "toml", +] + [[package]] name = "kanidm_client" version = "1.1.0-beta.13" @@ -2204,10 +2214,10 @@ dependencies = [ "compact_jwt", "dialoguer", "futures-concurrency", + "kanidm_build_profiles", "kanidm_client", "kanidm_proto", "libc", - "profiles", "qrcode", "rpassword 7.2.0", "serde", @@ -2235,6 +2245,7 @@ dependencies = [ "csv", "futures", "hashbrown 0.14.0", + "kanidm_build_profiles", "kanidm_client", "kanidm_lib_crypto", "kanidm_lib_file_permissions", @@ -2245,7 +2256,6 @@ dependencies = [ "libsqlite3-sys", "lru 0.8.1", "notify-debouncer-full", - "profiles", "rpassword 7.2.0", "rusqlite", "selinux", @@ -2286,13 +2296,13 @@ dependencies = [ "futures-util", "http", "hyper", + "kanidm_build_profiles", "kanidm_proto", "kanidm_utils_users", "kanidmd_lib", "ldap3_proto", "libc", "openssl", - "profiles", "rand", "regex", "serde", @@ -2326,6 +2336,7 @@ dependencies = [ "futures", "hashbrown 0.14.0", "idlset", + "kanidm_build_profiles", "kanidm_lib_crypto", "kanidm_proto", "kanidm_utils_users", @@ -2338,7 +2349,6 @@ dependencies = [ "num_enum", "openssl", "openssl-sys", - "profiles", "rand", "regex", "rusqlite", @@ -2382,12 +2392,12 @@ dependencies = [ "fantoccini", "futures", "hyper-tls", + "kanidm_build_profiles", "kanidm_client", "kanidm_proto", "kanidmd_core", "kanidmd_lib", "oauth2", - "profiles", "reqwest", "serde_json", "sketching", @@ -3055,12 +3065,12 @@ dependencies = [ "dialoguer", "futures-util", "hashbrown 0.14.0", + "kanidm_build_profiles", "kanidm_client", "kanidm_proto", "ldap3_proto", "mathru", "openssl", - "profiles", "rand", "serde", "serde_json", @@ -3384,16 +3394,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "profiles" -version = "1.1.0-beta.13" -dependencies = [ - "base64 0.21.2", - "git2", - "serde", - "toml", -] - [[package]] name = "prokio" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 1e0b32bd6..72edcadf2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -81,10 +81,11 @@ js-sys = "^0.3.63" kanidmd_core = { path = "./server/core" } kanidmd_lib = { path = "./server/lib" } kanidmd_lib_macros = { path = "./server/lib-macros" } +kanidm_build_profiles = { path = "./libs/profiles", version = "1.1.0-beta.13" } kanidm_lib_crypto = { path = "./libs/crypto" } kanidm_lib_file_permissions = { path = "./libs/file_permissions" } -kanidm_client = { path = "./libs/client", version = "1.1.0-alpha.11" } -kanidm_proto = { path = "./proto", version = "1.1.0-alpha.11" } +kanidm_client = { path = "./libs/client", version = "1.1.0-beta.13" } +kanidm_proto = { path = "./proto", version = "1.1.0-beta.13" } kanidm_unix_int = { path = "./unix_integration" } kanidm_utils_users = { path = "./libs/users" } # REMOVE this @@ -110,7 +111,6 @@ openssl = "^0.10.55" paste = "^1.0.14" pkg-config = "^0.3.27" proc-macro2 = "1.0.66" -profiles = { path = "./libs/profiles" } qrcode = "^0.12.0" quote = "1" rand = "^0.8.5" diff --git a/libs/profiles/Cargo.toml b/libs/profiles/Cargo.toml index 22ae9e808..8f84e1da7 100644 --- a/libs/profiles/Cargo.toml +++ b/libs/profiles/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "profiles" +name = "kanidm_build_profiles" description = "Kanidm Build System Profiles" documentation = "https://docs.rs/kanidm/latest/kanidm/" # We do not have tests in this pkg diff --git a/server/core/Cargo.toml b/server/core/Cargo.toml index b14dc2107..48970cc78 100644 --- a/server/core/Cargo.toml +++ b/server/core/Cargo.toml @@ -51,4 +51,4 @@ kanidm_utils_users = { workspace = true } uuid = { workspace = true, features = ["serde", "v4" ] } [build-dependencies] -profiles = { workspace = true } +kanidm_build_profiles = { workspace = true } diff --git a/server/daemon/Cargo.toml b/server/daemon/Cargo.toml index e22d13f7d..fb73eff34 100644 --- a/server/daemon/Cargo.toml +++ b/server/daemon/Cargo.toml @@ -47,4 +47,4 @@ tikv-jemallocator = { workspace = true } serde = { workspace = true, features = ["derive"] } clap = { workspace = true, features = ["derive"] } clap_complete = { workspace = true } -profiles = { workspace = true } +kanidm_build_profiles = { workspace = true } diff --git a/server/lib/Cargo.toml b/server/lib/Cargo.toml index 13824d6b6..30ce85ab1 100644 --- a/server/lib/Cargo.toml +++ b/server/lib/Cargo.toml @@ -86,5 +86,5 @@ futures = { workspace = true } kanidmd_lib_macros = { workspace = true } [build-dependencies] -profiles = { workspace = true } +kanidm_build_profiles = { workspace = true } diff --git a/server/testkit/Cargo.toml b/server/testkit/Cargo.toml index d319d3152..a4d9a8503 100644 --- a/server/testkit/Cargo.toml +++ b/server/testkit/Cargo.toml @@ -41,7 +41,7 @@ tokio = { workspace = true, features = ["net", "sync", "io-util", "macros"] } [build-dependencies] -profiles = { workspace = true } +kanidm_build_profiles = { workspace = true } [dev-dependencies] compact_jwt = { workspace = true } diff --git a/tools/cli/Cargo.toml b/tools/cli/Cargo.toml index 5cdfbd67e..ec4d43543 100644 --- a/tools/cli/Cargo.toml +++ b/tools/cli/Cargo.toml @@ -54,7 +54,7 @@ zxcvbn = { workspace=true } [build-dependencies] clap = { workspace = true, features = ["derive"] } clap_complete = { workspace=true } -profiles = { workspace = true } +kanidm_build_profiles = { workspace = true } uuid = { workspace=true } url = { workspace = true } diff --git a/tools/orca/Cargo.toml b/tools/orca/Cargo.toml index af8a84d5f..d692bbe49 100644 --- a/tools/orca/Cargo.toml +++ b/tools/orca/Cargo.toml @@ -42,4 +42,4 @@ uuid = { workspace = true, features = ["serde", "v4" ] } tikv-jemallocator = { workspace = true } [build-dependencies] -profiles = { workspace = true } +kanidm_build_profiles = { workspace = true } diff --git a/unix_integration/Cargo.toml b/unix_integration/Cargo.toml index d4025eebd..d0fe9a3a5 100644 --- a/unix_integration/Cargo.toml +++ b/unix_integration/Cargo.toml @@ -81,4 +81,4 @@ kanidmd_core = { workspace = true } [build-dependencies] clap = { workspace = true, features = ["derive"] } clap_complete = { workspace = true } -profiles = { workspace = true } +kanidm_build_profiles = { workspace = true }