From c632da8a1f214fe886473c5a7a80cb45b7287993 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Wed, 6 Jul 2022 09:24:06 +0200 Subject: [PATCH] Revert "use workspace-level dependencies" This reverts commit 0d9af484894ae92427460b7972dc5a5e3f4c5ad9. --- .bumpversion.cfg | 30 ++++++++++++++++- Cargo.toml | 53 +------------------------------ deny.toml | 21 +++++++++--- rust-toolchain.toml | 2 +- warpgate-admin/Cargo.toml | 50 ++++++++++++++--------------- warpgate-common/Cargo.toml | 36 ++++++++++----------- warpgate-db-entities/Cargo.toml | 20 ++++++------ warpgate-db-migrations/Cargo.toml | 15 ++++----- warpgate-protocol-http/Cargo.toml | 32 +++++++++---------- warpgate-protocol-ssh/Cargo.toml | 38 +++++++++++----------- warpgate-web/Cargo.toml | 16 ++++------ warpgate/Cargo.toml | 53 ++++++++++++++----------------- 12 files changed, 168 insertions(+), 198 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index fc491ee..89acee5 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -3,6 +3,34 @@ current_version = 0.3.0 commit = True tag = True -[bumpversion:file:Cargo.toml] +[bumpversion:file:warpgate/Cargo.toml] +search = version = "{current_version}" +replace = version = "{new_version}" + +[bumpversion:file:warpgate-admin/Cargo.toml] +search = version = "{current_version}" +replace = version = "{new_version}" + +[bumpversion:file:warpgate-common/Cargo.toml] +search = version = "{current_version}" +replace = version = "{new_version}" + +[bumpversion:file:warpgate-db-entities/Cargo.toml] +search = version = "{current_version}" +replace = version = "{new_version}" + +[bumpversion:file:warpgate-db-migrations/Cargo.toml] +search = version = "{current_version}" +replace = version = "{new_version}" + +[bumpversion:file:warpgate-protocol-http/Cargo.toml] +search = version = "{current_version}" +replace = version = "{new_version}" + +[bumpversion:file:warpgate-protocol-ssh/Cargo.toml] +search = version = "{current_version}" +replace = version = "{new_version}" + +[bumpversion:file:warpgate-web/Cargo.toml] search = version = "{current_version}" replace = version = "{new_version}" diff --git a/Cargo.toml b/Cargo.toml index ed33fc6..a7fc1ad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,4 @@ -cargo-features = ["workspace-inheritance"] - [workspace] -default-members = ["warpgate"] members = [ "warpgate", "warpgate-admin", @@ -12,55 +9,7 @@ members = [ "warpgate-protocol-ssh", "warpgate-web", ] - -[workspace.package] -edition = "2021" -license = "Apache-2.0" -version = "0.3.0" - -[workspace.dependencies] -anyhow = { version = "1.0", features = ["backtrace", "std"] } -async-trait = "0.1" -chrono = { version = "0.4", features = ["serde"] } -bytes = "1.1" -data-encoding = "2.3" -tracing = "0.1" -lazy_static = "1.4" -dialoguer = "0.10" -futures = "0.3" -poem = { version = "^1.3.30", features = [ - "cookie", - "session", - "anyhow", - "websocket", - "rustls", - "websocket", - "sse", - "embed", -] } -poem-openapi = { version = "^1.3.30", features = [ - "swagger-ui", - "chrono", - "uuid", - "static-files", -] } -russh = { version = "0.34.0-beta.5", features = ["openssl"] } -russh-keys = { version = "0.22.0-beta.3", features = ["openssl"] } -rust-embed = "6.3" -time = "0.3" -tokio = { version = "1.19", features = ["tracing", "signal", "macros"] } -sea-orm = { version = "^0.8", features = [ - "sqlx-sqlite", - "runtime-tokio-native-tls", - "macros", - "with-chrono", - "with-uuid", - "with-json", -], default-features = false } -serde = "1.0" -thiserror = "1.0" -uuid = { version = "0.8", features = ["v4", "serde"] } -serde_json = "1.0" +default-members = ["warpgate"] [profile.release] lto = true diff --git a/deny.toml b/deny.toml index 42d0919..fab3c9e 100644 --- a/deny.toml +++ b/deny.toml @@ -105,11 +105,22 @@ exceptions = [ # Some crates don't have (easily) machine readable licensing information, # adding a clarification entry for it allows you to manually specify the # licensing information -[[licenses.clarify]] -name = "ring" -version = "*" -expression = "MIT AND ISC AND OpenSSL" -license-files = [] +#[[licenses.clarify]] +# The name of the crate the clarification applies to +#name = "ring" +# The optional version constraint for the crate +#version = "*" +# The SPDX expression for the license requirements of the crate +#expression = "MIT AND ISC AND OpenSSL" +# One or more files in the crate's source used as the "source of truth" for +# the license expression. If the contents match, the clarification will be used +# when running the license check, otherwise the clarification will be ignored +# and the crate will be checked normally, which may produce warnings or errors +# depending on the rest of your configuration +#license-files = [ + # Each entry is a crate relative path, and the (opaque) hash of its contents + #{ path = "LICENSE", hash = 0xbd0eed23 } +#] [licenses.private] # If true, ignores workspace crates that aren't published, or are only diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 31ddac1..5df4faf 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "nightly-2022-05-30" +channel = "nightly-2022-03-14" diff --git a/warpgate-admin/Cargo.toml b/warpgate-admin/Cargo.toml index 2f53d3f..f042450 100644 --- a/warpgate-admin/Cargo.toml +++ b/warpgate-admin/Cargo.toml @@ -1,31 +1,29 @@ -cargo-features = ["workspace-inheritance"] - [package] +edition = "2021" +license = "Apache-2.0" name = "warpgate-admin" -edition.workspace = true -license.workspace = true -version.workspace = true +version = "0.3.0" [dependencies] -anyhow.workspace = true -async-trait.workspace = true -bytes.workspace = true -chrono.workspace = true -futures.workspace = true +anyhow = {version = "1.0", features = ["std"]} +async-trait = "0.1" +bytes = "1.1" +chrono = "0.4" +futures = "0.3" hex = "0.4" -mime_guess = { version = "2.0", default_features = false } -poem.workspace = true -poem-openapi.workspace = true -russh-keys.workspace = true -rust-embed.workspace = true -sea-orm.workspace = true -serde.workspace = true -serde_json.workspace = true -thiserror.workspace = true -tokio.workspace = true -tracing.workspace = true -uuid.workspace = true -warpgate-common = { version = "*", path = "../warpgate-common" } -warpgate-db-entities = { version = "*", path = "../warpgate-db-entities" } -warpgate-protocol-ssh = { version = "*", path = "../warpgate-protocol-ssh" } -warpgate-web = { version = "*", path = "../warpgate-web" } +mime_guess = {version = "2.0", default_features = false} +poem = {version = "^1.3.30", features = ["cookie", "session", "anyhow", "websocket"]} +poem-openapi = {version = "^1.3.30", features = ["swagger-ui", "chrono", "uuid", "static-files"]} +russh-keys = {version = "0.22.0-beta.3", features = ["openssl"]} +rust-embed = "6.3" +sea-orm = {version = "^0.8", features = ["sqlx-sqlite", "runtime-tokio-native-tls", "macros"], default-features = false} +serde = "1.0" +serde_json = "1.0" +thiserror = "1.0" +tokio = {version = "1.19", features = ["tracing"]} +tracing = "0.1" +uuid = {version = "0.8", features = ["v4", "serde"]} +warpgate-common = {version = "*", path = "../warpgate-common"} +warpgate-db-entities = {version = "*", path = "../warpgate-db-entities"} +warpgate-protocol-ssh = {version = "*", path = "../warpgate-protocol-ssh"} +warpgate-web = {version = "*", path = "../warpgate-web"} diff --git a/warpgate-common/Cargo.toml b/warpgate-common/Cargo.toml index 1cbadc7..9f4c5a9 100644 --- a/warpgate-common/Cargo.toml +++ b/warpgate-common/Cargo.toml @@ -1,37 +1,35 @@ -cargo-features = ["workspace-inheritance"] - [package] +edition = "2021" +license = "Apache-2.0" name = "warpgate-common" -edition.workspace = true -license.workspace = true -version.workspace = true +version = "0.3.0" [dependencies] -anyhow.workspace = true +anyhow = "1.0" argon2 = "0.4" -async-trait.workspace = true -bytes.workspace = true -chrono.workspace = true -data-encoding.workspace = true +async-trait = "0.1" +bytes = "1.1" +chrono = {version = "0.4", features = ["serde"]} +data-encoding = "2.3" humantime-serde = "1.1" -lazy_static.workspace = true +lazy_static = "1.4" once_cell = "1.10" packet = "0.1" password-hash = "0.4" -poem-openapi.workspace = true +poem-openapi = {version = "^1.3.30", features = ["swagger-ui", "chrono", "uuid", "static-files"]} rand = "0.8" rand_chacha = "0.3" rand_core = {version = "0.6", features = ["std"]} -sea-orm.workspace = true -serde.workspace = true -serde_json.workspace = true -thiserror.workspace = true -tokio.workspace = true +sea-orm = {version = "^0.8", features = ["sqlx-sqlite", "runtime-tokio-native-tls", "macros"], default-features = false} +serde = "1.0" +serde_json = "1.0" +thiserror = "1.0" +tokio = {version = "1.19", features = ["tracing"]} totp-rs = {version = "2.0", features = ["otpauth"]} -tracing.workspace = true +tracing = "0.1" tracing-core = "0.1" tracing-subscriber = "0.3" url = "2.2" -uuid.workspace = true +uuid = {version = "0.8", features = ["v4", "serde"]} warpgate-db-entities = {version = "*", path = "../warpgate-db-entities"} warpgate-db-migrations = {version = "*", path = "../warpgate-db-migrations"} diff --git a/warpgate-db-entities/Cargo.toml b/warpgate-db-entities/Cargo.toml index f6a3b4a..4e02096 100644 --- a/warpgate-db-entities/Cargo.toml +++ b/warpgate-db-entities/Cargo.toml @@ -1,15 +1,13 @@ -cargo-features = ["workspace-inheritance"] - [package] +edition = "2021" +license = "Apache-2.0" name = "warpgate-db-entities" -edition.workspace = true -license.workspace = true -version.workspace = true +version = "0.3.0" [dependencies] -chrono.workspace = true -poem-openapi.workspace = true -sea-orm.workspace = true -serde.workspace = true -serde_json.workspace = true -uuid.workspace = true +chrono = {version = "0.4", features = ["serde"]} +poem-openapi = {version = "^1.3.30", features = ["chrono", "uuid"]} +sea-orm = {version = "^0.8", features = ["macros", "with-chrono", "with-uuid", "with-json"], default-features = false} +serde = "1.0" +serde_json = "1.0" +uuid = {version = "0.8", features = ["v4", "serde"]} diff --git a/warpgate-db-migrations/Cargo.toml b/warpgate-db-migrations/Cargo.toml index 6b52b24..21c5155 100644 --- a/warpgate-db-migrations/Cargo.toml +++ b/warpgate-db-migrations/Cargo.toml @@ -1,16 +1,15 @@ -cargo-features = ["workspace-inheritance"] - [package] +edition = "2021" +license = "Apache-2.0" name = "warpgate-db-migrations" -edition.workspace = true -license.workspace = true -version.workspace = true +publish = false +version = "0.3.0" [lib] [dependencies] async-std = "^1.11" -chrono.workspace = true -sea-orm.workspace = true +chrono = "0.4" +sea-orm = {version = "^0.8", features = ["sqlx-sqlite", "runtime-tokio-native-tls", "macros"], default-features = false} sea-orm-migration = {version = "^0.8", default-features = false} -uuid.workspace = true +uuid = {version = "0.8", features = ["v4", "serde"]} diff --git a/warpgate-protocol-http/Cargo.toml b/warpgate-protocol-http/Cargo.toml index 92551c2..8b571c2 100644 --- a/warpgate-protocol-http/Cargo.toml +++ b/warpgate-protocol-http/Cargo.toml @@ -1,31 +1,29 @@ -cargo-features = ["workspace-inheritance"] - [package] +edition = "2021" +license = "Apache-2.0" name = "warpgate-protocol-http" -edition.workspace = true -license.workspace = true -version.workspace = true +version = "0.3.0" [dependencies] -anyhow.workspace = true -async-trait.workspace = true +anyhow = "1.0" +async-trait = "0.1" cookie = "0.16" -data-encoding.workspace = true +data-encoding = "2.3" delegate = "0.6" -futures.workspace = true +futures = "0.3" http = "0.2" -lazy_static.workspace = true -poem.workspace = true -poem-openapi.workspace = true +lazy_static = "1.4" +poem = {version = "^1.3.30", features = ["cookie", "session", "anyhow", "rustls", "websocket", "sse", "embed"]} +poem-openapi = {version = "^1.3.30", features = ["swagger-ui"]} reqwest = {version = "0.11", features = ["rustls-tls-native-roots", "stream"]} -serde.workspace = true -serde_json.workspace = true -tokio.workspace = true +serde = "1.0" +serde_json = "1.0" +tokio = {version = "1.19", features = ["tracing", "signal"]} tokio-tungstenite = {version = "0.17", features = ["rustls-tls-native-roots"]} -tracing.workspace = true +tracing = "0.1" warpgate-admin = {version = "*", path = "../warpgate-admin"} warpgate-common = {version = "*", path = "../warpgate-common"} warpgate-db-entities = {version = "*", path = "../warpgate-db-entities"} warpgate-web = {version = "*", path = "../warpgate-web"} percent-encoding = "2.1" -uuid.workspace = true +uuid = {version = "0.8", features = ["v4"]} diff --git a/warpgate-protocol-ssh/Cargo.toml b/warpgate-protocol-ssh/Cargo.toml index 7366c9d..3603a6b 100644 --- a/warpgate-protocol-ssh/Cargo.toml +++ b/warpgate-protocol-ssh/Cargo.toml @@ -1,26 +1,24 @@ -cargo-features = ["workspace-inheritance"] - [package] +edition = "2021" +license = "Apache-2.0" name = "warpgate-protocol-ssh" -edition.workspace = true -license.workspace = true -version.workspace = true +version = "0.3.0" [dependencies] ansi_term = "0.12" -anyhow.workspace = true -async-trait.workspace = true +anyhow = "1.0" +async-trait = "0.1" bimap = "0.6" -bytes.workspace = true -dialoguer.workspace = true -futures.workspace = true -russh.workspace = true -russh-keys.workspace = true -sea-orm.workspace = true -thiserror.workspace = true -time.workspace = true -tokio.workspace = true -tracing.workspace = true -uuid.workspace = true -warpgate-common = { version = "*", path = "../warpgate-common" } -warpgate-db-entities = { version = "*", path = "../warpgate-db-entities" } +bytes = "1.1" +dialoguer = "0.10" +futures = "0.3" +russh = {version = "0.34.0-beta.5", features = ["openssl"]} +russh-keys = {version = "0.22.0-beta.3", features = ["openssl"]} +sea-orm = {version = "^0.8", features = ["runtime-tokio-native-tls"], default-features = false} +thiserror = "1.0" +time = "0.3" +tokio = {version = "1.19", features = ["tracing", "signal"]} +tracing = "0.1" +uuid = {version = "0.8", features = ["v4"]} +warpgate-common = {version = "*", path = "../warpgate-common"} +warpgate-db-entities = {version = "*", path = "../warpgate-db-entities"} diff --git a/warpgate-web/Cargo.toml b/warpgate-web/Cargo.toml index eaf23a9..70e6a65 100644 --- a/warpgate-web/Cargo.toml +++ b/warpgate-web/Cargo.toml @@ -1,13 +1,11 @@ -cargo-features = ["workspace-inheritance"] - [package] +edition = "2021" +license = "Apache-2.0" name = "warpgate-web" -edition.workspace = true -license.workspace = true -version.workspace = true +version = "0.3.0" [dependencies] -rust-embed.workspace = true -serde.workspace = true -serde_json.workspace = true -thiserror.workspace = true +rust-embed = "6.3" +serde = "1.0" +serde_json = "1.0" +thiserror = "1.0" diff --git a/warpgate/Cargo.toml b/warpgate/Cargo.toml index e1fc099..0598fb5 100644 --- a/warpgate/Cargo.toml +++ b/warpgate/Cargo.toml @@ -1,41 +1,36 @@ -cargo-features = ["workspace-inheritance"] - [package] +edition = "2021" +license = "Apache-2.0" name = "warpgate" -edition.workspace = true -license.workspace = true -version.workspace = true +version = "0.3.0" [dependencies] ansi_term = "0.12" -anyhow.workspace = true -async-trait.workspace = true +anyhow = {version = "1.0", features = ["backtrace"]} +async-trait = "0.1" atty = "0.2" -bytes.workspace = true -clap = { version = "3.2", features = ["derive"] } -config = { version = "0.13", features = ["yaml"], default_features = false } -console = { version = "0.15", default_features = false } -console-subscriber = { version = "0.1", optional = true } -data-encoding.workspace = true -dhat = { version = "0.3", optional = true } -dialoguer.workspace = true -futures.workspace = true +bytes = "1.1" +clap = {version = "3.2", features = ["derive"]} +config = {version = "0.13", features = ["yaml"], default_features = false} +console = {version = "0.15", default_features = false} +console-subscriber = {version = "0.1", optional = true} +data-encoding = "2.3" +dhat = {version = "0.3", optional = true} +dialoguer = "0.10" +futures = "0.3" notify = "^5.0.0-beta.1" -openssl = { version = "0.10", features = ["vendored"] } # Embed OpenSSL +openssl = {version = "0.10", features = ["vendored"]}# Embed OpenSSL qrcode = "0.12" -rcgen = { version = "0.9", features = ["zeroize"] } +rcgen = {version = "0.9", features = ["zeroize"]} serde_yaml = "0.8.23" -time.workspace = true -tokio.workspace = true -tracing.workspace = true -tracing-subscriber = { version = "0.3", features = [ - "env-filter", - "local-time", -] } -warpgate-admin = { version = "*", path = "../warpgate-admin" } -warpgate-common = { version = "*", path = "../warpgate-common" } -warpgate-protocol-http = { version = "*", path = "../warpgate-protocol-http" } -warpgate-protocol-ssh = { version = "*", path = "../warpgate-protocol-ssh" } +time = "0.3" +tokio = {version = "1.19", features = ["tracing", "signal", "macros"]} +tracing = "0.1" +tracing-subscriber = {version = "0.3", features = ["env-filter", "local-time"]} +warpgate-admin = {version = "*", path = "../warpgate-admin"} +warpgate-common = {version = "*", path = "../warpgate-common"} +warpgate-protocol-http = {version = "*", path = "../warpgate-protocol-http"} +warpgate-protocol-ssh = {version = "*", path = "../warpgate-protocol-ssh"} [target.'cfg(target_os = "linux")'.dependencies] sd-notify = "0.4"