Skip to content

Commit 8f5588f

Browse files
committed
Convert a SPDX purl externalReference into the item level purl field
Signed-off-by: David Leadbeater <dgl@dgl.cx>
1 parent 582a78d commit 8f5588f

File tree

4 files changed

+8
-0
lines changed

4 files changed

+8
-0
lines changed

src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/Component/ExternalRefs.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,11 @@ public static void AddSpdxExternalRefs(this Component component, List<ExternalRe
143143
refPropValue = $"{extRef.ReferenceLocator} {extRef.Comment}";
144144
}
145145
component.Properties.AddSpdxElement(refPropName, refPropValue);
146+
147+
if (refPropName == PropertyTaxonomy.EXTERNAL_REFERENCE_PACKAGE_MANAGER_PURL)
148+
{
149+
component.Purl = refPropValue;
150+
}
146151
}
147152
}
148153
}

tests/CycloneDX.Spdx.Interop.Tests/Resources/Spdx/v2.3/document.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@
186186
"licenseDeclared": "NOASSERTION",
187187
"name": "Jena",
188188
"primaryPackagePurpose": "APPLICATION",
189+
"purl": "pkg:maven/org.apache.jena/apache-jena@3.12.0",
189190
"versionInfo": "3.12.0"
190191
},
191192
{

tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromSpdxToCDXTest_v2.2document.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@
268268
"name": "Jena",
269269
"version": "3.12.0",
270270
"copyright": "NOASSERTION",
271+
"purl": "pkg:maven/org.apache.jena/apache-jena@3.12.0",
271272
"externalReferences": [
272273
{
273274
"url": "https://search.maven.org/remotecontent?filepath=org/apache/jena/apache-jena/3.12.0/apache-jena-3.12.0.tar.gz",

tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromSpdxToCDXTest_v2.3document.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@
280280
"name": "Jena",
281281
"version": "3.12.0",
282282
"copyright": "NOASSERTION",
283+
"purl": "pkg:maven/org.apache.jena/apache-jena@3.12.0",
283284
"externalReferences": [
284285
{
285286
"url": "https://search.maven.org/remotecontent?filepath=org/apache/jena/apache-jena/3.12.0/apache-jena-3.12.0.tar.gz",

0 commit comments

Comments
 (0)