From 4b5977ab5c80ed67d277d846e40bd5fea6216446 Mon Sep 17 00:00:00 2001 From: Travis Long Date: Thu, 9 Mar 2023 12:02:10 -0600 Subject: [PATCH 1/4] Bumped version to 52.4.0 --- .buildconfig.yml | 2 +- CHANGELOG.md | 6 +- Cargo.lock | 4 +- DEPENDENCIES.md | 1011 +++++++++++------ glean-core/Cargo.toml | 2 +- .../android-native/dependency-licenses.xml | 412 +++---- glean-core/android/dependency-licenses.xml | 412 +++---- glean-core/python/setup.py | 2 +- glean-core/rlb/Cargo.toml | 4 +- .../GleanGradlePlugin.groovy | 2 +- 10 files changed, 1011 insertions(+), 846 deletions(-) diff --git a/.buildconfig.yml b/.buildconfig.yml index 76f10ae978..405b59ae70 100644 --- a/.buildconfig.yml +++ b/.buildconfig.yml @@ -1,4 +1,4 @@ -libraryVersion: 52.3.1 +libraryVersion: 52.4.0 groupId: org.mozilla.telemetry projects: glean: diff --git a/CHANGELOG.md b/CHANGELOG.md index af7ba6d3f4..faf88c628a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Unreleased changes -[Full changelog](https://github.com/mozilla/glean/compare/v52.3.1...main) +[Full changelog](https://github.com/mozilla/glean/compare/v52.4.0...main) + +# v52.4.0 (2023-03-09) + +[Full changelog](https://github.com/mozilla/glean/compare/v52.3.1...v52.4.0) * General * Update `glean_parser` to v7.1.0 ([release notes](https://github.com/mozilla/glean_parser/releases/tag/v7.1.0)) diff --git a/Cargo.lock b/Cargo.lock index 75ed875bed..fe40b26bd7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -366,7 +366,7 @@ dependencies = [ [[package]] name = "glean" -version = "52.3.1" +version = "52.4.0" dependencies = [ "chrono", "crossbeam-channel", @@ -409,7 +409,7 @@ dependencies = [ [[package]] name = "glean-core" -version = "52.3.1" +version = "52.4.0" dependencies = [ "android_logger", "bincode", diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md index b48b4081a2..e87f822b4e 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,7 +18,6 @@ The following text applies to code linked from these dependencies: * [miniz_oxide 0.6.2]( https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide ) - ``` Apache License @@ -206,7 +205,6 @@ The following text applies to code linked from these dependencies: * [lmdb-rkv 0.14.0]( https://github.com/mozilla/lmdb-rs.git ) - ``` Apache License @@ -420,7 +418,6 @@ The following text applies to code linked from these dependencies: * [rkv 0.18.4]( https://github.com/mozilla/rkv ) * [static_assertions 1.1.0]( https://github.com/nvzqz/static-assertions-rs ) - ``` Apache License @@ -633,7 +630,6 @@ The following text applies to code linked from these dependencies: * [tinyvec 1.6.0]( https://github.com/Lokathor/tinyvec ) - ``` Apache License @@ -844,10 +840,197 @@ The following text applies to code linked from these dependencies: The following text applies to code linked from these dependencies: +* [normpath 1.1.0]( https://github.com/dylni/normpath ) + +``` + 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 + +``` +## Apache License 2.0 + + +The following text applies to code linked from these dependencies: + * [windows-sys 0.42.0]( https://github.com/microsoft/windows-rs ) +* [windows-sys 0.45.0]( https://github.com/microsoft/windows-rs ) +* [windows-targets 0.42.1]( https://github.com/microsoft/windows-rs ) * [windows_x86_64_gnu 0.42.1]( https://github.com/microsoft/windows-rs ) - ``` Apache License Version 2.0, January 2004 @@ -1057,9 +1240,9 @@ The following text applies to code linked from these dependencies: The following text applies to code linked from these dependencies: +* [cvt 0.1.1]( https://github.com/marmistrz/cvt ) * [ryu 1.0.11]( https://github.com/dtolnay/ryu ) - ``` Apache License Version 2.0, January 2004 @@ -1271,7 +1454,6 @@ 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 @@ -1484,7 +1666,6 @@ 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 @@ -1697,7 +1878,6 @@ The following text applies to code linked from these dependencies: * [libc 0.2.139]( https://github.com/rust-lang/libc ) - ``` Apache License Version 2.0, January 2004 @@ -1886,7 +2066,6 @@ 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 @@ -2096,9 +2275,12 @@ limitations under the License. The following text applies to code linked from these dependencies: +* [aligned 0.4.1]( https://github.com/japaric/aligned ) * [anyhow 1.0.68]( https://github.com/dtolnay/anyhow ) +* [as-slice 0.2.1]( https://github.com/japaric/as-slice ) * [bitflags 1.3.2]( https://github.com/bitflags/bitflags ) * [camino 1.1.1]( https://github.com/camino-rs/camino ) +* [cfg-if 0.1.10]( https://github.com/alexcrichton/cfg-if ) * [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 ) @@ -2131,6 +2313,7 @@ The following text applies to code linked from these dependencies: * [serde 1.0.150]( https://github.com/serde-rs/serde ) * [serde_derive 1.0.150]( https://github.com/serde-rs/serde ) * [serde_json 1.0.89]( https://github.com/serde-rs/json ) +* [stable_deref_trait 1.2.0]( https://github.com/storyyeller/stable_deref_trait ) * [syn 1.0.105]( https://github.com/dtolnay/syn ) * [tempfile 3.3.0]( https://github.com/Stebalien/tempfile ) * [thiserror 1.0.37]( https://github.com/dtolnay/thiserror ) @@ -2144,7 +2327,6 @@ The following text applies to code linked from these dependencies: * [url 2.3.1]( https://github.com/servo/rust-url ) * [uuid 1.3.0]( https://github.com/uuid-rs/uuid ) - ``` Apache License Version 2.0, January 2004 @@ -2356,7 +2538,6 @@ 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 @@ -2568,7 +2749,6 @@ 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 @@ -2778,13 +2958,12 @@ limitations under the License. The following text applies to code linked from these dependencies: -* [getrandom 0.2.8]( https://github.com/rust-random/getrandom ) - +* [remove_dir_all 0.8.1]( https://github.com/XAMPPRocky/remove_dir_all.git ) ``` Apache License Version 2.0, January 2004 - https://www.apache.org/licenses/ + http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION @@ -2959,24 +3138,13 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 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] +Copyright 2017 Aaron Power 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 - https://www.apache.org/licenses/LICENSE-2.0 + 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, @@ -2984,20 +3152,19 @@ 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. + ``` ## Apache License 2.0 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 ) - +* [getrandom 0.2.8]( https://github.com/rust-random/getrandom ) ``` Apache License Version 2.0, January 2004 - https://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION @@ -3203,38 +3370,249 @@ limitations under the License. The following text applies to code linked from these dependencies: -* [fs-err 2.9.0]( https://github.com/andrewhickman/fs-err ) -* [log 0.4.17]( https://github.com/rust-lang/log ) - +* [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 - 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 + Apache License + Version 2.0, January 2004 + https://www.apache.org/licenses/LICENSE-2.0 + +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 + + https://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. + +``` +## Apache License 2.0 + + +The following text applies to code linked from these dependencies: + +* [fs-err 2.9.0]( https://github.com/andrewhickman/fs-err ) +* [log 0.4.17]( https://github.com/rust-lang/log ) + +``` + 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 @@ -3418,7 +3796,6 @@ 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 @@ -3618,8 +3995,48 @@ limitations under the License. The following text applies to code linked from these dependencies: -* [android_log-sys 0.2.0]( https://github.com/nercury/android_log-sys-rs ) +* [num_cpus 1.15.0]( https://github.com/seanmonstar/num_cpus ) + +``` +# Contributing + +## License + +Licensed under either of + + * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) + * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) + +at your option. +### Contribution + +Unless you explicitly state otherwise, any contribution intentionally submitted +for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any +additional terms or conditions. + +``` +## 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 + + +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 @@ -3832,7 +4249,6 @@ The following text applies to code linked from these dependencies: * [android_logger 0.12.0]( https://github.com/Nercury/android_logger-rs ) - ``` Apache License Version 2.0, January 2004 @@ -4043,13 +4459,14 @@ 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 ) +* [fs_at 0.1.2]( https://github.com/rbtcollins/fs_at.git ) * [lmdb-rkv-sys 0.11.2]( https://github.com/mozilla/lmdb-rs.git ) * [siphasher 0.3.10]( https://github.com/jedisct1/rust-siphash ) * [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 @@ -4065,300 +4482,51 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION "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. - -``` -## Apache License 2.0 - - -The following text applies to code linked from these dependencies: - -* [chrono 0.4.19]( https://github.com/chronotope/chrono ) - - -``` -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. +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. -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. +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. -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. +"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. -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: +"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). - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and +"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. - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and +"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." - (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 +"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. - (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. +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. - 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. +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. -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. +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: -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. + (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and -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. + (b) You must cause any modified files to carry prominent notices stating that You changed the files; and -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. + (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 -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. + (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. +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] @@ -4366,15 +4534,30 @@ 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 +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. -~~~~ +``` +## Apache License 2.0 + + +The following text applies to code linked from these dependencies: + +* [unicode-normalization 0.1.22]( https://github.com/unicode-rs/unicode-normalization ) + +``` +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. ``` ## BSD 2-Clause "Simplified" License @@ -4384,7 +4567,6 @@ 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. @@ -4421,7 +4603,6 @@ 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 @@ -4452,7 +4633,6 @@ The following text applies to code linked from these dependencies: * [ordered-float 3.2.0]( https://github.com/reem/rust-ordered-float ) - ``` Copyright (c) 2015 Jonathan Reem @@ -4488,7 +4668,6 @@ The following text applies to code linked from these dependencies: * [bytes 1.3.0]( https://github.com/tokio-rs/bytes ) - ``` Copyright (c) 2018 Carl Lerche @@ -4524,7 +4703,6 @@ 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 @@ -4551,7 +4729,6 @@ The following text applies to code linked from these dependencies: * [scroll_derive 0.11.0]( https://github.com/m4b/scroll ) - ``` MIT License @@ -4581,8 +4758,38 @@ SOFTWARE. The following text applies to code linked from these dependencies: -* [dashmap 4.0.2]( https://github.com/xacrimon/dashmap ) +* [smart-default 0.6.0]( https://github.com/idanarye/rust-smart-default ) + +``` +MIT License + +Copyright (c) 2017 Idan Arye + +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: +* [dashmap 4.0.2]( https://github.com/xacrimon/dashmap ) ``` MIT License @@ -4615,7 +4822,6 @@ The following text applies to code linked from these dependencies: * [oslog 0.1.0]( https://github.com/steven-joruk/oslog ) - ``` MIT License @@ -4647,7 +4853,6 @@ The following text applies to code linked from these dependencies: * [sample 0.1.0]( https://crates.io/crates/sample ) - ``` MIT License @@ -4668,7 +4873,6 @@ The following text applies to code linked from these dependencies: * [cargo_metadata 0.15.2]( https://github.com/oli-obk/cargo_metadata ) * [is-terminal 0.4.2]( https://github.com/sunfishcode/is-terminal ) - ``` Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated @@ -4704,7 +4908,6 @@ The following text applies to code linked from these dependencies: * [memchr 2.5.0]( https://github.com/BurntSushi/memchr ) * [termcolor 1.2.0]( https://github.com/BurntSushi/termcolor ) - ``` The MIT License (MIT) @@ -4736,7 +4939,6 @@ 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) @@ -4767,8 +4969,38 @@ SOFTWARE. The following text applies to code linked from these dependencies: -* [winapi-util 0.1.5]( https://github.com/BurntSushi/winapi-util ) +* [nix 0.26.2]( https://github.com/nix-rust/nix ) + +``` +The MIT License (MIT) + +Copyright (c) 2015 Carl Lerche + nix-rust Authors +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: + +* [winapi-util 0.1.5]( https://github.com/BurntSushi/winapi-util ) ``` The MIT License (MIT) @@ -4801,7 +5033,6 @@ The following text applies to code linked from these dependencies: * [whatsys 0.3.1]( https://github.com/badboy/whatsys ) - ``` The MIT License (MIT) @@ -4833,7 +5064,6 @@ 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) @@ -4865,7 +5095,6 @@ The following text applies to code linked from these dependencies: * [scroll 0.11.0]( https://github.com/m4b/scroll ) - ``` The MIT License (MIT) @@ -4897,7 +5126,6 @@ The following text applies to code linked from these dependencies: * [goblin 0.6.0]( https://github.com/m4b/goblin ) - ``` The MIT License (MIT) @@ -4929,7 +5157,6 @@ The following text applies to code linked from these dependencies: * [bincode 1.3.3]( https://github.com/servo/bincode ) - ``` The MIT License (MIT) @@ -4953,6 +5180,22 @@ 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.2.0]( 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 @@ -4971,7 +5214,6 @@ The following text applies to code linked from these dependencies: * [uniffi_meta 0.23.0]( https://github.com/mozilla/uniffi-rs ) * [uniffi_testing 0.23.0]( https://github.com/mozilla/uniffi-rs ) - ``` Mozilla Public License Version 2.0 @@ -5124,12 +5366,11 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice The following text applies to code linked from these dependencies: -* [glean 52.3.1]( https://github.com/mozilla/glean ) -* [glean-build 7.0.0]( https://github.com/mozilla/glean ) -* [glean-core 52.3.1]( https://github.com/mozilla/glean ) +* [glean 52.4.0]( https://github.com/mozilla/glean ) +* [glean-build 7.1.0]( https://github.com/mozilla/glean ) +* [glean-core 52.4.0]( https://github.com/mozilla/glean ) * [zeitstempel 0.1.1]( https://github.com/badboy/zeitstempel ) - ``` Mozilla Public License Version 2.0 ================================== @@ -5506,4 +5747,36 @@ 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 22e24ef8ab..e40a99f4cb 100644 --- a/glean-core/Cargo.toml +++ b/glean-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "glean-core" -version = "52.3.1" +version = "52.4.0" 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 a4aea6c731..1a7adc77d2 100644 --- a/glean-core/android-native/dependency-licenses.xml +++ b/glean-core/android-native/dependency-licenses.xml @@ -3,466 +3,410 @@ 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: normpath + https://github.com/dylni/normpath + Apache License 2.0: windows-sys https://github.com/microsoft/windows-rs - - + + Apache License 2.0: windows-sys + https://github.com/microsoft/windows-rs + + Apache License 2.0: windows-targets + https://github.com/microsoft/windows-rs + Apache License 2.0: windows_x86_64_gnu https://github.com/microsoft/windows-rs - - + + Apache License 2.0: cvt + https://github.com/marmistrz/cvt + Apache License 2.0: ryu https://github.com/dtolnay/ryu - - + 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: aligned + https://github.com/japaric/aligned + Apache License 2.0: anyhow https://github.com/dtolnay/anyhow - - + + Apache License 2.0: as-slice + https://github.com/japaric/as-slice + 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: 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/rust-cli/env_logger/ - - + Apache License 2.0: errno https://github.com/lambda-fairy/rust-errno - - + 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: glob https://github.com/rust-lang/glob - - + 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: inherent https://github.com/dtolnay/inherent - - + Apache License 2.0: io-lifetimes https://github.com/sunfishcode/io-lifetimes - - + 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: linux-raw-sys https://github.com/sunfishcode/linux-raw-sys - - + 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: rustix https://github.com/bytecodealliance/rustix - - + 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: stable_deref_trait + https://github.com/storyyeller/stable_deref_trait + 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/toml-rs/toml - - + 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: url https://github.com/servo/rust-url - - + Apache License 2.0: uuid https://github.com/uuid-rs/uuid - - + 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: remove_dir_all + https://github.com/XAMPPRocky/remove_dir_all.git + 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: fs-err https://github.com/andrewhickman/fs-err - - + Apache License 2.0: log https://github.com/rust-lang/log - - + Apache License 2.0: remove_dir_all https://github.com/XAMPPRocky/remove_dir_all.git - - + + Apache License 2.0: num_cpus + https://github.com/seanmonstar/num_cpus + + 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: fs_at + https://github.com/rbtcollins/fs_at.git + Apache License 2.0: lmdb-rkv-sys https://github.com/mozilla/lmdb-rs.git - - + Apache License 2.0: siphasher https://github.com/jedisct1/rust-siphash - - + 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: chrono - https://github.com/chronotope/chrono - - + + Apache License 2.0: unicode-normalization + https://github.com/unicode-rs/unicode-normalization + BSD 2-Clause "Simplified" License: arrayref https://github.com/droundy/arrayref - - + MIT License: nom https://github.com/Geal/nom - - + MIT License: ordered-float https://github.com/reem/rust-ordered-float - - + MIT License: bytes https://github.com/tokio-rs/bytes - - + MIT License: weedle2 https://github.com/mozilla/uniffi-rs - - + MIT License: scroll_derive https://github.com/m4b/scroll - - + + MIT License: smart-default + https://github.com/idanarye/rust-smart-default + 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: is-terminal https://github.com/sunfishcode/is-terminal - - + 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: nix + https://github.com/nix-rust/nix + 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_checksum_derive https://github.com/mozilla/uniffi-rs - - + Mozilla Public License 2.0: uniffi_core 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: uniffi_testing 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 a4aea6c731..1a7adc77d2 100644 --- a/glean-core/android/dependency-licenses.xml +++ b/glean-core/android/dependency-licenses.xml @@ -3,466 +3,410 @@ 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: normpath + https://github.com/dylni/normpath + Apache License 2.0: windows-sys https://github.com/microsoft/windows-rs - - + + Apache License 2.0: windows-sys + https://github.com/microsoft/windows-rs + + Apache License 2.0: windows-targets + https://github.com/microsoft/windows-rs + Apache License 2.0: windows_x86_64_gnu https://github.com/microsoft/windows-rs - - + + Apache License 2.0: cvt + https://github.com/marmistrz/cvt + Apache License 2.0: ryu https://github.com/dtolnay/ryu - - + 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: aligned + https://github.com/japaric/aligned + Apache License 2.0: anyhow https://github.com/dtolnay/anyhow - - + + Apache License 2.0: as-slice + https://github.com/japaric/as-slice + 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: 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/rust-cli/env_logger/ - - + Apache License 2.0: errno https://github.com/lambda-fairy/rust-errno - - + 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: glob https://github.com/rust-lang/glob - - + 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: inherent https://github.com/dtolnay/inherent - - + Apache License 2.0: io-lifetimes https://github.com/sunfishcode/io-lifetimes - - + 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: linux-raw-sys https://github.com/sunfishcode/linux-raw-sys - - + 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: rustix https://github.com/bytecodealliance/rustix - - + 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: stable_deref_trait + https://github.com/storyyeller/stable_deref_trait + 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/toml-rs/toml - - + 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: url https://github.com/servo/rust-url - - + Apache License 2.0: uuid https://github.com/uuid-rs/uuid - - + 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: remove_dir_all + https://github.com/XAMPPRocky/remove_dir_all.git + 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: fs-err https://github.com/andrewhickman/fs-err - - + Apache License 2.0: log https://github.com/rust-lang/log - - + Apache License 2.0: remove_dir_all https://github.com/XAMPPRocky/remove_dir_all.git - - + + Apache License 2.0: num_cpus + https://github.com/seanmonstar/num_cpus + + 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: fs_at + https://github.com/rbtcollins/fs_at.git + Apache License 2.0: lmdb-rkv-sys https://github.com/mozilla/lmdb-rs.git - - + Apache License 2.0: siphasher https://github.com/jedisct1/rust-siphash - - + 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: chrono - https://github.com/chronotope/chrono - - + + Apache License 2.0: unicode-normalization + https://github.com/unicode-rs/unicode-normalization + BSD 2-Clause "Simplified" License: arrayref https://github.com/droundy/arrayref - - + MIT License: nom https://github.com/Geal/nom - - + MIT License: ordered-float https://github.com/reem/rust-ordered-float - - + MIT License: bytes https://github.com/tokio-rs/bytes - - + MIT License: weedle2 https://github.com/mozilla/uniffi-rs - - + MIT License: scroll_derive https://github.com/m4b/scroll - - + + MIT License: smart-default + https://github.com/idanarye/rust-smart-default + 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: is-terminal https://github.com/sunfishcode/is-terminal - - + 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: nix + https://github.com/nix-rust/nix + 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_checksum_derive https://github.com/mozilla/uniffi-rs - - + Mozilla Public License 2.0: uniffi_core 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: uniffi_testing 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 ae59125d4a..a823aee1c8 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 = "52.3.1" +version = "52.4.0" requirements = [ "semver>=2.13.0", diff --git a/glean-core/rlb/Cargo.toml b/glean-core/rlb/Cargo.toml index 46f6e4806b..453bac3433 100644 --- a/glean-core/rlb/Cargo.toml +++ b/glean-core/rlb/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "glean" -version = "52.3.1" +version = "52.4.0" authors = ["Jan-Erik Rediger ", "The Glean Team "] description = "Glean SDK Rust language bindings" repository = "https://github.com/mozilla/glean" @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } [dependencies.glean-core] path = ".." -version = "52.3.1" +version = "52.4.0" [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 0e01cfe61c..2fda03b67b 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 = "52.3.1" + project.ext.glean_version = "52.4.0" def parserVersion = gleanParserVersion(project) // Print the required glean_parser version to the console. This is From cf1637e80b45d1804982b861eb4a8ae7d44c0a18 Mon Sep 17 00:00:00 2001 From: Travis Long Date: Thu, 9 Mar 2023 15:11:17 -0600 Subject: [PATCH 2/4] Bug 1820927 - Update tempfile crate This should remove the last dependency on the potential vuln `remove_dir_all@0.5.3` --- Cargo.lock | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fe40b26bd7..842dd6b5c3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -422,7 +422,7 @@ dependencies = [ "log", "once_cell", "oslog", - "remove_dir_all 0.8.1", + "remove_dir_all", "rkv", "serde", "serde_json", @@ -826,15 +826,6 @@ version = "0.6.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - [[package]] name = "remove_dir_all" version = "0.8.1" @@ -1006,16 +997,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" dependencies = [ "cfg-if 1.0.0", "fastrand", - "libc", "redox_syscall", - "remove_dir_all 0.5.3", - "winapi", + "rustix", + "windows-sys 0.42.0", ] [[package]] From 11e5293a4944e063fb9e0095fe5e512559397e07 Mon Sep 17 00:00:00 2001 From: Travis Long Date: Fri, 10 Mar 2023 10:42:02 -0600 Subject: [PATCH 3/4] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index faf88c628a..20f5b52eee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Unreleased changes [Full changelog](https://github.com/mozilla/glean/compare/v52.4.0...main) +* General + * Update `tempfile` crate to remove dependency on potentially vulnerable version of `remove_dir_all@0.5.3` # v52.4.0 (2023-03-09) From 2896fb6b083accc79c0aa18d03dda7952782c6fa Mon Sep 17 00:00:00 2001 From: Travis Long Date: Fri, 10 Mar 2023 10:42:54 -0600 Subject: [PATCH 4/4] Bumped version to 52.4.1 --- .buildconfig.yml | 2 +- CHANGELOG.md | 6 +- Cargo.lock | 4 +- DEPENDENCIES.md | 207 +----------------- glean-core/Cargo.toml | 2 +- .../android-native/dependency-licenses.xml | 3 - glean-core/android/dependency-licenses.xml | 3 - glean-core/python/setup.py | 2 +- glean-core/rlb/Cargo.toml | 4 +- .../GleanGradlePlugin.groovy | 2 +- 10 files changed, 16 insertions(+), 219 deletions(-) diff --git a/.buildconfig.yml b/.buildconfig.yml index 405b59ae70..bc050c8cd3 100644 --- a/.buildconfig.yml +++ b/.buildconfig.yml @@ -1,4 +1,4 @@ -libraryVersion: 52.4.0 +libraryVersion: 52.4.1 groupId: org.mozilla.telemetry projects: glean: diff --git a/CHANGELOG.md b/CHANGELOG.md index 20f5b52eee..c540de9369 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Unreleased changes -[Full changelog](https://github.com/mozilla/glean/compare/v52.4.0...main) +[Full changelog](https://github.com/mozilla/glean/compare/v52.4.1...main) + +# v52.4.1 (2023-03-10) + +[Full changelog](https://github.com/mozilla/glean/compare/v52.4.0...v52.4.1) * General * Update `tempfile` crate to remove dependency on potentially vulnerable version of `remove_dir_all@0.5.3` diff --git a/Cargo.lock b/Cargo.lock index 842dd6b5c3..73df5e3ebb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -366,7 +366,7 @@ dependencies = [ [[package]] name = "glean" -version = "52.4.0" +version = "52.4.1" dependencies = [ "chrono", "crossbeam-channel", @@ -409,7 +409,7 @@ dependencies = [ [[package]] name = "glean-core" -version = "52.4.0" +version = "52.4.1" dependencies = [ "android_logger", "bincode", diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md index e87f822b4e..737a3e88c6 100644 --- a/DEPENDENCIES.md +++ b/DEPENDENCIES.md @@ -2315,7 +2315,7 @@ The following text applies to code linked from these dependencies: * [serde_json 1.0.89]( https://github.com/serde-rs/json ) * [stable_deref_trait 1.2.0]( https://github.com/storyyeller/stable_deref_trait ) * [syn 1.0.105]( https://github.com/dtolnay/syn ) -* [tempfile 3.3.0]( https://github.com/Stebalien/tempfile ) +* [tempfile 3.4.0]( https://github.com/Stebalien/tempfile ) * [thiserror 1.0.37]( https://github.com/dtolnay/thiserror ) * [thiserror-impl 1.0.37]( https://github.com/dtolnay/thiserror ) * [time 0.1.45]( https://github.com/time-rs/time ) @@ -3788,207 +3788,6 @@ 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. -``` -## Apache License 2.0 - - -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 - 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 - -Copyright 2017 Aaron Power - -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. - - ``` ## Apache License 2.0 @@ -5366,9 +5165,9 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice The following text applies to code linked from these dependencies: -* [glean 52.4.0]( https://github.com/mozilla/glean ) +* [glean 52.4.1]( https://github.com/mozilla/glean ) * [glean-build 7.1.0]( https://github.com/mozilla/glean ) -* [glean-core 52.4.0]( https://github.com/mozilla/glean ) +* [glean-core 52.4.1]( 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 e40a99f4cb..b06868f7a4 100644 --- a/glean-core/Cargo.toml +++ b/glean-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "glean-core" -version = "52.4.0" +version = "52.4.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 1a7adc77d2..dc4a58623f 100644 --- a/glean-core/android-native/dependency-licenses.xml +++ b/glean-core/android-native/dependency-licenses.xml @@ -237,9 +237,6 @@ the details of which are reproduced below. Apache License 2.0: log https://github.com/rust-lang/log - - Apache License 2.0: remove_dir_all - https://github.com/XAMPPRocky/remove_dir_all.git Apache License 2.0: num_cpus https://github.com/seanmonstar/num_cpus diff --git a/glean-core/android/dependency-licenses.xml b/glean-core/android/dependency-licenses.xml index 1a7adc77d2..dc4a58623f 100644 --- a/glean-core/android/dependency-licenses.xml +++ b/glean-core/android/dependency-licenses.xml @@ -237,9 +237,6 @@ the details of which are reproduced below. Apache License 2.0: log https://github.com/rust-lang/log - - Apache License 2.0: remove_dir_all - https://github.com/XAMPPRocky/remove_dir_all.git Apache License 2.0: num_cpus https://github.com/seanmonstar/num_cpus diff --git a/glean-core/python/setup.py b/glean-core/python/setup.py index a823aee1c8..c98b98b416 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 = "52.4.0" +version = "52.4.1" requirements = [ "semver>=2.13.0", diff --git a/glean-core/rlb/Cargo.toml b/glean-core/rlb/Cargo.toml index 453bac3433..32cb4ea433 100644 --- a/glean-core/rlb/Cargo.toml +++ b/glean-core/rlb/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "glean" -version = "52.4.0" +version = "52.4.1" authors = ["Jan-Erik Rediger ", "The Glean Team "] description = "Glean SDK Rust language bindings" repository = "https://github.com/mozilla/glean" @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } [dependencies.glean-core] path = ".." -version = "52.4.0" +version = "52.4.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 2fda03b67b..18e509a297 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 = "52.4.0" + project.ext.glean_version = "52.4.1" def parserVersion = gleanParserVersion(project) // Print the required glean_parser version to the console. This is