diff --git a/Cargo.lock b/Cargo.lock index 0cb7ecdf311..b4eeb52abb0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1792,6 +1792,19 @@ dependencies = [ "regex", ] +[[package]] +name = "env_logger" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +dependencies = [ + "humantime 2.1.0", + "is-terminal", + "log", + "regex", + "termcolor", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -2134,11 +2147,11 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "git2" -version = "0.15.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2994bee4a3a6a51eb90c218523be382fd7ea09b16380b9312e9dbe955ff7c7d1" +checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "libc", "libgit2-sys", "log", @@ -2719,9 +2732,9 @@ checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libgit2-sys" -version = "0.14.2+1.5.1" +version = "0.16.1+1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" +checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" dependencies = [ "cc", "libc", @@ -3698,9 +3711,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.58" +version = "0.10.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9dfc0783362704e97ef3bd24261995a699468440099ef95d869b4d9732f829a" +checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -3739,9 +3752,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.94" +version = "0.9.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f55da20b29f956fb01f0add8683eb26ee13ebe3ebd935e49898717c6b4b2830" +checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" dependencies = [ "cc", "libc", @@ -5728,7 +5741,7 @@ dependencies = [ "diesel", "diesel_migrations", "digest 0.10.7", - "env_logger 0.7.1", + "env_logger 0.10.1", "futures 0.3.29", "futures-test", "futures-util", diff --git a/common/Cargo.toml b/common/Cargo.toml index b404f429938..afbb239cb74 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -20,7 +20,7 @@ anyhow = "1.0.53" blake2 = "0.10" config = { version = "0.13.0", default_features = false, features = ["toml"] } dirs-next = "1.0.2" -git2 = { version = "0.15", default_features = false, optional = true } +git2 = { version = "0.18", default_features = false, optional = true } log = "0.4.8" log4rs = { git = "https://github.com/tari-project/log4rs.git", default_features = false, features = ["config_parsing", "threshold_filter", "yaml_format"] } multiaddr = { version = "0.14.0" } diff --git a/comms/dht/Cargo.toml b/comms/dht/Cargo.toml index e2ca69e3ed7..7e2371a9ebd 100644 --- a/comms/dht/Cargo.toml +++ b/comms/dht/Cargo.toml @@ -50,7 +50,7 @@ pin-project = "0.4" [dev-dependencies] tari_test_utils = { path = "../../infrastructure/test_utils" } -env_logger = "0.7.0" +env_logger = "0.10" futures-test = { version = "0.3.5" } futures-util = "^0.3.1" lmdb-zero = "0.4.4" diff --git a/comms/dht/examples/memorynet_graph_network_track_join.rs b/comms/dht/examples/memorynet_graph_network_track_join.rs index c8da6033016..00b34ebbefb 100644 --- a/comms/dht/examples/memorynet_graph_network_track_join.rs +++ b/comms/dht/examples/memorynet_graph_network_track_join.rs @@ -83,7 +83,7 @@ use crate::{ #[allow(clippy::same_item_push)] #[allow(clippy::too_many_lines)] async fn main() { - let _ = env_logger::from_env(Env::default()) + let _ = env_logger::Builder::from_env(Env::default()) .format_timestamp_millis() .try_init(); let matches = App::new("MemoryNet") diff --git a/comms/dht/examples/memorynet_graph_network_track_propagation.rs b/comms/dht/examples/memorynet_graph_network_track_propagation.rs index 6c6e5a66440..104a6c6b33c 100644 --- a/comms/dht/examples/memorynet_graph_network_track_propagation.rs +++ b/comms/dht/examples/memorynet_graph_network_track_propagation.rs @@ -80,7 +80,7 @@ use crate::{ #[tokio::main] #[allow(clippy::same_item_push)] async fn main() { - let _ = env_logger::from_env(Env::default()) + let _ = env_logger::Builder::from_env(Env::default()) .format_timestamp_millis() .try_init(); // let matches = App::new("MemoryNet") diff --git a/infrastructure/libtor/Cargo.toml b/infrastructure/libtor/Cargo.toml index af471b5f261..ff5c86342e1 100644 --- a/infrastructure/libtor/Cargo.toml +++ b/infrastructure/libtor/Cargo.toml @@ -14,7 +14,7 @@ log = "0.4.8" rand = "0.8" tempfile = "3.1.0" tor-hash-passwd = "1.0.1" -openssl = { version = "0.10.55", features = ["vendored"] } +openssl = { version = "0.10.61", features = ["vendored"] } [target.'cfg(unix)'.dependencies] libtor = { version="46.9.0"} diff --git a/integration_tests/Cargo.toml b/integration_tests/Cargo.toml index 455f0cbff46..792a942a1c4 100644 --- a/integration_tests/Cargo.toml +++ b/integration_tests/Cargo.toml @@ -37,7 +37,7 @@ async-trait = "0.1.50" chrono = { version = "0.4.22", default-features = false } config = "0.13.0" csv = "1.1" -cucumber = { version = "0.18.0", features = ["default", "libtest", "output-junit"] } +cucumber = { version = "0.20.0", features = ["default", "libtest", "output-junit"] } futures = { version = "^0.3.1" } indexmap = "1.9.1" libc = "0.2.65"