Skip to content

Commit

Permalink
Merge pull request #127 from Potafe/main
Browse files Browse the repository at this point in the history
fix: replace duplicate spdx files
  • Loading branch information
spatil00 authored Feb 25, 2025
2 parents 3ebd218 + 5f457ad commit 06a4fb9
Show file tree
Hide file tree
Showing 4 changed files with 240 additions and 696 deletions.
356 changes: 33 additions & 323 deletions test/json/input/test1.json
Original file line number Diff line number Diff line change
@@ -1,324 +1,34 @@
{
"SPDXID": "SPDXRef-DOCUMENT",
"spdxVersion": "SPDX-2.2",
"creationInfo": {
"created": "2022-11-02T10:30:22Z",
"licenseListVersion": "3.13",
"creators": ["Organization: Philips"]
},
"documentDescribes": [
"SPDXRef-package-42dd561c-5275-4869-a66f-998e987327d7"
],
"name": "AltaTrack Equipment",
"dataLicense": "CC0-1.0",
"documentNamespace": "https://spdx.philips.com/spdx/Airtrack1.2-42dd561c-5275-4869-a66f-998e987327d7",
"packages": [
{
"SPDXID": "SPDXRef-package-42dd561c-5275-4869-a66f-998e987327d7",
"copyrightText": "NOASSERTION",
"description": "NOASSERTION",
"downloadLocation": "NOASSERTION",
"filesAnalyzed": false,
"homepage": "NOASSERTION",
"licenseConcluded": "LicenseRef-Commercial-6903e358-d1d3-4a75-b64f-c713e9144c63",
"licenseDeclared": "NOASSERTION",
"name": "AltaTrack",
"supplier": "Organization: Philips",
"versionInfo": "1.2.0"
},
{
"SPDXID": "SPDXRef-package-d1d0a05e-088a-429d-9901-baee35b17b24",
"copyrightText": "NOASSERTION",
"description": "NOASSERTION",
"downloadLocation": "NOASSERTION",
"filesAnalyzed": false,
"homepage": "NOASSERTION",
"licenseConcluded": "LicenseRef-Commercial-6903e358-d1d3-4a75-b64f-c713e9144c63",
"licenseDeclared": "NOASSERTION",
"name": "Windows Embedded Standard 7 SP1",
"supplier": "Organization: Microsoft",
"versionInfo": "6.1.7601"
},
{
"SPDXID": "SPDXRef-package-0d9a5af1-1663-479e-9fdc-4fa5d3f0025e",
"copyrightText": "NOASSERTION",
"description": "NOASSERTION",
"downloadLocation": "NOASSERTION",
"filesAnalyzed": false,
"homepage": "NOASSERTION",
"licenseConcluded": "LicenseRef-Commercial-6903e358-d1d3-4a75-b64f-c713e9144c63",
"licenseDeclared": "NOASSERTION",
"name": ".NET Framework 4.6.2",
"supplier": "Organization: Microsoft",
"versionInfo": "4.6.01590"
},
{
"SPDXID": "SPDXRef-package-536ce4ee-0b57-4282-8f56-ad11955e277c",
"copyrightText": "NOASSERTION",
"description": "NOASSERTION",
"downloadLocation": "NOASSERTION",
"filesAnalyzed": false,
"homepage": "NOASSERTION",
"licenseConcluded": "LicenseRef-Commercial-6903e358-d1d3-4a75-b64f-c713e9144c63",
"licenseDeclared": "NOASSERTION",
"name": "Visual Studio C++ 2015 Runtime Libraries",
"supplier": "Organization: Microsoft",
"versionInfo": "14.0.24212"
},
{
"SPDXID": "SPDXRef-package-19f87b4c-080d-4fa9-bb3c-d3f28045dcdd",
"copyrightText": "NOASSERTION",
"description": "NOASSERTION",
"downloadLocation": "NOASSERTION",
"filesAnalyzed": false,
"homepage": "NOASSERTION",
"licenseConcluded": "LicenseRef-Commercial-6903e358-d1d3-4a75-b64f-c713e9144c63",
"licenseDeclared": "NOASSERTION",
"name": "IPP 7",
"supplier": "Organization: Intel",
"versionInfo": "7.0.205"
},
{
"SPDXID": "SPDXRef-package-4b8e8004-07d0-47a4-99bd-4208385d2fbf",
"copyrightText": "NOASSERTION",
"description": "NOASSERTION",
"downloadLocation": "NOASSERTION",
"filesAnalyzed": false,
"homepage": "NOASSERTION",
"licenseConcluded": "LicenseRef-PhilipsProprietary-8663A847-2230-4D98-A7CC-10B4B1DC380A",
"licenseDeclared": "NOASSERTION",
"name": "Vessel and Table Segmentation algorithm",
"supplier": "Organization: Philips",
"versionInfo": "1.0.0.11"
},
{
"SPDXID": "SPDXRef-package-78a6b64e-57b6-4728-93e0-4a793497137b",
"copyrightText": "NOASSERTION",
"description": "NOASSERTION",
"downloadLocation": "NOASSERTION",
"filesAnalyzed": false,
"homepage": "NOASSERTION",
"licenseConcluded": "LicenseRef-PhilipsProprietary-8663A847-2230-4D98-A7CC-10B4B1DC380A",
"licenseDeclared": "NOASSERTION",
"name": "Bone Segmentation algorithm",
"supplier": "Organization: Philips",
"versionInfo": "1.0.0.11"
},
{
"SPDXID": "SPDXRef-package-d816ca2d-e043-4016-9cbe-ef1d7c32d610",
"copyrightText": "NOASSERTION",
"description": "NOASSERTION",
"downloadLocation": "NOASSERTION",
"filesAnalyzed": false,
"homepage": "NOASSERTION",
"licenseConcluded": "LicenseRef-PhilipsProprietary-8663A847-2230-4D98-A7CC-10B4B1DC380A",
"licenseDeclared": "NOASSERTION",
"name": "Interventional Workspot",
"supplier": "Organization: Philips",
"versionInfo": "1.5.0"
},
{
"SPDXID": "SPDXRef-package-10e2bc4e-d68f-48ad-b7c0-0f8224a1d8e3",
"copyrightText": "NOASSERTION",
"description": "NOASSERTION",
"downloadLocation": "NOASSERTION",
"filesAnalyzed": false,
"homepage": "NOASSERTION",
"licenseConcluded": "LicenseRef-Commercial-6903e358-d1d3-4a75-b64f-c713e9144c63",
"licenseDeclared": "NOASSERTION",
"name": "Windows 10 IoT Enterprise 2016 LTSB",
"supplier": "Organization: Microsoft",
"versionInfo": "N.A."
},
{
"SPDXID": "SPDXRef-package-0240227a-996a-4b38-b8d1-3fb2b7fb7e2a",
"copyrightText": "NOASSERTION",
"description": "NOASSERTION",
"downloadLocation": "NOASSERTION",
"filesAnalyzed": false,
"homepage": "NOASSERTION",
"licenseConcluded": "LicenseRef-Commercial-6903e358-d1d3-4a75-b64f-c713e9144c63",
"licenseDeclared": "NOASSERTION",
"name": "Visual Studio C++ 2010 Runtime Libraries SP1",
"supplier": "Organization: Microsoft",
"versionInfo": "10.0.40219.325"
},
{
"SPDXID": "SPDXRef-package-af9823fd-3e45-40e1-953c-0d33369aad32",
"copyrightText": "NOASSERTION",
"description": "NOASSERTION",
"downloadLocation": "NOASSERTION",
"filesAnalyzed": false,
"homepage": "NOASSERTION",
"licenseConcluded": "LicenseRef-Commercial-6903e358-d1d3-4a75-b64f-c713e9144c63",
"licenseDeclared": "NOASSERTION",
"name": "CP210 Runtime Libraries",
"supplier": "Organization: Silicon Labs",
"versionInfo": "3.4.0"
},
{
"SPDXID": "SPDXRef-package-fba3fb85-4b1a-4991-984d-9ef56306c063",
"copyrightText": "NOASSERTION",
"description": "NOASSERTION",
"downloadLocation": "NOASSERTION",
"filesAnalyzed": false,
"homepage": "NOASSERTION",
"licenseConcluded": "LicenseRef-Commercial-6903e358-d1d3-4a75-b64f-c713e9144c63",
"licenseDeclared": "NOASSERTION",
"name": "4FM Library",
"supplier": "Organization: 4DSP",
"versionInfo": "1.52.101 / 1.52.103"
},
{
"SPDXID": "SPDXRef-package-95882f7d-88bb-4249-8cac-4aaf7f31b684",
"copyrightText": "NOASSERTION",
"description": "NOASSERTION",
"downloadLocation": "NOASSERTION",
"filesAnalyzed": false,
"homepage": "NOASSERTION",
"licenseConcluded": "LicenseRef-Commercial-6903e358-d1d3-4a75-b64f-c713e9144c63",
"licenseDeclared": "NOASSERTION",
"name": "4FM Driver",
"supplier": "Organization: 4DSP",
"versionInfo": "6.1.7600.16385"
},
{
"SPDXID": "SPDXRef-package-1c97ed53-e96c-4a57-a3cb-0a8fe7f9ce01",
"copyrightText": "NOASSERTION",
"description": "NOASSERTION",
"downloadLocation": "NOASSERTION",
"filesAnalyzed": false,
"homepage": "NOASSERTION",
"licenseConcluded": "LicenseRef-Commercial-6903e358-d1d3-4a75-b64f-c713e9144c63",
"licenseDeclared": "NOASSERTION",
"name": "Visual Studio C++ 2012 Update 4 Runtime Libraries",
"supplier": "Organization: Microsoft",
"versionInfo": "11.0.61030"
},
{
"SPDXID": "SPDXRef-package-6b47d485-5f26-49d0-9b5e-d6630e3a2271",
"copyrightText": "NOASSERTION",
"description": "NOASSERTION",
"downloadLocation": "NOASSERTION",
"filesAnalyzed": false,
"homepage": "NOASSERTION",
"licenseConcluded": "LicenseRef-Commercial-6903e358-d1d3-4a75-b64f-c713e9144c63",
"licenseDeclared": "NOASSERTION",
"name": "CUDA Runtime and FFT Library",
"supplier": "Organization: Nvidia",
"versionInfo": "6.5.14"
},
{
"SPDXID": "SPDXRef-package-aa38760e-09c8-4726-abca-d2ae5708f988",
"copyrightText": "NOASSERTION",
"description": "NOASSERTION",
"downloadLocation": "NOASSERTION",
"filesAnalyzed": false,
"homepage": "NOASSERTION",
"licenseConcluded": "LicenseRef-Commercial-6903e358-d1d3-4a75-b64f-c713e9144c63",
"licenseDeclared": "NOASSERTION",
"name": "Nvidia Driver",
"supplier": "Organization: Nvidia",
"versionInfo": "341.16"
}
],
"relationships": [
{
"relationshipType": "DEPENDS_ON",
"spdxElementId": "SPDXRef-package-42dd561c-5275-4869-a66f-998e987327d7",
"relatedSpdxElement": "SPDXRef-package-d1d0a05e-088a-429d-9901-baee35b17b24"
},
{
"relationshipType": "DEPENDS_ON",
"spdxElementId": "SPDXRef-package-42dd561c-5275-4869-a66f-998e987327d7",
"relatedSpdxElement": "SPDXRef-package-d1d0a05e-088a-429d-9901-baee35b17b24"
},
{
"relationshipType": "DEPENDS_ON",
"spdxElementId": "SPDXRef-package-42dd561c-5275-4869-a66f-998e987327d7",
"relatedSpdxElement": "SPDXRef-package-0d9a5af1-1663-479e-9fdc-4fa5d3f0025e"
},
{
"relationshipType": "DEPENDS_ON",
"spdxElementId": "SPDXRef-package-42dd561c-5275-4869-a66f-998e987327d7",
"relatedSpdxElement": "SPDXRef-package-536ce4ee-0b57-4282-8f56-ad11955e277c"
},
{
"relationshipType": "DEPENDS_ON",
"spdxElementId": "SPDXRef-package-42dd561c-5275-4869-a66f-998e987327d7",
"relatedSpdxElement": "SPDXRef-package-19f87b4c-080d-4fa9-bb3c-d3f28045dcdd"
},
{
"relationshipType": "DEPENDS_ON",
"spdxElementId": "SPDXRef-package-42dd561c-5275-4869-a66f-998e987327d7",
"relatedSpdxElement": "SPDXRef-package-4b8e8004-07d0-47a4-99bd-4208385d2fbf"
},
{
"relationshipType": "DEPENDS_ON",
"spdxElementId": "SPDXRef-package-42dd561c-5275-4869-a66f-998e987327d7",
"relatedSpdxElement": "SPDXRef-package-78a6b64e-57b6-4728-93e0-4a793497137b"
},
{
"relationshipType": "DEPENDS_ON",
"spdxElementId": "SPDXRef-package-42dd561c-5275-4869-a66f-998e987327d7",
"relatedSpdxElement": "SPDXRef-package-d816ca2d-e043-4016-9cbe-ef1d7c32d610"
},
{
"relationshipType": "DEPENDS_ON",
"spdxElementId": "SPDXRef-package-42dd561c-5275-4869-a66f-998e987327d7",
"relatedSpdxElement": "SPDXRef-package-10e2bc4e-d68f-48ad-b7c0-0f8224a1d8e3"
},
{
"relationshipType": "DEPENDS_ON",
"spdxElementId": "SPDXRef-package-42dd561c-5275-4869-a66f-998e987327d7",
"relatedSpdxElement": "SPDXRef-package-0240227a-996a-4b38-b8d1-3fb2b7fb7e2a"
},
{
"relationshipType": "DEPENDS_ON",
"spdxElementId": "SPDXRef-package-42dd561c-5275-4869-a66f-998e987327d7",
"relatedSpdxElement": "SPDXRef-package-af9823fd-3e45-40e1-953c-0d33369aad32"
},
{
"relationshipType": "DEPENDS_ON",
"spdxElementId": "SPDXRef-package-42dd561c-5275-4869-a66f-998e987327d7",
"relatedSpdxElement": "SPDXRef-package-fba3fb85-4b1a-4991-984d-9ef56306c063"
},
{
"relationshipType": "DEPENDS_ON",
"spdxElementId": "SPDXRef-package-42dd561c-5275-4869-a66f-998e987327d7",
"relatedSpdxElement": "SPDXRef-package-95882f7d-88bb-4249-8cac-4aaf7f31b684"
},
{
"relationshipType": "DEPENDS_ON",
"spdxElementId": "SPDXRef-package-42dd561c-5275-4869-a66f-998e987327d7",
"relatedSpdxElement": "SPDXRef-package-95882f7d-88bb-4249-8cac-4aaf7f31b684"
},
{
"relationshipType": "DEPENDS_ON",
"spdxElementId": "SPDXRef-package-42dd561c-5275-4869-a66f-998e987327d7",
"relatedSpdxElement": "SPDXRef-package-1c97ed53-e96c-4a57-a3cb-0a8fe7f9ce01"
},
{
"relationshipType": "DEPENDS_ON",
"spdxElementId": "SPDXRef-package-42dd561c-5275-4869-a66f-998e987327d7",
"relatedSpdxElement": "SPDXRef-package-6b47d485-5f26-49d0-9b5e-d6630e3a2271"
},
{
"relationshipType": "DEPENDS_ON",
"spdxElementId": "SPDXRef-package-42dd561c-5275-4869-a66f-998e987327d7",
"relatedSpdxElement": "SPDXRef-package-aa38760e-09c8-4726-abca-d2ae5708f988"
}
],
"hasExtractedLicensingInfos": [
{
"name": "Philips Proprietary License",
"licenseId": "LicenseRef-PhilipsProprietary-8663A847-2230-4D98-A7CC-10B4B1DC380A",
"extractedText": "This is sample text"
},
{
"name": "Commercial",
"licenseId": "LicenseRef-Commercial-6903e358-d1d3-4a75-b64f-c713e9144c63",
"extractedText": "This is sample text"
}
]
{
"SPDXID" : "SPDXRef-DOCUMENT",
"spdxVersion" : "SPDX-2.3",
"creationInfo" : {
"created" : "2023-05-12T18:30:22Z",
"creators" : [ "Person: Gary O'Neall (gary@sourceauditor.com)" ]
},
"name" : "SPDX Tools v1.1.5 Java SBOM",
"dataLicense" : "CC0-1.0",
"documentNamespace" : "http://spdx.org/spdxdocs/tools-java/v1.1.5-444504E0-4F89-41D3-9A0C-0305E82C3301",
"packages" : [ {
"SPDXID" : "SPDXRef-Package",
"name" : "tools-java",
"versionInfo" : "1.5.1",
"supplier" : "Organization: SPDX (Spdx-tech@lists.spdx.org)",
"packageFileName" : "tools-java-1.1.5.zip",
"checksums" : [ {
"algorithm" : "SHA1",
"checksumValue" : "e01bcba3c55fa7f0c82d08d0cdce9061b21bf32f"
} ],
"downloadLocation" : "https://github.com/spdx/tools-java/releases/download/v1.1.5/tools-java-1.1.5.zip",
"filesAnalyzed" : false,
"externalRefs" : [ {
"referenceCategory" : "PACKAGE-MANAGER",
"referenceLocator" : "pkg:github/spdx/tools-java@2235d5d7f7fe46ce1e0d54b7831c5681633b25cc",
"referenceType" : "purl"
} ]
} ],
"relationships" : [ {
"spdxElementId" : "SPDXRef-DOCUMENT",
"relationshipType" : "DESCRIBES",
"relatedSpdxElement" : "SPDXRef-Package"
} ]
}
Loading

0 comments on commit 06a4fb9

Please sign in to comment.