From c6e1531efc2834b41c0aeee20b37a956300e89ed Mon Sep 17 00:00:00 2001 From: Joseph Perez Date: Wed, 9 Oct 2024 15:03:44 +0200 Subject: [PATCH] chore: bump zenoh version --- Cargo.lock | 54 ++++++++++++------------- zenoh-plugin-dds/src/route_zenoh_dds.rs | 2 - 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7963279..df23ab1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4351,7 +4351,7 @@ dependencies = [ [[package]] name = "zenoh" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" dependencies = [ "ahash", "async-trait", @@ -4418,7 +4418,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" dependencies = [ "zenoh-collections", ] @@ -4426,7 +4426,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" dependencies = [ "tracing", "uhlc", @@ -4437,12 +4437,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" [[package]] name = "zenoh-config" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" dependencies = [ "json5", "num_cpus", @@ -4463,7 +4463,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" dependencies = [ "lazy_static", "tokio", @@ -4474,7 +4474,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" dependencies = [ "aes 0.8.4", "hmac 0.12.1", @@ -4487,7 +4487,7 @@ dependencies = [ [[package]] name = "zenoh-ext" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" dependencies = [ "bincode", "flume", @@ -4504,7 +4504,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" dependencies = [ "hashbrown 0.14.5", "keyed-set", @@ -4518,7 +4518,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" dependencies = [ "zenoh-config", "zenoh-link-commons", @@ -4535,7 +4535,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" dependencies = [ "async-trait", "flume", @@ -4558,7 +4558,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" dependencies = [ "async-trait", "base64 0.22.1", @@ -4583,7 +4583,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" dependencies = [ "async-trait", "socket2 0.5.7", @@ -4600,7 +4600,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" dependencies = [ "async-trait", "base64 0.22.1", @@ -4627,7 +4627,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" dependencies = [ "async-trait", "socket2 0.5.7", @@ -4646,7 +4646,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" dependencies = [ "async-trait", "nix", @@ -4664,7 +4664,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" dependencies = [ "async-trait", "futures-util", @@ -4684,7 +4684,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" dependencies = [ "proc-macro2", "quote", @@ -4720,7 +4720,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-rest" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" dependencies = [ "anyhow", "async-std", @@ -4745,7 +4745,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" dependencies = [ "git-version", "libloading", @@ -4761,7 +4761,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" dependencies = [ "const_format", "rand 0.8.5", @@ -4775,7 +4775,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" dependencies = [ "anyhow", ] @@ -4783,7 +4783,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" dependencies = [ "lazy_static", "ron", @@ -4796,7 +4796,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" dependencies = [ "event-listener 5.3.1", "futures", @@ -4809,7 +4809,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" dependencies = [ "futures", "tokio", @@ -4822,7 +4822,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" dependencies = [ "async-trait", "crossbeam-utils", @@ -4855,7 +4855,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d3768b87d23599f791af2de0c0d8fbe41f079431" dependencies = [ "async-trait", "const_format", diff --git a/zenoh-plugin-dds/src/route_zenoh_dds.rs b/zenoh-plugin-dds/src/route_zenoh_dds.rs index 5d03321..3663f5e 100644 --- a/zenoh-plugin-dds/src/route_zenoh_dds.rs +++ b/zenoh-plugin-dds/src/route_zenoh_dds.rs @@ -186,7 +186,6 @@ impl RouteZenohDDS<'_> { .zsession .declare_subscriber(ke.clone()) .callback(subscriber_callback) - .undeclare_on_drop(true) .allowed_origin(Locality::Remote) // Allow only remote publications to avoid loops .querying() .query_timeout(plugin.config.queries_timeout) @@ -204,7 +203,6 @@ impl RouteZenohDDS<'_> { .zsession .declare_subscriber(ke.clone()) .callback(subscriber_callback) - .undeclare_on_drop(true) .allowed_origin(Locality::Remote) // Allow only remote publications to avoid loops .await .map_err(|e| {