From e9c0a7e6b7f47a45972ab8dfd5ad9ad5690dccfc Mon Sep 17 00:00:00 2001
From: Michael Ilyin <milyin@gmail.com>
Date: Fri, 27 Sep 2024 15:24:30 +0200
Subject: [PATCH 1/2] new serailzer API update

---
 Cargo.lock    | 59 +++++++++++++++++++++++----------------------------
 Cargo.toml    |  6 +++---
 v1/src/lib.rs |  6 +++---
 v2/src/lib.rs |  6 +++---
 4 files changed, 35 insertions(+), 42 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e3d8269..5b2d836 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3849,12 +3849,6 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
-[[package]]
-name = "unwrap-infallible"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
-
 [[package]]
 name = "unzip-n"
 version = "0.1.2"
@@ -4320,7 +4314,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#965e9050ac2d1cae83ad0919c91f2ac9cd56f648"
+source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
 dependencies = [
  "ahash",
  "async-trait",
@@ -4347,7 +4341,6 @@ dependencies = [
  "tokio-util",
  "tracing",
  "uhlc",
- "unwrap-infallible",
  "vec_map",
  "zenoh-buffers",
  "zenoh-codec",
@@ -4417,7 +4410,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#965e9050ac2d1cae83ad0919c91f2ac9cd56f648"
+source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
 dependencies = [
  "zenoh-collections",
 ]
@@ -4425,7 +4418,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#965e9050ac2d1cae83ad0919c91f2ac9cd56f648"
+source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
 dependencies = [
  "tracing",
  "uhlc",
@@ -4436,12 +4429,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#965e9050ac2d1cae83ad0919c91f2ac9cd56f648"
+source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#965e9050ac2d1cae83ad0919c91f2ac9cd56f648"
+source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
 dependencies = [
  "json5",
  "num_cpus",
@@ -4462,7 +4455,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#965e9050ac2d1cae83ad0919c91f2ac9cd56f648"
+source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -4473,7 +4466,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#965e9050ac2d1cae83ad0919c91f2ac9cd56f648"
+source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
 dependencies = [
  "aes 0.8.4",
  "hmac 0.12.1",
@@ -4486,7 +4479,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#965e9050ac2d1cae83ad0919c91f2ac9cd56f648"
+source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
 dependencies = [
  "hashbrown",
  "keyed-set",
@@ -4500,7 +4493,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#965e9050ac2d1cae83ad0919c91f2ac9cd56f648"
+source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -4517,7 +4510,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#965e9050ac2d1cae83ad0919c91f2ac9cd56f648"
+source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
 dependencies = [
  "async-trait",
  "flume",
@@ -4540,7 +4533,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#965e9050ac2d1cae83ad0919c91f2ac9cd56f648"
+source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -4565,7 +4558,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#965e9050ac2d1cae83ad0919c91f2ac9cd56f648"
+source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -4582,7 +4575,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#965e9050ac2d1cae83ad0919c91f2ac9cd56f648"
+source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -4609,7 +4602,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#965e9050ac2d1cae83ad0919c91f2ac9cd56f648"
+source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -4628,7 +4621,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#965e9050ac2d1cae83ad0919c91f2ac9cd56f648"
+source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
 dependencies = [
  "async-trait",
  "nix",
@@ -4646,7 +4639,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#965e9050ac2d1cae83ad0919c91f2ac9cd56f648"
+source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -4666,7 +4659,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#965e9050ac2d1cae83ad0919c91f2ac9cd56f648"
+source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4677,7 +4670,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#965e9050ac2d1cae83ad0919c91f2ac9cd56f648"
+source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
 dependencies = [
  "git-version",
  "libloading",
@@ -4693,7 +4686,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#965e9050ac2d1cae83ad0919c91f2ac9cd56f648"
+source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
 dependencies = [
  "const_format",
  "rand 0.8.5",
@@ -4707,7 +4700,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#965e9050ac2d1cae83ad0919c91f2ac9cd56f648"
+source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
 dependencies = [
  "anyhow",
 ]
@@ -4715,7 +4708,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#965e9050ac2d1cae83ad0919c91f2ac9cd56f648"
+source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
 dependencies = [
  "lazy_static",
  "ron",
@@ -4728,7 +4721,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#965e9050ac2d1cae83ad0919c91f2ac9cd56f648"
+source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
 dependencies = [
  "event-listener 5.3.1",
  "futures",
@@ -4741,7 +4734,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#965e9050ac2d1cae83ad0919c91f2ac9cd56f648"
+source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
 dependencies = [
  "futures",
  "tokio",
@@ -4754,7 +4747,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#965e9050ac2d1cae83ad0919c91f2ac9cd56f648"
+source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -4787,7 +4780,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#965e9050ac2d1cae83ad0919c91f2ac9cd56f648"
+source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
 dependencies = [
  "async-trait",
  "const_format",
@@ -4812,7 +4805,7 @@ dependencies = [
 [[package]]
 name = "zenoh_backend_traits"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#965e9050ac2d1cae83ad0919c91f2ac9cd56f648"
+source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
 dependencies = [
  "async-trait",
  "const_format",
diff --git a/Cargo.toml b/Cargo.toml
index eccf3bc..9b62c56 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -44,10 +44,10 @@ serde_json = "1.0.94"
 tokio = { version = "1.35.1", default-features = false } # Default features are disabled due to some crates' requirements
 tracing = "0.1"
 uuid = { version = "1.3.0", features = ["v4"] }
-zenoh = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = [
+zenoh = { git = "https://github.com/ZettaScaleLabs/zenoh.git", branch = "serialization_ext2", features = [
     "unstable",
     "internal",
     "plugins"
 ] }
-zenoh_backend_traits = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
-zenoh-plugin-trait = { version = "1.0.0-dev", git = "htttps://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
+zenoh_backend_traits = { git = "https://github.com/ZettaScaleLabs/zenoh.git", branch = "serialization_ext2" }
+zenoh-plugin-trait = {  git = "https://github.com/ZettaScaleLabs/zenoh.git", branch = "serialization_ext2" }
diff --git a/v1/src/lib.rs b/v1/src/lib.rs
index ad3896a..ffbb9ee 100644
--- a/v1/src/lib.rs
+++ b/v1/src/lib.rs
@@ -440,9 +440,9 @@ impl Storage for InfluxDbStorage {
         }
 
         // encode the value as a string to be stored in InfluxDB, converting to base64 if the buffer is not a UTF-8 string
-        let (base64, strvalue) = match value.payload().deserialize::<String>() {
+        let (base64, strvalue) = match value.payload().try_to_string() {
             Ok(s) => (false, s),
-            Err(err) => (true, b64_std_engine.encode(err.to_string())),
+            Err(err) => (true, b64_std_engine.encode(err.to_string()).into()),
         };
 
         // Note: tags are stored as strings in InfluxDB, while fileds are typed.
@@ -460,7 +460,7 @@ impl Storage for InfluxDbStorage {
         .add_field("encoding_prefix", encoding.id())
         .add_field("encoding_suffix", encoding_string_rep) // TODO: Rename To Encoding and only keep String rep
         .add_field("base64", base64)
-        .add_field("value", strvalue);
+        .add_field("value", strvalue.as_ref());
 
         debug!("Put {:?} with Influx query: {:?}", measurement, query);
         if let Err(e) = self.client.query(&query).await {
diff --git a/v2/src/lib.rs b/v2/src/lib.rs
index 9d891bc..d00515d 100644
--- a/v2/src/lib.rs
+++ b/v2/src/lib.rs
@@ -555,9 +555,9 @@ impl Storage for InfluxDbStorage {
         // Note: assume that uhlc timestamp was generated by a clock using UNIX_EPOCH (that's the case by default)
         // encode the value as a string to be stored in InfluxDB, converting to base64 if the buffer is not a UTF-8 string
 
-        let (base64, strvalue) = match value.payload().deserialize::<String>() {
+        let (base64, strvalue) = match value.payload().try_to_string() {
             Ok(s) => (false, s),
-            Err(err) => (true, b64_std_engine.encode(err.to_string())),
+            Err(err) => (true, b64_std_engine.encode(err.to_string()).into()),
         };
 
         // Note: tags are stored as strings in InfluxDB, while fileds are typed.
@@ -572,7 +572,7 @@ impl Storage for InfluxDbStorage {
             .field("encoding_prefix", encoding.id() as i64) //should be u8 but not supported in v2.x so using a workaround
             .field("encoding_suffix", encoding_string_rep) // TODO: Left for compatibility, consider replacing wiht single "Encoding" field
             .field("base64", base64)
-            .field("value", strvalue)
+            .field("value", strvalue.as_ref())
             .timestamp(influx_time) //converted timestamp to i64
             .build()?];
 

From 55ca7e5a7ecf75d02f319d06250395784044d55d Mon Sep 17 00:00:00 2001
From: Michael Ilyin <milyin@gmail.com>
Date: Tue, 1 Oct 2024 13:19:11 +0200
Subject: [PATCH 2/2] cargo toml updated

---
 Cargo.lock | 236 +++++++++++++++++++++++++++--------------------------
 Cargo.toml |   6 +-
 2 files changed, 125 insertions(+), 117 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5b2d836..ab6361d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -167,7 +167,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
  "synstructure",
 ]
 
@@ -179,7 +179,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -366,13 +366,13 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.82"
+version = "0.1.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -383,9 +383,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "backtrace"
@@ -498,9 +498,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
 
 [[package]]
 name = "cache-padded"
@@ -510,9 +510,9 @@ checksum = "981520c98f422fcc584dc1a95c334e6953900b9106bc47a9839b81790009eb21"
 
 [[package]]
 name = "cc"
-version = "1.1.20"
+version = "1.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45bcde016d64c21da4be18b655631e5ab6d3107607e71a73a9f53eb48aae23fb"
+checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938"
 dependencies = [
  "shlex",
 ]
@@ -828,7 +828,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -887,7 +887,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1098,7 +1098,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1198,7 +1198,7 @@ checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1380,9 +1380,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
 [[package]]
 name = "httpdate"
@@ -1413,7 +1413,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.10",
+ "socket2 0.5.7",
  "tokio",
  "tower-service",
  "tracing",
@@ -1436,9 +1436,9 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -1558,7 +1558,7 @@ checksum = "6ac96b3660efd0cde32b0b20bc86cc93f33269cd9f6c97e759e0b0259b2133fb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1726,9 +1726,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.159"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
 
 [[package]]
 name = "libloading"
@@ -2005,9 +2005,12 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
+dependencies = [
+ "portable-atomic",
+]
 
 [[package]]
 name = "opaque-debug"
@@ -2081,7 +2084,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.4",
+ "redox_syscall 0.5.7",
  "smallvec",
  "windows-targets 0.52.6",
 ]
@@ -2109,9 +2112,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.7.12"
+version = "2.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c73c26c01b8c87956cea613c907c9d6ecffd8d18a2a5908e5de0adfaa185cea"
+checksum = "fdbef9d1d47087a895abd220ed25eb4ad973a5e26f6a4367b038c25e28dfc2d9"
 dependencies = [
  "memchr",
  "thiserror",
@@ -2120,9 +2123,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.7.12"
+version = "2.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "664d22978e2815783adbdd2c588b455b1bd625299ce36b2a99881ac9627e6d8d"
+checksum = "4d3a6e3394ec80feb3b6393c725571754c6188490265c61aaf260810d6b95aa0"
 dependencies = [
  "pest",
  "pest_generator",
@@ -2130,22 +2133,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.12"
+version = "2.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2d5487022d5d33f4c30d91c22afa240ce2a644e87fe08caad974d4eab6badbe"
+checksum = "94429506bde1ca69d1b5601962c73f4172ab4726571a59ea95931218cb0e930e"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.12"
+version = "2.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0091754bbd0ea592c4deb3a122ce8ecbb0753b738aa82bc055fcc2eccc8d8174"
+checksum = "ac8a071862e93690b6e34e9a5fb8e33ff3734473ac0245b27232222c4906a33f"
 dependencies = [
  "once_cell",
  "pest",
@@ -2192,7 +2195,7 @@ dependencies = [
  "phf_shared",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -2221,7 +2224,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -2342,6 +2345,12 @@ dependencies = [
  "universal-hash",
 ]
 
+[[package]]
+name = "portable-atomic"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
+
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -2512,9 +2521,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.4"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -2532,14 +2541,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-automata 0.4.8",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -2553,13 +2562,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -2570,9 +2579,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
@@ -2802,7 +2811,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5"
 dependencies = [
  "openssl-probe",
- "rustls-pemfile 2.1.3",
+ "rustls-pemfile 2.2.0",
  "rustls-pki-types",
  "schannel",
  "security-framework",
@@ -2819,19 +2828,18 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64 0.22.1",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55"
 
 [[package]]
 name = "rustls-platform-verifier"
@@ -2850,7 +2858,7 @@ dependencies = [
  "rustls-webpki 0.102.8",
  "security-framework",
  "security-framework-sys",
- "webpki-roots 0.26.5",
+ "webpki-roots 0.26.6",
  "winapi",
 ]
 
@@ -2927,7 +2935,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -2982,9 +2990,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.1"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -3051,7 +3059,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3062,7 +3070,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3399,9 +3407,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3422,7 +3430,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3448,22 +3456,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3593,7 +3601,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3670,7 +3678,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3767,9 +3775,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
+checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
 
 [[package]]
 name = "uhlc"
@@ -3808,18 +3816,18 @@ checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "universal-hash"
@@ -3994,7 +4002,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
  "wasm-bindgen-shared",
 ]
 
@@ -4028,7 +4036,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -4041,9 +4049,9 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
 
 [[package]]
 name = "wasm-streams"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
+checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -4089,9 +4097,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.5"
+version = "0.26.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -4314,7 +4322,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.0.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "ahash",
  "async-trait",
@@ -4410,7 +4418,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.0.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "zenoh-collections",
 ]
@@ -4418,7 +4426,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.0.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "tracing",
  "uhlc",
@@ -4429,12 +4437,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.0.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "json5",
  "num_cpus",
@@ -4455,7 +4463,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -4466,7 +4474,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "aes 0.8.4",
  "hmac 0.12.1",
@@ -4479,7 +4487,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "hashbrown",
  "keyed-set",
@@ -4493,7 +4501,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -4510,7 +4518,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "async-trait",
  "flume",
@@ -4533,20 +4541,20 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
  "quinn",
  "rustls 0.23.13",
- "rustls-pemfile 2.1.3",
+ "rustls-pemfile 2.2.0",
  "rustls-pki-types",
  "rustls-webpki 0.102.8",
  "secrecy",
  "tokio",
  "tokio-util",
  "tracing",
- "webpki-roots 0.26.5",
+ "webpki-roots 0.26.6",
  "x509-parser",
  "zenoh-config",
  "zenoh-core",
@@ -4558,7 +4566,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -4575,12 +4583,12 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.0.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
  "rustls 0.23.13",
- "rustls-pemfile 2.1.3",
+ "rustls-pemfile 2.2.0",
  "rustls-pki-types",
  "rustls-webpki 0.102.8",
  "secrecy",
@@ -4589,7 +4597,7 @@ dependencies = [
  "tokio-rustls 0.26.0",
  "tokio-util",
  "tracing",
- "webpki-roots 0.26.5",
+ "webpki-roots 0.26.6",
  "x509-parser",
  "zenoh-config",
  "zenoh-core",
@@ -4602,7 +4610,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -4621,7 +4629,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "async-trait",
  "nix",
@@ -4639,7 +4647,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -4659,18 +4667,18 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
  "zenoh-keyexpr",
 ]
 
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "git-version",
  "libloading",
@@ -4686,7 +4694,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "const_format",
  "rand 0.8.5",
@@ -4700,7 +4708,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "anyhow",
 ]
@@ -4708,7 +4716,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "lazy_static",
  "ron",
@@ -4721,7 +4729,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "event-listener 5.3.1",
  "futures",
@@ -4734,7 +4742,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "futures",
  "tokio",
@@ -4747,7 +4755,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -4780,7 +4788,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "async-trait",
  "const_format",
@@ -4805,7 +4813,7 @@ dependencies = [
 [[package]]
 name = "zenoh_backend_traits"
 version = "1.0.0-dev"
-source = "git+https://github.com/ZettaScaleLabs/zenoh.git?branch=serialization_ext2#1f11f57cc52fb211f83b4134b22233baf14a108a"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#febd589126a4e16d120d04d36e4b50430f569881"
 dependencies = [
  "async-trait",
  "const_format",
@@ -4837,7 +4845,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 9b62c56..ae507d3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -44,10 +44,10 @@ serde_json = "1.0.94"
 tokio = { version = "1.35.1", default-features = false } # Default features are disabled due to some crates' requirements
 tracing = "0.1"
 uuid = { version = "1.3.0", features = ["v4"] }
-zenoh = { git = "https://github.com/ZettaScaleLabs/zenoh.git", branch = "serialization_ext2", features = [
+zenoh = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = [
     "unstable",
     "internal",
     "plugins"
 ] }
-zenoh_backend_traits = { git = "https://github.com/ZettaScaleLabs/zenoh.git", branch = "serialization_ext2" }
-zenoh-plugin-trait = {  git = "https://github.com/ZettaScaleLabs/zenoh.git", branch = "serialization_ext2" }
+zenoh_backend_traits = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
+zenoh-plugin-trait = { version = "1.0.0-dev", git = "htttps://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
\ No newline at end of file