Skip to content

fix: Preserve original license operator when applying license mappings #10995

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: Preserve original license operator when applying license mappings #10995

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 28 additions & 0 deletions model/src/test/kotlin/PackageCurationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,34 @@ class PackageCurationTest : WordSpec({
result.metadata.declaredLicensesProcessed.spdxExpression shouldBe expression
}
}

"preserve OR operator when mapping makes previously invalid licenses valid" {
Copy link
Member

@sschuberth sschuberth Oct 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just as a remark to begin with / as a note to myself: We cannot generally assume that OR needs to be preserved in this test, as the operator is package-type-specific.

// This test case demonstrates a bug where two declared licenses - one valid SPDX and one
// invalid that needs mapping - are incorrectly combined with AND instead of OR.
val pkg = Package.EMPTY.copy(
declaredLicenses = setOf("Apache-2.0", "GNU Lesser General Public License v2.1 only"),
// In reality, the initial processing only mapped the valid license
declaredLicensesProcessed = ProcessedDeclaredLicense(
spdxExpression = "Apache-2.0".toSpdx(),
unmapped = setOf("GNU Lesser General Public License v2.1 only")
)
)

val curation = PackageCuration(
id = pkg.id,
data = PackageCurationData(
declaredLicenseMapping = mapOf(
"GNU Lesser General Public License v2.1 only" to "LGPL-2.1-only".toSpdx()
)
)
)

val result = curation.apply(pkg.toCuratedPackage())

// Expected: Since the package originally declared two separate licenses, they should be
// combined with OR (dual-licensing), not AND (both licenses apply).
result.metadata.declaredLicensesProcessed.spdxExpression shouldBe "Apache-2.0 OR LGPL-2.1-only".toSpdx()
}
}

"isApplicable()" should {
Expand Down
Loading