From fe23df50ca41b8a359c8628507b5b894bd777e2c Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Tue, 27 Aug 2024 13:53:46 +0100 Subject: [PATCH 1/2] Update Dataset Example 01 to 3.0.1 Use `contentType` (from Core) instead of `software_contentType` Signed-off-by: Arthit Suriyawongkul --- dataset/example01/spdx3.0/example01.spdx3.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dataset/example01/spdx3.0/example01.spdx3.json b/dataset/example01/spdx3.0/example01.spdx3.json index 351c814..b833046 100644 --- a/dataset/example01/spdx3.0/example01.spdx3.json +++ b/dataset/example01/spdx3.0/example01.spdx3.json @@ -1,10 +1,10 @@ { - "@context": "https://spdx.org/rdf/3.0.0/spdx-context.jsonld", + "@context": "https://spdx.org/rdf/3.0.1/spdx-context.jsonld", "@graph": [ { "type": "CreationInfo", "@id": "_:creationinfo", - "specVersion": "3.0.0", + "specVersion": "3.0.1", "createdBy": [ "https://spdx.org/spdxdocs/Person1-1000e6a2-0229-4875-baa7-c99be213b6e1" ], @@ -100,7 +100,7 @@ "spdxId": "https://spdx.org/spdxdocs/File1-d029fccb-7ee9-42be-a445-5e2066db0de8", "creationInfo": "_:creationinfo", "name": "data.csv", - "software_contentType": "text/csv;charset=UTF-8", + "contentType": "text/csv;charset=UTF-8", "software_primaryPurpose": "data", "releaseTime": "2024-04-15T08:10:00Z", "originatedBy": [ @@ -112,7 +112,7 @@ "spdxId": "https://spdx.org/spdxdocs/File2-caf55baf-cd02-406a-b7ec-838842ca869f", "creationInfo": "_:creationinfo", "name": "codebook.csv", - "software_contentType": "text/csv;charset=UTF-8", + "contentType": "text/csv;charset=UTF-8", "software_primaryPurpose": "data", "releaseTime": "2024-04-15T08:10:00Z", "originatedBy": [ @@ -170,8 +170,8 @@ "spdxId": "https://spdx.org/licenses/CC-BY-4.0", "creationInfo": "_:creationinfo", "simplelicensing_licenseExpression": "CC-BY-4.0", - "simplelicensing_licenseListVersion": "3.24.0", - "comment": "Added as a workaround for the lack of https://spdx.org/licenses/CC-BY-4.0 as a valid ListedLicense in SPDX 3.0.0 RDF. This will be removed once https://github.com/spdx/LicenseListPublisher/issues/183 is implemented." + "simplelicensing_licenseListVersion": "3.25.0", + "comment": "Added as a workaround for the lack of https://spdx.org/licenses/CC-BY-4.0 as a valid ListedLicense in SPDX 3.0.1 RDF. This will be removed once https://github.com/spdx/LicenseListPublisher/issues/183 is implemented." } ] } \ No newline at end of file From ac59aaa4c1caa1f38f71e29e218840ef2a0a3a35 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Thu, 12 Sep 2024 00:11:05 +0100 Subject: [PATCH 2/2] Update example01.spdx3.json Signed-off-by: Arthit Suriyawongkul --- dataset/example01/spdx3.0/example01.spdx3.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dataset/example01/spdx3.0/example01.spdx3.json b/dataset/example01/spdx3.0/example01.spdx3.json index b833046..5783abc 100644 --- a/dataset/example01/spdx3.0/example01.spdx3.json +++ b/dataset/example01/spdx3.0/example01.spdx3.json @@ -78,7 +78,8 @@ "software_primaryPurpose": "data", "dataset_confidentialityLevel": "clear", "dataset_dataPreprocessing": [ - "The dataset is built upon a number of datasets and processing steps. See: https://github.com/owid/co2-data/blob/master/README.md" + "The dataset is built upon a number of datasets and processing steps.", + "See: https://github.com/owid/co2-data/blob/master/README.md" ], "dataset_datasetAvailability": "directDownload", "dataset_dataCollectionProcess": "The data is collected from various sources, including international organizations and research institutions.", @@ -174,4 +175,4 @@ "comment": "Added as a workaround for the lack of https://spdx.org/licenses/CC-BY-4.0 as a valid ListedLicense in SPDX 3.0.1 RDF. This will be removed once https://github.com/spdx/LicenseListPublisher/issues/183 is implemented." } ] -} \ No newline at end of file +}