Skip to content

Commit

Permalink
fix(reporter): Add authors to concluded license in disclosure document
Browse files Browse the repository at this point in the history
Include authors for package dependencies when both `concluded_license`
and `authors` are curated, and ORT is configured with the
`addAuthorsToCopyrights` option enabled. This ensures that package
authors appear under the respective concluded license in the
Disclosure Document.

This behavior applies when the Scanner option `skipConcluded` is
enabled, having the effect that the scan stage is skipped for the
particular package dependency in this case.

Fixes #9599.

Signed-off-by: Wolfgang Klenk <[email protected]>
  • Loading branch information
wkl3nk committed Dec 18, 2024
1 parent f72f69e commit ebf4025
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions model/src/main/kotlin/licenses/LicenseInfoResolver.kt
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ class LicenseInfoResolver(
licenseInfo.concludedLicenseInfo.concludedLicense?.also {
originalExpressions += ResolvedOriginalExpression(expression = it, source = LicenseSource.CONCLUDED)
}

licenseInfo.declaredLicenseInfo.authors.takeIf { it.isNotEmpty() && addAuthorsToCopyrights }?.also {
locations += resolveCopyrightFromAuthors(it)
}
}
}

Expand Down

0 comments on commit ebf4025

Please sign in to comment.