fix(spdx-report): Apply license choices

sschuberth · sschuberth · commit e644284ee263 · 2024-11-05T11:31:21.000+01:00
Signed-off-by: Sebastian Schuberth &lt;sebastian@doubleopen.org&gt;
diff --git a/plugins/reporters/spdx/src/main/kotlin/Extensions.kt b/plugins/reporters/spdx/src/main/kotlin/Extensions.kt
@@ -152,6 +152,8 @@ internal fun Package.toSpdxPackage(
     }
 
     val resolvedLicenseExpressions = licenseInfoResolver.resolveLicenseInfo(id).filterExcluded()
+        .applyChoices(ortResult.getPackageLicenseChoices(id))
+        .applyChoices(ortResult.getRepositoryLicenseChoices())
 
     val declaredPackageLicenses = resolvedLicenseExpressions.filter(LicenseView.ONLY_DECLARED)
 

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,8 @@ internal fun Package.toSpdxPackage(`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`val resolvedLicenseExpressions = licenseInfoResolver.resolveLicenseInfo(id).filterExcluded()`
	`155`	`+ .applyChoices(ortResult.getPackageLicenseChoices(id))`
	`156`	`+ .applyChoices(ortResult.getRepositoryLicenseChoices())`
`155`	`157`
`156`	`158`	`val declaredPackageLicenses = resolvedLicenseExpressions.filter(LicenseView.ONLY_DECLARED)`
`157`	`159`