[pull] master from SchemaStore:master

src/schema-validation.jsonc

@@ -392,15 +392,15 @@
     "https://json-schema.org/draft-07/schema",
     "https://json-schema.org/draft/2019-09/schema",
     "https://json-schema.org/draft/2020-12/schema",
-    "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/schema-catalog.json",
-    "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/schema-org-action.json",
-    "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/schema-org-contact-point.json",
-    "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/schema-org-place.json",
-    "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/schema-org-thing.json",
-    "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/lsdlschema.json",
-    "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/BizTalkServerApplicationSchema.json",
-    "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/metaschema-draft-07-unofficial-strict.json",
-    "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/schema-draft-v4.json"
+    "https://json.schemastore.org/schema-catalog.json",
+    "https://json.schemastore.org/schema-org-action.json",
+    "https://json.schemastore.org/schema-org-contact-point.json",
+    "https://json.schemastore.org/schema-org-place.json",
+    "https://json.schemastore.org/schema-org-thing.json",
+    "https://json.schemastore.org/lsdlschema.json",
+    "https://json.schemastore.org/BizTalkServerApplicationSchema.json",
+    "https://json.schemastore.org/metaschema-draft-07-unofficial-strict.json",
+    "https://json.schemastore.org/schema-draft-v4.json"
   ],
   "options": {
     "abc-supply-plan-1.0.0.json": {

src/schemas/json/schema-catalog.json

@@ -6,9 +6,7 @@
     "$schema": {
       "description": "Link to https://json.schemastore.org/schema-catalog.json",
       "type": "string",
-      "enum": [
-        "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/schema-catalog.json"
-      ]
+      "enum": ["https://json.schemastore.org/schema-catalog.json"]
     },
     "schemas": {
       "type": "array",

src/schemas/json/sigrid-scope-file.schema.json

@@ -218,8 +218,22 @@
     "architecture_patterns": {
       "type": "array",
       "items": {
-        "type": "object"
+        "$ref": "#/definitions/architecture_pattern"
       }
+    },
+    "architecture_pattern": {
+      "type": "object",
+      "properties": {
+        "description": {
+          "type": "string"
+        }
+      },
+      "required": ["description"],
+      "additionalProperties": true
+    },
+    "dependency_checker_source": {
+      "type": "string",
+      "enum": ["all", "sbom"]
     }
   },
 
@@ -257,25 +271,6 @@
       "description": "SIG Maintainability Model that should be used for the analysis, defaults to latest."
     },
 
-    "alerts": {
-      "type": "object",
-      "properties": {
-        "enabled": {
-          "type": "boolean",
-          "description": "When true, will send alert email notifications when noteworthy events happen."
-        },
-        "recipients": {
-          "type": "array",
-          "items": {
-            "type": "string",
-            "format": "email"
-          },
-          "description": "List of email addresses that should receive alerts."
-        }
-      },
-      "additionalProperties": false
-    },
-
     "dependencychecker": {
       "type": "object",
       "properties": {
@@ -369,37 +364,13 @@
             "type": "string"
           },
           "description": "List of technologies for which the analysis should be disabled."
-        }
-      },
-      "additionalProperties": false,
-      "required": []
-    },
-
-    "checkmarx": {
-      "type": "object",
-      "properties": {
-        "enabled": {
-          "type": "boolean",
-          "description": "Indicates that this system should be scanned for vulnerabilities using Checkmarx."
-        },
-        "id": {
-          "anyOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "type": "string"
-            }
-          ],
-          "description": "Unique ID to identify the Checkmarx project."
         },
-        "username": {
-          "type": "string",
-          "description": "Your Checkmarx username."
+        "source": {
+          "$ref": "#/definitions/dependency_checker_source"
         }
       },
       "additionalProperties": false,
-      "required": ["enabled", "id"]
+      "required": []
     },
 
     "architecture": {
@@ -419,7 +390,7 @@
         },
         "custom_components": {
           "type": "boolean",
-          "description": "Overrides automatic component detection with components defined manually in scope file."
+          "description": "Deprecated. This option is obsolete."
         },
         "file_annotation_components": {
           "type": "boolean",
@@ -466,7 +437,7 @@
         },
         "history_enabled": {
           "type": "boolean",
-          "description": "Deprecated, this is now detected automatically."
+          "description": "Deprecated. This option is obsolete."
         },
         "history": {
           "anyOf": [
@@ -477,7 +448,7 @@
               "type": "string"
             }
           ],
-          "description": "Deprecated, this is now detected automatically."
+          "description": "Deprecated. This option is obsolete."
         },
         "history_period_months": {
           "type": "integer",
@@ -501,7 +472,7 @@
         },
         "branch": {
           "$ref": "#/definitions/branches",
-          "description": "Repository branch to use, comma-separated for multiple branches. Defaults to current branch."
+          "description": "Deprecated. This option is obsolete."
         },
         "duplication": {
           "type": "boolean",
@@ -567,7 +538,8 @@
       },
       "additionalProperties": false,
       "required": []
-    }
+    },
+    "checkmarx": false
   },
   "required": ["languages"],
   "title": "Sigrid scope configuration file",

src/test/schema-catalog/minimal.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/schema-catalog.json",
+  "$schema": "https://json.schemastore.org/schema-catalog.json",
   "schemas": [
     {
       "description": "minimal",

src/test/schema-catalog/multiple.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/schema-catalog.json",
+  "$schema": "https://json.schemastore.org/schema-catalog.json",
   "schemas": [
     {
       "description": "minimal",