diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock index f8846a89..f915918e 100644 --- a/zenoh-jni/Cargo.lock +++ b/zenoh-jni/Cargo.lock @@ -3058,7 +3058,7 @@ dependencies = [ [[package]] name = "zenoh" version = "1.3.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.3.0#76cdcc9d2b91397f8d59eddb414772b6c0a14f95" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598" dependencies = [ "ahash", "arc-swap", @@ -3106,7 +3106,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "1.3.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.3.0#76cdcc9d2b91397f8d59eddb414772b6c0a14f95" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598" dependencies = [ "zenoh-collections", ] @@ -3114,7 +3114,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "1.3.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.3.0#76cdcc9d2b91397f8d59eddb414772b6c0a14f95" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598" dependencies = [ "tracing", "uhlc", @@ -3125,12 +3125,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "1.3.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.3.0#76cdcc9d2b91397f8d59eddb414772b6c0a14f95" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598" [[package]] name = "zenoh-config" version = "1.3.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.3.0#76cdcc9d2b91397f8d59eddb414772b6c0a14f95" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598" dependencies = [ "json5", "num_cpus", @@ -3153,7 +3153,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "1.3.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.3.0#76cdcc9d2b91397f8d59eddb414772b6c0a14f95" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598" dependencies = [ "lazy_static", "tokio", @@ -3164,7 +3164,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "1.3.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.3.0#76cdcc9d2b91397f8d59eddb414772b6c0a14f95" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598" dependencies = [ "aes", "hmac", @@ -3177,7 +3177,7 @@ dependencies = [ [[package]] name = "zenoh-ext" version = "1.3.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.3.0#76cdcc9d2b91397f8d59eddb414772b6c0a14f95" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598" dependencies = [ "async-trait", "bincode", @@ -3196,7 +3196,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "1.3.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.3.0#76cdcc9d2b91397f8d59eddb414772b6c0a14f95" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598" dependencies = [ "getrandom", "hashbrown 0.14.5", @@ -3211,7 +3211,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "1.3.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.3.0#76cdcc9d2b91397f8d59eddb414772b6c0a14f95" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598" dependencies = [ "zenoh-config", "zenoh-link-commons", @@ -3228,7 +3228,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "1.3.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.3.0#76cdcc9d2b91397f8d59eddb414772b6c0a14f95" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598" dependencies = [ "async-trait", "flume 0.11.0", @@ -3252,7 +3252,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "1.3.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.3.0#76cdcc9d2b91397f8d59eddb414772b6c0a14f95" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598" dependencies = [ "async-trait", "base64 0.22.1", @@ -3279,7 +3279,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "1.3.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.3.0#76cdcc9d2b91397f8d59eddb414772b6c0a14f95" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598" dependencies = [ "async-trait", "socket2", @@ -3296,7 +3296,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "1.3.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.3.0#76cdcc9d2b91397f8d59eddb414772b6c0a14f95" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598" dependencies = [ "async-trait", "base64 0.22.1", @@ -3325,7 +3325,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "1.3.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.3.0#76cdcc9d2b91397f8d59eddb414772b6c0a14f95" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598" dependencies = [ "async-trait", "socket2", @@ -3344,7 +3344,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "1.3.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.3.0#76cdcc9d2b91397f8d59eddb414772b6c0a14f95" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598" dependencies = [ "async-trait", "nix", @@ -3362,7 +3362,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "1.3.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.3.0#76cdcc9d2b91397f8d59eddb414772b6c0a14f95" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598" dependencies = [ "async-trait", "futures-util", @@ -3382,7 +3382,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "1.3.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.3.0#76cdcc9d2b91397f8d59eddb414772b6c0a14f95" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598" dependencies = [ "proc-macro2", "quote", @@ -3393,7 +3393,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "1.3.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.3.0#76cdcc9d2b91397f8d59eddb414772b6c0a14f95" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598" dependencies = [ "git-version", "libloading", @@ -3409,7 +3409,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "1.3.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.3.0#76cdcc9d2b91397f8d59eddb414772b6c0a14f95" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598" dependencies = [ "const_format", "rand", @@ -3423,7 +3423,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "1.3.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.3.0#76cdcc9d2b91397f8d59eddb414772b6c0a14f95" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598" dependencies = [ "anyhow", ] @@ -3431,7 +3431,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "1.3.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.3.0#76cdcc9d2b91397f8d59eddb414772b6c0a14f95" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598" dependencies = [ "lazy_static", "ron", @@ -3445,8 +3445,9 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "1.3.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.3.0#76cdcc9d2b91397f8d59eddb414772b6c0a14f95" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598" dependencies = [ + "arc-swap", "event-listener", "futures", "tokio", @@ -3458,7 +3459,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "1.3.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.3.0#76cdcc9d2b91397f8d59eddb414772b6c0a14f95" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598" dependencies = [ "futures", "tokio", @@ -3471,7 +3472,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "1.3.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.3.0#76cdcc9d2b91397f8d59eddb414772b6c0a14f95" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598" dependencies = [ "async-trait", "crossbeam-utils", @@ -3504,7 +3505,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "1.3.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.3.0#76cdcc9d2b91397f8d59eddb414772b6c0a14f95" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#be7372d6e2b8d500f9c2e925a773261d3b693598" dependencies = [ "async-trait", "const_format", diff --git a/zenoh-jni/Cargo.toml b/zenoh-jni/Cargo.toml index 49426c3a..2db682ed 100644 --- a/zenoh-jni/Cargo.toml +++ b/zenoh-jni/Cargo.toml @@ -36,8 +36,8 @@ flume = "0.10.14" uhlc = "0.8.0" json5 = "0.4.1" serde_yaml = "0.9.19" -zenoh = { version = "1.3.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "release/1.3.0", features = ["unstable", "internal"], default-features = false } -zenoh-ext = { version = "1.3.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "release/1.3.0", features = ["internal"], default-features = false, optional = true } +zenoh = { version = "1.3.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = ["unstable", "internal"], default-features = false } +zenoh-ext = { version = "1.3.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = ["internal"], default-features = false, optional = true } tracing = { version = "0.1" , features = ["log"] } [lib] name = "zenoh_jni"