From ceae230549c804780c6ef1712f9d4855bffa86a7 Mon Sep 17 00:00:00 2001 From: Simon Rupf Date: Sat, 23 Nov 2024 09:51:01 +0100 Subject: [PATCH] release 1.1.2 - bump serde_json from 1.0.132 to 1.0.133 - bump quick-xml from 0.37.0 to 0.37.1 - updated dependencies --- CHANGELOG.md | 6 +++ Cargo.lock | 66 +++++++++++++-------------- Cargo.toml | 2 +- LICENSE.md | 123 ++++++++++++++++++++++++--------------------------- about.toml | 2 +- 5 files changed, 99 insertions(+), 100 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c8efef..e022eca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ Change Log of convert2json utilities ==================================== +Version 1.1.2 / 2024-11-23 +-------------------------- +- bump serde_json from 1.0.132 to 1.0.133 +- bump quick-xml from 0.37.0 to 0.37.1 +- updated dependencies + Version 1.1.1 / 2024-11-16 -------------------------- - bump csv from 1.3.0 to 1.3.1 diff --git a/Cargo.lock b/Cargo.lock index 339b4b4..f61b70b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "convert2json" -version = "1.1.1" +version = "1.1.2" dependencies = [ "csv", "pico-args", @@ -47,15 +47,15 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" [[package]] name = "indexmap" -version = "2.2.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", "hashbrown", @@ -63,15 +63,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "pico-args" @@ -81,9 +81,9 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "proc-macro2" -version = "1.0.89" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -100,9 +100,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -124,9 +124,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "serde" @@ -173,9 +173,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -195,9 +195,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.85" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -206,18 +206,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", @@ -226,9 +226,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.8" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", @@ -238,18 +238,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap", "serde", @@ -260,9 +260,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unsafe-libyaml" @@ -278,9 +278,9 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "winnow" -version = "0.5.34" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index 75177f6..39f28a6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "convert2json" description = "CLI utilities to convert CSV, INI, RSV, TOML, XML & YAML into JSON and for use with jaq or jq." authors = ["Simon Rupf "] -version = "1.1.1" +version = "1.1.2" edition = "2021" license = "MIT" repository = "https://github.com/simonrupf/convert2json" diff --git a/LICENSE.md b/LICENSE.md index c775019..91c3fce 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -6,7 +6,7 @@ This document lists the licenses of the projects used in convert2json. - [Apache License 2.0](#Apache-2.0) (20) - [MIT License](#MIT) (12) -- [Unicode License Agreement - Data Files and Software (2016)](#Unicode-DFS-2016) (1) +- [Unicode License v3](#Unicode-3.0) (1) ## Full license texts @@ -14,10 +14,10 @@ This document lists the licenses of the projects used in convert2json. #### Used by -- [serde_spanned](https://github.com/toml-rs/toml) 0.6.5 -- [toml](https://github.com/toml-rs/toml) 0.8.8 -- [toml_datetime](https://github.com/toml-rs/toml) 0.6.5 -- [toml_edit](https://github.com/toml-rs/toml) 0.21.0 +- [serde_spanned](https://github.com/toml-rs/toml) 0.6.8 +- [toml](https://github.com/toml-rs/toml) 0.8.19 +- [toml_datetime](https://github.com/toml-rs/toml) 0.6.8 +- [toml_edit](https://github.com/toml-rs/toml) 0.22.22 ``` Apache License @@ -228,18 +228,18 @@ This document lists the licenses of the projects used in convert2json. #### Used by -- [itoa](https://github.com/dtolnay/itoa) 1.0.10 -- [proc-macro2](https://github.com/dtolnay/proc-macro2) 1.0.89 -- [quote](https://github.com/dtolnay/quote) 1.0.35 -- [ryu](https://github.com/dtolnay/ryu) 1.0.16 +- [itoa](https://github.com/dtolnay/itoa) 1.0.13 +- [proc-macro2](https://github.com/dtolnay/proc-macro2) 1.0.92 +- [quote](https://github.com/dtolnay/quote) 1.0.37 +- [ryu](https://github.com/dtolnay/ryu) 1.0.18 - [serde](https://github.com/serde-rs/serde) 1.0.215 - [serde_derive](https://github.com/serde-rs/serde) 1.0.215 -- [serde_json](https://github.com/serde-rs/json) 1.0.132 +- [serde_json](https://github.com/serde-rs/json) 1.0.133 - [serde_yaml](https://github.com/dtolnay/serde-yaml) 0.9.34+deprecated -- [syn](https://github.com/dtolnay/syn) 2.0.85 -- [thiserror-impl](https://github.com/dtolnay/thiserror) 1.0.56 -- [thiserror](https://github.com/dtolnay/thiserror) 1.0.56 -- [unicode-ident](https://github.com/dtolnay/unicode-ident) 1.0.12 +- [syn](https://github.com/dtolnay/syn) 2.0.89 +- [thiserror-impl](https://github.com/dtolnay/thiserror) 1.0.69 +- [thiserror](https://github.com/dtolnay/thiserror) 1.0.69 +- [unicode-ident](https://github.com/dtolnay/unicode-ident) 1.0.14 ``` Apache License @@ -425,8 +425,8 @@ END OF TERMS AND CONDITIONS #### Used by - [equivalent](https://github.com/cuviper/equivalent) 1.0.1 -- [hashbrown](https://github.com/rust-lang/hashbrown) 0.14.3 -- [indexmap](https://github.com/indexmap-rs/indexmap) 2.2.2 +- [hashbrown](https://github.com/rust-lang/hashbrown) 0.15.1 +- [indexmap](https://github.com/indexmap-rs/indexmap) 2.6.0 ``` Apache License @@ -824,7 +824,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRES #### Used by -- [convert2json](https://github.com/simonrupf/convert2json) 1.1.1 +- [convert2json](https://github.com/simonrupf/convert2json) 1.1.2 - [unsafe-libyaml](https://github.com/dtolnay/unsafe-libyaml) 0.2.11 ``` @@ -857,7 +857,7 @@ DEALINGS IN THE SOFTWARE. #### Used by -- [winnow](https://github.com/winnow-rs/winnow) 0.5.34 +- [winnow](https://github.com/winnow-rs/winnow) 0.6.20 ``` Permission is hereby granted, free of charge, to any person obtaining @@ -886,7 +886,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - [csv-core](https://github.com/BurntSushi/rust-csv) 0.1.11 - [csv](https://github.com/BurntSushi/rust-csv) 1.3.1 -- [memchr](https://github.com/BurntSushi/memchr) 2.7.1 +- [memchr](https://github.com/BurntSushi/memchr) 2.7.4 ``` The MIT License (MIT) @@ -916,7 +916,7 @@ THE SOFTWARE. #### Used by -- [quick-xml](https://github.com/tafia/quick-xml) 0.37.0 +- [quick-xml](https://github.com/tafia/quick-xml) 0.37.1 ``` The MIT License (MIT) @@ -944,59 +944,52 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ``` -### Unicode License Agreement - Data Files and Software (2016) +### Unicode License v3 #### Used by -- [unicode-ident](https://github.com/dtolnay/unicode-ident) 1.0.12 +- [unicode-ident](https://github.com/dtolnay/unicode-ident) 1.0.14 ``` -UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE - -See Terms of Use <https://www.unicode.org/copyright.html> -for definitions of Unicode Inc.’s Data Files and Software. - -NOTICE TO USER: Carefully read the following legal agreement. -BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S -DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), -YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE -TERMS AND CONDITIONS OF THIS AGREEMENT. -IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE -THE DATA FILES OR SOFTWARE. +UNICODE LICENSE V3 COPYRIGHT AND PERMISSION NOTICE -Copyright © 1991-2022 Unicode, Inc. All rights reserved. -Distributed under the Terms of Use in https://www.unicode.org/copyright.html. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Unicode data files and any associated documentation -(the "Data Files") or Unicode software and any associated documentation -(the "Software") to deal in the Data Files or Software -without restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, and/or sell copies of -the Data Files or Software, and to permit persons to whom the Data Files -or Software are furnished to do so, provided that either -(a) this copyright and permission notice appear with all copies -of the Data Files or Software, or -(b) this copyright and permission notice appear in associated -Documentation. - -THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF -ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT OF THIRD PARTY RIGHTS. -IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS -NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL -DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THE DATA FILES OR SOFTWARE. - -Except as contained in this notice, the name of a copyright holder -shall not be used in advertising or otherwise to promote the sale, -use or other dealings in these Data Files or Software without prior -written authorization of the copyright holder. +Copyright © 1991-2023 Unicode, Inc. + +NOTICE TO USER: Carefully read the following legal agreement. BY +DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR +SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE +TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT +DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of data files and any associated documentation (the "Data Files") or +software and any associated documentation (the "Software") to deal in the +Data Files or Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, and/or sell +copies of the Data Files or Software, and to permit persons to whom the +Data Files or Software are furnished to do so, provided that either (a) +this copyright and permission notice appear with all copies of the Data +Files or Software, or (b) this copyright and permission notice appear in +associated Documentation. + +THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF +THIRD PARTY RIGHTS. + +IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE +BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, +OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA +FILES OR SOFTWARE. + +Except as contained in this notice, the name of a copyright holder shall +not be used in advertising or otherwise to promote the sale, use or other +dealings in these Data Files or Software without prior written +authorization of the copyright holder. ``` diff --git a/about.toml b/about.toml index 69feba1..8b112cf 100644 --- a/about.toml +++ b/about.toml @@ -2,7 +2,7 @@ accepted = [ "Apache-2.0", "BSD-3-Clause", "MIT", - "Unicode-DFS-2016", + "Unicode-3.0", ] no-clearly-defined = true