Skip to content

Commit

Permalink
fix(freemarker): Apply license choices for NOTICE_DEFAULT
Browse files Browse the repository at this point in the history
Fixes #8438.

Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
  • Loading branch information
sschuberth committed Nov 1, 2024
1 parent 1de3e08 commit 4a7d58a
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ ${copyrights?join("\n", "")}
are configured not to be included in notice files, and filter all licenses that are contained in the license
files already printed above.
--]
[#assign licensesFilteredBySource = LicenseView.CONCLUDED_OR_DECLARED_AND_DETECTED.filter(package.license.licenses)]
[#assign resolvedLicenseInfo = LicenseView.CONCLUDED_OR_DECLARED_AND_DETECTED.filter(package.license, package.licenseChoices)]
[#assign resolvedLicenses = helper.filterForCategory(
package.licensesNotInLicenseFiles(licensesFilteredBySource),
package.licensesNotInLicenseFiles(resolvedLicenseInfo.licenses),
noticeCategoryName
)]
[#assign isFirst = true]
Expand Down

0 comments on commit 4a7d58a

Please sign in to comment.