From 5d2327ece4a2bcc8a4940b721ff696e391e5394d Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Mon, 31 Jul 2023 16:36:20 -0700 Subject: [PATCH] Rename ExternalReference to ExternalRef Resolves #234 Fixes an unnecessary incompatibility between SPDX 2.3 and SPDX 3.0 spec versions. Signed-off-by: Gary O'Neall --- model/Core/Classes/Element.md | 4 ++-- .../{ExternalReference.md => ExternalRef.md} | 8 ++++---- .../{externalReference.md => externalRef.md} | 6 +++--- ...rnalReferenceType.md => externalRefType.md} | 8 ++++---- ...rnalReferenceType.md => ExternalRefType.md} | 4 ++-- .../CvssV2VulnAssessmentRelationship.md | 14 +++++++------- .../CvssV3VulnAssessmentRelationship.md | 14 +++++++------- model/Security/Classes/Vulnerability.md | 18 +++++++++--------- 8 files changed, 38 insertions(+), 38 deletions(-) rename model/Core/Classes/{ExternalReference.md => ExternalRef.md} (83%) rename model/Core/Properties/{externalReference.md => externalRef.md} (83%) rename model/Core/Properties/{externalReferenceType.md => externalRefType.md} (50%) rename model/Core/Vocabularies/{ExternalReferenceType.md => ExternalRefType.md} (98%) diff --git a/model/Core/Classes/Element.md b/model/Core/Classes/Element.md index 7f4734268..f0447a624 100644 --- a/model/Core/Classes/Element.md +++ b/model/Core/Classes/Element.md @@ -45,8 +45,8 @@ and inter-relatable content objects. - maxCount: 1 - verifiedUsing - type: IntegrityMethod -- externalReference - - type: ExternalReference +- externalRef + - type: ExternalRef - minCount: 0 - externalIdentifier - type: ExternalIdentifier diff --git a/model/Core/Classes/ExternalReference.md b/model/Core/Classes/ExternalRef.md similarity index 83% rename from model/Core/Classes/ExternalReference.md rename to model/Core/Classes/ExternalRef.md index 98b46304c..ed6997035 100644 --- a/model/Core/Classes/ExternalReference.md +++ b/model/Core/Classes/ExternalRef.md @@ -1,6 +1,6 @@ SPDX-License-Identifier: Community-Spec-1.0 -# ExternalReference +# ExternalRef ## Summary @@ -13,14 +13,14 @@ that provides additional characteristics of an Element. ## Metadata -- name: ExternalReference +- name: ExternalRef - SubclassOf: none - Instantiability: Concrete ## Properties -- externalReferenceType - - type: ExternalReferenceType +- externalRefType + - type: ExternalRefType - maxCount: 1 - locator - type: xsd:anyURI diff --git a/model/Core/Properties/externalReference.md b/model/Core/Properties/externalRef.md similarity index 83% rename from model/Core/Properties/externalReference.md rename to model/Core/Properties/externalRef.md index c34aed675..75d3dcc82 100644 --- a/model/Core/Properties/externalReference.md +++ b/model/Core/Properties/externalRef.md @@ -1,6 +1,6 @@ SPDX-License-Identifier: Community-Spec-1.0 -# externalReference +# externalRef ## Summary @@ -14,7 +14,7 @@ that provides additional characteristics of an Element. ## Metadata -- name: externalReference +- name: externalRef - Nature: ObjectProperty -- Range: ExternalReference +- Range: ExternalRef diff --git a/model/Core/Properties/externalReferenceType.md b/model/Core/Properties/externalRefType.md similarity index 50% rename from model/Core/Properties/externalReferenceType.md rename to model/Core/Properties/externalRefType.md index f479d6d25..bbdb5c169 100644 --- a/model/Core/Properties/externalReferenceType.md +++ b/model/Core/Properties/externalRefType.md @@ -1,6 +1,6 @@ SPDX-License-Identifier: Community-Spec-1.0 -# externalReferenceType +# externalRefType ## Summary @@ -8,11 +8,11 @@ Specifies the type of the external reference. ## Description -An externalReferenceType specifies the type of the external reference. +An externalRefType specifies the type of the external reference. ## Metadata -- name: externalReferenceType +- name: externalRefType - Nature: ObjectProperty -- Range: ExternalReferenceType +- Range: ExternalRefType diff --git a/model/Core/Vocabularies/ExternalReferenceType.md b/model/Core/Vocabularies/ExternalRefType.md similarity index 98% rename from model/Core/Vocabularies/ExternalReferenceType.md rename to model/Core/Vocabularies/ExternalRefType.md index 7107382ab..a0798d6d9 100644 --- a/model/Core/Vocabularies/ExternalReferenceType.md +++ b/model/Core/Vocabularies/ExternalRefType.md @@ -1,6 +1,6 @@ SPDX-License-Identifier: Community-Spec-1.0 -# ExternalReferenceType +# ExternalRefType ## Summary @@ -12,7 +12,7 @@ ExteralReferenceType specifies the type of an external reference. ## Metadata -- name: ExternalReferenceType +- name: ExternalRefType ## Entries diff --git a/model/Security/Classes/CvssV2VulnAssessmentRelationship.md b/model/Security/Classes/CvssV2VulnAssessmentRelationship.md index 83a89bed2..1789bac30 100644 --- a/model/Security/Classes/CvssV2VulnAssessmentRelationship.md +++ b/model/Security/Classes/CvssV2VulnAssessmentRelationship.md @@ -29,20 +29,20 @@ A CvssV2VulnAssessmentRelationship relationship describes the determined score a "from": "urn:spdx.dev:vuln-cve-2020-28498", "to": ["urn:product-acme-application-1.3"], "assessedElement": "urn:npm-elliptic-6.5.2", - "externalReferences": [ + "externalRefs": [ { - "@type": "ExternalReference", - "externalReferenceType": "securityAdvisory", + "@type": "ExternalRef", + "externalRefType": "securityAdvisory", "locator": "https://nvd.nist.gov/vuln/detail/CVE-2020-28498" }, { - "@type": "ExternalReference", - "externalReferenceType": "securityAdvisory", + "@type": "ExternalRef", + "externalRefType": "securityAdvisory", "locator": "https://snyk.io/vuln/SNYK-JS-ELLIPTIC-1064899" }, { - "@type": "ExternalReference", - "externalReferenceType": "securityFix", + "@type": "ExternalRef", + "externalRefType": "securityFix", "locator": "https://github.com/indutny/elliptic/commit/441b742" } ], diff --git a/model/Security/Classes/CvssV3VulnAssessmentRelationship.md b/model/Security/Classes/CvssV3VulnAssessmentRelationship.md index dfaa4de0e..2be53a75e 100644 --- a/model/Security/Classes/CvssV3VulnAssessmentRelationship.md +++ b/model/Security/Classes/CvssV3VulnAssessmentRelationship.md @@ -32,20 +32,20 @@ Vulnerability Scoring System (CVSS) as defined on "from": "urn:spdx.dev:vuln-cve-2020-28498", "to": ["urn:product-acme-application-1.3"], "assessedElement": "urn:npm-elliptic-6.5.2", - "externalReferences": [ + "externalRefs": [ { - "@type": "ExternalReference", - "externalReferenceType": "securityAdvisory", + "@type": "ExternalRef", + "externalRefType": "securityAdvisory", "locator": "https://nvd.nist.gov/vuln/detail/CVE-2020-28498" }, { - "@type": "ExternalReference", - "externalReferenceType": "securityAdvisory", + "@type": "ExternalRef", + "externalRefType": "securityAdvisory", "locator": "https://snyk.io/vuln/SNYK-JS-ELLIPTIC-1064899" }, { - "@type": "ExternalReference", - "externalReferenceType": "securityFix", + "@type": "ExternalRef", + "externalRefType": "securityFix", "locator": "https://github.com/indutny/elliptic/commit/441b742" } ], diff --git a/model/Security/Classes/Vulnerability.md b/model/Security/Classes/Vulnerability.md index 69e9e2739..212541ed4 100644 --- a/model/Security/Classes/Vulnerability.md +++ b/model/Security/Classes/Vulnerability.md @@ -44,25 +44,25 @@ Specifies a vulnerability and its associated information. "identifierLocator": "https://security.snyk.io/vuln/SNYK-JS-ELLIPTIC-1064899" } ], - "externalReferences": [ + "externalRefs": [ { - "@type": "ExternalReference", - "externalReferenceType": "securityAdvisory", + "@type": "ExternalRef", + "externalRefType": "securityAdvisory", "locator": "https://nvd.nist.gov/vuln/detail/CVE-2020-28498" }, { - "@type": "ExternalReference", - "externalReferenceType": "securityAdvisory", + "@type": "ExternalRef", + "externalRefType": "securityAdvisory", "locator": "https://ubuntu.com/security/CVE-2020-28498" }, { - "@type": "ExternalReference", - "externalReferenceType": "securityOther", + "@type": "ExternalRef", + "externalRefType": "securityOther", "locator": "https://github.com/indutny/elliptic/pull/244/commits" }, { - "@type": "ExternalReference", - "externalReferenceType": "securityOther", + "@type": "ExternalRef", + "externalRefType": "securityOther", "locator": "https://github.com/christianlundkvist/blog/blob/master/2020_05_26_secp256k1_twist_attacks/secp256k1_twist_attacks.md" } ]