diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock
index 9a6015b8..8e019e9e 100644
--- a/zenoh-jni/Cargo.lock
+++ b/zenoh-jni/Cargo.lock
@@ -2866,7 +2866,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2620ff82234baadb3fbae52066ac74ead8452864"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#16ddfadc5832beeca5c9d1f6c6c1c0db8ce85b41"
 dependencies = [
  "ahash",
  "async-trait",
@@ -2915,7 +2915,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2620ff82234baadb3fbae52066ac74ead8452864"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#16ddfadc5832beeca5c9d1f6c6c1c0db8ce85b41"
 dependencies = [
  "zenoh-collections",
 ]
@@ -2923,7 +2923,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2620ff82234baadb3fbae52066ac74ead8452864"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#16ddfadc5832beeca5c9d1f6c6c1c0db8ce85b41"
 dependencies = [
  "tracing",
  "uhlc",
@@ -2934,12 +2934,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2620ff82234baadb3fbae52066ac74ead8452864"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#16ddfadc5832beeca5c9d1f6c6c1c0db8ce85b41"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2620ff82234baadb3fbae52066ac74ead8452864"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#16ddfadc5832beeca5c9d1f6c6c1c0db8ce85b41"
 dependencies = [
  "flume 0.11.0",
  "json5",
@@ -2961,7 +2961,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2620ff82234baadb3fbae52066ac74ead8452864"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#16ddfadc5832beeca5c9d1f6c6c1c0db8ce85b41"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -2972,7 +2972,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2620ff82234baadb3fbae52066ac74ead8452864"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#16ddfadc5832beeca5c9d1f6c6c1c0db8ce85b41"
 dependencies = [
  "aes",
  "hmac",
@@ -2985,7 +2985,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2620ff82234baadb3fbae52066ac74ead8452864"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#16ddfadc5832beeca5c9d1f6c6c1c0db8ce85b41"
 dependencies = [
  "bincode",
  "flume 0.11.0",
@@ -3001,7 +3001,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2620ff82234baadb3fbae52066ac74ead8452864"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#16ddfadc5832beeca5c9d1f6c6c1c0db8ce85b41"
 dependencies = [
  "hashbrown 0.14.5",
  "keyed-set",
@@ -3015,7 +3015,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2620ff82234baadb3fbae52066ac74ead8452864"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#16ddfadc5832beeca5c9d1f6c6c1c0db8ce85b41"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -3032,7 +3032,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2620ff82234baadb3fbae52066ac74ead8452864"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#16ddfadc5832beeca5c9d1f6c6c1c0db8ce85b41"
 dependencies = [
  "async-trait",
  "flume 0.11.0",
@@ -3055,7 +3055,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2620ff82234baadb3fbae52066ac74ead8452864"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#16ddfadc5832beeca5c9d1f6c6c1c0db8ce85b41"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3080,7 +3080,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2620ff82234baadb3fbae52066ac74ead8452864"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#16ddfadc5832beeca5c9d1f6c6c1c0db8ce85b41"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3097,7 +3097,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2620ff82234baadb3fbae52066ac74ead8452864"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#16ddfadc5832beeca5c9d1f6c6c1c0db8ce85b41"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3124,7 +3124,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2620ff82234baadb3fbae52066ac74ead8452864"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#16ddfadc5832beeca5c9d1f6c6c1c0db8ce85b41"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3143,7 +3143,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2620ff82234baadb3fbae52066ac74ead8452864"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#16ddfadc5832beeca5c9d1f6c6c1c0db8ce85b41"
 dependencies = [
  "async-trait",
  "nix",
@@ -3161,7 +3161,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2620ff82234baadb3fbae52066ac74ead8452864"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#16ddfadc5832beeca5c9d1f6c6c1c0db8ce85b41"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3181,7 +3181,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2620ff82234baadb3fbae52066ac74ead8452864"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#16ddfadc5832beeca5c9d1f6c6c1c0db8ce85b41"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3192,7 +3192,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2620ff82234baadb3fbae52066ac74ead8452864"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#16ddfadc5832beeca5c9d1f6c6c1c0db8ce85b41"
 dependencies = [
  "git-version",
  "libloading",
@@ -3207,7 +3207,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2620ff82234baadb3fbae52066ac74ead8452864"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#16ddfadc5832beeca5c9d1f6c6c1c0db8ce85b41"
 dependencies = [
  "const_format",
  "rand",
@@ -3221,7 +3221,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2620ff82234baadb3fbae52066ac74ead8452864"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#16ddfadc5832beeca5c9d1f6c6c1c0db8ce85b41"
 dependencies = [
  "anyhow",
 ]
@@ -3229,7 +3229,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2620ff82234baadb3fbae52066ac74ead8452864"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#16ddfadc5832beeca5c9d1f6c6c1c0db8ce85b41"
 dependencies = [
  "lazy_static",
  "ron",
@@ -3242,7 +3242,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2620ff82234baadb3fbae52066ac74ead8452864"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#16ddfadc5832beeca5c9d1f6c6c1c0db8ce85b41"
 dependencies = [
  "event-listener",
  "futures",
@@ -3255,7 +3255,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2620ff82234baadb3fbae52066ac74ead8452864"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#16ddfadc5832beeca5c9d1f6c6c1c0db8ce85b41"
 dependencies = [
  "futures",
  "tokio",
@@ -3268,7 +3268,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2620ff82234baadb3fbae52066ac74ead8452864"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#16ddfadc5832beeca5c9d1f6c6c1c0db8ce85b41"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -3301,7 +3301,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2620ff82234baadb3fbae52066ac74ead8452864"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#16ddfadc5832beeca5c9d1f6c6c1c0db8ce85b41"
 dependencies = [
  "async-trait",
  "const_format",
diff --git a/zenoh-jni/src/publisher.rs b/zenoh-jni/src/publisher.rs
index 15e59c2f..c6607cd0 100644
--- a/zenoh-jni/src/publisher.rs
+++ b/zenoh-jni/src/publisher.rs
@@ -19,7 +19,7 @@ use jni::{
     sys::jint,
     JNIEnv,
 };
-use zenoh::{bytes::EncodingBuilderTrait, pubsub::Publisher, sample::SampleBuilderTrait, Wait};
+use zenoh::{pubsub::Publisher, Wait};
 
 use crate::{
     errors::Result,
diff --git a/zenoh-jni/src/query.rs b/zenoh-jni/src/query.rs
index fae0dd51..f7b557ec 100644
--- a/zenoh-jni/src/query.rs
+++ b/zenoh-jni/src/query.rs
@@ -27,10 +27,9 @@ use jni::{
 use uhlc::ID;
 use zenoh::{
     key_expr::KeyExpr,
-    prelude::{EncodingBuilderTrait, Wait},
-    qos::{CongestionControl, Priority, QoSBuilderTrait},
+    prelude::Wait,
+    qos::{CongestionControl, Priority},
     query::Query,
-    sample::{SampleBuilderTrait, TimestampBuilderTrait},
     time::{Timestamp, NTP64},
 };
 
diff --git a/zenoh-jni/src/session.rs b/zenoh-jni/src/session.rs
index 2391261c..9240d82a 100644
--- a/zenoh-jni/src/session.rs
+++ b/zenoh-jni/src/session.rs
@@ -27,11 +27,10 @@ use std::sync::Arc;
 use std::time::Duration;
 use zenoh::config::{Config, ZenohId};
 use zenoh::key_expr::KeyExpr;
-use zenoh::prelude::{EncodingBuilderTrait, Wait};
+use zenoh::prelude::Wait;
 use zenoh::pubsub::{Publisher, Subscriber};
-use zenoh::qos::QoSBuilderTrait;
 use zenoh::query::{Query, Queryable, ReplyError, Selector};
-use zenoh::sample::{Sample, SampleBuilderTrait};
+use zenoh::sample::Sample;
 use zenoh::session::{Session, SessionDeclarations};
 
 /// Open a Zenoh session via JNI.