diff --git a/CHANGELOG.md b/CHANGELOG.md index 0930621..8f42a7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] - ReleaseDate +### Changed +- [PR#90](https://github.com/EmbarkStudios/spdx/pull/90) changed this crate to default to `no_std`, unless the `detection` feature is enabled, closing [PR#89](https://github.com/EmbarkStudios/spdx/pull/89). Thanks [@so-rose](https://github.com/so-rose)! +- [PR#91](https://github.com/EmbarkStudios/spdx/pull/91) changed the license terms from `MIT OR Apache2.0` to just `Apache-2.0`, as [PR#84](https://github.com/EmbarkStudios/spdx/pull/84) merged external code that was only licensed under `Apache-2.0`. See [#88](https://github.com/EmbarkStudios/spdx/pull/88) for the original raising of this mismatch. + ## [0.13.2] - 2025-12-04 ### Fixed - [PR#87](https://github.com/EmbarkStudios/spdx/pull/87) fixed a code generation bug introduced in [PR#86](https://github.com/EmbarkStudios/spdx/pull/86) that caused `LicenseId::text()` to return the incorrect license text. diff --git a/Cargo.toml b/Cargo.toml index a45eb11..a4def9a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ documentation = "https://docs.rs/spdx" readme = "README.md" keywords = ["spdx", "license"] categories = ["parser-implementations"] -license = "MIT OR Apache-2.0" +license = "Apache-2.0" repository = "https://github.com/EmbarkStudios/spdx" include = [ "Cargo.toml", @@ -33,7 +33,7 @@ detection = ["std", "regex", "unicode-normalization"] # Allows de/serialization of a spdx::detection::Store for quicker loading detection-cache = ["std", "detection", "zstd"] # Inlines a cache into this crate, which contains all of the licenses from the -# SPDX crate that the crate version was packaged with +# SPDX license list that the crate version was packaged with detection-inline-cache = ["std", "detection-cache"] # Performs license detection in parallel within the same text detection-parallel = ["std", "detection", "rayon"] diff --git a/LICENSE-MIT b/LICENSE-MIT deleted file mode 100644 index 0bdad8f..0000000 --- a/LICENSE-MIT +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (c) 2019 Embark Studios - -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. diff --git a/README.md b/README.md index 181cecb..b512fbc 100644 --- a/README.md +++ b/README.md @@ -76,12 +76,7 @@ Please read our [Contributor Guide](CONTRIBUTING.md) for more information on how ## License -Licensed under either of - -* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or ) -* MIT license ([LICENSE-MIT](LICENSE-MIT) or ) - -at your option. +Licensed under Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or ) ### Contribution