feat: support multi license mix #582
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| { | ||
| "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", | ||
| "bomFormat": "CycloneDX", | ||
| "specVersion": "1.6", | ||
| "serialNumber": "urn:uuid:df628836-6b9b-41c9-a724-b44743c54d42", | ||
| "version": 1, | ||
| "metadata": { | ||
| "lifecycles": [{"phase": "design"}] | ||
| }, | ||
| "components": [ | ||
| { | ||
| "type": "library", | ||
| "group": "com.example", | ||
| "name": "situation-A", | ||
| "version": "1", | ||
| "description": "Multiple licenses: declared ids/names, and a concluded expression", | ||
| "licenses": [ | ||
| { | ||
| "license": { | ||
| "id": "MIT", | ||
| "acknowledgement": "declared" | ||
| } | ||
| }, | ||
| { | ||
| "license": { | ||
| "id": "PostgreSQL", | ||
| "acknowledgement": "declared" | ||
| } | ||
| }, | ||
| { | ||
| "license": { | ||
| "name": "Apache Software License", | ||
| "acknowledgement": "declared" | ||
| } | ||
| }, | ||
| { | ||
| "expression": "(MIT OR PostgreSQL OR Apache-2.0)", | ||
| "acknowledgement": "concluded" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "type": "library", | ||
| "group": "com.example", | ||
| "name": "situation-B", | ||
| "version": "1", | ||
| "description": "Multiple license expressions: one declared, one concluded", | ||
| "licenses": [ | ||
| { | ||
| "expression": "MIT OR (GPL-3.0 OR GPL-2.0)", | ||
| "acknowledgement": "declared" | ||
| }, | ||
| { | ||
| "expression": "(GPL-3.0-only AND LGPL-2.0-only)", | ||
| "acknowledgement": "concluded" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "type": "library", | ||
| "group": "com.example", | ||
| "name": "situation-C", | ||
| "version": "1", | ||
| "description": "Multiple license: one declared expression, one concluded id", | ||
| "licenses": [ | ||
| { | ||
| "expression": "GPL-3.0-or-later OR GPL-2.0", | ||
| "acknowledgement": "declared" | ||
| }, | ||
| { | ||
| "license": { | ||
| "id": "GPL-3.0-only", | ||
| "acknowledgement": "concluded" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
|
There was a problem hiding this comment. this is a backport of a newly added valid example for CDX 1.7. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| <?xml version="1.0"?> | ||
| <bom xmlns="http://cyclonedx.org/schema/bom/1.6" | ||
| serialNumber="urn:uuid:df628836-6b9b-41c9-a724-b44743c54d42" | ||
| > | ||
| <!-- | ||
| All license posture in here is for show-case ony. | ||
| This is not a real law-case! | ||
| --> | ||
| <metadata> | ||
| <lifecycles><lifecycle><phase>design</phase></lifecycle></lifecycles> | ||
| </metadata> | ||
| <components> | ||
| <component type="library"> | ||
| <group>com.example</group> | ||
| <name>situation-A</name> | ||
| <version>1</version> | ||
| <description>Multiple licenses: declared ids/names, and a concluded expression</description> | ||
| <licenses> | ||
| <license acknowledgement="declared"><id>MIT</id></license> | ||
| <license acknowledgement="declared"><id>PostgreSQL</id></license> | ||
| <license acknowledgement="declared"><name>Apache Software License</name></license> | ||
| <expression acknowledgement="concluded">(MIT OR PostgreSQL OR Apache-2.0)</expression> | ||
| </licenses> | ||
| </component> | ||
| <component type="library"> | ||
| <group>com.example</group> | ||
| <name>situation-B</name> | ||
| <version>1</version> | ||
| <description>Multiple license expressions: one declared, one concluded</description> | ||
| <licenses> | ||
| <expression acknowledgement="declared">MIT OR (GPL-3.0 OR GPL-2.0)</expression> | ||
| <expression acknowledgement="concluded">(GPL-3.0-only AND LGPL-2.0-only)</expression> | ||
| </licenses> | ||
| </component> | ||
| <component type="library"> | ||
| <group>com.example</group> | ||
| <name>situation-C</name> | ||
| <version>1</version> | ||
| <description>Multiple license: one declared expression, one concluded id</description> | ||
| <licenses> | ||
| <expression acknowledgement="declared">GPL-3.0-or-later OR GPL-2.0</expression> | ||
| <license acknowledgement="concluded"><id>GPL-3.0-only</id></license> | ||
| </licenses> | ||
| </component> | ||
| </components> | ||
| </bom> |
|
There was a problem hiding this comment. this case is now passing - as expected |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| { | ||
| "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json", | ||
| "bomFormat": "CycloneDX", | ||
| "specVersion": "1.7", | ||
| "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", | ||
| "version": 1, | ||
| "components": [ | ||
| { | ||
| "type": "application", | ||
| "publisher": "Acme Inc", | ||
| "group": "com.acme", | ||
| "name": "tomcat-catalina", | ||
| "version": "9.0.14", | ||
| "description": "Modified version of Apache Catalina", | ||
| "scope": "required", | ||
| "licenses": [ | ||
| { | ||
| "license": { | ||
| "id": "Apache-2.0" | ||
| } | ||
| }, | ||
| { | ||
| "expression": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0" | ||
| }, | ||
| { | ||
| "license": { | ||
| "name": "My Own License", | ||
| "text": { | ||
| "content": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
|
There was a problem hiding this comment. this case is now passing - as expected |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| # proto-file: schema/bom-1.7.proto | ||
| # proto-message: Bom | ||
|
|
||
| # All license posture in here is for show-case ony. | ||
| # This is not a real law-case! | ||
|
|
||
| spec_version: "1.7" | ||
| serial_number: "urn:uuid:b1ef52c6-7cd8-43d5-9e42-5e69044bbe9e" | ||
| version: 1 | ||
| components { | ||
| type: CLASSIFICATION_APPLICATION | ||
| publisher: "Acme Inc" | ||
| group: "com.acme" | ||
| name: "tomcat-catalina" | ||
| version: "9.0.14" | ||
| description: "Modified version of Apache Catalina" | ||
| scope: SCOPE_REQUIRED | ||
| licenses { | ||
| license: { | ||
| id: "Apache-2.0" | ||
| } | ||
| } | ||
| licenses { | ||
| expression: "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0" | ||
| } | ||
| licenses { | ||
| license: { | ||
| name: "My Own License" | ||
| text: { | ||
| value: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." | ||
| } | ||
| } | ||
| } | ||
| } |
|
There was a problem hiding this comment. this case is now passing - as expected |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,8 @@ | ||
| <?xml version="1.0"?> | ||
| <bom xmlns="http://cyclonedx.org/schema/bom/1.7" | ||
| serialNumber="urn:uuid:b1ef52c6-7cd8-43d5-9e42-5e69044bbe9e" | ||
| version="1" | ||
| > | ||
| <components> | ||
| <component type="application"> | ||
| <publisher>Acme Inc</publisher> | ||
|
|
@@ -8,17 +11,15 @@ | |
| <version>9.0.14</version> | ||
| <description>Modified version of Apache Catalina</description> | ||
| <scope>required</scope> | ||
| <licenses> | ||
| <license> | ||
| <id>Apache-2.0</id> | ||
| </license> | ||
| <expression>EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0</expression> | ||
| <license> | ||
| <name>My Own License</name> | ||
| <text><![CDATA[Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.]]></text> | ||
| </license> | ||
| </licenses> | ||
| <purl>pkg:maven/com.acme/[email protected]?packaging=jar</purl> | ||
| </component> | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is a backport of a newly added valid example for CDX 1.7.
in CDX 1.6, it is invalid.