diff --git a/data/schema/v1/Decision_Point-1-0-1.schema.json b/data/schema/v1/Decision_Point-1-0-1.schema.json index 168cb8f0..75b573d9 100644 --- a/data/schema/v1/Decision_Point-1-0-1.schema.json +++ b/data/schema/v1/Decision_Point-1-0-1.schema.json @@ -3,7 +3,7 @@ "title": "Decision Point schema definition", "$id": "https://certcc.github.io/SSVC/data/schema/v1/Decision_Point-1-0-1.schema.json", "description": "Decision points are the basic building blocks of SSVC decision functions. Individual decision points describe a single aspect of the input to a decision function.", - "definitions": { + "$defs": { "schemaVersion": { "description": "Schema version used to represent this Decision Point", "type": "string", @@ -37,7 +37,7 @@ "additionalProperties": false, "properties": { "schemaVersion": { - "$ref": "#/definitions/schemaVersion" + "$ref": "#/$defs/schemaVersion" }, "namespace": { "type": "string", @@ -65,7 +65,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/definitions/decision_point_value" + "$ref": "#/$defs/decision_point_value" } } }, @@ -80,5 +80,5 @@ ] } }, - "$ref": "#/definitions/decision_point" + "$ref": "#/$defs/decision_point" } diff --git a/data/schema/v1/Decision_Point_Group-1-0-1.schema.json b/data/schema/v1/Decision_Point_Group-1-0-1.schema.json index b1c1a4e7..7ff2f5dd 100644 --- a/data/schema/v1/Decision_Point_Group-1-0-1.schema.json +++ b/data/schema/v1/Decision_Point_Group-1-0-1.schema.json @@ -2,7 +2,7 @@ "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "Decision Points Group schema definition", "$id": "https://certcc.github.io/SSVC/data/schema/v1/Decision_Point_Group-1-0-1.schema.json", - "definitions": { + "$defs": { "schemaVersion": { "description": "Schema version used to represent Decision Point Group", "type": "string", @@ -13,7 +13,7 @@ "additionalProperties": false, "properties": { "schemaVersion": { - "$ref": "#/definitions/schemaVersion" + "$ref": "#/$defs/schemaVersion" }, "version": { "type": "string", @@ -44,6 +44,6 @@ ] } }, - "$ref": "#/definitions/decision_point_group" + "$ref": "#/$defs/decision_point_group" } diff --git a/data/schema/v1/Decision_Point_Value_Selection-1-0-1.schema.json b/data/schema/v1/Decision_Point_Value_Selection-1-0-1.schema.json index 48c9e562..59022e04 100644 --- a/data/schema/v1/Decision_Point_Value_Selection-1-0-1.schema.json +++ b/data/schema/v1/Decision_Point_Value_Selection-1-0-1.schema.json @@ -1,11 +1,11 @@ { "$schema": "https://json-schema.org/draft/2020-12/schema", "$id": "https://certcc.github.io/SSVC/data/schema/v1/Decision_Point_Value_Selection-1-0-1.schema.json", - "definitions": { + "$defs": { "id": { "type": "string", "description": "Identifier for a vulnerability could be CVE, CERT/CC VU#, OSV id, Bugtraq, GHSA etc.", - "examples": ["CVE-2024-101010","VU#11111","GHSA-11a1-22b2-33c3"] + "examples": ["CVE-1900-1234","VU#11111","GHSA-11a1-22b2-33c3"] }, "role": { "type": "string", @@ -35,7 +35,7 @@ "description": "SSVC Namespace that were used for defining the evaluated Decision Points", "title": "namespace", "type": "string", - "examples": ["ssvc","cvvsv4"] + "examples": ["ssvc","cvssv4"] }, "values": { "description": "Evaluated values of the Decision Point", @@ -66,16 +66,16 @@ }, "properties": { "id": { - "$ref": "#/definitions/id" + "$ref": "#/$defs/id" }, "role": { - "$ref": "#/definitions/role" + "$ref": "#/$defs/role" }, "schemaVersion": { - "$ref": "#/definitions/schemaVersion" + "$ref": "#/$defs/schemaVersion" }, "timestamp": { - "$ref": "#/definitions/timestamp" + "$ref": "#/$defs/timestamp" }, "selections": { "description" : "An array of Decision Points and their Values that were down-selected or evaluated ", @@ -83,7 +83,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/definitions/SsvcdecisionpointselectionSchema" + "$ref": "#/$defs/SsvcdecisionpointselectionSchema" } } }, diff --git a/data/schema_examples/CVE-1969-0000-Decision_Point_Value_Selection.json b/data/schema_examples/CVE-1900-1234-Decision_Point_Value_Selection.json similarity index 94% rename from data/schema_examples/CVE-1969-0000-Decision_Point_Value_Selection.json rename to data/schema_examples/CVE-1900-1234-Decision_Point_Value_Selection.json index 5ec025a4..d6ad58c7 100644 --- a/data/schema_examples/CVE-1969-0000-Decision_Point_Value_Selection.json +++ b/data/schema_examples/CVE-1900-1234-Decision_Point_Value_Selection.json @@ -1,5 +1,5 @@ { - "id": "CVE-1969-0000", + "id": "CVE-1900-1234", "timestamp": "2021-09-29T15:29:44Z", "schemaVersion": "1-0-1", "selections": [ diff --git a/requirements.txt b/requirements.txt index 5dd68388..7a27ea0b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,15 +1,15 @@ mkdocs==1.6.1 mkdocs-bibtex==2.16.2 -mkdocs-include-markdown-plugin==7.0.0 +mkdocs-include-markdown-plugin==7.1.2 mkdocs-table-reader-plugin==3.1.0 -mkdocs-material==9.5.42 +mkdocs-material==9.5.49 mkdocs-material-extensions==1.3.1 -mkdocstrings==0.26.2 -mkdocstrings-python==1.12.2 +mkdocstrings==0.27.0 +mkdocstrings-python==1.13.0 mkdocs-print-site-plugin==2.6.0 dataclasses-json==0.6.7 thefuzz==0.22.1 pandas==2.2.3 -scikit-learn==1.5.2 +scikit-learn==1.6.1 jsonschema==4.23.0 networkx==3.4.2