Skip to content

Commit

Permalink
Leave only the first meaningful number in dependency version numbers
Browse files Browse the repository at this point in the history
  • Loading branch information
DmitrySamoylov committed Oct 11, 2024
1 parent 535fb3e commit b08709b
Show file tree
Hide file tree
Showing 45 changed files with 199 additions and 216 deletions.
48 changes: 24 additions & 24 deletions onvif/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,36 +9,36 @@ license = "MIT"
tls = ["reqwest/native-tls"]

[dependencies]
async-recursion = "0.3.1"
async-trait = "0.1.41"
base64 = "0.13.0"
bigdecimal = "0.3.0"
chrono = "0.4.19"
digest_auth = "0.3.0"
futures = "0.3.30"
futures-core = "0.3.8"
futures-util = "0.3.30"
num-bigint = "0.4.2"
reqwest = { version = "0.12.3", default-features = false }
async-recursion = "0.3"
async-trait = "0.1"
base64 = "0.13"
bigdecimal = "0.3"
chrono = "0.4"
digest_auth = "0.3"
futures = "0.3"
futures-core = "0.3"
futures-util = "0.3"
num-bigint = "0.4"
reqwest = { version = "0.12", default-features = false }
schema = { version = "0.1.0", path = "../schema", default-features = false, features = ["analytics", "devicemgmt", "event", "media", "ptz"] }
sha1 = "0.6.0"
sha1 = "0.6"
thiserror = "1.0"
tokio = { version = "1", default-features = false, features = ["net", "sync", "time"] }
tokio-stream = "0.1"
tracing = "0.1.26"
url = "2.2.0"
uuid = { version = "0.8.1", features = ["v4"] }
xml-rs = "=0.8.3"
xmltree = "0.10.2"
tracing = "0.1"
url = "2"
uuid = { version = "1", features = ["v4"] }
xml-rs = "0.8"
xmltree = "0.10"
xsd-macro-utils = { git = "https://github.com/lumeohq/xsd-parser-rs", rev = "7f3d433" }
xsd-types = { git = "https://github.com/lumeohq/xsd-parser-rs", rev = "7f3d433" }
yaserde = "0.7.1"
yaserde_derive = "0.7.1"
yaserde = "0.7"
yaserde_derive = "0.7"

[dev-dependencies]
dotenv = "0.15.0"
futures-util = "0.3.8"
structopt = "0.3.21"
tokio = { version = "1.0.1", features = ["full"] }
tracing-subscriber = "0.2.20"
dotenv = "0.15"
futures-util = "0.3"
structopt = "0.3"
tokio = { version = "1", features = ["full"] }
tracing-subscriber = "0.2"
b_2 = { path = "../wsdl_rs/b_2" }
9 changes: 3 additions & 6 deletions onvif/src/soap/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ fn test_soap() {
</my:Book>
"#;

let expected = r#"
<?xml version="1.0" encoding="UTF-8"?>
let expected = r#"<?xml version="1.0" encoding="UTF-8"?>
<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"
xmlns:my="http://www.example.my/schema">
<s:Body>
Expand Down Expand Up @@ -44,8 +43,7 @@ fn test_unsoap() {
pub pages: i32,
}

let input = r#"
<?xml version="1.0" encoding="utf-8"?>
let input = r#"<?xml version="1.0" encoding="utf-8"?>
<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"
xmlns:my="http://www.example.my/schema">
<s:Body>
Expand All @@ -69,8 +67,7 @@ fn test_unsoap() {

#[test]
fn test_get_fault() {
let response = r#"
<?xml version="1.0" ?>
let response = r#"<?xml version="1.0" ?>
<soapenv:Fault
xmlns:soapenv="http://www.w3.org/2003/05/soap-envelope"
xmlns:ter="http://www.onvif.org/ver10/error"
Expand Down
72 changes: 36 additions & 36 deletions schema/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ edition = "2018"
license = "MIT"

[dependencies]
bigdecimal = "0.3.0"
chrono = "0.4.19"
num-bigint = "0.4.2"
percent-encoding = "2.1.0"
bigdecimal = "0.3"
chrono = "0.4"
num-bigint = "0.4"
percent-encoding = "2"
transport = { path = "../transport" }
url = "2.2.1"
url = "2"
validate = { path = "../validate" }
xml-rs = "=0.8.3"
xml-rs = "0.8"
xsd-macro-utils = { git = "https://github.com/lumeohq/xsd-parser-rs", rev = "7f3d433" }
xsd-types = { git = "https://github.com/lumeohq/xsd-parser-rs", rev = "7f3d433" }

Expand All @@ -29,40 +29,40 @@ xmlmime = { path = "../xsd_rs/xmlmime" }
xop = { path = "../xsd_rs/xop" }

# wsdl
accesscontrol = { path = "../wsdl_rs/accesscontrol" , optional = true}
accessrules = { path = "../wsdl_rs/accessrules" , optional = true}
actionengine = { path = "../wsdl_rs/actionengine" , optional = true}
advancedsecurity = { path = "../wsdl_rs/advancedsecurity" , optional = true}
analytics = { path = "../wsdl_rs/analytics" , optional = true}
authenticationbehavior = { path = "../wsdl_rs/authenticationbehavior" , optional = true}
accesscontrol = { path = "../wsdl_rs/accesscontrol", optional = true }
accessrules = { path = "../wsdl_rs/accessrules", optional = true }
actionengine = { path = "../wsdl_rs/actionengine", optional = true }
advancedsecurity = { path = "../wsdl_rs/advancedsecurity", optional = true }
analytics = { path = "../wsdl_rs/analytics", optional = true }
authenticationbehavior = { path = "../wsdl_rs/authenticationbehavior", optional = true }
b_2 = { path = "../wsdl_rs/b_2" }
bf_2 = { path = "../wsdl_rs/bf_2" , optional = true}
credential = { path = "../wsdl_rs/credential" , optional = true}
deviceio = { path = "../wsdl_rs/deviceio" , optional = true}
devicemgmt = { path = "../wsdl_rs/devicemgmt" , optional = true}
display = { path = "../wsdl_rs/display" , optional = true}
doorcontrol = { path = "../wsdl_rs/doorcontrol" , optional = true}
event = { path = "../wsdl_rs/event" , optional = true}
imaging = { path = "../wsdl_rs/imaging" , optional = true}
media = { path = "../wsdl_rs/media" , optional = true}
media2 = { path = "../wsdl_rs/media2" , optional = true}
provisioning = { path = "../wsdl_rs/provisioning" , optional = true}
ptz = { path = "../wsdl_rs/ptz" , optional = true}
receiver = { path = "../wsdl_rs/receiver" , optional = true}
recording = { path = "../wsdl_rs/recording" , optional = true}
replay = { path = "../wsdl_rs/replay" , optional = true}
schedule = { path = "../wsdl_rs/schedule" , optional = true}
search = { path = "../wsdl_rs/search" , optional = true}
bf_2 = { path = "../wsdl_rs/bf_2", optional = true }
credential = { path = "../wsdl_rs/credential", optional = true }
deviceio = { path = "../wsdl_rs/deviceio", optional = true }
devicemgmt = { path = "../wsdl_rs/devicemgmt", optional = true }
display = { path = "../wsdl_rs/display", optional = true }
doorcontrol = { path = "../wsdl_rs/doorcontrol", optional = true }
event = { path = "../wsdl_rs/event", optional = true }
imaging = { path = "../wsdl_rs/imaging", optional = true }
media = { path = "../wsdl_rs/media", optional = true }
media2 = { path = "../wsdl_rs/media2", optional = true }
provisioning = { path = "../wsdl_rs/provisioning", optional = true }
ptz = { path = "../wsdl_rs/ptz", optional = true }
receiver = { path = "../wsdl_rs/receiver", optional = true }
recording = { path = "../wsdl_rs/recording", optional = true }
replay = { path = "../wsdl_rs/replay", optional = true }
schedule = { path = "../wsdl_rs/schedule", optional = true }
search = { path = "../wsdl_rs/search", optional = true }
t_1 = { path = "../wsdl_rs/t_1" }
thermal = { path = "../wsdl_rs/thermal" , optional = true}
uplink = { path = "../wsdl_rs/uplink" , optional = true}
thermal = { path = "../wsdl_rs/thermal", optional = true }
uplink = { path = "../wsdl_rs/uplink", optional = true }
ws_addr = { path = "../wsdl_rs/ws_addr" }
ws_discovery = { path = "../wsdl_rs/ws_discovery" }
xml_xsd = { path = "../wsdl_rs/xml_xsd" }

[dev-dependencies]
assert_approx_eq = "1.1.0"
async-trait = "0.1.42"
tokio = { version = "1.0.1", features = ["full"] }
yaserde = "0.7.1"
yaserde_derive = "0.7.1"
assert_approx_eq = "1"
async-trait = "0.1"
tokio = { version = "1", features = ["full"] }
yaserde = "0.7"
yaserde_derive = "0.7"
39 changes: 13 additions & 26 deletions schema/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ impl transport::Transport for FakeTransport {
#[test]
#[cfg(feature = "devicemgmt")]
fn basic_deserialization() {
let response = r#"
<?xml version="1.0" encoding="UTF-8"?>
let response = r#"<?xml version="1.0" encoding="utf-8"?>
<tds:GetSystemDateAndTimeResponse
xmlns:tt="http://www.onvif.org/ver10/schema"
xmlns:tds="http://www.onvif.org/ver10/device/wsdl">
Expand Down Expand Up @@ -70,8 +69,7 @@ fn basic_deserialization() {
#[cfg(feature = "devicemgmt")]
#[test]
fn basic_serialization() {
let expected = r#"
<?xml version="1.0" encoding="utf-8"?>
let expected = r#"<?xml version="1.0" encoding="utf-8"?>
<tds:GetSystemDateAndTime xmlns:tds="http://www.onvif.org/ver10/device/wsdl" />
"#;

Expand Down Expand Up @@ -126,8 +124,7 @@ fn extend_base_serialization() {
..Default::default()
};

let expected = r#"
<?xml version="1.0" encoding="utf-8"?>
let expected = r#"<?xml version="1.0" encoding="utf-8"?>
<tt:VideoSourceConfiguration xmlns:tt="http://www.onvif.org/ver10/schema" token="123abc">
<tt:SourceToken>456cde</tt:SourceToken>
<tt:Bounds x="1" y="2" width="3" height="4" />
Expand Down Expand Up @@ -256,8 +253,7 @@ fn choice_serialization() {
]),
};

let expected = r#"
<?xml version="1.0" encoding="utf-8"?>
let expected = r#"<?xml version="1.0" encoding="utf-8"?>
<tt:ColorOptions xmlns:tt="http://www.onvif.org/ver10/schema">
<ColorspaceRange>
<tt:X><tt:Min>0.1</tt:Min><tt:Max>0.11</tt:Max></tt:X>
Expand Down Expand Up @@ -294,8 +290,7 @@ fn duration_serialization() {
},
};

let expected = r#"
<?xml version="1.0" encoding="utf-8"?>
let expected = r#"<?xml version="1.0" encoding="utf-8"?>
<tt:MediaUri xmlns:tt="http://www.onvif.org/ver10/schema">
<tt:Uri>http://a/b/c</tt:Uri>
<tt:InvalidAfterConnect>false</tt:InvalidAfterConnect>
Expand Down Expand Up @@ -399,8 +394,7 @@ async fn operation_get_device_information() {

#[test]
fn probe_serialization() {
let expected = r#"
<?xml version="1.0" encoding="utf-8"?>
let expected = r#"<?xml version="1.0" encoding="utf-8"?>
<s:Envelope
xmlns:d="http://schemas.xmlsoap.org/ws/2005/04/discovery"
xmlns:s="http://www.w3.org/2003/05/soap-envelope"
Expand Down Expand Up @@ -439,8 +433,7 @@ fn probe_match_deserialization() {
// Following XML was taken from ONVIF guide
// https://www.onvif.org/wp-content/uploads/2016/12/ONVIF_WG-APG-Application_Programmers_Guide-1.pdf

let ser = r#"
<?xml version="1.0" encoding="UTF-8"?>
let ser = r#"<?xml version="1.0" encoding="utf-8"?>
<SOAP-ENV:Envelope
xmlns:SOAP-ENV="http://www.w3.org/2003/05/soap-envelope"
xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing"
Expand Down Expand Up @@ -510,8 +503,7 @@ fn string_list_serialization() {
])),
};

let expected = r#"
<?xml version="1.0" encoding="utf-8"?>
let expected = r#"<?xml version="1.0" encoding="utf-8"?>
<tt:FocusOptions20Extension xmlns:tt="http://www.onvif.org/ver10/schema">
<tt:AFModes>Auto Manual</tt:AFModes>
</tt:FocusOptions20Extension>
Expand Down Expand Up @@ -545,8 +537,7 @@ fn string_list_deserialization() {
fn float_list_serialization() {
let model = tt::FloatAttrList(vec![1.0, 2.3, 3.99]);

let expected = r#"
<?xml version="1.0" encoding="utf-8"?>
let expected = r#"<?xml version="1.0" encoding="utf-8"?>
<FloatAttrList>1 2.3 3.99</FloatAttrList>
"#;

Expand All @@ -557,8 +548,7 @@ fn float_list_serialization() {

#[test]
fn float_list_deserialization() {
let ser = r#"
<?xml version="1.0" encoding="utf-8"?>
let ser = r#"<?xml version="1.0" encoding="utf-8"?>
<FloatAttrList>1 2.3 3.99</FloatAttrList>
"#;

Expand All @@ -570,8 +560,7 @@ fn float_list_deserialization() {
#[test]
fn nested_structs_with_same_named_attributes() {
// https://github.com/media-io/yaserde/issues/12#issuecomment-601235031
let ser = r#"
<?xml version="1.0" encoding="utf-8"?>
let ser = r#"<?xml version="1.0" encoding="utf-8"?>
<tt:Profile token="a" xmlns:tt="http://www.onvif.org/ver10/schema">
<tt:PTZConfiguration token="b" />
</tt:Profile>
Expand All @@ -587,8 +576,7 @@ fn nested_structs_with_same_named_attributes() {
fn nested_structs_with_same_named_fields() {
// There was an issue in yaserde which is now fixed
// https://github.com/media-io/yaserde/issues/51
let ser = r#"
<?xml version="1.0" encoding="utf-8"?>
let ser = r#"<?xml version="1.0" encoding="utf-8"?>
<tt:Profile xmlns:tt="http://www.onvif.org/ver10/schema">
<tt:Extension />
</tt:Profile>
Expand All @@ -610,8 +598,7 @@ fn extension_inside_extension() {
// https://github.com/media-io/yaserde/issues/76
// If field `extension` in `SecurityCapabilitiesExtension` is uncommented accidentally
// then this test will fail. Also note that there's a bunch of such cases in `onvif.rs`.
let ser = r#"
<?xml version="1.0" encoding="utf-8"?>
let ser = r#"<?xml version="1.0" encoding="utf-8"?>
<tt:SecurityCapabilities xmlns:tt="http://www.onvif.org/ver10/schema">
<tt:Extension>
<tt:TLS1.0>false</tt:TLS1.0>
Expand Down
6 changes: 3 additions & 3 deletions transport/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ edition = "2021"
license = "MIT"

[dependencies]
async-trait = "0.1.42"
thiserror = "1.0.23"
yaserde = "0.7.1"
async-trait = "0.1"
thiserror = "1"
yaserde = "0.7"
6 changes: 3 additions & 3 deletions wsdl_rs/accesscontrol/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ license = "MIT"
transport = { path = "../../transport" }
types = { path = "../../xsd_rs/types" }
validate = { path = "../../validate" }
xml-rs = "=0.8.3"
xml-rs = "0.8"
xsd-macro-utils = { git = "https://github.com/lumeohq/xsd-parser-rs", rev = "7f3d433" }
xsd-types = { git = "https://github.com/lumeohq/xsd-parser-rs", rev = "7f3d433" }
yaserde = "0.7.1"
yaserde_derive = "0.7.1"
yaserde = "0.7"
yaserde_derive = "0.7"
6 changes: 3 additions & 3 deletions wsdl_rs/accessrules/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ license = "MIT"
transport = { path = "../../transport" }
types = { path = "../../xsd_rs/types" }
validate = { path = "../../validate" }
xml-rs = "=0.8.3"
xml-rs = "0.8"
xsd-macro-utils = { git = "https://github.com/lumeohq/xsd-parser-rs", rev = "7f3d433" }
xsd-types = { git = "https://github.com/lumeohq/xsd-parser-rs", rev = "7f3d433" }
yaserde = "0.7.1"
yaserde_derive = "0.7.1"
yaserde = "0.7"
yaserde_derive = "0.7"
6 changes: 3 additions & 3 deletions wsdl_rs/actionengine/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ common = { path = "../../xsd_rs/common" }
onvif = { package = "onvif-xsd", path = "../../xsd_rs/onvif_xsd" }
transport = { path = "../../transport" }
validate = { path = "../../validate" }
xml-rs = "=0.8.3"
xml-rs = "0.8"
xsd-macro-utils = { git = "https://github.com/lumeohq/xsd-parser-rs", rev = "7f3d433" }
xsd-types = { git = "https://github.com/lumeohq/xsd-parser-rs", rev = "7f3d433" }
yaserde = "0.7.1"
yaserde_derive = "0.7.1"
yaserde = "0.7"
yaserde_derive = "0.7"
6 changes: 3 additions & 3 deletions wsdl_rs/advancedsecurity/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ license = "MIT"
[dependencies]
transport = { path = "../../transport" }
validate = { path = "../../validate" }
xml-rs = "=0.8.3"
xml-rs = "0.8"
xsd-macro-utils = { git = "https://github.com/lumeohq/xsd-parser-rs", rev = "7f3d433" }
xsd-types = { git = "https://github.com/lumeohq/xsd-parser-rs", rev = "7f3d433" }
yaserde = "0.7.1"
yaserde_derive = "0.7.1"
yaserde = "0.7"
yaserde_derive = "0.7"
6 changes: 3 additions & 3 deletions wsdl_rs/analytics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ common = { path = "../../xsd_rs/common" }
onvif = { package = "onvif-xsd", path = "../../xsd_rs/onvif_xsd" }
transport = { path = "../../transport" }
validate = { path = "../../validate" }
xml-rs = "=0.8.3"
xml-rs = "0.8"
xsd-macro-utils = { git = "https://github.com/lumeohq/xsd-parser-rs", rev = "7f3d433" }
xsd-types = { git = "https://github.com/lumeohq/xsd-parser-rs", rev = "7f3d433" }
yaserde = "0.7.1"
yaserde_derive = "0.7.1"
yaserde = "0.7"
yaserde_derive = "0.7"
6 changes: 3 additions & 3 deletions wsdl_rs/authenticationbehavior/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ transport = { path = "../../transport" }
types = { path = "../../xsd_rs/types" }
onvif = { package = "onvif-xsd", path = "../../xsd_rs/onvif_xsd" }
validate = { path = "../../validate" }
xml-rs = "=0.8.3"
xml-rs = "0.8"
xsd-macro-utils = { git = "https://github.com/lumeohq/xsd-parser-rs", rev = "7f3d433" }
xsd-types = { git = "https://github.com/lumeohq/xsd-parser-rs", rev = "7f3d433" }
yaserde = "0.7.1"
yaserde_derive = "0.7.1"
yaserde = "0.7"
yaserde_derive = "0.7"
Loading

0 comments on commit b08709b

Please sign in to comment.