From dfef310063dd40ed24b8c9e59a773c2cf5631b16 Mon Sep 17 00:00:00 2001 From: eclipse-zenoh-bot Date: Fri, 26 Apr 2024 14:47:05 +0000 Subject: [PATCH] build: Sync Cargo lockfile with Zenoh's --- zenoh-jni/Cargo.lock | 90 +++++++++++++++++++++++++++----------------- 1 file changed, 56 insertions(+), 34 deletions(-) diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock index 68d927c2..b8328aa9 100644 --- a/zenoh-jni/Cargo.lock +++ b/zenoh-jni/Cargo.lock @@ -288,6 +288,9 @@ name = "bitflags" version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +dependencies = [ + "serde", +] [[package]] name = "block-buffer" @@ -1709,6 +1712,18 @@ dependencies = [ "cache-padded", ] +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64", + "bitflags 2.4.2", + "serde", + "serde_derive", +] + [[package]] name = "rsa" version = "0.9.2" @@ -1780,9 +1795,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.2" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", "ring 0.17.6", @@ -2353,7 +2368,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls 0.22.2", + "rustls 0.22.4", "rustls-pki-types", "tokio", ] @@ -2985,7 +3000,7 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "zenoh" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e8916bf3ce3e3418b953eccd58f2aa1482839257" dependencies = [ "ahash", "async-trait", @@ -3035,7 +3050,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e8916bf3ce3e3418b953eccd58f2aa1482839257" dependencies = [ "zenoh-collections", ] @@ -3043,7 +3058,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e8916bf3ce3e3418b953eccd58f2aa1482839257" dependencies = [ "serde", "tracing", @@ -3055,12 +3070,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e8916bf3ce3e3418b953eccd58f2aa1482839257" [[package]] name = "zenoh-config" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e8916bf3ce3e3418b953eccd58f2aa1482839257" dependencies = [ "flume 0.11.0", "json5", @@ -3080,7 +3095,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e8916bf3ce3e3418b953eccd58f2aa1482839257" dependencies = [ "async-global-executor", "lazy_static", @@ -3092,7 +3107,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e8916bf3ce3e3418b953eccd58f2aa1482839257" dependencies = [ "aes", "hmac", @@ -3105,7 +3120,7 @@ dependencies = [ [[package]] name = "zenoh-ext" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e8916bf3ce3e3418b953eccd58f2aa1482839257" dependencies = [ "bincode", "flume 0.11.0", @@ -3126,7 +3141,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e8916bf3ce3e3418b953eccd58f2aa1482839257" dependencies = [ "hashbrown 0.14.0", "keyed-set", @@ -3140,7 +3155,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e8916bf3ce3e3418b953eccd58f2aa1482839257" dependencies = [ "async-trait", "zenoh-config", @@ -3158,12 +3173,12 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e8916bf3ce3e3418b953eccd58f2aa1482839257" dependencies = [ "async-trait", "flume 0.11.0", "futures", - "rustls 0.22.2", + "rustls 0.22.4", "rustls-webpki 0.102.2", "serde", "tokio", @@ -3171,6 +3186,7 @@ dependencies = [ "tracing", "zenoh-buffers", "zenoh-codec", + "zenoh-config", "zenoh-core", "zenoh-protocol", "zenoh-result", @@ -3181,7 +3197,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e8916bf3ce3e3418b953eccd58f2aa1482839257" dependencies = [ "async-trait", "base64", @@ -3189,13 +3205,15 @@ dependencies = [ "quinn", "rustls 0.21.7", "rustls-native-certs 0.7.0", - "rustls-pemfile 2.0.0", + "rustls-pemfile 1.0.3", + "rustls-pki-types", "rustls-webpki 0.102.2", "secrecy", "tokio", "tokio-rustls 0.24.1", "tokio-util", "tracing", + "webpki-roots", "zenoh-config", "zenoh-core", "zenoh-link-commons", @@ -3209,7 +3227,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e8916bf3ce3e3418b953eccd58f2aa1482839257" dependencies = [ "async-trait", "tokio", @@ -3227,12 +3245,12 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e8916bf3ce3e3418b953eccd58f2aa1482839257" dependencies = [ "async-trait", "base64", "futures", - "rustls 0.22.2", + "rustls 0.22.4", "rustls-pemfile 2.0.0", "rustls-pki-types", "rustls-webpki 0.102.2", @@ -3255,7 +3273,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e8916bf3ce3e3418b953eccd58f2aa1482839257" dependencies = [ "async-trait", "socket2 0.5.6", @@ -3276,7 +3294,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e8916bf3ce3e3418b953eccd58f2aa1482839257" dependencies = [ "async-trait", "futures", @@ -3296,7 +3314,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e8916bf3ce3e3418b953eccd58f2aa1482839257" dependencies = [ "async-trait", "futures-util", @@ -3317,7 +3335,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e8916bf3ce3e3418b953eccd58f2aa1482839257" dependencies = [ "proc-macro2", "quote", @@ -3328,7 +3346,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e8916bf3ce3e3418b953eccd58f2aa1482839257" dependencies = [ "const_format", "libloading", @@ -3344,7 +3362,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e8916bf3ce3e3418b953eccd58f2aa1482839257" dependencies = [ "const_format", "rand", @@ -3358,7 +3376,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e8916bf3ce3e3418b953eccd58f2aa1482839257" dependencies = [ "anyhow", ] @@ -3366,19 +3384,23 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e8916bf3ce3e3418b953eccd58f2aa1482839257" dependencies = [ "futures", "lazy_static", + "libc", + "ron", + "serde", "tokio", "zenoh-collections", + "zenoh-macros", "zenoh-result", ] [[package]] name = "zenoh-sync" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e8916bf3ce3e3418b953eccd58f2aa1482839257" dependencies = [ "event-listener 4.0.0", "futures", @@ -3392,7 +3414,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e8916bf3ce3e3418b953eccd58f2aa1482839257" dependencies = [ "futures", "tokio", @@ -3405,7 +3427,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e8916bf3ce3e3418b953eccd58f2aa1482839257" dependencies = [ "async-trait", "flume 0.11.0", @@ -3437,7 +3459,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#4f42ce780da20bd2a08c06bf5cbb5d6ad7db031d" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e8916bf3ce3e3418b953eccd58f2aa1482839257" dependencies = [ "async-std", "async-trait", @@ -3497,6 +3519,6 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"