From 62b8caf801ff1797394f54bea7673bf876024150 Mon Sep 17 00:00:00 2001 From: eclipse-zenoh-bot Date: Wed, 5 Feb 2025 15:07:31 +0000 Subject: [PATCH 1/3] chore: Bump version to `1.2.1` --- version.txt | 2 +- zenoh-jni/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/version.txt b/version.txt index 867e5243..cb174d58 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.2.0 \ No newline at end of file +1.2.1 \ No newline at end of file diff --git a/zenoh-jni/Cargo.toml b/zenoh-jni/Cargo.toml index e7f6a061..75905d44 100644 --- a/zenoh-jni/Cargo.toml +++ b/zenoh-jni/Cargo.toml @@ -14,7 +14,7 @@ [package] rust-version = "1.75.0" -version = "1.2.0" +version = "1.2.1" repository = "https://github.com/eclipse-zenoh/zenoh" homepage = "http://zenoh.io" edition = "2021" From e9f2f44f9f056919c39799cbad626655259c7975 Mon Sep 17 00:00:00 2001 From: eclipse-zenoh-bot Date: Wed, 5 Feb 2025 15:08:31 +0000 Subject: [PATCH 2/3] chore: Bump `zenoh.*` dependencies to `1.2.1` --- zenoh-jni/Cargo.lock | 106 +++++++++++++++++++++---------------------- zenoh-jni/Cargo.toml | 4 +- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock index 19bcf02a..924f4cd6 100644 --- a/zenoh-jni/Cargo.lock +++ b/zenoh-jni/Cargo.lock @@ -2887,8 +2887,8 @@ dependencies = [ [[package]] name = "zenoh" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ca058bd17167afcd44eb3914987830401ec3d02c" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5" dependencies = [ "ahash", "async-trait", @@ -2934,16 +2934,16 @@ dependencies = [ [[package]] name = "zenoh-buffers" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ca058bd17167afcd44eb3914987830401ec3d02c" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5" dependencies = [ "zenoh-collections", ] [[package]] name = "zenoh-codec" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ca058bd17167afcd44eb3914987830401ec3d02c" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5" dependencies = [ "tracing", "uhlc", @@ -2953,13 +2953,13 @@ dependencies = [ [[package]] name = "zenoh-collections" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ca058bd17167afcd44eb3914987830401ec3d02c" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5" [[package]] name = "zenoh-config" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ca058bd17167afcd44eb3914987830401ec3d02c" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5" dependencies = [ "json5", "num_cpus", @@ -2980,8 +2980,8 @@ dependencies = [ [[package]] name = "zenoh-core" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ca058bd17167afcd44eb3914987830401ec3d02c" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5" dependencies = [ "lazy_static", "tokio", @@ -2991,8 +2991,8 @@ dependencies = [ [[package]] name = "zenoh-crypto" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ca058bd17167afcd44eb3914987830401ec3d02c" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5" dependencies = [ "aes", "hmac", @@ -3004,8 +3004,8 @@ dependencies = [ [[package]] name = "zenoh-ext" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ca058bd17167afcd44eb3914987830401ec3d02c" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5" dependencies = [ "async-trait", "bincode", @@ -3023,8 +3023,8 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ca058bd17167afcd44eb3914987830401ec3d02c" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5" dependencies = [ "getrandom", "hashbrown 0.14.5", @@ -3038,8 +3038,8 @@ dependencies = [ [[package]] name = "zenoh-link" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ca058bd17167afcd44eb3914987830401ec3d02c" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5" dependencies = [ "zenoh-config", "zenoh-link-commons", @@ -3055,8 +3055,8 @@ dependencies = [ [[package]] name = "zenoh-link-commons" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ca058bd17167afcd44eb3914987830401ec3d02c" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5" dependencies = [ "async-trait", "flume 0.11.0", @@ -3079,8 +3079,8 @@ dependencies = [ [[package]] name = "zenoh-link-quic" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ca058bd17167afcd44eb3914987830401ec3d02c" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5" dependencies = [ "async-trait", "base64 0.22.1", @@ -3106,8 +3106,8 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ca058bd17167afcd44eb3914987830401ec3d02c" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5" dependencies = [ "async-trait", "socket2", @@ -3123,8 +3123,8 @@ dependencies = [ [[package]] name = "zenoh-link-tls" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ca058bd17167afcd44eb3914987830401ec3d02c" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5" dependencies = [ "async-trait", "base64 0.22.1", @@ -3152,8 +3152,8 @@ dependencies = [ [[package]] name = "zenoh-link-udp" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ca058bd17167afcd44eb3914987830401ec3d02c" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5" dependencies = [ "async-trait", "socket2", @@ -3171,8 +3171,8 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ca058bd17167afcd44eb3914987830401ec3d02c" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5" dependencies = [ "async-trait", "nix", @@ -3189,8 +3189,8 @@ dependencies = [ [[package]] name = "zenoh-link-ws" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ca058bd17167afcd44eb3914987830401ec3d02c" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5" dependencies = [ "async-trait", "futures-util", @@ -3209,8 +3209,8 @@ dependencies = [ [[package]] name = "zenoh-macros" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ca058bd17167afcd44eb3914987830401ec3d02c" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5" dependencies = [ "proc-macro2", "quote", @@ -3220,8 +3220,8 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ca058bd17167afcd44eb3914987830401ec3d02c" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5" dependencies = [ "git-version", "libloading", @@ -3236,8 +3236,8 @@ dependencies = [ [[package]] name = "zenoh-protocol" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ca058bd17167afcd44eb3914987830401ec3d02c" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5" dependencies = [ "const_format", "rand", @@ -3250,16 +3250,16 @@ dependencies = [ [[package]] name = "zenoh-result" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ca058bd17167afcd44eb3914987830401ec3d02c" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5" dependencies = [ "anyhow", ] [[package]] name = "zenoh-runtime" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ca058bd17167afcd44eb3914987830401ec3d02c" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5" dependencies = [ "lazy_static", "ron", @@ -3272,8 +3272,8 @@ dependencies = [ [[package]] name = "zenoh-sync" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ca058bd17167afcd44eb3914987830401ec3d02c" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5" dependencies = [ "event-listener", "futures", @@ -3285,8 +3285,8 @@ dependencies = [ [[package]] name = "zenoh-task" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ca058bd17167afcd44eb3914987830401ec3d02c" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5" dependencies = [ "futures", "tokio", @@ -3298,8 +3298,8 @@ dependencies = [ [[package]] name = "zenoh-transport" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ca058bd17167afcd44eb3914987830401ec3d02c" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5" dependencies = [ "async-trait", "crossbeam-utils", @@ -3331,8 +3331,8 @@ dependencies = [ [[package]] name = "zenoh-util" -version = "1.2.0" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#ca058bd17167afcd44eb3914987830401ec3d02c" +version = "1.2.1" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5" dependencies = [ "async-trait", "const_format", @@ -3356,7 +3356,7 @@ dependencies = [ [[package]] name = "zenoh_jni" -version = "1.2.0" +version = "1.2.1" dependencies = [ "android-logd-logger", "async-std", diff --git a/zenoh-jni/Cargo.toml b/zenoh-jni/Cargo.toml index 75905d44..26f4ec23 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.2.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = ["unstable", "internal"], default-features = false } -zenoh-ext = { version = "1.2.0", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = ["internal"], default-features = false, optional = true } +zenoh = { version = "1.2.1", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "release/1.2.1", features = ["unstable", "internal"], default-features = false } +zenoh-ext = { version = "1.2.1", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "release/1.2.1", features = ["internal"], default-features = false, optional = true } tracing = { version = "0.1" , features = ["log"] } [lib] name = "zenoh_jni" From 5e3a876bd97d6a1a19948ebbec5e3a2e7324b405 Mon Sep 17 00:00:00 2001 From: eclipse-zenoh-bot Date: Thu, 13 Feb 2025 17:09:05 +0000 Subject: [PATCH 3/3] chore: Update git/branch zenoh-java/zenoh-jni/Cargo.toml --- zenoh-jni/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zenoh-jni/Cargo.toml b/zenoh-jni/Cargo.toml index 26f4ec23..b06d387f 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.2.1", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "release/1.2.1", features = ["unstable", "internal"], default-features = false } -zenoh-ext = { version = "1.2.1", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "release/1.2.1", features = ["internal"], default-features = false, optional = true } +zenoh = { version = "1.2.1", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = ["unstable", "internal"], default-features = false } +zenoh-ext = { version = "1.2.1", 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"