From ebf402537169d931cc78810f2172b50a39c30fb1 Mon Sep 17 00:00:00 2001 From: Wolfgang Klenk Date: Wed, 18 Dec 2024 11:17:02 +0100 Subject: [PATCH] fix(reporter): Add authors to concluded license in disclosure document 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 --- model/src/main/kotlin/licenses/LicenseInfoResolver.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/model/src/main/kotlin/licenses/LicenseInfoResolver.kt b/model/src/main/kotlin/licenses/LicenseInfoResolver.kt index 9aa72be3aa225..a7a3d57287895 100644 --- a/model/src/main/kotlin/licenses/LicenseInfoResolver.kt +++ b/model/src/main/kotlin/licenses/LicenseInfoResolver.kt @@ -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) + } } }