From 860362a81a375c62131df5ee7613c1941277200b Mon Sep 17 00:00:00 2001 From: eclipse-zenoh-bot Date: Fri, 19 Apr 2024 09:49:52 +0000 Subject: [PATCH] chore: Bump /zenoh.*/ dependencies to `0.11.0-rc.1` --- Cargo.toml | 62 ++-- plugins/zenoh-plugin-rest/Cargo.toml | 164 +++++---- .../zenoh-plugin-storage-manager/Cargo.toml | 179 ++++++---- zenoh/Cargo.toml | 312 +++++++++++------- 4 files changed, 457 insertions(+), 260 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 168af45e08..de6d574e69 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -163,135 +163,135 @@ version = "0.3.9" features = [ "iphlpapi" ] [workspace.dependencies.zenoh-ext] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "zenoh-ext" [workspace.dependencies.zenoh-shm] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "commons/zenoh-shm" [workspace.dependencies.zenoh-result] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "commons/zenoh-result" default-features = false [workspace.dependencies.zenoh-config] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "commons/zenoh-config" [workspace.dependencies.zenoh-protocol] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "commons/zenoh-protocol" default-features = false [workspace.dependencies.zenoh-keyexpr] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "commons/zenoh-keyexpr" default-features = false [workspace.dependencies.zenoh-core] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "commons/zenoh-core" [workspace.dependencies.zenoh-buffers] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "commons/zenoh-buffers" default-features = false [workspace.dependencies.zenoh-util] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "commons/zenoh-util" [workspace.dependencies.zenoh-crypto] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "commons/zenoh-crypto" [workspace.dependencies.zenoh-codec] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "commons/zenoh-codec" [workspace.dependencies.zenoh-sync] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "commons/zenoh-sync" [workspace.dependencies.zenoh-collections] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "commons/zenoh-collections" default-features = false [workspace.dependencies.zenoh-macros] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "commons/zenoh-macros" [workspace.dependencies.zenoh-plugin-trait] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "plugins/zenoh-plugin-trait" default-features = false [workspace.dependencies.zenoh_backend_traits] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "plugins/zenoh-backend-traits" [workspace.dependencies.zenoh-transport] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "io/zenoh-transport" default-features = false [workspace.dependencies.zenoh-link-tls] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "io/zenoh-links/zenoh-link-tls" [workspace.dependencies.zenoh-link-tcp] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "io/zenoh-links/zenoh-link-tcp" [workspace.dependencies.zenoh-link-unixsock_stream] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "io/zenoh-links/zenoh-link-unixsock_stream" [workspace.dependencies.zenoh-link-quic] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "io/zenoh-links/zenoh-link-quic" [workspace.dependencies.zenoh-link-udp] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "io/zenoh-links/zenoh-link-udp" [workspace.dependencies.zenoh-link-ws] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "io/zenoh-links/zenoh-link-ws" [workspace.dependencies.zenoh-link-unixpipe] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "io/zenoh-links/zenoh-link-unixpipe" [workspace.dependencies.zenoh-link-serial] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "io/zenoh-links/zenoh-link-serial" [workspace.dependencies.zenoh-link-vsock] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "io/zenoh-links/zenoh-link-vsock" [workspace.dependencies.zenoh-link] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "io/zenoh-link" [workspace.dependencies.zenoh-link-commons] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "io/zenoh-link-commons" [workspace.dependencies.zenoh] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "zenoh" default-features = false [workspace.dependencies.zenoh-runtime] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "commons/zenoh-runtime" [workspace.dependencies.zenoh-task] -version = "0.11.0-dev" +version = "0.11.0-rc.1" path = "commons/zenoh-task" [profile] diff --git a/plugins/zenoh-plugin-rest/Cargo.toml b/plugins/zenoh-plugin-rest/Cargo.toml index 19fa9eafdc..4f132a87a8 100644 --- a/plugins/zenoh-plugin-rest/Cargo.toml +++ b/plugins/zenoh-plugin-rest/Cargo.toml @@ -1,74 +1,126 @@ -# -# Copyright (c) 2023 ZettaScale Technology -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License 2.0 which is available at -# http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 -# which is available at https://www.apache.org/licenses/LICENSE-2.0. -# -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 -# -# Contributors: -# ZettaScale Zenoh Team, -# [package] -rust-version = { workspace = true } name = "zenoh-plugin-rest" -version = { workspace = true } -repository = { workspace = true } -homepage = { workspace = true } -authors = { workspace = true } -edition = { workspace = true } -license = { workspace = true } -categories = ["network-programming", "web-programming::http-server"] +categories = [ "network-programming", "web-programming::http-server" ] description = "The zenoh REST plugin" +[package.rust-version] +workspace = true + +[package.version] +workspace = true + +[package.repository] +workspace = true + +[package.homepage] +workspace = true + +[package.authors] +workspace = true + +[package.edition] +workspace = true + +[package.license] +workspace = true + +[package.metadata] +[package.metadata.deb] +name = "zenoh-plugin-rest" +maintainer = "zenoh-dev@eclipse.org" +copyright = "2024 ZettaScale Technology" +section = "net" +license-file = [ "../../LICENSE", "0" ] +depends = "zenohd (=0.11.0-rc.1)" + [features] -default = ["no_mangle", "zenoh/default"] +default = [ "no_mangle", "zenoh/default" ] no_mangle = [] [lib] name = "zenoh_plugin_rest" -crate-type = ["cdylib", "rlib"] +crate-type = [ "cdylib", "rlib" ] [dependencies] -anyhow = { workspace = true, features = ["default"] } -async-std = { workspace = true, features = ["default", "attributes"] } -base64 = { workspace = true } -const_format = { workspace = true } -zenoh-util = {workspace = true } -flume = { workspace = true } -futures = { workspace = true } -git-version = { workspace = true } -http-types = { workspace = true } -lazy_static = { workspace = true } -tracing = {workspace = true} -schemars = { workspace = true } -serde = { workspace = true, features = ["default"] } -serde_json = { workspace = true } -tide = { workspace = true } -zenoh = { workspace = true, features = ["unstable"] } -zenoh-plugin-trait = { workspace = true } -zenoh-result = { workspace = true } +[dependencies.anyhow] +workspace = true +features = [ "default" ] + +[dependencies.async-std] +workspace = true +features = [ "default", "attributes" ] + +[dependencies.base64] +workspace = true + +[dependencies.const_format] +workspace = true + +[dependencies.zenoh-util] +workspace = true + +[dependencies.flume] +workspace = true + +[dependencies.futures] +workspace = true + +[dependencies.git-version] +workspace = true + +[dependencies.http-types] +workspace = true + +[dependencies.lazy_static] +workspace = true + +[dependencies.tracing] +workspace = true + +[dependencies.schemars] +workspace = true + +[dependencies.serde] +workspace = true +features = [ "default" ] + +[dependencies.serde_json] +workspace = true + +[dependencies.tide] +workspace = true + +[dependencies.zenoh] +workspace = true +features = [ "unstable" ] + +[dependencies.zenoh-plugin-trait] +workspace = true + +[dependencies.zenoh-result] +workspace = true [build-dependencies] -rustc_version = { workspace = true } -schemars = { workspace = true } -serde = { workspace = true, features = ["default"] } -serde_json = { workspace = true } -jsonschema = { workspace = true } +[build-dependencies.rustc_version] +workspace = true + +[build-dependencies.schemars] +workspace = true + +[build-dependencies.serde] +workspace = true +features = [ "default" ] + +[build-dependencies.serde_json] +workspace = true + +[build-dependencies.jsonschema] +workspace = true [dev-dependencies] -clap = { workspace = true } +[dev-dependencies.clap] +workspace = true [[example]] name = "z_serve_sse" -path = "examples/z_serve_sse.rs" - -[package.metadata.deb] -name = "zenoh-plugin-rest" -maintainer = "zenoh-dev@eclipse.org" -copyright = "2024 ZettaScale Technology" -section = "net" -license-file = ["../../LICENSE", "0"] -depends = "zenohd (=0.11.0-dev-1)" +path = "examples/z_serve_sse.rs" \ No newline at end of file diff --git a/plugins/zenoh-plugin-storage-manager/Cargo.toml b/plugins/zenoh-plugin-storage-manager/Cargo.toml index 35a5232cf0..37a9367038 100644 --- a/plugins/zenoh-plugin-storage-manager/Cargo.toml +++ b/plugins/zenoh-plugin-storage-manager/Cargo.toml @@ -1,74 +1,135 @@ -# -# Copyright (c) 2023 ZettaScale Technology -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License 2.0 which is available at -# http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 -# which is available at https://www.apache.org/licenses/LICENSE-2.0. -# -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 -# -# Contributors: -# ZettaScale Zenoh Team, -# [package] -rust-version = { workspace = true } name = "zenoh-plugin-storage-manager" -version = { workspace = true } -repository = { workspace = true } -homepage = { workspace = true } -authors = { workspace = true } -edition = { workspace = true } -license = { workspace = true } -categories = { workspace = true } description = "The zenoh storages plugin." +[package.rust-version] +workspace = true + +[package.version] +workspace = true + +[package.repository] +workspace = true + +[package.homepage] +workspace = true + +[package.authors] +workspace = true + +[package.edition] +workspace = true + +[package.license] +workspace = true + +[package.categories] +workspace = true + +[package.metadata] +[package.metadata.deb] +name = "zenoh-plugin-storage-manager" +maintainer = "zenoh-dev@eclipse.org" +copyright = "2024 ZettaScale Technology" +section = "net" +license-file = [ "../../LICENSE", "0" ] +depends = "zenohd (=0.11.0-rc.1)" + [features] -default = ["no_mangle", "zenoh/default"] +default = [ "no_mangle", "zenoh/default" ] no_mangle = [] [lib] name = "zenoh_plugin_storage_manager" -crate-type = ["cdylib", "rlib"] +crate-type = [ "cdylib", "rlib" ] [dependencies] -async-std = { workspace = true, features = ["default"] } -async-trait = { workspace = true } -crc = { workspace = true } -const_format = { workspace = true } -derive-new = { workspace = true } -zenoh-util = {workspace = true } -flume = { workspace = true } -futures = { workspace = true } -git-version = { workspace = true } -libloading = { workspace = true } -tracing = {workspace = true} -serde = { workspace = true, features = ["default"] } -serde_json = { workspace = true } -urlencoding = { workspace = true } -zenoh = { workspace = true, features = ["unstable"] } -zenoh-collections = { workspace = true } -zenoh-core = { workspace = true } -zenoh-keyexpr = { workspace = true } -zenoh-plugin-trait = { workspace = true } -zenoh-result = { workspace = true } -zenoh_backend_traits = { workspace = true } +[dependencies.async-std] +workspace = true +features = [ "default" ] + +[dependencies.async-trait] +workspace = true + +[dependencies.crc] +workspace = true + +[dependencies.const_format] +workspace = true + +[dependencies.derive-new] +workspace = true + +[dependencies.zenoh-util] +workspace = true + +[dependencies.flume] +workspace = true + +[dependencies.futures] +workspace = true + +[dependencies.git-version] +workspace = true + +[dependencies.libloading] +workspace = true + +[dependencies.tracing] +workspace = true + +[dependencies.serde] +workspace = true +features = [ "default" ] + +[dependencies.serde_json] +workspace = true + +[dependencies.urlencoding] +workspace = true + +[dependencies.zenoh] +workspace = true +features = [ "unstable" ] + +[dependencies.zenoh-collections] +workspace = true + +[dependencies.zenoh-core] +workspace = true + +[dependencies.zenoh-keyexpr] +workspace = true + +[dependencies.zenoh-plugin-trait] +workspace = true + +[dependencies.zenoh-result] +workspace = true + +[dependencies.zenoh_backend_traits] +workspace = true [build-dependencies] -rustc_version = { workspace = true } -zenoh_backend_traits = { workspace = true } -schemars = { workspace = true } -serde = { workspace = true, features = ["default"] } -serde_json = { workspace = true } -jsonschema = { workspace = true } +[build-dependencies.rustc_version] +workspace = true -[dev-dependencies] -async-global-executor = { workspace = true } +[build-dependencies.zenoh_backend_traits] +workspace = true -[package.metadata.deb] -name = "zenoh-plugin-storage-manager" -maintainer = "zenoh-dev@eclipse.org" -copyright = "2024 ZettaScale Technology" -section = "net" -license-file = ["../../LICENSE", "0"] -depends = "zenohd (=0.11.0-dev-1)" +[build-dependencies.schemars] +workspace = true + +[build-dependencies.serde] +workspace = true +features = [ "default" ] + +[build-dependencies.serde_json] +workspace = true + +[build-dependencies.jsonschema] +workspace = true + +[dev-dependencies] +[dev-dependencies.async-global-executor] +workspace = true \ No newline at end of file diff --git a/zenoh/Cargo.toml b/zenoh/Cargo.toml index bb6087494b..2f3eede0d8 100644 --- a/zenoh/Cargo.toml +++ b/zenoh/Cargo.toml @@ -1,131 +1,215 @@ -# -# Copyright (c) 2023 ZettaScale Technology -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License 2.0 which is available at -# http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 -# which is available at https://www.apache.org/licenses/LICENSE-2.0. -# -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 -# -# Contributors: -# ZettaScale Zenoh Team, -# [package] -rust-version = { workspace = true } name = "zenoh" -version = { workspace = true } -repository = { workspace = true } -homepage = { workspace = true } -authors = { workspace = true } -edition = { workspace = true } -license = { workspace = true } -categories = { workspace = true } -description = { workspace = true } readme = "../README.md" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html -[badges] -maintenance = { status = "actively-developed" } +[package.rust-version] +workspace = true -[features] -auth_pubkey = ["zenoh-transport/auth_pubkey"] -auth_usrpwd = ["zenoh-transport/auth_usrpwd"] -complete_n = ["zenoh-codec/complete_n"] -shared-memory = [ - "zenoh-shm", - "zenoh-protocol/shared-memory", - "zenoh-transport/shared-memory", -] -stats = ["zenoh-transport/stats", "zenoh-protocol/stats"] -transport_multilink = ["zenoh-transport/transport_multilink"] -transport_compression = ["zenoh-transport/transport_compression"] -transport_quic = ["zenoh-transport/transport_quic"] -transport_serial = ["zenoh-transport/transport_serial"] -transport_unixpipe = ["zenoh-transport/transport_unixpipe"] -transport_tcp = ["zenoh-transport/transport_tcp"] -transport_tls = ["zenoh-transport/transport_tls"] -transport_udp = ["zenoh-transport/transport_udp"] -transport_unixsock-stream = ["zenoh-transport/transport_unixsock-stream"] -transport_ws = ["zenoh-transport/transport_ws"] -transport_vsock = ["zenoh-transport/transport_vsock"] -unstable = [] -default = [ - "auth_pubkey", - "auth_usrpwd", - "transport_multilink", - "transport_compression", - "transport_quic", - "transport_tcp", - "transport_tls", - "transport_udp", - "transport_unixsock-stream", - "transport_ws", -] +[package.version] +workspace = true -[dependencies] -tokio = { workspace = true, features = ["rt", "macros", "time"] } -tokio-util = { workspace = true } -ahash = { workspace = true } -async-trait = { workspace = true } -base64 = { workspace = true } -const_format = { workspace = true } - -event-listener = { workspace = true } -flume = { workspace = true } -form_urlencoded = { workspace = true } -futures = { workspace = true } -git-version = { workspace = true } -lazy_static = { workspace = true } -tracing = {workspace = true} -ordered-float = { workspace = true } -paste = { workspace = true } -petgraph = { workspace = true } -rand = { workspace = true, features = ["default"] } -regex = { workspace = true } -serde = { workspace = true, features = ["default"] } -serde_json = { workspace = true } -socket2 = { workspace = true } -stop-token = { workspace = true } -uhlc = { workspace = true, features = ["default"] } -uuid = { workspace = true, features = ["default"] } -vec_map = { workspace = true } -zenoh-buffers = { workspace = true, features = ["std"] } -zenoh-codec = { workspace = true } -zenoh-collections = { workspace = true, features = ["std"] } -zenoh-config = { workspace = true } -zenoh-core = { workspace = true } -zenoh-crypto = { workspace = true } -zenoh-keyexpr = { workspace = true } -zenoh-link = { workspace = true } -zenoh-macros = { workspace = true } -zenoh-plugin-trait = { workspace = true } -zenoh-protocol = { workspace = true, features = ["std"] } -zenoh-result = { workspace = true } -zenoh-shm = { workspace = true, optional = true } -zenoh-sync = { workspace = true } -zenoh-transport = { workspace = true } -zenoh-util = { workspace = true } -zenoh-runtime = { workspace = true } -zenoh-task = { workspace = true } +[package.repository] +workspace = true -[build-dependencies] -rustc_version = { workspace = true } +[package.homepage] +workspace = true -[lib] -name = "zenoh" +[package.authors] +workspace = true + +[package.edition] +workspace = true -# For doc generation on docs.rs, activate the "unstable" feature to generate their documentation -# NOTE: if you change this, also change it in .github/workflows/release.yml in "doc" job. +[package.license] +workspace = true + +[package.categories] +workspace = true + +[package.description] +workspace = true + +[package.metadata] +[package.metadata.docs] [package.metadata.docs.rs] -features = ["unstable"] +features = [ "unstable" ] [package.metadata.deb] name = "zenoh" maintainer = "zenoh-dev@eclipse.org" copyright = "2024 ZettaScale Technology" section = "net" -license-file = ["../LICENSE", "0"] -depends = "zenohd (=0.11.0-dev-1), zenoh-plugin-rest (=0.11.0-dev-1), zenoh-plugin-storage-manager (=0.11.0-dev-1)" +license-file = [ "../LICENSE", "0" ] +depends = "zenohd (=0.11.0-rc.1), zenoh-plugin-rest (=0.11.0-rc.1), zenoh-plugin-storage-manager (=0.11.0-rc.1)" maintainer-scripts = ".deb" -assets = [["../README.md", "README.md", "644"]] +assets = [ [ "../README.md", "README.md", "644" ] ] + +[badges] +[badges.maintenance] +status = "actively-developed" + +[features] +auth_pubkey = [ "zenoh-transport/auth_pubkey" ] +auth_usrpwd = [ "zenoh-transport/auth_usrpwd" ] +complete_n = [ "zenoh-codec/complete_n" ] +shared-memory = [ "zenoh-shm", "zenoh-protocol/shared-memory", "zenoh-transport/shared-memory" ] +stats = [ "zenoh-transport/stats", "zenoh-protocol/stats" ] +transport_multilink = [ "zenoh-transport/transport_multilink" ] +transport_compression = [ "zenoh-transport/transport_compression" ] +transport_quic = [ "zenoh-transport/transport_quic" ] +transport_serial = [ "zenoh-transport/transport_serial" ] +transport_unixpipe = [ "zenoh-transport/transport_unixpipe" ] +transport_tcp = [ "zenoh-transport/transport_tcp" ] +transport_tls = [ "zenoh-transport/transport_tls" ] +transport_udp = [ "zenoh-transport/transport_udp" ] +transport_unixsock-stream = [ "zenoh-transport/transport_unixsock-stream" ] +transport_ws = [ "zenoh-transport/transport_ws" ] +transport_vsock = [ "zenoh-transport/transport_vsock" ] +unstable = [] +default = [ "auth_pubkey", "auth_usrpwd", "transport_multilink", "transport_compression", "transport_quic", "transport_tcp", "transport_tls", "transport_udp", "transport_unixsock-stream", "transport_ws" ] + +[dependencies] +[dependencies.tokio] +workspace = true +features = [ "rt", "macros", "time" ] + +[dependencies.tokio-util] +workspace = true + +[dependencies.ahash] +workspace = true + +[dependencies.async-trait] +workspace = true + +[dependencies.base64] +workspace = true + +[dependencies.const_format] +workspace = true + +[dependencies.event-listener] +workspace = true + +[dependencies.flume] +workspace = true + +[dependencies.form_urlencoded] +workspace = true + +[dependencies.futures] +workspace = true + +[dependencies.git-version] +workspace = true + +[dependencies.lazy_static] +workspace = true + +[dependencies.tracing] +workspace = true + +[dependencies.ordered-float] +workspace = true + +[dependencies.paste] +workspace = true + +[dependencies.petgraph] +workspace = true + +[dependencies.rand] +workspace = true +features = [ "default" ] + +[dependencies.regex] +workspace = true + +[dependencies.serde] +workspace = true +features = [ "default" ] + +[dependencies.serde_json] +workspace = true + +[dependencies.socket2] +workspace = true + +[dependencies.stop-token] +workspace = true + +[dependencies.uhlc] +workspace = true +features = [ "default" ] + +[dependencies.uuid] +workspace = true +features = [ "default" ] + +[dependencies.vec_map] +workspace = true + +[dependencies.zenoh-buffers] +workspace = true +features = [ "std" ] + +[dependencies.zenoh-codec] +workspace = true + +[dependencies.zenoh-collections] +workspace = true +features = [ "std" ] + +[dependencies.zenoh-config] +workspace = true + +[dependencies.zenoh-core] +workspace = true + +[dependencies.zenoh-crypto] +workspace = true + +[dependencies.zenoh-keyexpr] +workspace = true + +[dependencies.zenoh-link] +workspace = true + +[dependencies.zenoh-macros] +workspace = true + +[dependencies.zenoh-plugin-trait] +workspace = true + +[dependencies.zenoh-protocol] +workspace = true +features = [ "std" ] + +[dependencies.zenoh-result] +workspace = true + +[dependencies.zenoh-shm] +workspace = true +optional = true + +[dependencies.zenoh-sync] +workspace = true + +[dependencies.zenoh-transport] +workspace = true + +[dependencies.zenoh-util] +workspace = true + +[dependencies.zenoh-runtime] +workspace = true + +[dependencies.zenoh-task] +workspace = true + +[build-dependencies] +[build-dependencies.rustc_version] +workspace = true + +[lib] +name = "zenoh" \ No newline at end of file