License text curations poc

license-text-curations/Native/_/lwip.yml

@@ -0,0 +1,20 @@
+- id: "Native::lwip:2.2.1"
+  curations:
+  - license_id: "BSD-2-Clause"
+    comment: |
+      Use the license text found in file $filepath
+    license_text: |
+      XXXXXXXXX
+      BSD-2-Clause Text 1
+  - license_id: "BSD-4-Clause"
+    comment: |
+      ANOTHER TEXT FOR BSD
+    license_text: |
+      XXXXXXXXX
+      BSD-4-Clause Text 1
+  - license_id: "BSD-4-Clause"
+    comment: |
+      Use the license text found in file $filepath
+    license_text: |
+      XXXXXXXXX 
+      BSD-4-Clause Text 2

text-templates/NOTICE_BY_PACKAGE.ftl

@@ -99,37 +99,37 @@ ${copyrights?join("\n", "")}
     --]
     [#assign resolvedLicenseInfo = LicenseView.CONCLUDED_OR_DECLARED_AND_DETECTED.filter(package.license, package.licenseChoices)]
     [#assign resolvedLicenses = helper.filterForCategory(
-        package.licensesNotInLicenseFiles(resolvedLicenseInfo.licenses),
+        package.licensesNotInLicenseFiles(resolvedLicenseInfo.licenses, true),
         noticeCategoryName
     )]
     [#assign isFirst = true]
     [#list resolvedLicenses as resolvedLicense]
-        [#assign licenseName = resolvedLicense.license.simpleLicense()]
-        [#assign licenseText = licenseFactProvider.getLicenseText(licenseName)!]
-        [#if !licenseText?has_content][#continue][/#if]
+        [#assign singleLicenseExpression = resolvedLicense.license.toString()]
+        [#assign licenseTexts = licenseFactProvider.getLicenseTextsString(singleLicenseExpression, package.id)!]
+        [#if !licenseTexts?has_content][#continue][/#if]
         [#if isFirst]
             [#if !hasNoticePackageLicenses]
 ----
 
 Package: [#if package.id.namespace?has_content]${package.id.namespace}:[/#if]${package.id.name}:${package.id.version}
                 [#assign hasNoticePackageLicenses = true]
             [/#if]
-
-The following copyrights and licenses were found in the source code of this package:
             [#assign isFirst = false]
-        [#else]
-  --
         [/#if]
+
+  --
         [#assign copyrights = resolvedLicense.getCopyrights()]
         [#if copyrights?has_content]
 
-        [/#if]
+The following copyrights correspond to the ${singleLicenseExpression} license in [#if package.id.namespace?has_content]${package.id.namespace}:[/#if]${package.id.name}:${package.id.version}:
+
 ${copyrights?join("\n", "", "\n")}
-${licenseText}
-        [#assign exceptionName = resolvedLicense.license.exception()!]
-        [#assign exceptionText = licenseFactProvider.getLicenseText(exceptionName)!]
-        [#if exceptionText?has_content]
-${exceptionText}
         [/#if]
+        [#list licenseTexts as licenseText]
+
+The following license text corresponds to the ${singleLicenseExpression} license in [#if package.id.namespace?has_content]${package.id.namespace}:[/#if]${package.id.name}:${package.id.version}:
+
+${licenseText}
+        [/#list]
     [/#list]
 [/#list]