From 58eb355fb4a3b4c45e504b858de6bf095c1a630b Mon Sep 17 00:00:00 2001 From: Chris H-C Date: Tue, 15 Nov 2022 14:48:12 -0500 Subject: [PATCH 1/5] Bumped version to 51.8.1 --- .buildconfig.yml | 2 +- CHANGELOG.md | 6 +- Cargo.lock | 4 +- DEPENDENCIES.md | 369 +++++++++++++---- glean-core/Cargo.toml | 2 +- .../android-native/dependency-licenses.xml | 388 +++++++++++------- glean-core/android/dependency-licenses.xml | 388 +++++++++++------- glean-core/python/setup.py | 2 +- glean-core/rlb/Cargo.toml | 4 +- .../GleanGradlePlugin.groovy | 2 +- 10 files changed, 789 insertions(+), 378 deletions(-) diff --git a/.buildconfig.yml b/.buildconfig.yml index 5c34e4e7a5..34cd0c311a 100644 --- a/.buildconfig.yml +++ b/.buildconfig.yml @@ -1,4 +1,4 @@ -libraryVersion: 51.8.0 +libraryVersion: 51.8.1 groupId: org.mozilla.telemetry projects: glean: diff --git a/CHANGELOG.md b/CHANGELOG.md index ad5cb59cfa..3d0ba0c7f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Unreleased changes -[Full changelog](https://github.com/mozilla/glean/compare/v51.8.0...main) +[Full changelog](https://github.com/mozilla/glean/compare/v51.8.1...main) + +# v51.8.1 (2022-11-15) + +[Full changelog](https://github.com/mozilla/glean/compare/v51.8.0...v51.8.1) * General * Do not serialize `count` field in distribution payload ([#2267](https://github.com/mozilla/glean/pull/2267)) diff --git a/Cargo.lock b/Cargo.lock index 6db34075e7..0d4454040e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -366,7 +366,7 @@ dependencies = [ [[package]] name = "glean" -version = "51.8.0" +version = "51.8.1" dependencies = [ "chrono", "crossbeam-channel", @@ -409,7 +409,7 @@ dependencies = [ [[package]] name = "glean-core" -version = "51.8.0" +version = "51.8.1" dependencies = [ "android_logger", "bincode", diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md index 9df6b6ced1..578ece01b0 100644 --- a/DEPENDENCIES.md +++ b/DEPENDENCIES.md @@ -8,7 +8,7 @@ the details of which are reproduced below. * [MIT License](#MIT) * [Mozilla Public License 2.0](#MPL-2.0) * [BSD 2-Clause "Simplified" License](#BSD-2-Clause) -* [Unicode License Agreement - Data Files and Software (2016)](#Unicode-DFS-2016) + ------------- ## Apache License 2.0 @@ -18,6 +18,7 @@ The following text applies to code linked from these dependencies: * [miniz_oxide 0.5.1]( https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide ) + ``` Apache License @@ -205,6 +206,7 @@ The following text applies to code linked from these dependencies: * [lmdb-rkv 0.14.0]( https://github.com/mozilla/lmdb-rs.git ) + ``` Apache License @@ -418,6 +420,7 @@ The following text applies to code linked from these dependencies: * [rkv 0.17.1]( https://github.com/mozilla/rkv ) * [static_assertions 1.1.0]( https://github.com/nvzqz/static-assertions-rs ) + ``` Apache License @@ -630,6 +633,7 @@ The following text applies to code linked from these dependencies: * [tinyvec 1.6.0]( https://github.com/Lokathor/tinyvec ) + ``` Apache License @@ -847,6 +851,7 @@ The following text applies to code linked from these dependencies: * [ryu 1.0.11]( https://github.com/dtolnay/ryu ) * [unicode-linebreak 0.1.4]( https://github.com/axelf4/unicode-linebreak ) + ``` Apache License Version 2.0, January 2004 @@ -1058,6 +1063,7 @@ The following text applies to code linked from these dependencies: * [winapi 0.3.9]( https://github.com/retep998/winapi-rs ) + ``` Apache License Version 2.0, January 2004 @@ -1270,6 +1276,7 @@ The following text applies to code linked from these dependencies: * [crc32fast 1.3.2]( https://github.com/srijs/rust-crc32fast ) * [humantime 2.1.0]( https://github.com/tailhook/humantime ) + ``` Apache License Version 2.0, January 2004 @@ -1482,6 +1489,7 @@ The following text applies to code linked from these dependencies: * [libc 0.2.135]( https://github.com/rust-lang/libc ) + ``` Apache License Version 2.0, January 2004 @@ -1670,6 +1678,7 @@ The following text applies to code linked from these dependencies: * [askama_derive 0.11.2]( https://github.com/djc/askama ) * [askama_escape 0.10.3]( https://github.com/djc/askama ) + ``` Apache License Version 2.0, January 2004 @@ -1881,6 +1890,7 @@ The following text applies to code linked from these dependencies: * [proc-macro-error-attr 1.0.4]( https://gitlab.com/CreepySkeleton/proc-macro-error ) + ``` Apache License Version 2.0, January 2004 @@ -2097,7 +2107,7 @@ The following text applies to code linked from these dependencies: * [cfg-if 1.0.0]( https://github.com/alexcrichton/cfg-if ) * [crossbeam-channel 0.5.6]( https://github.com/crossbeam-rs/crossbeam ) * [crossbeam-utils 0.8.8]( https://github.com/crossbeam-rs/crossbeam ) -* [env_logger 0.9.1]( https://github.com/env-logger-rs/env_logger/ ) +* [env_logger 0.9.3]( https://github.com/env-logger-rs/env_logger/ ) * [fastrand 1.7.0]( https://github.com/smol-rs/fastrand ) * [flate2 1.0.24]( https://github.com/rust-lang/flate2-rs ) * [form_urlencoded 1.0.1]( https://github.com/servo/rust-url ) @@ -2136,6 +2146,7 @@ The following text applies to code linked from these dependencies: * [unicode-width 0.1.10]( https://github.com/unicode-rs/unicode-width ) * [url 2.2.2]( https://github.com/servo/rust-url ) + ``` Apache License Version 2.0, January 2004 @@ -2347,6 +2358,7 @@ The following text applies to code linked from these dependencies: * [minimal-lexical 0.2.1]( https://github.com/Alexhuszagh/minimal-lexical ) + ``` Apache License Version 2.0, January 2004 @@ -2558,6 +2570,7 @@ The following text applies to code linked from these dependencies: * [xshell 0.2.2]( https://github.com/matklad/xshell ) + ``` Apache License Version 2.0, January 2004 @@ -2769,6 +2782,7 @@ The following text applies to code linked from these dependencies: * [getrandom 0.2.7]( https://github.com/rust-random/getrandom ) + ``` Apache License Version 2.0, January 2004 @@ -2981,6 +2995,7 @@ The following text applies to code linked from these dependencies: * [adler 1.0.2]( https://github.com/jonas-schievink/adler.git ) * [cargo-platform 0.1.2]( https://github.com/rust-lang/cargo ) + ``` Apache License Version 2.0, January 2004 @@ -3192,6 +3207,7 @@ The following text applies to code linked from these dependencies: * [proc-macro-error 1.0.4]( https://gitlab.com/CreepySkeleton/proc-macro-error ) + ``` Apache License Version 2.0, January 2004 @@ -3405,6 +3421,7 @@ The following text applies to code linked from these dependencies: * [log 0.4.17]( https://github.com/rust-lang/log ) * [uuid 0.8.2]( https://github.com/uuid-rs/uuid ) + ``` Apache License Version 2.0, January 2004 @@ -3616,6 +3633,7 @@ The following text applies to code linked from these dependencies: * [remove_dir_all 0.5.3]( https://github.com/XAMPPRocky/remove_dir_all.git ) + ``` Apache License Version 2.0, January 2004 @@ -3809,21 +3827,6 @@ See the License for the specific language governing permissions and limitations under the License. -``` -## Apache License 2.0 - - -The following text applies to code linked from these dependencies: - -* [winapi 0.3.9]( https://github.com/retep998/winapi-rs ) - -``` -// Licensed under the Apache License, Version 2.0 -// or the MIT license -// , at your option. -// All files in the project carrying such notice may not be copied, modified, or distributed -// except according to those terms. - ``` ## Apache License 2.0 @@ -3832,6 +3835,7 @@ The following text applies to code linked from these dependencies: * [android_log-sys 0.2.0]( https://github.com/nercury/android_log-sys-rs ) + ``` Apache License Version 2.0, January 2004 @@ -4043,6 +4047,7 @@ The following text applies to code linked from these dependencies: * [android_logger 0.11.1]( https://github.com/Nercury/android_logger-rs ) + ``` Apache License Version 2.0, January 2004 @@ -4253,12 +4258,12 @@ limitations under the License. The following text applies to code linked from these dependencies: * [askama_shared 0.12.2]( https://github.com/djc/askama ) -* [chrono 0.4.19]( https://github.com/chronotope/chrono ) * [lmdb-rkv-sys 0.11.2]( https://github.com/mozilla/lmdb-rs.git ) * [tinyvec_macros 0.1.0]( https://github.com/Soveu/tinyvec_macros ) * [winapi-x86_64-pc-windows-gnu 0.4.0]( https://github.com/retep998/winapi-rs ) * [xshell-macros 0.2.2]( https://github.com/matklad/xshell ) + ``` Apache License Version 2.0, January 2004 @@ -4340,17 +4345,250 @@ limitations under the License. The following text applies to code linked from these dependencies: -* [unicode-normalization 0.1.19]( https://github.com/unicode-rs/unicode-normalization ) -* [unicode-width 0.1.10]( https://github.com/unicode-rs/unicode-width ) +* [chrono 0.4.19]( https://github.com/chronotope/chrono ) + ``` -Licensed under the Apache License, Version 2.0 - or the MIT -license , -at your option. All files in the project carrying such -notice may not be copied, modified, or distributed except -according to those terms. +Rust-chrono is dual-licensed under The MIT License [1] and +Apache 2.0 License [2]. Copyright (c) 2014--2017, Kang Seonghoon and +contributors. + +Nota Bene: This is same as the Rust Project's own license. + + +[1]: , which is reproduced below: + +~~~~ +The MIT License (MIT) + +Copyright (c) 2014, Kang Seonghoon. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS 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. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +~~~~ + + +[2]: , which is reproduced below: + +~~~~ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +~~~~ + ``` ## BSD 2-Clause "Simplified" License @@ -4360,6 +4598,7 @@ The following text applies to code linked from these dependencies: * [arrayref 0.3.6]( https://github.com/droundy/arrayref ) + ``` Copyright (c) 2015 David Roundy All rights reserved. @@ -4396,6 +4635,7 @@ The following text applies to code linked from these dependencies: * [matches 0.1.9]( https://github.com/SimonSapin/rust-std-candidates ) + ``` Copyright (c) 2014-2016 Simon Sapin @@ -4431,6 +4671,7 @@ The following text applies to code linked from these dependencies: * [nom 7.1.1]( https://github.com/Geal/nom ) + ``` Copyright (c) 2014-2019 Geoffroy Couprie @@ -4461,6 +4702,7 @@ The following text applies to code linked from these dependencies: * [ordered-float 3.0.0]( https://github.com/reem/rust-ordered-float ) + ``` Copyright (c) 2015 Jonathan Reem @@ -4496,6 +4738,7 @@ The following text applies to code linked from these dependencies: * [atty 0.2.14]( https://github.com/softprops/atty ) + ``` Copyright (c) 2015-2019 Doug Tangren @@ -4526,6 +4769,7 @@ The following text applies to code linked from these dependencies: * [bytes 1.1.0]( https://github.com/tokio-rs/bytes ) + ``` Copyright (c) 2018 Carl Lerche @@ -4561,6 +4805,7 @@ The following text applies to code linked from these dependencies: * [weedle2 4.0.0]( https://github.com/mozilla/uniffi-rs ) + ``` Copyright 2018-Present Sharad Chand Copyright 2022 Jan-Erik Rediger @@ -4587,6 +4832,7 @@ The following text applies to code linked from these dependencies: * [textwrap 0.15.1]( https://github.com/mgeisler/textwrap ) + ``` MIT License @@ -4618,6 +4864,7 @@ The following text applies to code linked from these dependencies: * [scroll_derive 0.11.0]( https://github.com/m4b/scroll ) + ``` MIT License @@ -4649,6 +4896,7 @@ The following text applies to code linked from these dependencies: * [smawk 0.3.1]( https://github.com/mgeisler/smawk ) + ``` MIT License @@ -4680,6 +4928,7 @@ The following text applies to code linked from these dependencies: * [dashmap 4.0.2]( https://github.com/xacrimon/dashmap ) + ``` MIT License @@ -4711,6 +4960,7 @@ The following text applies to code linked from these dependencies: * [oslog 0.1.0]( https://github.com/steven-joruk/oslog ) + ``` MIT License @@ -4742,6 +4992,7 @@ The following text applies to code linked from these dependencies: * [sample 0.1.0]( https://crates.io/crates/sample ) + ``` MIT License @@ -4761,6 +5012,7 @@ The following text applies to code linked from these dependencies: * [cargo_metadata 0.14.2]( https://github.com/oli-obk/cargo_metadata ) + ``` Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated @@ -4796,6 +5048,7 @@ The following text applies to code linked from these dependencies: * [memchr 2.5.0]( https://github.com/BurntSushi/memchr ) * [termcolor 1.1.3]( https://github.com/BurntSushi/termcolor ) + ``` The MIT License (MIT) @@ -4827,6 +5080,7 @@ The following text applies to code linked from these dependencies: * [mime_guess 2.0.4]( https://github.com/abonander/mime_guess ) + ``` The MIT License (MIT) @@ -4859,6 +5113,7 @@ The following text applies to code linked from these dependencies: * [strsim 0.10.0]( https://github.com/dguo/strsim-rs ) + ``` The MIT License (MIT) @@ -4892,6 +5147,7 @@ The following text applies to code linked from these dependencies: * [winapi-util 0.1.5]( https://github.com/BurntSushi/winapi-util ) + ``` The MIT License (MIT) @@ -4923,6 +5179,7 @@ The following text applies to code linked from these dependencies: * [whatsys 0.1.2]( https://github.com/badboy/whatsys ) + ``` The MIT License (MIT) @@ -4954,6 +5211,7 @@ The following text applies to code linked from these dependencies: * [xshell-venv 1.1.0]( https://github.com/badboy/xshell-venv ) + ``` The MIT License (MIT) @@ -4985,6 +5243,7 @@ The following text applies to code linked from these dependencies: * [scroll 0.11.0]( https://github.com/m4b/scroll ) + ``` The MIT License (MIT) @@ -5016,6 +5275,7 @@ The following text applies to code linked from these dependencies: * [goblin 0.5.4]( https://github.com/m4b/goblin ) + ``` The MIT License (MIT) @@ -5047,6 +5307,7 @@ The following text applies to code linked from these dependencies: * [bincode 1.3.3]( https://github.com/servo/bincode ) + ``` The MIT License (MIT) @@ -5070,22 +5331,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -``` -## MIT License - - -The following text applies to code linked from these dependencies: - -* [byteorder 1.4.3]( https://github.com/BurntSushi/byteorder ) -* [memchr 2.5.0]( https://github.com/BurntSushi/memchr ) -* [termcolor 1.1.3]( https://github.com/BurntSushi/termcolor ) -* [winapi-util 0.1.5]( https://github.com/BurntSushi/winapi-util ) - -``` -This project is dual-licensed under the Unlicense and MIT licenses. - -You may use this code under the terms of either license. - ``` ## Mozilla Public License 2.0 @@ -5101,6 +5346,7 @@ The following text applies to code linked from these dependencies: * [uniffi_macros 0.21.0]( https://github.com/mozilla/uniffi-rs ) * [uniffi_meta 0.21.0]( https://github.com/mozilla/uniffi-rs ) + ``` Mozilla Public License Version 2.0 @@ -5253,11 +5499,12 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice The following text applies to code linked from these dependencies: -* [glean 51.8.0]( https://github.com/mozilla/glean ) +* [glean 51.8.1]( https://github.com/mozilla/glean ) * [glean-build 6.3.0]( https://github.com/mozilla/glean ) -* [glean-core 51.8.0]( https://github.com/mozilla/glean ) +* [glean-core 51.8.1]( https://github.com/mozilla/glean ) * [zeitstempel 0.1.1]( https://github.com/badboy/zeitstempel ) + ``` Mozilla Public License Version 2.0 ================================== @@ -5634,36 +5881,4 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice defined by the Mozilla Public License, v. 2.0. ``` -## Unicode License Agreement - Data Files and Software (2016) - - -The following text applies to code linked from these dependencies: - -* [unicode-ident 1.0.5]( https://github.com/dtolnay/unicode-ident ) - -``` -UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE - -Unicode Data Files include all data files under the directories http://www.unicode.org/Public/, http://www.unicode.org/reports/, http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and http://www.unicode.org/utility/trac/browser/. - -Unicode Data Files do not include PDF online code charts under the directory http://www.unicode.org/Public/. - -Software includes any source code published in the Unicode Standard or under the directories http://www.unicode.org/Public/, http://www.unicode.org/reports/, http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and http://www.unicode.org/utility/trac/browser/. - -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. - -COPYRIGHT AND PERMISSION NOTICE - -Copyright © 1991-2016 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in http://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. - -``` diff --git a/glean-core/Cargo.toml b/glean-core/Cargo.toml index 3e8a64dc34..676f29dee1 100644 --- a/glean-core/Cargo.toml +++ b/glean-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "glean-core" -version = "51.8.0" +version = "51.8.1" authors = ["Jan-Erik Rediger ", "The Glean Team "] description = "A modern Telemetry library" repository = "https://github.com/mozilla/glean" diff --git a/glean-core/android-native/dependency-licenses.xml b/glean-core/android-native/dependency-licenses.xml index cfa7d8d34f..c2c73864e6 100644 --- a/glean-core/android-native/dependency-licenses.xml +++ b/glean-core/android-native/dependency-licenses.xml @@ -3,386 +3,482 @@ Binary distributions of this software incorporate code from a number of third-party dependencies. These dependencies are available under a variety of free and open source licenses, the details of which are reproduced below. ---> +--> + Apache License 2.0: miniz_oxide https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide - + + Apache License 2.0: lmdb-rkv https://github.com/mozilla/lmdb-rs.git - + + Apache License 2.0: rkv https://github.com/mozilla/rkv - + + Apache License 2.0: static_assertions https://github.com/nvzqz/static-assertions-rs - + + Apache License 2.0: tinyvec https://github.com/Lokathor/tinyvec - + + Apache License 2.0: clap https://github.com/clap-rs/clap - + + Apache License 2.0: clap_derive https://github.com/clap-rs/clap/tree/master/clap_derive - + + Apache License 2.0: clap_lex https://github.com/clap-rs/clap/tree/master/clap_lex - + + Apache License 2.0: os_str_bytes https://github.com/dylni/os_str_bytes - + + Apache License 2.0: ryu https://github.com/dtolnay/ryu - + + Apache License 2.0: unicode-linebreak https://github.com/axelf4/unicode-linebreak - + + Apache License 2.0: winapi https://github.com/retep998/winapi-rs - + + Apache License 2.0: crc32fast https://github.com/srijs/rust-crc32fast - + + Apache License 2.0: humantime https://github.com/tailhook/humantime - + + Apache License 2.0: libc https://github.com/rust-lang/libc - + + Apache License 2.0: askama https://github.com/djc/askama - + + Apache License 2.0: askama_derive https://github.com/djc/askama - + + Apache License 2.0: askama_escape https://github.com/djc/askama - + + Apache License 2.0: proc-macro-error-attr https://gitlab.com/CreepySkeleton/proc-macro-error - + + Apache License 2.0: ahash https://github.com/tkaitchuck/ahash - + + Apache License 2.0: anyhow https://github.com/dtolnay/anyhow - + + Apache License 2.0: bitflags https://github.com/bitflags/bitflags - + + Apache License 2.0: camino https://github.com/camino-rs/camino - + + Apache License 2.0: cfg-if https://github.com/alexcrichton/cfg-if - + + Apache License 2.0: crossbeam-channel https://github.com/crossbeam-rs/crossbeam - + + Apache License 2.0: crossbeam-utils https://github.com/crossbeam-rs/crossbeam - + + Apache License 2.0: env_logger https://github.com/env-logger-rs/env_logger/ - + + Apache License 2.0: fastrand https://github.com/smol-rs/fastrand - + + Apache License 2.0: flate2 https://github.com/rust-lang/flate2-rs - + + Apache License 2.0: form_urlencoded https://github.com/servo/rust-url - + + Apache License 2.0: hashbrown https://github.com/rust-lang/hashbrown - + + Apache License 2.0: heck https://github.com/withoutboats/heck - + + Apache License 2.0: id-arena https://github.com/fitzgen/id-arena - + + Apache License 2.0: idna https://github.com/servo/rust-url/ - + + Apache License 2.0: indexmap https://github.com/bluss/indexmap - + + Apache License 2.0: inherent https://github.com/dtolnay/inherent - + + Apache License 2.0: itoa https://github.com/dtolnay/itoa - + + Apache License 2.0: lazy_static https://github.com/rust-lang-nursery/lazy-static.rs - + + Apache License 2.0: mime https://github.com/hyperium/mime - + + Apache License 2.0: num-integer https://github.com/rust-num/num-integer - + + Apache License 2.0: num-traits https://github.com/rust-num/num-traits - + + Apache License 2.0: num_cpus https://github.com/seanmonstar/num_cpus - + + Apache License 2.0: once_cell https://github.com/matklad/once_cell - + + Apache License 2.0: paste https://github.com/dtolnay/paste - + + Apache License 2.0: percent-encoding https://github.com/servo/rust-url/ - + + Apache License 2.0: plain https://github.com/randomites/plain - + + Apache License 2.0: proc-macro2 https://github.com/dtolnay/proc-macro2 - + + Apache License 2.0: quote https://github.com/dtolnay/quote - + + Apache License 2.0: semver https://github.com/dtolnay/semver - + + Apache License 2.0: serde https://github.com/serde-rs/serde - + + Apache License 2.0: serde_derive https://github.com/serde-rs/serde - + + Apache License 2.0: serde_json https://github.com/serde-rs/json - + + Apache License 2.0: syn https://github.com/dtolnay/syn - + + Apache License 2.0: tempfile https://github.com/Stebalien/tempfile - + + Apache License 2.0: thiserror https://github.com/dtolnay/thiserror - + + Apache License 2.0: thiserror-impl https://github.com/dtolnay/thiserror - + + Apache License 2.0: time https://github.com/time-rs/time - + + Apache License 2.0: toml https://github.com/alexcrichton/toml-rs - + + Apache License 2.0: unicase https://github.com/seanmonstar/unicase - + + Apache License 2.0: unicode-bidi https://github.com/servo/unicode-bidi - + + Apache License 2.0: unicode-ident https://github.com/dtolnay/unicode-ident - + + Apache License 2.0: unicode-normalization https://github.com/unicode-rs/unicode-normalization - + + Apache License 2.0: unicode-width https://github.com/unicode-rs/unicode-width - + + Apache License 2.0: url https://github.com/servo/rust-url - + + Apache License 2.0: minimal-lexical https://github.com/Alexhuszagh/minimal-lexical - + + Apache License 2.0: xshell https://github.com/matklad/xshell - + + Apache License 2.0: getrandom https://github.com/rust-random/getrandom - + + Apache License 2.0: adler https://github.com/jonas-schievink/adler.git - + + Apache License 2.0: cargo-platform https://github.com/rust-lang/cargo - + + Apache License 2.0: proc-macro-error https://gitlab.com/CreepySkeleton/proc-macro-error - + + Apache License 2.0: fs-err https://github.com/andrewhickman/fs-err - + + Apache License 2.0: log https://github.com/rust-lang/log - + + Apache License 2.0: uuid https://github.com/uuid-rs/uuid - + + Apache License 2.0: remove_dir_all https://github.com/XAMPPRocky/remove_dir_all.git - - Apache License 2.0: winapi - https://github.com/retep998/winapi-rs - + + Apache License 2.0: android_log-sys https://github.com/nercury/android_log-sys-rs - + + Apache License 2.0: android_logger https://github.com/Nercury/android_logger-rs - + + Apache License 2.0: askama_shared https://github.com/djc/askama - - Apache License 2.0: chrono - https://github.com/chronotope/chrono - + + Apache License 2.0: lmdb-rkv-sys https://github.com/mozilla/lmdb-rs.git - + + Apache License 2.0: tinyvec_macros https://github.com/Soveu/tinyvec_macros - + + Apache License 2.0: winapi-x86_64-pc-windows-gnu https://github.com/retep998/winapi-rs - + + Apache License 2.0: xshell-macros https://github.com/matklad/xshell - - Apache License 2.0: unicode-normalization - https://github.com/unicode-rs/unicode-normalization - - Apache License 2.0: unicode-width - https://github.com/unicode-rs/unicode-width - + + + Apache License 2.0: chrono + https://github.com/chronotope/chrono + + BSD 2-Clause "Simplified" License: arrayref https://github.com/droundy/arrayref - + + MIT License: matches https://github.com/SimonSapin/rust-std-candidates - + + MIT License: nom https://github.com/Geal/nom - + + MIT License: ordered-float https://github.com/reem/rust-ordered-float - + + MIT License: atty https://github.com/softprops/atty - + + MIT License: bytes https://github.com/tokio-rs/bytes - + + MIT License: weedle2 https://github.com/mozilla/uniffi-rs - + + MIT License: textwrap https://github.com/mgeisler/textwrap - + + MIT License: scroll_derive https://github.com/m4b/scroll - + + MIT License: smawk https://github.com/mgeisler/smawk - + + MIT License: dashmap https://github.com/xacrimon/dashmap - + + MIT License: oslog https://github.com/steven-joruk/oslog - + + MIT License: sample https://crates.io/crates/sample - + + MIT License: cargo_metadata https://github.com/oli-obk/cargo_metadata - + + MIT License: byteorder https://github.com/BurntSushi/byteorder - + + MIT License: memchr https://github.com/BurntSushi/memchr - + + MIT License: termcolor https://github.com/BurntSushi/termcolor - + + MIT License: mime_guess https://github.com/abonander/mime_guess - + + MIT License: strsim https://github.com/dguo/strsim-rs - + + MIT License: winapi-util https://github.com/BurntSushi/winapi-util - + + MIT License: whatsys https://github.com/badboy/whatsys - + + MIT License: xshell-venv https://github.com/badboy/xshell-venv - + + MIT License: scroll https://github.com/m4b/scroll - + + MIT License: goblin https://github.com/m4b/goblin - + + MIT License: bincode https://github.com/servo/bincode - - MIT License: byteorder - https://github.com/BurntSushi/byteorder - - MIT License: memchr - https://github.com/BurntSushi/memchr - - MIT License: termcolor - https://github.com/BurntSushi/termcolor - - MIT License: winapi-util - https://github.com/BurntSushi/winapi-util - + + Mozilla Public License 2.0: embedded-uniffi-bindgen https://crates.io/crates/embedded-uniffi-bindgen - + + Mozilla Public License 2.0: glean-bundle https://github.com/mozilla/glean - + + Mozilla Public License 2.0: glean-bundle-android https://github.com/mozilla/glean - + + Mozilla Public License 2.0: uniffi https://github.com/mozilla/uniffi-rs - + + Mozilla Public License 2.0: uniffi_bindgen https://github.com/mozilla/uniffi-rs - + + Mozilla Public License 2.0: uniffi_build https://github.com/mozilla/uniffi-rs - + + Mozilla Public License 2.0: uniffi_macros https://github.com/mozilla/uniffi-rs - + + Mozilla Public License 2.0: uniffi_meta https://github.com/mozilla/uniffi-rs - + + Mozilla Public License 2.0: glean https://github.com/mozilla/glean - + + Mozilla Public License 2.0: glean-build https://github.com/mozilla/glean - + + Mozilla Public License 2.0: glean-core https://github.com/mozilla/glean - + + Mozilla Public License 2.0: zeitstempel https://github.com/badboy/zeitstempel - - Unicode License Agreement - Data Files and Software (2016): unicode-ident - https://github.com/dtolnay/unicode-ident - + + diff --git a/glean-core/android/dependency-licenses.xml b/glean-core/android/dependency-licenses.xml index cfa7d8d34f..c2c73864e6 100644 --- a/glean-core/android/dependency-licenses.xml +++ b/glean-core/android/dependency-licenses.xml @@ -3,386 +3,482 @@ Binary distributions of this software incorporate code from a number of third-party dependencies. These dependencies are available under a variety of free and open source licenses, the details of which are reproduced below. ---> +--> + Apache License 2.0: miniz_oxide https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide - + + Apache License 2.0: lmdb-rkv https://github.com/mozilla/lmdb-rs.git - + + Apache License 2.0: rkv https://github.com/mozilla/rkv - + + Apache License 2.0: static_assertions https://github.com/nvzqz/static-assertions-rs - + + Apache License 2.0: tinyvec https://github.com/Lokathor/tinyvec - + + Apache License 2.0: clap https://github.com/clap-rs/clap - + + Apache License 2.0: clap_derive https://github.com/clap-rs/clap/tree/master/clap_derive - + + Apache License 2.0: clap_lex https://github.com/clap-rs/clap/tree/master/clap_lex - + + Apache License 2.0: os_str_bytes https://github.com/dylni/os_str_bytes - + + Apache License 2.0: ryu https://github.com/dtolnay/ryu - + + Apache License 2.0: unicode-linebreak https://github.com/axelf4/unicode-linebreak - + + Apache License 2.0: winapi https://github.com/retep998/winapi-rs - + + Apache License 2.0: crc32fast https://github.com/srijs/rust-crc32fast - + + Apache License 2.0: humantime https://github.com/tailhook/humantime - + + Apache License 2.0: libc https://github.com/rust-lang/libc - + + Apache License 2.0: askama https://github.com/djc/askama - + + Apache License 2.0: askama_derive https://github.com/djc/askama - + + Apache License 2.0: askama_escape https://github.com/djc/askama - + + Apache License 2.0: proc-macro-error-attr https://gitlab.com/CreepySkeleton/proc-macro-error - + + Apache License 2.0: ahash https://github.com/tkaitchuck/ahash - + + Apache License 2.0: anyhow https://github.com/dtolnay/anyhow - + + Apache License 2.0: bitflags https://github.com/bitflags/bitflags - + + Apache License 2.0: camino https://github.com/camino-rs/camino - + + Apache License 2.0: cfg-if https://github.com/alexcrichton/cfg-if - + + Apache License 2.0: crossbeam-channel https://github.com/crossbeam-rs/crossbeam - + + Apache License 2.0: crossbeam-utils https://github.com/crossbeam-rs/crossbeam - + + Apache License 2.0: env_logger https://github.com/env-logger-rs/env_logger/ - + + Apache License 2.0: fastrand https://github.com/smol-rs/fastrand - + + Apache License 2.0: flate2 https://github.com/rust-lang/flate2-rs - + + Apache License 2.0: form_urlencoded https://github.com/servo/rust-url - + + Apache License 2.0: hashbrown https://github.com/rust-lang/hashbrown - + + Apache License 2.0: heck https://github.com/withoutboats/heck - + + Apache License 2.0: id-arena https://github.com/fitzgen/id-arena - + + Apache License 2.0: idna https://github.com/servo/rust-url/ - + + Apache License 2.0: indexmap https://github.com/bluss/indexmap - + + Apache License 2.0: inherent https://github.com/dtolnay/inherent - + + Apache License 2.0: itoa https://github.com/dtolnay/itoa - + + Apache License 2.0: lazy_static https://github.com/rust-lang-nursery/lazy-static.rs - + + Apache License 2.0: mime https://github.com/hyperium/mime - + + Apache License 2.0: num-integer https://github.com/rust-num/num-integer - + + Apache License 2.0: num-traits https://github.com/rust-num/num-traits - + + Apache License 2.0: num_cpus https://github.com/seanmonstar/num_cpus - + + Apache License 2.0: once_cell https://github.com/matklad/once_cell - + + Apache License 2.0: paste https://github.com/dtolnay/paste - + + Apache License 2.0: percent-encoding https://github.com/servo/rust-url/ - + + Apache License 2.0: plain https://github.com/randomites/plain - + + Apache License 2.0: proc-macro2 https://github.com/dtolnay/proc-macro2 - + + Apache License 2.0: quote https://github.com/dtolnay/quote - + + Apache License 2.0: semver https://github.com/dtolnay/semver - + + Apache License 2.0: serde https://github.com/serde-rs/serde - + + Apache License 2.0: serde_derive https://github.com/serde-rs/serde - + + Apache License 2.0: serde_json https://github.com/serde-rs/json - + + Apache License 2.0: syn https://github.com/dtolnay/syn - + + Apache License 2.0: tempfile https://github.com/Stebalien/tempfile - + + Apache License 2.0: thiserror https://github.com/dtolnay/thiserror - + + Apache License 2.0: thiserror-impl https://github.com/dtolnay/thiserror - + + Apache License 2.0: time https://github.com/time-rs/time - + + Apache License 2.0: toml https://github.com/alexcrichton/toml-rs - + + Apache License 2.0: unicase https://github.com/seanmonstar/unicase - + + Apache License 2.0: unicode-bidi https://github.com/servo/unicode-bidi - + + Apache License 2.0: unicode-ident https://github.com/dtolnay/unicode-ident - + + Apache License 2.0: unicode-normalization https://github.com/unicode-rs/unicode-normalization - + + Apache License 2.0: unicode-width https://github.com/unicode-rs/unicode-width - + + Apache License 2.0: url https://github.com/servo/rust-url - + + Apache License 2.0: minimal-lexical https://github.com/Alexhuszagh/minimal-lexical - + + Apache License 2.0: xshell https://github.com/matklad/xshell - + + Apache License 2.0: getrandom https://github.com/rust-random/getrandom - + + Apache License 2.0: adler https://github.com/jonas-schievink/adler.git - + + Apache License 2.0: cargo-platform https://github.com/rust-lang/cargo - + + Apache License 2.0: proc-macro-error https://gitlab.com/CreepySkeleton/proc-macro-error - + + Apache License 2.0: fs-err https://github.com/andrewhickman/fs-err - + + Apache License 2.0: log https://github.com/rust-lang/log - + + Apache License 2.0: uuid https://github.com/uuid-rs/uuid - + + Apache License 2.0: remove_dir_all https://github.com/XAMPPRocky/remove_dir_all.git - - Apache License 2.0: winapi - https://github.com/retep998/winapi-rs - + + Apache License 2.0: android_log-sys https://github.com/nercury/android_log-sys-rs - + + Apache License 2.0: android_logger https://github.com/Nercury/android_logger-rs - + + Apache License 2.0: askama_shared https://github.com/djc/askama - - Apache License 2.0: chrono - https://github.com/chronotope/chrono - + + Apache License 2.0: lmdb-rkv-sys https://github.com/mozilla/lmdb-rs.git - + + Apache License 2.0: tinyvec_macros https://github.com/Soveu/tinyvec_macros - + + Apache License 2.0: winapi-x86_64-pc-windows-gnu https://github.com/retep998/winapi-rs - + + Apache License 2.0: xshell-macros https://github.com/matklad/xshell - - Apache License 2.0: unicode-normalization - https://github.com/unicode-rs/unicode-normalization - - Apache License 2.0: unicode-width - https://github.com/unicode-rs/unicode-width - + + + Apache License 2.0: chrono + https://github.com/chronotope/chrono + + BSD 2-Clause "Simplified" License: arrayref https://github.com/droundy/arrayref - + + MIT License: matches https://github.com/SimonSapin/rust-std-candidates - + + MIT License: nom https://github.com/Geal/nom - + + MIT License: ordered-float https://github.com/reem/rust-ordered-float - + + MIT License: atty https://github.com/softprops/atty - + + MIT License: bytes https://github.com/tokio-rs/bytes - + + MIT License: weedle2 https://github.com/mozilla/uniffi-rs - + + MIT License: textwrap https://github.com/mgeisler/textwrap - + + MIT License: scroll_derive https://github.com/m4b/scroll - + + MIT License: smawk https://github.com/mgeisler/smawk - + + MIT License: dashmap https://github.com/xacrimon/dashmap - + + MIT License: oslog https://github.com/steven-joruk/oslog - + + MIT License: sample https://crates.io/crates/sample - + + MIT License: cargo_metadata https://github.com/oli-obk/cargo_metadata - + + MIT License: byteorder https://github.com/BurntSushi/byteorder - + + MIT License: memchr https://github.com/BurntSushi/memchr - + + MIT License: termcolor https://github.com/BurntSushi/termcolor - + + MIT License: mime_guess https://github.com/abonander/mime_guess - + + MIT License: strsim https://github.com/dguo/strsim-rs - + + MIT License: winapi-util https://github.com/BurntSushi/winapi-util - + + MIT License: whatsys https://github.com/badboy/whatsys - + + MIT License: xshell-venv https://github.com/badboy/xshell-venv - + + MIT License: scroll https://github.com/m4b/scroll - + + MIT License: goblin https://github.com/m4b/goblin - + + MIT License: bincode https://github.com/servo/bincode - - MIT License: byteorder - https://github.com/BurntSushi/byteorder - - MIT License: memchr - https://github.com/BurntSushi/memchr - - MIT License: termcolor - https://github.com/BurntSushi/termcolor - - MIT License: winapi-util - https://github.com/BurntSushi/winapi-util - + + Mozilla Public License 2.0: embedded-uniffi-bindgen https://crates.io/crates/embedded-uniffi-bindgen - + + Mozilla Public License 2.0: glean-bundle https://github.com/mozilla/glean - + + Mozilla Public License 2.0: glean-bundle-android https://github.com/mozilla/glean - + + Mozilla Public License 2.0: uniffi https://github.com/mozilla/uniffi-rs - + + Mozilla Public License 2.0: uniffi_bindgen https://github.com/mozilla/uniffi-rs - + + Mozilla Public License 2.0: uniffi_build https://github.com/mozilla/uniffi-rs - + + Mozilla Public License 2.0: uniffi_macros https://github.com/mozilla/uniffi-rs - + + Mozilla Public License 2.0: uniffi_meta https://github.com/mozilla/uniffi-rs - + + Mozilla Public License 2.0: glean https://github.com/mozilla/glean - + + Mozilla Public License 2.0: glean-build https://github.com/mozilla/glean - + + Mozilla Public License 2.0: glean-core https://github.com/mozilla/glean - + + Mozilla Public License 2.0: zeitstempel https://github.com/badboy/zeitstempel - - Unicode License Agreement - Data Files and Software (2016): unicode-ident - https://github.com/dtolnay/unicode-ident - + + diff --git a/glean-core/python/setup.py b/glean-core/python/setup.py index 8d9969ea66..ff41730250 100644 --- a/glean-core/python/setup.py +++ b/glean-core/python/setup.py @@ -56,7 +56,7 @@ history = history_file.read() # glean version. Automatically updated by the bin/prepare_release.sh script -version = "51.8.0" +version = "51.8.1" requirements = [ "semver>=2.13.0", diff --git a/glean-core/rlb/Cargo.toml b/glean-core/rlb/Cargo.toml index 8d18899751..506819aec8 100644 --- a/glean-core/rlb/Cargo.toml +++ b/glean-core/rlb/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "glean" -version = "51.8.0" +version = "51.8.1" authors = ["Jan-Erik Rediger ", "The Glean Team "] description = "Glean SDK Rust language bindings" repository = "https://github.com/mozilla/glean" @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies.glean-core] path = ".." -version = "51.8.0" +version = "51.8.1" [dependencies] crossbeam-channel = "0.5" diff --git a/gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy b/gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy index 51e376c50c..bbb4c0fa1f 100644 --- a/gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy +++ b/gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy @@ -555,7 +555,7 @@ except: void apply(Project project) { isOffline = project.gradle.startParameter.offline - project.ext.glean_version = "51.8.0" + project.ext.glean_version = "51.8.1" def parserVersion = gleanParserVersion(project) // Print the required glean_parser version to the console. This is From 28c10289c3e55a0650911c570bf7eff9b91c6b8e Mon Sep 17 00:00:00 2001 From: Chris H-C Date: Thu, 17 Nov 2022 09:54:42 -0500 Subject: [PATCH 2/5] bug 1801128 - Use `remove_dir_all` crate to clear stores reliably on Windows --- CHANGELOG.md | 3 +++ Cargo.lock | 1 + glean-core/Cargo.toml | 1 + glean-core/src/event_database/mod.rs | 2 +- glean-core/src/ping/mod.rs | 2 +- 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d0ba0c7f6..3bc7635367 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ [Full changelog](https://github.com/mozilla/glean/compare/v51.8.1...main) +* General + * BUGFIX: Reliably clear pending pings and events on Windows using `remove_dir_all` crate ([bug 1801128](https://bugzilla.mozilla.org/show_bug.cgi?id=1801128)) + # v51.8.1 (2022-11-15) [Full changelog](https://github.com/mozilla/glean/compare/v51.8.0...v51.8.1) diff --git a/Cargo.lock b/Cargo.lock index 0d4454040e..2652fe5de8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -422,6 +422,7 @@ dependencies = [ "log", "once_cell", "oslog", + "remove_dir_all", "rkv", "serde", "serde_json", diff --git a/glean-core/Cargo.toml b/glean-core/Cargo.toml index 676f29dee1..feafca398a 100644 --- a/glean-core/Cargo.toml +++ b/glean-core/Cargo.toml @@ -43,6 +43,7 @@ whatsys = "0.1.2" uniffi = "0.21.0" uniffi_macros = "0.21.0" time = "0.1.40" +remove_dir_all = "0.5.3" [target.'cfg(target_os = "android")'.dependencies] android_logger = { version = "0.11.0", default-features = false } diff --git a/glean-core/src/event_database/mod.rs b/glean-core/src/event_database/mod.rs index 7d25b96189..bae588a909 100644 --- a/glean-core/src/event_database/mod.rs +++ b/glean-core/src/event_database/mod.rs @@ -300,7 +300,7 @@ impl EventDatabase { // safe unwrap, only error case is poisoning let _lock = self.file_lock.write().unwrap(); - std::fs::remove_dir_all(&self.path)?; + remove_dir_all::remove_dir_all(&self.path)?; create_dir_all(&self.path)?; Ok(()) diff --git a/glean-core/src/ping/mod.rs b/glean-core/src/ping/mod.rs index 2af9659da7..db04ba82e4 100644 --- a/glean-core/src/ping/mod.rs +++ b/glean-core/src/ping/mod.rs @@ -355,7 +355,7 @@ impl PingMaker { pub fn clear_pending_pings(&self, data_path: &Path) -> Result<()> { let pings_dir = self.get_pings_dir(data_path, None)?; - std::fs::remove_dir_all(&pings_dir)?; + remove_dir_all::remove_dir_all(&pings_dir)?; create_dir_all(&pings_dir)?; log::debug!("All pending pings deleted"); From 34689cec11d89c2cf52e51ee5f39f44a016e6664 Mon Sep 17 00:00:00 2001 From: Jan-Erik Rediger Date: Tue, 15 Nov 2022 12:34:48 +0100 Subject: [PATCH 3/5] Upgrade to rkv 0.18.2 Note: This keeps LMDB enabled. --- Cargo.lock | 85 +++++++++++++++++++------------------------ glean-core/Cargo.toml | 2 +- 2 files changed, 39 insertions(+), 48 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2652fe5de8..1f15cb58f8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -131,9 +131,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "1.3.2" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "byteorder" @@ -180,9 +180,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.73" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "41ca34107f97baef6cfb231b32f36115781856b8f8208e8c580e0bcaea374842" [[package]] name = "cfg-if" @@ -339,11 +339,10 @@ dependencies = [ [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" dependencies = [ - "matches", "percent-encoding", ] @@ -355,9 +354,9 @@ checksum = "64db3e262960f0662f43a6366788d5f10f7f244b8f7d7d987f560baf5ded5c50" [[package]] name = "getrandom" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if", "libc", @@ -486,11 +485,10 @@ checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" [[package]] name = "idna" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] @@ -507,9 +505,9 @@ dependencies = [ [[package]] name = "inherent" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa5135cb6aa90ee17b4f0a0fb2908059b0830f90fda333f12816f275b21820c" +checksum = "2fb971b57a573f221e77621bea15a412033924a30beb9511fa2867572e41ea0e" dependencies = [ "proc-macro2", "quote", @@ -590,9 +588,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.135" +version = "0.2.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c" +checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" [[package]] name = "lmdb-rkv" @@ -626,12 +624,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - [[package]] name = "memchr" version = "2.5.0" @@ -716,9 +708,9 @@ checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "ordered-float" -version = "3.0.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bcbab4bfea7a59c2c0fe47211a1ac4e3e96bea6eb446d704f310bc5c732ae2" +checksum = "129d36517b53c461acc6e1580aeb919c8ae6708a4b1eae61c4463a615d4f0411" dependencies = [ "num-traits", ] @@ -748,15 +740,15 @@ checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pkg-config" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "plain" @@ -843,9 +835,9 @@ dependencies = [ [[package]] name = "rkv" -version = "0.17.1" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6006704273063c72952370ad236b8d58556dcc4f99a95ced4d9ad40f3e80a69" +checksum = "2c3b196786090b5b57c9bb0f4afca6ac6a5bfb6182c0161ef32f1ecade43ac47" dependencies = [ "arrayref", "bincode", @@ -911,18 +903,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.145" +version = "1.0.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" +checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.145" +version = "1.0.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" +checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" dependencies = [ "proc-macro2", "quote", @@ -931,9 +923,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.86" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41feea4228a6f1cd09ec7a3593a682276702cd67b5273544757dae23c096f074" +checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" dependencies = [ "itoa", "ryu", @@ -960,9 +952,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.102" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" +checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" dependencies = [ "proc-macro2", "quote", @@ -1005,18 +997,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.31" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.31" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" dependencies = [ "proc-macro2", "quote", @@ -1091,9 +1083,9 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.19" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] @@ -1185,13 +1177,12 @@ dependencies = [ [[package]] name = "url" -version = "2.2.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" dependencies = [ "form_urlencoded", "idna", - "matches", "percent-encoding", ] diff --git a/glean-core/Cargo.toml b/glean-core/Cargo.toml index feafca398a..0404269722 100644 --- a/glean-core/Cargo.toml +++ b/glean-core/Cargo.toml @@ -29,7 +29,7 @@ maintenance = { status = "actively-developed" } [dependencies] serde = { version = "1.0.104", features = ["derive"] } serde_json = "1.0.44" -rkv = { version = "0.17.0", default-features = false } +rkv = { version = "0.18.2", default-features = false, features = ["lmdb"] } bincode = "1.2.1" log = "0.4.8" uuid = { version = "0.8.1", features = ["v4"] } From ceacc3711a30ef38199ce0696c01693dee89f081 Mon Sep 17 00:00:00 2001 From: Chris H-C Date: Thu, 17 Nov 2022 16:01:20 -0500 Subject: [PATCH 4/5] Update CHANGELOG for release --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bc7635367..ab2ea5d71e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ * General * BUGFIX: Reliably clear pending pings and events on Windows using `remove_dir_all` crate ([bug 1801128](https://bugzilla.mozilla.org/show_bug.cgi?id=1801128)) + * Update to rkv v0.18.2 ([#2270](https://github.com/mozilla/glean/pull/2270)) # v51.8.1 (2022-11-15) From 5da8d030c4d1b9ee730aa607e6621ad7f86a9957 Mon Sep 17 00:00:00 2001 From: Chris H-C Date: Thu, 17 Nov 2022 16:01:47 -0500 Subject: [PATCH 5/5] Bumped version to 51.8.2 --- .buildconfig.yml | 2 +- CHANGELOG.md | 6 +- Cargo.lock | 4 +- DEPENDENCIES.md | 74 +++++-------------- glean-core/Cargo.toml | 2 +- .../android-native/dependency-licenses.xml | 4 - glean-core/android/dependency-licenses.xml | 4 - glean-core/python/setup.py | 2 +- glean-core/rlb/Cargo.toml | 4 +- .../GleanGradlePlugin.groovy | 2 +- 10 files changed, 32 insertions(+), 72 deletions(-) diff --git a/.buildconfig.yml b/.buildconfig.yml index 34cd0c311a..80f069fca5 100644 --- a/.buildconfig.yml +++ b/.buildconfig.yml @@ -1,4 +1,4 @@ -libraryVersion: 51.8.1 +libraryVersion: 51.8.2 groupId: org.mozilla.telemetry projects: glean: diff --git a/CHANGELOG.md b/CHANGELOG.md index ab2ea5d71e..1e8b26a7f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Unreleased changes -[Full changelog](https://github.com/mozilla/glean/compare/v51.8.1...main) +[Full changelog](https://github.com/mozilla/glean/compare/v51.8.2...main) + +# v51.8.2 (2022-11-17) + +[Full changelog](https://github.com/mozilla/glean/compare/v51.8.1...v51.8.2) * General * BUGFIX: Reliably clear pending pings and events on Windows using `remove_dir_all` crate ([bug 1801128](https://bugzilla.mozilla.org/show_bug.cgi?id=1801128)) diff --git a/Cargo.lock b/Cargo.lock index 1f15cb58f8..5ecad378cf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -365,7 +365,7 @@ dependencies = [ [[package]] name = "glean" -version = "51.8.1" +version = "51.8.2" dependencies = [ "chrono", "crossbeam-channel", @@ -408,7 +408,7 @@ dependencies = [ [[package]] name = "glean-core" -version = "51.8.1" +version = "51.8.2" dependencies = [ "android_logger", "bincode", diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md index 578ece01b0..6db19d967e 100644 --- a/DEPENDENCIES.md +++ b/DEPENDENCIES.md @@ -417,7 +417,7 @@ The following text applies to code linked from these dependencies: The following text applies to code linked from these dependencies: -* [rkv 0.17.1]( https://github.com/mozilla/rkv ) +* [rkv 0.18.2]( https://github.com/mozilla/rkv ) * [static_assertions 1.1.0]( https://github.com/nvzqz/static-assertions-rs ) @@ -1487,7 +1487,7 @@ The following text applies to code linked from these dependencies: The following text applies to code linked from these dependencies: -* [libc 0.2.135]( https://github.com/rust-lang/libc ) +* [libc 0.2.137]( https://github.com/rust-lang/libc ) ``` @@ -2102,7 +2102,7 @@ The following text applies to code linked from these dependencies: * [ahash 0.7.6]( https://github.com/tkaitchuck/ahash ) * [anyhow 1.0.66]( https://github.com/dtolnay/anyhow ) -* [bitflags 1.3.2]( https://github.com/bitflags/bitflags ) +* [bitflags 1.2.1]( https://github.com/bitflags/bitflags ) * [camino 1.1.1]( https://github.com/camino-rs/camino ) * [cfg-if 1.0.0]( https://github.com/alexcrichton/cfg-if ) * [crossbeam-channel 0.5.6]( https://github.com/crossbeam-rs/crossbeam ) @@ -2110,13 +2110,13 @@ The following text applies to code linked from these dependencies: * [env_logger 0.9.3]( https://github.com/env-logger-rs/env_logger/ ) * [fastrand 1.7.0]( https://github.com/smol-rs/fastrand ) * [flate2 1.0.24]( https://github.com/rust-lang/flate2-rs ) -* [form_urlencoded 1.0.1]( https://github.com/servo/rust-url ) +* [form_urlencoded 1.1.0]( https://github.com/servo/rust-url ) * [hashbrown 0.12.3]( https://github.com/rust-lang/hashbrown ) * [heck 0.4.0]( https://github.com/withoutboats/heck ) * [id-arena 2.2.1]( https://github.com/fitzgen/id-arena ) -* [idna 0.2.3]( https://github.com/servo/rust-url/ ) +* [idna 0.3.0]( https://github.com/servo/rust-url/ ) * [indexmap 1.9.1]( https://github.com/bluss/indexmap ) -* [inherent 1.0.1]( https://github.com/dtolnay/inherent ) +* [inherent 1.0.2]( https://github.com/dtolnay/inherent ) * [itoa 1.0.4]( https://github.com/dtolnay/itoa ) * [lazy_static 1.4.0]( https://github.com/rust-lang-nursery/lazy-static.rs ) * [mime 0.3.16]( https://github.com/hyperium/mime ) @@ -2125,26 +2125,26 @@ The following text applies to code linked from these dependencies: * [num_cpus 1.13.1]( https://github.com/seanmonstar/num_cpus ) * [once_cell 1.16.0]( https://github.com/matklad/once_cell ) * [paste 1.0.9]( https://github.com/dtolnay/paste ) -* [percent-encoding 2.1.0]( https://github.com/servo/rust-url/ ) +* [percent-encoding 2.2.0]( https://github.com/servo/rust-url/ ) * [plain 0.2.3]( https://github.com/randomites/plain ) * [proc-macro2 1.0.47]( https://github.com/dtolnay/proc-macro2 ) * [quote 1.0.21]( https://github.com/dtolnay/quote ) * [semver 1.0.10]( https://github.com/dtolnay/semver ) -* [serde 1.0.145]( https://github.com/serde-rs/serde ) -* [serde_derive 1.0.145]( https://github.com/serde-rs/serde ) -* [serde_json 1.0.86]( https://github.com/serde-rs/json ) -* [syn 1.0.102]( https://github.com/dtolnay/syn ) +* [serde 1.0.147]( https://github.com/serde-rs/serde ) +* [serde_derive 1.0.147]( https://github.com/serde-rs/serde ) +* [serde_json 1.0.87]( https://github.com/serde-rs/json ) +* [syn 1.0.103]( https://github.com/dtolnay/syn ) * [tempfile 3.3.0]( https://github.com/Stebalien/tempfile ) -* [thiserror 1.0.31]( https://github.com/dtolnay/thiserror ) -* [thiserror-impl 1.0.31]( https://github.com/dtolnay/thiserror ) +* [thiserror 1.0.37]( https://github.com/dtolnay/thiserror ) +* [thiserror-impl 1.0.37]( https://github.com/dtolnay/thiserror ) * [time 0.1.44]( https://github.com/time-rs/time ) * [toml 0.5.9]( https://github.com/alexcrichton/toml-rs ) * [unicase 2.6.0]( https://github.com/seanmonstar/unicase ) * [unicode-bidi 0.3.8]( https://github.com/servo/unicode-bidi ) * [unicode-ident 1.0.5]( https://github.com/dtolnay/unicode-ident ) -* [unicode-normalization 0.1.19]( https://github.com/unicode-rs/unicode-normalization ) +* [unicode-normalization 0.1.22]( https://github.com/unicode-rs/unicode-normalization ) * [unicode-width 0.1.10]( https://github.com/unicode-rs/unicode-width ) -* [url 2.2.2]( https://github.com/servo/rust-url ) +* [url 2.3.1]( https://github.com/servo/rust-url ) ``` @@ -2780,7 +2780,7 @@ limitations under the License. The following text applies to code linked from these dependencies: -* [getrandom 0.2.7]( https://github.com/rust-random/getrandom ) +* [getrandom 0.2.8]( https://github.com/rust-random/getrandom ) ``` @@ -4633,42 +4633,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. The following text applies to code linked from these dependencies: -* [matches 0.1.9]( https://github.com/SimonSapin/rust-std-candidates ) - - -``` -Copyright (c) 2014-2016 Simon Sapin - -Permission is hereby granted, free of charge, to any -person obtaining a copy of this software and associated -documentation files (the "Software"), to deal in the -Software without restriction, including without -limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software -is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice -shall be included in all copies or substantial portions -of the Software. - -THE SOFTWARE IS 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. IN NO EVENT -SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR -IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. - -``` -## MIT License - - -The following text applies to code linked from these dependencies: - * [nom 7.1.1]( https://github.com/Geal/nom ) @@ -4700,7 +4664,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. The following text applies to code linked from these dependencies: -* [ordered-float 3.0.0]( https://github.com/reem/rust-ordered-float ) +* [ordered-float 3.2.0]( https://github.com/reem/rust-ordered-float ) ``` @@ -5499,9 +5463,9 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice The following text applies to code linked from these dependencies: -* [glean 51.8.1]( https://github.com/mozilla/glean ) +* [glean 51.8.2]( https://github.com/mozilla/glean ) * [glean-build 6.3.0]( https://github.com/mozilla/glean ) -* [glean-core 51.8.1]( https://github.com/mozilla/glean ) +* [glean-core 51.8.2]( https://github.com/mozilla/glean ) * [zeitstempel 0.1.1]( https://github.com/badboy/zeitstempel ) diff --git a/glean-core/Cargo.toml b/glean-core/Cargo.toml index 0404269722..87763e92d6 100644 --- a/glean-core/Cargo.toml +++ b/glean-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "glean-core" -version = "51.8.1" +version = "51.8.2" authors = ["Jan-Erik Rediger ", "The Glean Team "] description = "A modern Telemetry library" repository = "https://github.com/mozilla/glean" diff --git a/glean-core/android-native/dependency-licenses.xml b/glean-core/android-native/dependency-licenses.xml index c2c73864e6..4500f40034 100644 --- a/glean-core/android-native/dependency-licenses.xml +++ b/glean-core/android-native/dependency-licenses.xml @@ -336,10 +336,6 @@ the details of which are reproduced below. BSD 2-Clause "Simplified" License: arrayref https://github.com/droundy/arrayref - - MIT License: matches - https://github.com/SimonSapin/rust-std-candidates - MIT License: nom https://github.com/Geal/nom diff --git a/glean-core/android/dependency-licenses.xml b/glean-core/android/dependency-licenses.xml index c2c73864e6..4500f40034 100644 --- a/glean-core/android/dependency-licenses.xml +++ b/glean-core/android/dependency-licenses.xml @@ -336,10 +336,6 @@ the details of which are reproduced below. BSD 2-Clause "Simplified" License: arrayref https://github.com/droundy/arrayref - - MIT License: matches - https://github.com/SimonSapin/rust-std-candidates - MIT License: nom https://github.com/Geal/nom diff --git a/glean-core/python/setup.py b/glean-core/python/setup.py index ff41730250..9302ebba4c 100644 --- a/glean-core/python/setup.py +++ b/glean-core/python/setup.py @@ -56,7 +56,7 @@ history = history_file.read() # glean version. Automatically updated by the bin/prepare_release.sh script -version = "51.8.1" +version = "51.8.2" requirements = [ "semver>=2.13.0", diff --git a/glean-core/rlb/Cargo.toml b/glean-core/rlb/Cargo.toml index 506819aec8..9f5f9272ac 100644 --- a/glean-core/rlb/Cargo.toml +++ b/glean-core/rlb/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "glean" -version = "51.8.1" +version = "51.8.2" authors = ["Jan-Erik Rediger ", "The Glean Team "] description = "Glean SDK Rust language bindings" repository = "https://github.com/mozilla/glean" @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies.glean-core] path = ".." -version = "51.8.1" +version = "51.8.2" [dependencies] crossbeam-channel = "0.5" diff --git a/gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy b/gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy index bbb4c0fa1f..6dd7418024 100644 --- a/gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy +++ b/gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy @@ -555,7 +555,7 @@ except: void apply(Project project) { isOffline = project.gradle.startParameter.offline - project.ext.glean_version = "51.8.1" + project.ext.glean_version = "51.8.2" def parserVersion = gleanParserVersion(project) // Print the required glean_parser version to the console. This is