revert the fixes to CDX1.2

Signed-off-by: Jan Kowalleck <[email protected]>

Author: jkowalleck

schema/bom-1.2-strict.schema.json

@@ -135,16 +135,19 @@
       "properties": {
         "vendor": {
           "type": "string",
+          "format": "string",
           "title": "Tool Vendor",
           "description": "The date and time (timestamp) when the document was created."
         },
         "name": {
           "type": "string",
+          "format": "string",
           "title": "Tool Name",
           "description": "The date and time (timestamp) when the document was created."
         },
         "version": {
           "type": "string",
+          "format": "string",
           "title": "Tool Version",
           "description": "The date and time (timestamp) when the document was created."
         },
@@ -857,6 +860,7 @@
       "properties": {
         "ref": {
           "type": "string",
+          "format": "string",
           "title": "Reference",
           "description": "References a component by the components bom-ref attribute"
         },

schema/bom-1.2.schema.json

@@ -126,16 +126,19 @@
       "properties": {
         "vendor": {
           "type": "string",
+          "format": "string",
           "title": "Tool Vendor",
           "description": "The date and time (timestamp) when the document was created."
         },
         "name": {
           "type": "string",
+          "format": "string",
           "title": "Tool Name",
           "description": "The date and time (timestamp) when the document was created."
         },
         "version": {
           "type": "string",
+          "format": "string",
           "title": "Tool Version",
           "description": "The date and time (timestamp) when the document was created."
         },
@@ -831,6 +834,7 @@
       "properties": {
         "ref": {
           "type": "string",
+          "format": "string",
           "title": "Reference",
           "description": "References a component by the components bom-ref attribute"
         },

tools/src/test/js/json-schema-lint-tests.js

@@ -72,10 +72,19 @@ for (const bomSchemaFile of bomSchemas) {
         console.log('> Skipped.')
         continue
     }
-    const strict = [Number(v[1]), Number(v[2])] >= [1, 5]
+
+    const cdxVersion = [Number(v[1]), Number(v[2])]
+    const strict = cdxVersion >= [1, 5]
         ? true
         : 'log'
     console.debug('> strict:', strict)
+    const ajv = getAjv(strict)
+
+    if (cdxVersion[0] === 1 &&  cdxVersion[1] === 2) {
+        // CycloneDX 1.2 had a wrong undefined format `string`.
+        // Let's ignore this format only for this special version.
+        ajv.addFormat('string', true)
+    }
 
     let bomSchema
     try {
@@ -87,7 +96,7 @@ for (const bomSchemaFile of bomSchemas) {
     }
 
     try {
-        getAjv(strict).compile(bomSchema)
+        ajv.compile(bomSchema)
     } catch (err) {
         ++errCnt
         console.error(`!!! SCHEMA ERROR: ${err}`)