Skip to content

Change license terms #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jake-Shadle merged 2 commits into from
Dec 17, 2025
Merged

Change license terms #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0a9d13
Change license terms
Jake-Shadle Dec 17, 2025
6f80cad
Update CHANGELOG
Jake-Shadle Dec 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

<!-- next-header -->
## [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.
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"]
Expand Down
25 changes: 0 additions & 25 deletions LICENSE-MIT
View file
Open in desktop

This file was deleted.

7 changes: 1 addition & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <http://www.apache.org/licenses/LICENSE-2.0>)
* MIT license ([LICENSE-MIT](LICENSE-MIT) or <http://opensource.org/licenses/MIT>)

at your option.
Licensed under Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or <http://www.apache.org/licenses/LICENSE-2.0>)

### Contribution

Expand Down