fix(model): Apply author to copyright mapping also for concluded lice…

…nses As concluded licenses are supposed to trump other licenses, they are usually taken instead of declared and detected licenses in reports. When doing do, and the concluded license is not among the other licenses, any author information that is configured to be mapped to copyrights would be dropped. To prevent that, apply the same author to copyright mapping that is done for declared licenses also for concluded licenses. Fixes #9599. Signed-off-by: Wolfgang Klenk <[email protected]>
oss-review-toolkit · Dec 19, 2024 · c57a94c · c57a94c
1 parent 14b2d68
commit c57a94c
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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)
+                }
             }
         }