[pull] master from SchemaStore:master

src/api/json/catalog.json

@@ -3678,6 +3678,12 @@
       "fileMatch": ["karakum.config.json"],
       "url": "https://raw.githubusercontent.com/karakum-team/karakum/master/karakum-schema/karakum-schema.json"
     },
+    {
+      "name": "klin.json",
+      "description": "klin quality policy configuration",
+      "fileMatch": ["klin.json"],
+      "url": "https://raw.githubusercontent.com/brajevicm/klin/main/schemas/klin.json"
+    },
     {
       "name": "Knative Functions - func.yaml",
       "description": "Knative Functions func.yaml files",

src/schemas/json/sarif-1.0.0.json

@@ -1084,7 +1084,7 @@
     "$schema": {
       "description": "The URI of the JSON schema corresponding to the version.",
       "type": "string",
-      "format": "uri"
+      "format": "uri-reference"
     },
     "version": {
       "description": "The SARIF format version of this log file.",

src/schemas/json/sarif-2.0.0-csd.2.beta.2018-10-10.json

@@ -1547,7 +1547,7 @@
     "$schema": {
       "description": "The URI of the JSON schema corresponding to the version.",
       "type": "string",
-      "format": "uri"
+      "format": "uri-reference"
     },
     "version": {
       "description": "The SARIF format version of this log file.",

src/schemas/json/sarif-2.0.0-csd.2.beta.2019-01-09.json

@@ -1761,7 +1761,7 @@
     "$schema": {
       "description": "The URI of the JSON schema corresponding to the version.",
       "type": "string",
-      "format": "uri"
+      "format": "uri-reference"
     },
     "version": {
       "description": "The SARIF format version of this log file.",

src/schemas/json/sarif-2.0.0-csd.2.beta.2019-01-24.json

@@ -1858,7 +1858,7 @@
     "$schema": {
       "description": "The URI of the JSON schema corresponding to the version.",
       "type": "string",
-      "format": "uri"
+      "format": "uri-reference"
     },
     "version": {
       "description": "The SARIF format version of this log file.",

src/schemas/json/sarif-2.0.0.json

@@ -1704,7 +1704,7 @@
     "$schema": {
       "description": "The URI of the JSON schema corresponding to the version.",
       "type": "string",
-      "format": "uri"
+      "format": "uri-reference"
     },
     "version": {
       "description": "The SARIF format version of this log file.",

src/schemas/json/sarif-2.1.0-rtm.0.json

@@ -620,25 +620,27 @@
         "properties": {
           "$ref": "#/definitions/propertyBag",
           "description": "Key/value pairs that provide additional information about the external property file."
+        },
+        "location": {
+          "$ref": "#/definitions/artifactLocation",
+          "description": "The location of the external property file."
+        },
+        "guid": {
+          "description": "A stable, unique identifier for the external property file in the form of a GUID.",
+          "type": "string",
+          "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"
         }
       },
       "anyOf": [
         {
           "properties": {
-            "location": {
-              "$ref": "#/definitions/artifactLocation",
-              "description": "The location of the external property file."
-            }
+            "location": true
           },
           "required": ["location"]
         },
         {
           "properties": {
-            "guid": {
-              "description": "A stable, unique identifier for the external property file in the form of a GUID.",
-              "type": "string",
-              "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"
-            }
+            "guid": true
           },
           "required": ["guid"]
         }
@@ -893,28 +895,30 @@
         "properties": {
           "$ref": "#/definitions/propertyBag",
           "description": "Key/value pairs that provide additional information about the graph traversal."
+        },
+        "runGraphIndex": {
+          "description": "The index within the run.graphs to be associated with the result.",
+          "type": "integer",
+          "default": -1,
+          "minimum": -1
+        },
+        "resultGraphIndex": {
+          "description": "The index within the result.graphs to be associated with the result.",
+          "type": "integer",
+          "default": -1,
+          "minimum": -1
         }
       },
       "oneOf": [
         {
           "properties": {
-            "runGraphIndex": {
-              "description": "The index within the run.graphs to be associated with the result.",
-              "type": "integer",
-              "default": -1,
-              "minimum": -1
-            }
+            "runGraphIndex": true
           },
           "required": ["runGraphIndex"]
         },
         {
           "properties": {
-            "resultGraphIndex": {
-              "description": "The index within the result.graphs to be associated with the result.",
-              "type": "integer",
-              "default": -1,
-              "minimum": -1
-            }
+            "resultGraphIndex": true
           },
           "required": ["resultGraphIndex"]
         }
@@ -1211,24 +1215,26 @@
         "properties": {
           "$ref": "#/definitions/propertyBag",
           "description": "Key/value pairs that provide additional information about the message."
+        },
+        "text": {
+          "description": "A plain text message string.",
+          "type": "string"
+        },
+        "id": {
+          "description": "The identifier for this message.",
+          "type": "string"
         }
       },
       "anyOf": [
         {
           "properties": {
-            "text": {
-              "description": "A plain text message string.",
-              "type": "string"
-            }
+            "text": true
           },
           "required": ["text"]
         },
         {
           "properties": {
-            "id": {
-              "description": "The identifier for this message.",
-              "type": "string"
-            }
+            "id": true
           },
           "required": ["id"]
         }
@@ -1356,24 +1362,26 @@
         "properties": {
           "$ref": "#/definitions/propertyBag",
           "description": "Key/value pairs that provide additional information about the physical location."
+        },
+        "address": {
+          "$ref": "#/definitions/address",
+          "description": "The address of the location."
+        },
+        "artifactLocation": {
+          "$ref": "#/definitions/artifactLocation",
+          "description": "The location of the artifact."
         }
       },
       "anyOf": [
         {
           "properties": {
-            "address": {
-              "$ref": "#/definitions/address",
-              "description": "The address of the location."
-            }
+            "address": true
           },
           "required": ["address"]
         },
         {
           "properties": {
-            "artifactLocation": {
-              "$ref": "#/definitions/artifactLocation",
-              "description": "The location of the artifact."
-            }
+            "artifactLocation": true
           },
           "required": ["artifactLocation"]
         }
@@ -1647,36 +1655,39 @@
         "properties": {
           "$ref": "#/definitions/propertyBag",
           "description": "Key/value pairs that provide additional information about the reporting descriptor reference."
+        },
+        "index": {
+          "description": "The index into an array of descriptors in toolComponent.ruleDescriptors, toolComponent.notificationDescriptors, or toolComponent.taxonomyDescriptors, depending on context.",
+          "type": "integer",
+          "default": -1,
+          "minimum": -1
+        },
+        "guid": {
+          "description": "A guid that uniquely identifies the descriptor.",
+          "type": "string",
+          "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"
+        },
+        "id": {
+          "description": "The id of the descriptor.",
+          "type": "string"
         }
       },
       "anyOf": [
         {
           "properties": {
-            "index": {
-              "description": "The index into an array of descriptors in toolComponent.ruleDescriptors, toolComponent.notificationDescriptors, or toolComponent.taxonomyDescriptors, depending on context.",
-              "type": "integer",
-              "default": -1,
-              "minimum": -1
-            }
+            "index": true
           },
           "required": ["index"]
         },
         {
           "properties": {
-            "guid": {
-              "description": "A guid that uniquely identifies the descriptor.",
-              "type": "string",
-              "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"
-            }
+            "guid": true
           },
           "required": ["guid"]
         },
         {
           "properties": {
-            "id": {
-              "description": "The id of the descriptor.",
-              "type": "string"
-            }
+            "id": true
           },
           "required": ["id"]
         }
@@ -2850,7 +2861,7 @@
     "$schema": {
       "description": "The URI of the JSON schema corresponding to the version.",
       "type": "string",
-      "format": "uri"
+      "format": "uri-reference"
     },
     "version": {
       "description": "The SARIF format version of this log file.",