Changed omnibor to omniborId

Signed-off-by: Steve Springett <[email protected]>

schema/bom-1.6.proto

@@ -149,7 +149,7 @@ message Component {
   // Textual strings that aid in discovery, search, and retrieval of the associated object. Tags often serve as a way to group or categorize similar or related objects by various attributes. Examples include "json-parser", "object-persistence", "text-to-image", "translation", and "object-detection".
   repeated string tags = 30;
   // Specifies the OmniBOR Artifact ID. The OmniBOR, if specified, MUST be valid and conform to the specification defined at: https://www.iana.org/assignments/uri-schemes/prov/gitoid
-  repeated string omnibor = 31;
+  repeated string omniborId = 31;
   // Specifies the Software Heritage persistent identifier (SWHID). The SWHID, if specified, MUST be valid and conform to the specification defined at: https://docs.softwareheritage.org/devel/swh-model/persistent-identifiers.html
   repeated string swhid = 32;
 }
@@ -770,7 +770,7 @@ enum EvidenceFieldType {
   EVIDENCE_FIELD_CPE = 5;
   EVIDENCE_FIELD_SWID = 6;
   EVIDENCE_FIELD_HASH = 7;
-  EVIDENCE_FIELD_OMNIBOR = 8;
+  EVIDENCE_FIELD_OMNIBOR_ID = 8;
   EVIDENCE_FIELD_SWHID = 9;
 }
 

schema/bom-1.6.schema.json

@@ -969,7 +969,7 @@
           "description": "Specifies the package-url (purl). The purl, if specified, MUST be valid and conform to the specification defined at: [https://github.com/package-url/purl-spec](https://github.com/package-url/purl-spec)",
           "examples": ["pkg:maven/com.acme/[email protected]?packaging=jar"]
         },
-        "omnibor": {
+        "omniborId": {
           "type": "array",
           "title": "OmniBOR Artifact Identifier (gitoid)",
           "description": "Specifies the OmniBOR Artifact ID. The OmniBOR, if specified, MUST be valid and conform to the specification defined at: [https://www.iana.org/assignments/uri-schemes/prov/gitoid](https://www.iana.org/assignments/uri-schemes/prov/gitoid)",
@@ -4446,7 +4446,7 @@
         "field": {
           "type": "string",
           "enum": [
-            "group", "name", "version", "purl", "cpe", "omnibor", "swhid", "swid", "hash"
+            "group", "name", "version", "purl", "cpe", "omniborId", "swhid", "swid", "hash"
           ],
           "title": "Field",
           "description": "The identity field of the component which the evidence describes."

schema/bom-1.6.xsd

@@ -590,7 +590,7 @@ limitations under the License.
                     </xs:documentation>
                 </xs:annotation>
             </xs:element>
-            <xs:element name="omnibor" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
+            <xs:element name="omniborId" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
                 <xs:annotation>
                     <xs:documentation>
                         Specifies the OmniBOR Artifact ID. The OmniBOR, if specified, MUST be valid and conform
@@ -2263,7 +2263,7 @@ limitations under the License.
             <xs:enumeration value="version"/>
             <xs:enumeration value="purl"/>
             <xs:enumeration value="cpe"/>
-            <xs:enumeration value="omnibor"/>
+            <xs:enumeration value="omniborId"/>
             <xs:enumeration value="swhid"/>
             <xs:enumeration value="swid"/>
             <xs:enumeration value="hash"/>

tools/src/test/resources/1.6/valid-component-identifiers-1.6.json

@@ -11,7 +11,7 @@
       "version": "1.0.0",
       "cpe": "cpe:2.3:a:example:acme-library:1.0.0:*:*:*:*:*:*:*",
       "purl": "pkg:maven/com.example/[email protected]",
-      "omnibor": [
+      "omniborId": [
         "gitoid:blob:sha1:261eeb9e9f8b2b4b0d119366dda99c6fd7d35c64",
         "gitoid:blob:sha256:9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08"
       ],

tools/src/test/resources/1.6/valid-component-identifiers-1.6.textproto

@@ -11,7 +11,7 @@ components {
   version: "1.0.0"
   cpe: "cpe:2.3:a:example:acme-library:1.0.0:*:*:*:*:*:*:*"
   purl: "pkg:maven/com.example/[email protected]"
-  omnibor: [
+  omniborId: [
     "gitoid:blob:sha1:261eeb9e9f8b2b4b0d119366dda99c6fd7d35c64",
     "gitoid:blob:sha256:9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08"
   ]

tools/src/test/resources/1.6/valid-component-identifiers-1.6.xml

@@ -7,8 +7,8 @@
             <version>1.0.0</version>
             <cpe>cpe:2.3:a:example:acme-library:1.0.0:*:*:*:*:*:*:*</cpe>
             <purl>pkg:maven/com.example/[email protected]</purl>
-            <omnibod>gitoid:blob:sha1:261eeb9e9f8b2b4b0d119366dda99c6fd7d35c64</omnibod>
-            <omnibor>gitoid:blob:sha256:9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08</omnibor>
+            <omnibodId>gitoid:blob:sha1:261eeb9e9f8b2b4b0d119366dda99c6fd7d35c64</omnibodId>
+            <omniborId>gitoid:blob:sha256:9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08</omniborId>
             <swhid>swh:1:cnt:94a9ed024d3859793618152ea559a168bbcbb5e2</swhid>
         </component>
     </components>