Skip to content
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

Misc. SPDX / license mapping related improvements #8730

Merged
merged 7 commits into from
Jun 18, 2024
+42 −29
Merged

Misc. SPDX / license mapping related improvements #8730

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1684a7b
refactor(ort-utils): Semantically separate mapping from processing li…
sschuberth Jun 6, 2024
1cb3931
docs(spdx-utils): Improve function docs to use imperative mood
sschuberth Jun 18, 2024
7059940
feat(spdx-utils): Introduce a `toSpdxOrNull()` utility extension func…
sschuberth Jun 6, 2024
4ec8b6f
chore(clearly-defined): Avoid a now redundant receiver-based `let` call
sschuberth Jun 17, 2024
8f61fcc
docs(spdx-utils): Refer to `SpdxSimpleLicenseMapping` in `normalize()`
sschuberth Jun 6, 2024
b0c9ebe
docs(spdx-utils): Remove an obsolete `SpdxSimpleLicenseMapping` sentence
sschuberth Jun 6, 2024
7cdf3ef
docs(spdx-utils): Duplicate mapping docs into the YML files for visib…
sschuberth Jun 6, 2024
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
Prev Previous commit
Next Next commit
docs(spdx-utils): Remove an obsolete SpdxSimpleLicenseMapping sentence 
The remark about ambiguity due to a missing version became somewhat
obsolete with e7247e0.

Signed-off-by: Sebastian Schuberth <[email protected]>
@sschuberth
sschuberth committed Jun 18, 2024
commit b0c9ebe722760cc359a4bba06bd937131181cb8b
5 changes: 2 additions & 3 deletions utils/spdx/src/main/kotlin/SpdxSimpleLicenseMapping.kt
View file
Original file line number Diff line number Diff line change
@@ -23,9 +23,8 @@ import com.fasterxml.jackson.module.kotlin.readValue

/**
* A mapping from simple license names to valid SPDX license IDs. This mapping only contains license strings which *can*
* be parsed by [SpdxExpression.parse] but have a corresponding valid SPDX license ID that should be used instead. When
* mapping a name without any indication of a version to an ID with a version, the most commonly used version at the
* time of writing is used. See [SpdxDeclaredLicenseMapping] for a mapping of unparsable license strings.
* be parsed by [SpdxExpression.parse] but have a corresponding valid SPDX license ID that should be used instead. See
* [SpdxDeclaredLicenseMapping] for a mapping of unparsable license strings.
*/
object SpdxSimpleLicenseMapping {
/**