Skip to content

Commit a37b6b7

Browse files
committed
Schema fixes
- Add specVersion to creationInfo object - Only one context allowed - originatedBy is an array - dataLicense is not required - Fix element list in example7-third-party-modules.spdx.json - Remove build conformance (requires more information about the build) Signed-off-by: Nisha Kumar <[email protected]>
1 parent 66311c9 commit a37b6b7

File tree

4 files changed

+32
-28
lines changed

4 files changed

+32
-28
lines changed

software/example7/spdx-3.0/example7-bin.spdx.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
2-
"@context": [
3-
"https://spdx.org/rdf/3.0.0/spdx-context.jsonld"
4-
],
2+
"@context": "https://spdx.org/rdf/3.0.0/spdx-context.jsonld",
53
"@graph": [
64
{
75
"spdxId": "urn:uuid:6731cd26-926c-486b-8127-340c0f11a228",
@@ -20,6 +18,7 @@
2018
{
2119
"@id": "_:creationInfo",
2220
"type": "CreationInfo",
21+
"specVersion": "3.0.0",
2322
"created": "2020-11-24T01:12:27Z",
2423
"createdBy": [
2524
"urn:uuid:6731cd26-926c-486b-8127-340c0f11a228"
@@ -32,7 +31,9 @@
3231
"name": "hello",
3332
"creationInfo": "_:creationInfo",
3433
"comment": "This binary was created by building go source code",
35-
"originatedBy": "urn:uuid:6731cd26-926c-486b-8127-340c0f11a228",
34+
"originatedBy": [
35+
"urn:uuid:6731cd26-926c-486b-8127-340c0f11a228"
36+
],
3637
"software_primaryPurpose": "executable"
3738
},
3839
{
@@ -147,11 +148,9 @@
147148
"comment": "This document's primary communication is the SBOM",
148149
"name": "example7-bin.spdx",
149150
"profileConformance": [
150-
"core",
151-
"software",
152-
"build"
151+
"core",
152+
"software"
153153
],
154-
"dataLicense": "CC0-1.0",
155154
"rootElement": [
156155
"urn:uuid:4c7ec5f3-875b-4f99-8c4c-f0a718da8c4f"
157156
]

software/example7/spdx-3.0/example7-go-module.spdx.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
2-
"@context": [
3-
"https://spdx.org/rdf/3.0.0/spdx-context.jsonld"
4-
],
2+
"@context": "https://spdx.org/rdf/3.0.0/spdx-context.jsonld",
53
"@graph": [
64
{
75
"spdxId": "urn:uuid:cf7dddac-8ce5-4a16-8860-ee255be7b4c8",
@@ -20,6 +18,7 @@
2018
{
2119
"@id": "_:creationInfo",
2220
"type": "CreationInfo",
21+
"specVersion": "3.0.0",
2322
"created": "2020-11-25T01:12:27Z",
2423
"createdBy": [
2524
"urn:uuid:cf7dddac-8ce5-4a16-8860-ee255be7b4c8"
@@ -34,7 +33,9 @@
3433
"comment": "This is version controlled source code, generated by the ssame person who made this document",
3534
"software_primaryPurpose": "source",
3635
"software_downloadLocation": "git://github.com/spdx/spdx-examples.git#software/example7/src/hello",
37-
"originatedBy": "urn:uuid:cf7dddac-8ce5-4a16-8860-ee255be7b4c8"
36+
"originatedBy": [
37+
"urn:uuid:cf7dddac-8ce5-4a16-8860-ee255be7b4c8"
38+
]
3839
},
3940
{
4041
"type": "software_Sbom",
@@ -56,10 +57,9 @@
5657
"comment": "This document's primary communication is the SBOM",
5758
"name": "example7-go-module.spdx",
5859
"profileConformance": [
59-
"core",
60+
"core",
6061
"software"
6162
],
62-
"dataLicense": "CC0-1.0",
6363
"rootElement": [
6464
"urn:uuid:711c6f39-6c80-494e-b848-1c01e8962345"
6565
]

software/example7/spdx-3.0/example7-golang.spdx.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
2-
"@context": [
3-
"https://spdx.org/rdf/3.0.0/spdx-context.jsonld"
4-
],
2+
"@context": "https://spdx.org/rdf/3.0.0/spdx-context.jsonld",
53
"@graph": [
64
{
75
"spdxId": "urn:uuid:cc81c9c0-c466-4e22-b3f6-945a65f5d07b",
@@ -27,6 +25,7 @@
2725
{
2826
"@id": "_:creationInfo",
2927
"type": "CreationInfo",
28+
"specVersion": "3.0.0",
3029
"created": "2020-11-24T01:12:27Z",
3130
"createdBy": [
3231
"urn:uuid:cc81c9c0-c466-4e22-b3f6-945a65f5d07b"
@@ -42,7 +41,9 @@
4241
"software_packageVersion": "1.16.4",
4342
"software_primaryPurpose": "install",
4443
"software_downloadLocation": "https://golang.org/dl/go1.16.4.linux-amd64.tar.gz",
45-
"originatedBy": "urn:uuid:a5d2b614-1c0a-477d-b1fc-dc391f2c1c6d",
44+
"originatedBy": [
45+
"urn:uuid:a5d2b614-1c0a-477d-b1fc-dc391f2c1c6d"
46+
],
4647
"verifiedUsing": [
4748
{
4849
"type": "Hash",
@@ -57,7 +58,9 @@
5758
"name": "go",
5859
"creationInfo": "_:creationInfo",
5960
"comment": "The installation comes with an executable",
60-
"originatedBy": "urn:uuid:a5d2b614-1c0a-477d-b1fc-dc391f2c1c6d",
61+
"originatedBy": [
62+
"urn:uuid:a5d2b614-1c0a-477d-b1fc-dc391f2c1c6d"
63+
],
6164
"software_primaryPurpose": "executable"
6265
},
6366
{
@@ -93,10 +96,9 @@
9396
"comment": "This document's primary communication is the SBOM",
9497
"name": "example7-golang.spdx",
9598
"profileConformance": [
96-
"core",
99+
"core",
97100
"software"
98101
],
99-
"dataLicense": "CC0-1.0",
100102
"rootElement": [
101103
"urn:uuid:d523d308-8348-4051-85ea-a67a14978fad"
102104
]

software/example7/spdx-3.0/example7-third-party-modules.spdx.json

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
2-
"@context": [
3-
"https://spdx.org/rdf/3.0.0/spdx-context.jsonld"
4-
],
2+
"@context": "https://spdx.org/rdf/3.0.0/spdx-context.jsonld",
53
"@graph": [
64
{
75
"spdxId": "urn:uuid:75f4bf57-0976-446d-869a-67856a1fa5bb",
@@ -34,6 +32,7 @@
3432
{
3533
"@id": "_:creationInfo",
3634
"type": "CreationInfo",
35+
"specVersion": "3.0.0",
3736
"created": "2020-11-25T01:12:27Z",
3837
"createdBy": [
3938
"urn:uuid:75f4bf57-0976-446d-869a-67856a1fa5bb"
@@ -48,7 +47,9 @@
4847
"comment": "Go module dependency. The author is not given",
4948
"software_primaryPurpose": "library",
5049
"software_downloadLocation": "git://golang.org/x/[email protected]",
51-
"originatedBy": "urn:uuid:4b3add7d-8d36-488d-b7cc-f3891af633d1"
50+
"originatedBy": [
51+
"urn:uuid:4b3add7d-8d36-488d-b7cc-f3891af633d1"
52+
]
5253
},
5354
{
5455
"spdxId": "urn:uuid:84e4231d-fc1d-4b4e-9609-05781f81fa73",
@@ -58,7 +59,9 @@
5859
"comment": "Go module dependency. The author is not given",
5960
"software_primaryPurpose": "library",
6061
"software_downloadLocation": "git://rsc.io/[email protected]",
61-
"originatedBy": "urn:uuid:1c20ec6e-6e84-417a-8b7f-51bb69f62cb2"
62+
"originatedBy": [
63+
"urn:uuid:1c20ec6e-6e84-417a-8b7f-51bb69f62cb2"
64+
]
6265
},
6366
{
6467
"type": "software_Sbom",
@@ -71,7 +74,8 @@
7174
],
7275
"element": [
7376
"urn:uuid:75f4bf57-0976-446d-869a-67856a1fa5bb",
74-
"urn:uuid:0ae67aec-e3f7-4020-b0bc-068486068127",
77+
"urn:uuid:4b3add7d-8d36-488d-b7cc-f3891af633d1",
78+
"urn:uuid:1c20ec6e-6e84-417a-8b7f-51bb69f62cb2",
7579
"urn:uuid:4918b993-36f8-4e75-bf94-2f017575eae5",
7680
"urn:uuid:84e4231d-fc1d-4b4e-9609-05781f81fa73"
7781
]
@@ -86,7 +90,6 @@
8690
"core",
8791
"software"
8892
],
89-
"dataLicense": "CC0-1.0",
9093
"rootElement": [
9194
"urn:uuid:30bebcfc-096f-4cbd-9fea-da1b8c5f8ea6"
9295
]

0 commit comments

Comments
 (0)