diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock index 5078c5f5..97455a69 100644 --- a/zenoh-jni/Cargo.lock +++ b/zenoh-jni/Cargo.lock @@ -1981,14 +1981,15 @@ dependencies = [ [[package]] name = "ron" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db09040cc89e461f1a265139777a2bde7f8d8c67c4936f700c63ce3e2904d468" +checksum = "fd490c5b18261893f14449cbd28cb9c0b637aebf161cd77900bfdedaff21ec32" dependencies = [ - "base64", "bitflags 2.10.0", + "once_cell", "serde", "serde_derive", + "typeid", "unicode-ident", ] @@ -2046,7 +2047,7 @@ dependencies = [ "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.103.8", + "rustls-webpki", "subtle", "zeroize", ] @@ -2096,7 +2097,7 @@ dependencies = [ "rustls", "rustls-native-certs", "rustls-platform-verifier-android", - "rustls-webpki 0.103.8", + "rustls-webpki", "security-framework", "security-framework-sys", "webpki-root-certs", @@ -2109,17 +2110,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" -[[package]] -name = "rustls-webpki" -version = "0.102.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] - [[package]] name = "rustls-webpki" version = "0.103.8" @@ -2161,19 +2151,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "schemars" -version = "0.8.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615" -dependencies = [ - "dyn-clone", - "either", - "schemars_derive", - "serde", - "serde_json", -] - [[package]] name = "schemars" version = "0.9.0" @@ -2193,16 +2170,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9558e172d4e8533736ba97870c4b2cd63f84b382a3d6eb063da41b91cce17289" dependencies = [ "dyn-clone", + "either", "ref-cast", + "schemars_derive", "serde", "serde_json", ] [[package]] name = "schemars_derive" -version = "0.8.22" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d" +checksum = "301858a4023d78debd2353c7426dc486001bddc91ae31a76fb1f55132f7e2633" dependencies = [ "proc-macro2", "quote", @@ -2491,9 +2470,9 @@ dependencies = [ [[package]] name = "stabby" -version = "36.2.2" +version = "72.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b7e94eaf470c2e76b5f15fb2fb49714471a36cc512df5ee231e62e82ec79f8" +checksum = "976399a0c48ea769ef7f5dc303bb88240ab8d84008647a6b2303eced3dab3945" dependencies = [ "rustversion", "stabby-abi", @@ -2501,9 +2480,9 @@ dependencies = [ [[package]] name = "stabby-abi" -version = "36.2.2" +version = "72.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc7a63b8276b54e51bfffe3d85da56e7906b2dcfcb29018a8ab666c06734c1a" +checksum = "f7b54832a9a1f92a0e55e74a5c0332744426edc515bb3fbad82f10b874a87f0d" dependencies = [ "rustc_version", "rustversion", @@ -2513,9 +2492,9 @@ dependencies = [ [[package]] name = "stabby-macros" -version = "36.2.2" +version = "72.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eecb7ec5611ec93ec79d120fbe55f31bea234dc1bed1001d4a071bb688651615" +checksum = "a768b1e51e4dbfa4fa52ae5c01241c0a41e2938fdffbb84add0c8238092f9091" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2924,6 +2903,12 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "typeid" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c" + [[package]] name = "typenum" version = "1.19.0" @@ -3157,15 +3142,6 @@ dependencies = [ "rustls-pki-types", ] -[[package]] -name = "webpki-roots" -version = "0.26.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" -dependencies = [ - "webpki-roots 1.0.4", -] - [[package]] name = "webpki-roots" version = "1.0.4" @@ -3558,7 +3534,7 @@ dependencies = [ [[package]] name = "zenoh" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "ahash", "arc-swap", @@ -3609,7 +3585,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "zenoh-collections", ] @@ -3617,7 +3593,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "tracing", "uhlc", @@ -3628,7 +3604,7 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "ahash", ] @@ -3636,7 +3612,7 @@ dependencies = [ [[package]] name = "zenoh-config" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "json5", "nonempty-collections", @@ -3660,7 +3636,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "lazy_static", "tokio", @@ -3671,7 +3647,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "aes", "hmac", @@ -3684,7 +3660,7 @@ dependencies = [ [[package]] name = "zenoh-ext" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "async-trait", "bincode", @@ -3703,13 +3679,13 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "getrandom 0.2.16", "hashbrown 0.16.0", "keyed-set", "rand 0.8.5", - "schemars 0.8.22", + "schemars 1.1.0", "serde", "token-cell", "zenoh-result", @@ -3718,7 +3694,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "zenoh-config", "zenoh-link-commons", @@ -3736,7 +3712,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "async-trait", "base64", @@ -3746,7 +3722,7 @@ dependencies = [ "rustls", "rustls-pemfile", "rustls-pki-types", - "rustls-webpki 0.102.8", + "rustls-webpki", "secrecy", "serde", "socket2 0.5.10", @@ -3754,7 +3730,7 @@ dependencies = [ "tokio", "tokio-util", "tracing", - "webpki-roots 0.26.11", + "webpki-roots", "x509-parser", "zenoh-buffers", "zenoh-codec", @@ -3769,20 +3745,20 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "async-trait", "base64", "quinn", "rustls", "rustls-pemfile", - "rustls-webpki 0.102.8", + "rustls-webpki", "secrecy", "time", "tokio", "tokio-util", "tracing", - "webpki-roots 0.26.11", + "webpki-roots", "zenoh-config", "zenoh-core", "zenoh-link-commons", @@ -3794,12 +3770,12 @@ dependencies = [ [[package]] name = "zenoh-link-quic_datagram" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "async-trait", "quinn", "rustls", - "rustls-webpki 0.102.8", + "rustls-webpki", "time", "tokio", "tokio-util", @@ -3814,7 +3790,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "async-trait", "socket2 0.5.10", @@ -3831,14 +3807,14 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "async-trait", "base64", "rustls", "rustls-pemfile", "rustls-pki-types", - "rustls-webpki 0.102.8", + "rustls-webpki", "secrecy", "socket2 0.5.10", "time", @@ -3847,7 +3823,7 @@ dependencies = [ "tokio-rustls", "tokio-util", "tracing", - "webpki-roots 0.26.11", + "webpki-roots", "x509-parser", "zenoh-config", "zenoh-core", @@ -3860,7 +3836,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "async-trait", "libc", @@ -3881,7 +3857,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "async-trait", "nix", @@ -3899,7 +3875,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "async-trait", "futures-util", @@ -3919,7 +3895,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "proc-macro2", "quote", @@ -3930,7 +3906,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "git-version", "libloading", @@ -3947,7 +3923,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "const_format", "rand 0.8.5", @@ -3961,7 +3937,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "anyhow", ] @@ -3969,7 +3945,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "lazy_static", "ron", @@ -3983,7 +3959,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "arc-swap", "event-listener", @@ -3997,7 +3973,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "futures", "tokio", @@ -4010,7 +3986,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "async-trait", "crossbeam-utils", @@ -4044,7 +4020,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "1.6.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#a7eebd83d6c4cd6c28755deb57c762165f11d7ef" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#154fa3241b5f4edde123cd2a65ea5c1cf3833823" dependencies = [ "async-trait", "const_format", @@ -4055,7 +4031,7 @@ dependencies = [ "libc", "libloading", "pnet_datalink", - "schemars 0.8.22", + "schemars 1.1.0", "serde", "serde_json", "shellexpand",