From e3e77fe7b42bc00cdb3fe4f2b70a4ce45d11f1b9 Mon Sep 17 00:00:00 2001 From: Firstyear Date: Thu, 8 Feb 2024 09:54:07 +1000 Subject: [PATCH] Update to latest dev version (#2486) --- Cargo.lock | 46 +++++++++++++++---------------- Cargo.toml | 26 ++++++++--------- Makefile | 2 +- libs/crypto/Cargo.toml | 2 +- project_docs/RELEASE_CHECKLIST.md | 4 +-- server/lib-macros/Cargo.toml | 2 +- 6 files changed, 41 insertions(+), 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e71cc6552..303cd8462 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1079,7 +1079,7 @@ dependencies = [ [[package]] name = "daemon" -version = "1.1.0-rc.16" +version = "1.2.0-dev" dependencies = [ "clap", "clap_complete", @@ -2931,7 +2931,7 @@ dependencies = [ [[package]] name = "kanidm-ipa-sync" -version = "1.1.0-rc.16" +version = "1.2.0-dev" dependencies = [ "base64urlsafedata", "chrono", @@ -2956,7 +2956,7 @@ dependencies = [ [[package]] name = "kanidm-ldap-sync" -version = "1.1.0-rc.16" +version = "1.2.0-dev" dependencies = [ "base64urlsafedata", "chrono", @@ -2982,7 +2982,7 @@ dependencies = [ [[package]] name = "kanidm_build_profiles" -version = "1.1.0-rc.16" +version = "1.2.0-dev" dependencies = [ "base64 0.21.7", "gix", @@ -2992,7 +2992,7 @@ dependencies = [ [[package]] name = "kanidm_client" -version = "1.1.0-rc.16" +version = "1.2.0-dev" dependencies = [ "hyper", "kanidm_lib_file_permissions", @@ -3011,7 +3011,7 @@ dependencies = [ [[package]] name = "kanidm_lib_crypto" -version = "1.1.0-rc.15-dev" +version = "1.2.0-dev" dependencies = [ "argon2", "base64 0.21.7", @@ -3030,7 +3030,7 @@ dependencies = [ [[package]] name = "kanidm_lib_file_permissions" -version = "1.1.0-rc.16" +version = "1.2.0-dev" dependencies = [ "kanidm_utils_users", "whoami", @@ -3038,7 +3038,7 @@ dependencies = [ [[package]] name = "kanidm_proto" -version = "1.1.0-rc.16" +version = "1.2.0-dev" dependencies = [ "base32", "base64urlsafedata", @@ -3058,7 +3058,7 @@ dependencies = [ [[package]] name = "kanidm_tools" -version = "1.1.0-rc.16" +version = "1.2.0-dev" dependencies = [ "async-recursion", "clap", @@ -3090,7 +3090,7 @@ dependencies = [ [[package]] name = "kanidm_unix_int" -version = "1.1.0-rc.16" +version = "1.2.0-dev" dependencies = [ "async-trait", "base64urlsafedata", @@ -3129,14 +3129,14 @@ dependencies = [ [[package]] name = "kanidm_utils_users" -version = "1.1.0-rc.16" +version = "1.2.0-dev" dependencies = [ "libc", ] [[package]] name = "kanidmd_core" -version = "1.1.0-rc.16" +version = "1.2.0-dev" dependencies = [ "async-trait", "axum", @@ -3189,7 +3189,7 @@ dependencies = [ [[package]] name = "kanidmd_lib" -version = "1.1.0-rc.16" +version = "1.2.0-dev" dependencies = [ "base64 0.21.7", "base64urlsafedata", @@ -3246,7 +3246,7 @@ dependencies = [ [[package]] name = "kanidmd_lib_macros" -version = "1.1.0-rc.15-dev" +version = "1.2.0-dev" dependencies = [ "proc-macro2", "quote", @@ -3255,7 +3255,7 @@ dependencies = [ [[package]] name = "kanidmd_testkit" -version = "1.1.0-rc.16" +version = "1.2.0-dev" dependencies = [ "assert_cmd", "compact_jwt 0.3.3", @@ -3293,7 +3293,7 @@ dependencies = [ [[package]] name = "kanidmd_web_ui_admin" -version = "1.1.0-rc.16" +version = "1.2.0-dev" dependencies = [ "gloo", "gloo-utils 0.2.0", @@ -3314,7 +3314,7 @@ dependencies = [ [[package]] name = "kanidmd_web_ui_login_flows" -version = "1.1.0-rc.16" +version = "1.2.0-dev" dependencies = [ "gloo", "gloo-utils 0.2.0", @@ -3335,7 +3335,7 @@ dependencies = [ [[package]] name = "kanidmd_web_ui_shared" -version = "1.1.0-rc.16" +version = "1.2.0-dev" dependencies = [ "gloo", "js-sys", @@ -3354,7 +3354,7 @@ dependencies = [ [[package]] name = "kanidmd_web_ui_user" -version = "1.1.0-rc.16" +version = "1.2.0-dev" dependencies = [ "gloo", "gloo-timers 0.3.0", @@ -3771,7 +3771,7 @@ dependencies = [ [[package]] name = "nss_kanidm" -version = "1.1.0-rc.16" +version = "1.2.0-dev" dependencies = [ "kanidm_unix_int", "lazy_static", @@ -4170,7 +4170,7 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "orca" -version = "1.1.0-rc.16" +version = "1.2.0-dev" dependencies = [ "clap", "crossbeam", @@ -4214,7 +4214,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pam_kanidm" -version = "1.1.0-rc.16" +version = "1.2.0-dev" dependencies = [ "kanidm_unix_int", "libc", @@ -5352,7 +5352,7 @@ dependencies = [ [[package]] name = "sketching" -version = "1.1.0-rc.16" +version = "1.2.0-dev" dependencies = [ "gethostname", "num_enum", diff --git a/Cargo.toml b/Cargo.toml index a3399357d..3fa41a6b8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ members = [ ] [workspace.package] -version = "1.1.0-rc.16" +version = "1.2.0-dev" authors = [ "William Brown ", "James Hodgkinson ", @@ -78,19 +78,19 @@ sshkey-attest = { git = "https://github.com/kanidm/webauthn-rs.git", rev = "5f4d # kanidm-hsm-crypto = { path = "../hsm-crypto" } [workspace.dependencies] -kanidmd_core = { path = "./server/core", version = "1.1.0-rc.16" } -kanidmd_lib = { path = "./server/lib", version = "1.1.0-rc.16" } -kanidmd_lib_macros = { path = "./server/lib-macros", version = "1.1.0-rc.16" } -kanidmd_testkit = { path = "./server/testkit", version = "1.1.0-rc.16" } -kanidm_build_profiles = { path = "./libs/profiles", version = "1.1.0-rc.16" } -kanidm_client = { path = "./libs/client", version = "1.1.0-rc.16" } +kanidmd_core = { path = "./server/core", version = "=1.2.0-dev" } +kanidmd_lib = { path = "./server/lib", version = "=1.2.0-dev" } +kanidmd_lib_macros = { path = "./server/lib-macros", version = "=1.2.0-dev" } +kanidmd_testkit = { path = "./server/testkit", version = "=1.2.0-dev" } +kanidm_build_profiles = { path = "./libs/profiles", version = "=1.2.0-dev" } +kanidm_client = { path = "./libs/client", version = "=1.2.0-dev" } kanidm-hsm-crypto = "^0.1.5" -kanidm_lib_crypto = { path = "./libs/crypto", version = "1.1.0-rc.16" } -kanidm_lib_file_permissions = { path = "./libs/file_permissions", version = "1.1.0-rc.16" } -kanidm_proto = { path = "./proto", version = "1.1.0-rc.16" } -kanidm_unix_int = { path = "./unix_integration", version = "1.1.0-rc.16" } -kanidm_utils_users = { path = "./libs/users", version = "1.1.0-rc.16" } -sketching = { path = "./libs/sketching", version = "1.1.0-rc.16" } +kanidm_lib_crypto = { path = "./libs/crypto", version = "=1.2.0-dev" } +kanidm_lib_file_permissions = { path = "./libs/file_permissions", version = "=1.2.0-dev" } +kanidm_proto = { path = "./proto", version = "=1.2.0-dev" } +kanidm_unix_int = { path = "./unix_integration", version = "=1.2.0-dev" } +kanidm_utils_users = { path = "./libs/users", version = "=1.2.0-dev" } +sketching = { path = "./libs/sketching", version = "=1.2.0-dev" } serde_with = "3.4.0" argon2 = { version = "0.5.2", features = ["alloc"] } diff --git a/Makefile b/Makefile index 27f1b2db6..3e6c506b4 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ IMAGE_BASE ?= kanidm IMAGE_VERSION ?= devel -IMAGE_EXT_VERSION ?= 1.1.0-rc.16 +IMAGE_EXT_VERSION ?= 1.2.0-dev CONTAINER_TOOL_ARGS ?= IMAGE_ARCH ?= "linux/amd64,linux/arm64" CONTAINER_BUILD_ARGS ?= diff --git a/libs/crypto/Cargo.toml b/libs/crypto/Cargo.toml index d9b08a092..2150d6e45 100644 --- a/libs/crypto/Cargo.toml +++ b/libs/crypto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kanidm_lib_crypto" -version = "1.1.0-rc.15-dev" +version = { workspace = true } edition = { workspace = true } description = "Kanidm cryptographic functionality" license = { workspace = true } diff --git a/project_docs/RELEASE_CHECKLIST.md b/project_docs/RELEASE_CHECKLIST.md index 2bca36d58..0da657fa7 100644 --- a/project_docs/RELEASE_CHECKLIST.md +++ b/project_docs/RELEASE_CHECKLIST.md @@ -62,16 +62,16 @@ cargo install wasm-bindgen-cli - [ ] publish `sketching` - [ ] publish `kanidm_utils_users` - [ ] publish `kanidm_lib_file_permissions` -- [ ] publish `kanidm_client` - [ ] publish `kanidm_lib_crypto` - [ ] publish `kanidm_build_profiles` +- [ ] publish `kanidm_client` - [ ] publish `kanidm_tools` ### Docker - [ ] docker buildx use cluster - [ ] `make buildx/kanidmd/x86_64_v3 buildx/kanidmd buildx/kanidm_tools buildx/radiusd` -- [ ] `IMAGE_VERSION=latest make buildx/kanidmd/x86_64_v3 buildx/kanidmd buildx/kanidm_tools buildx/radiusd` +- [ ] `IMAGE_VERSION=latest make buildx` - [ ] Update the readme on docker ### Distro diff --git a/server/lib-macros/Cargo.toml b/server/lib-macros/Cargo.toml index 86c2bbcd6..9c4acc937 100644 --- a/server/lib-macros/Cargo.toml +++ b/server/lib-macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kanidmd_lib_macros" -version = "1.1.0-rc.15-dev" +version = { workspace = true } edition = { workspace = true } [lib]