Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #106 from CycloneDX/spec-v1.5-licensing
feat(spec1-5): add licensing, license properties, and license bom-ref
- Loading branch information
Showing
10 changed files
with
339 additions
and
4 deletions.
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
59 changes: 59 additions & 0 deletions
59
testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-license-licensing.json
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,59 @@ | ||
| { | ||
| "bomFormat": "CycloneDX", | ||
| "specVersion": "1.5", | ||
| "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", | ||
| "version": 1, | ||
| "components": [ | ||
| { | ||
| "type": "library", | ||
| "publisher": "Acme Inc", | ||
| "group": "com.acme", | ||
| "name": "cryptographic-provider", | ||
| "version": "2.2.0", | ||
| "licenses": [ | ||
| { | ||
| "license": { | ||
| "bom-ref": "acme-license-1", | ||
| "name": "Acme Commercial License", | ||
| "licensing": { | ||
| "altIds": [ | ||
| "acme", | ||
| "acme-license" | ||
| ], | ||
| "licensor": { | ||
| "organization": { | ||
| "name": "Acme Inc", | ||
| "contact": [ | ||
| { | ||
| "name": "Acme Licensing Fulfillment", | ||
| "email": "licensing@example.com" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "licensee": { | ||
| "organization": { | ||
| "name": "Example Co." | ||
| } | ||
| }, | ||
| "purchaser": { | ||
| "individual": { | ||
| "name": "Samantha Wright", | ||
| "email": "samantha.wright@gmail.com", | ||
| "phone": "800-555-1212" | ||
| } | ||
| }, | ||
| "purchaseOrder": "PO-12345", | ||
| "licenseTypes": [ | ||
| "appliance" | ||
| ], | ||
| "lastRenewal": "2022-04-13T20:20:39+00:00", | ||
| "expiration": "2023-04-13T20:20:39+00:00" | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
|
|
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
49 changes: 49 additions & 0 deletions
49
testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-license-licensing.xml
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,49 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <bom xmlns="http://cyclonedx.org/schema/bom/1.5" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"> | ||
| <components> | ||
| <component type="library"> | ||
| <publisher>Acme Inc</publisher> | ||
| <group>com.acme</group> | ||
| <name>cryptographic-provider</name> | ||
| <version>2.2.0</version> | ||
| <licenses> | ||
| <license bom-ref="acme-license-1"> | ||
| <name>Acme Commercial License</name> | ||
| <licensing> | ||
| <altIds> | ||
| <altId>acme</altId> | ||
| <altId>acme-license</altId> | ||
| </altIds> | ||
| <licensor> | ||
| <organization> | ||
| <name>Acme Inc</name> | ||
| <contact> | ||
| <name>Acme Licensing Fulfillment</name> | ||
| <email>licensing@example.com</email> | ||
| </contact> | ||
| </organization> | ||
| </licensor> | ||
| <licensee> | ||
| <organization> | ||
| <name>Example Co.</name> | ||
| </organization> | ||
| </licensee> | ||
| <purchaser> | ||
| <individual> | ||
| <name>Samantha Wright</name> | ||
| <email>samantha.wright@gmail.com</email> | ||
| <phone>800-555-1212</phone> | ||
| </individual> | ||
| </purchaser> | ||
| <purchaseOrder>PO-12345</purchaseOrder> | ||
| <licenseTypes> | ||
| <licenseType>appliance</licenseType> | ||
| </licenseTypes> | ||
| <lastRenewal>2022-04-13T20:20:39+00:00</lastRenewal> | ||
| <expiration>2023-04-13T20:20:39+00:00</expiration> | ||
| </licensing> | ||
| </license> | ||
| </licenses> | ||
| </component> | ||
| </components> | ||
| </bom> |
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,55 @@ | ||
| { | ||
| "bomFormat": "CycloneDX", | ||
| "specVersion": "1.5", | ||
| "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", | ||
| "version": 1, | ||
| "components": [ | ||
| { | ||
| "type": "library", | ||
| "publisher": "Acme Inc", | ||
| "group": "com.acme", | ||
| "name": "cryptographic-provider", | ||
| "version": "2.2.0", | ||
| "licenses": [ | ||
| { | ||
| "license": { | ||
| "bom-ref": "acme-license-1", | ||
| "name": "Acme Commercial License", | ||
| "licensing": { | ||
| "altIds": [ | ||
| "acme", "acme-license" | ||
| ], | ||
| "licensor": { | ||
| "organization": { | ||
| "name": "Acme Inc", | ||
| "contact": [ | ||
| { | ||
| "name": "Acme Licensing Fulfillment", | ||
| "email": "licensing@example.com" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "licensee": { | ||
| "organization": { | ||
| "name": "Example Co." | ||
| } | ||
| }, | ||
| "purchaser": { | ||
| "individual": { | ||
| "name": "Samantha Wright", | ||
| "email": "samantha.wright@gmail.com", | ||
| "phone": "800-555-1212" | ||
| } | ||
| }, | ||
| "purchaseOrder": "PO-12345", | ||
| "licenseTypes": ["appliance"], | ||
| "lastRenewal": "2022-04-13T20:20:39+00:00", | ||
| "expiration": "2023-04-13T20:20:39+00:00" | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
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,49 @@ | ||
| ?xml version="1.0"?> | ||
| <bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5"> | ||
| <components> | ||
| <component type="library"> | ||
| <publisher>Acme Inc</publisher> | ||
| <group>com.acme</group> | ||
| <name>cryptographic-provider</name> | ||
| <version>2.2.0</version> | ||
| <licenses> | ||
| <license bom-ref="acme-license-1"> | ||
| <name>Acme Commercial License</name> | ||
| <licensing> | ||
| <altIds> | ||
| <altId>acme</altId> | ||
| <altId>acme-license</altId> | ||
| </altIds> | ||
| <licensor> | ||
| <organization> | ||
| <name>Acme Inc</name> | ||
| <contact> | ||
| <name>Acme Licensing Fulfillment</name> | ||
| <email>licensing@example.com</email> | ||
| </contact> | ||
| </organization> | ||
| </licensor> | ||
| <licensee> | ||
| <organization> | ||
| <name>Example Co.</name> | ||
| </organization> | ||
| </licensee> | ||
| <purchaser> | ||
| <individual> | ||
| <name>Samantha Wright</name> | ||
| <email>samantha.wright@gmail.com</email> | ||
| <phone>800-555-1212</phone> | ||
| </individual> | ||
| </purchaser> | ||
| <purchaseOrder>PO-12345</purchaseOrder> | ||
| <licenseTypes> | ||
| <licenseType>appliance</licenseType> | ||
| </licenseTypes> | ||
| <lastRenewal>2022-04-13T20:20:39+00:00</lastRenewal> | ||
| <expiration>2023-04-13T20:20:39+00:00</expiration> | ||
| </licensing> | ||
| </license> | ||
| </licenses> | ||
| </component> | ||
| </components> | ||
| </bom> |
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
Oops, something went wrong.