feat: license expression text attachment

jkowalleck · jkowalleck · commit dac5995e958f · 2025-02-20T14:00:12.000+01:00
- tests: examples for licenses with text
- tests: draft for expressiosn with text

Signed-off-by: Jan Kowalleck &lt;jan.kowalleck@gmail.com&gt;
diff --git a/tools/src/test/resources/1.7/valid-license-expression-1.7.json b/tools/src/test/resources/1.7/valid-license-expression-1.7.json
@@ -33,9 +33,21 @@
       ],
       "licenses": [
         {
-          "expression": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0",
+          "bom-ref": "my-license",
           "acknowledgement": "declared",
-          "bom-ref": "my-license"
+          "expression": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0",
+          "expression-texts": [
+            "license-identifier": "EPL-2.0",
+            "text": {
+              "content": "Eclipse Public License - v 2.0\n\n    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE\n    PUBLIC LICENSE (\"AGREEMENT\"). ANY USE, REPRODUCTION OR DISTRIBUTION\n    OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT..."
+            },
+            {
+              "license-identifier": "GPL-2.0 WITH Classpath-exception-2.0",
+              "text": {
+                "content": "                    GNU GENERAL PUBLIC LICENSE\n                       Version 2, June 1991\n\n Copyright (C) 1989, 1991 Free Software Foundation, Inc.,\n <https://fsf.org/>\n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed...\n\n...\n\nLinking this library statically or dynamically with other modules is making a combined work based on this library..."
+              }
+            }
+          ]
         }
       ],
       "purl": "pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar"
diff --git a/tools/src/test/resources/1.7/valid-license-expression-1.7.textproto b/tools/src/test/resources/1.7/valid-license-expression-1.7.textproto
@@ -29,9 +29,21 @@ components {
     value: "e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282"
   }
   licenses {
-    expression: "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0"
-    acknowledgement: LICENSE_ACKNOWLEDGEMENT_ENUMERATION_DECLARED
     bom_ref: "my-license"
+    acknowledgement: LICENSE_ACKNOWLEDGEMENT_ENUMERATION_DECLARED
+    expression: "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0"
+    expression_texts {
+      license_identifier: "EPL-2.0"
+      text {
+        content: "Eclipse Public License - v 2.0\n\n    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE\n    PUBLIC LICENSE (\"AGREEMENT\"). ANY USE, REPRODUCTION OR DISTRIBUTION\n    OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT..."
+      }
+    }
+    expression_texts {
+      license_identifier: "GPL-2.0 WITH Classpath-exception-2.0",
+      text: {
+        content: "                    GNU GENERAL PUBLIC LICENSE\n                       Version 2, June 1991\n\n Copyright (C) 1989, 1991 Free Software Foundation, Inc.,\n <https://fsf.org/>\n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed...\n\n...\n\nLinking this library statically or dynamically with other modules is making a combined work based on this library..."
+      }
+    }
   }
   purl: "pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar"
 }
diff --git a/tools/src/test/resources/1.7/valid-license-expression-1.7.xml b/tools/src/test/resources/1.7/valid-license-expression-1.7.xml
@@ -15,7 +15,25 @@
                 <hash alg="SHA-512">e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282</hash>
             </hashes>
             <licenses>
-                <expression bom-ref="my-license" acknowledgement="declared">EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0</expression>
+                <expression bom-ref="my-license" acknowledgement="declared">
+                    <value>EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0</value>
+                    <text license-identifier="EPL-2.0"><![CDATA[Eclipse Public License - v 2.0
+
+    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+    PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+    OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT...]]]></text>
+                    <text license-identifier="GPL-2.0 WITH Classpath-exception-2.0"><![CDATA[                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed...
+
+...
+
+Linking this library statically or dynamically with other modules is making a combined work based on this library...]]></text>
+                </expression>
             </licenses>
             <purl>pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar</purl>
         </component>
diff --git a/tools/src/test/resources/1.7/valid-license-id-1.7.json b/tools/src/test/resources/1.7/valid-license-id-1.7.json
@@ -36,7 +36,10 @@
           "license": {
             "id": "Apache-2.0",
             "acknowledgement": "declared",
-            "bom-ref": "my-license"
+            "bom-ref": "my-license",
+            "text": {
+              "content": "\n                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION..."
+            }
           }
         }
       ],
diff --git a/tools/src/test/resources/1.7/valid-license-id-1.7.textproto b/tools/src/test/resources/1.7/valid-license-id-1.7.textproto
@@ -33,6 +33,14 @@ components {
       id: "Apache-2.0"
       acknowledgement: LICENSE_ACKNOWLEDGEMENT_ENUMERATION_DECLARED
       bom_ref: "my-license"
+      text {
+        value: """
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+        TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION..."""
+      }
     }
   }
   purl: "pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar"
diff --git a/tools/src/test/resources/1.7/valid-license-id-1.7.xml b/tools/src/test/resources/1.7/valid-license-id-1.7.xml
@@ -17,6 +17,12 @@
             <licenses>
                 <license bom-ref="my-license" acknowledgement="declared">
                     <id>Apache-2.0</id>
+                    <text><![CDATA[
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION...]]></text>
                 </license>
             </licenses>
             <purl>pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar</purl>
diff --git a/tools/src/test/resources/1.7/valid-license-name-1.7.json b/tools/src/test/resources/1.7/valid-license-name-1.7.json
@@ -34,8 +34,12 @@
       "licenses": [
         {
           "license": {
-            "name": "Apache License 2.0",
-            "bom-ref": "my-license"
+            "name": "My License",
+            "bom-ref": "my-license",
+            "acknowledgement": "declared",
+            "text": {
+              "content": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus nec turpis efficitur, ullamcorper lorem ac, fermentum nulla. Mauris a enim nunc. Aliquam diam tellus, porttitor venenatis leo in, mollis ultricies lacus. Sed sagittis hendrerit nulla, eget pulvinar diam..."
+            }
           }
         }
       ],
diff --git a/tools/src/test/resources/1.7/valid-license-name-1.7.textproto b/tools/src/test/resources/1.7/valid-license-name-1.7.textproto
@@ -30,8 +30,12 @@ components {
   }
   licenses {
     license {
-      name: "Apache License 2.0"
+      name: "My License"
       bom_ref: "my-license"
+      acknowledgement: LICENSE_ACKNOWLEDGEMENT_ENUMERATION_DECLARED
+      text {
+        value: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus nec turpis efficitur, ullamcorper lorem ac, fermentum nulla. Mauris a enim nunc. Aliquam diam tellus, porttitor venenatis leo in, mollis ultricies lacus. Sed sagittis hendrerit nulla, eget pulvinar diam..."
+      }
     }
   }
   purl: "pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar"
diff --git a/tools/src/test/resources/1.7/valid-license-name-1.7.xml b/tools/src/test/resources/1.7/valid-license-name-1.7.xml
@@ -15,8 +15,9 @@
                 <hash alg="SHA-512">e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282</hash>
             </hashes>
             <licenses>
-                <license bom-ref="my-license">
-                    <name>Apache License 2.0</name>
+                <license bom-ref="my-license" acknowledgement="declared">
+                    <name>My License</name>
+                    <text><![CDATA[Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus nec turpis efficitur, ullamcorper lorem ac, fermentum nulla. Mauris a enim nunc. Aliquam diam tellus, porttitor venenatis leo in, mollis ultricies lacus. Sed sagittis hendrerit nulla, eget pulvinar diam...]]></text>
                 </license>
             </licenses>
             <purl>pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar</purl>

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,10 @@`
`36`	`36`	`"license": {`
`37`	`37`	`"id": "Apache-2.0",`
`38`	`38`	`"acknowledgement": "declared",`
`39`		`- "bom-ref": "my-license"`
	`39`	`+ "bom-ref": "my-license",`
	`40`	`+ "text": {`
	`41`	`+ "content": "\n Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION..."`
	`42`	`+ }`
`40`	`43`	`}`
`41`	`44`	`}`
`42`	`45`	`],`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,12 @@`
`34`	`34`	`"licenses": [`
`35`	`35`	`{`
`36`	`36`	`"license": {`
`37`		`- "name": "Apache License 2.0",`
`38`		`- "bom-ref": "my-license"`
	`37`	`+ "name": "My License",`
	`38`	`+ "bom-ref": "my-license",`
	`39`	`+ "acknowledgement": "declared",`
	`40`	`+ "text": {`
	`41`	`+ "content": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus nec turpis efficitur, ullamcorper lorem ac, fermentum nulla. Mauris a enim nunc. Aliquam diam tellus, porttitor venenatis leo in, mollis ultricies lacus. Sed sagittis hendrerit nulla, eget pulvinar diam..."`
	`42`	`+ }`
`39`	`43`	`}`
`40`	`44`	`}`
`41`	`45`	`],`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,12 @@ components {`
`30`	`30`	`}`
`31`	`31`	`licenses {`
`32`	`32`	`license {`
`33`		`- name: "Apache License 2.0"`
	`33`	`+ name: "My License"`
`34`	`34`	`bom_ref: "my-license"`
	`35`	`+ acknowledgement: LICENSE_ACKNOWLEDGEMENT_ENUMERATION_DECLARED`
	`36`	`+ text {`
	`37`	`+ value: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus nec turpis efficitur, ullamcorper lorem ac, fermentum nulla. Mauris a enim nunc. Aliquam diam tellus, porttitor venenatis leo in, mollis ultricies lacus. Sed sagittis hendrerit nulla, eget pulvinar diam..."`
	`38`	`+ }`
`35`	`39`	`}`
`36`	`40`	`}`
`37`	`41`	`purl: "pkg:maven/com.acme/[email protected]?packaging=jar"`