From 98050f378469afb8e6d74dc0dc511095ecf94dd0 Mon Sep 17 00:00:00 2001 From: Kevin Broch Date: Mon, 18 Nov 2024 14:11:43 -0800 Subject: [PATCH] WIP #280 --- schemas/arch_schema.json | 2 +- schemas/cert_class_schema.json | 2 +- schemas/cert_model_schema.json | 2 +- schemas/config_schema.json | 2 +- schemas/csr_schema.json | 2 +- schemas/ext_schema.json | 6 +- schemas/implemented_exts_schema.json | 2 +- schemas/inst_schema.json | 2 +- schemas/inst_variable_metadatas.json | 2 +- schemas/json-schema-draft-07.json | 245 --------------------------- schemas/manual_version_schema.json | 2 +- schemas/schema_defs.json | 4 +- 12 files changed, 14 insertions(+), 259 deletions(-) delete mode 100644 schemas/json-schema-draft-07.json diff --git a/schemas/arch_schema.json b/schemas/arch_schema.json index 385784650..109ff6f81 100644 --- a/schemas/arch_schema.json +++ b/schemas/arch_schema.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "http://json-schema.org/draft/2020-12/schema#", "type": "object", "title": "Unified Architecture Specification", diff --git a/schemas/cert_class_schema.json b/schemas/cert_class_schema.json index d7f7ff80c..9b276f490 100644 --- a/schemas/cert_class_schema.json +++ b/schemas/cert_class_schema.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "http://json-schema.org/draft/2020-12/schema#", "type": "object", "required": ["$schema", "kind", "name", "long_name", "introduction"], diff --git a/schemas/cert_model_schema.json b/schemas/cert_model_schema.json index b20551445..5815f6bc8 100644 --- a/schemas/cert_model_schema.json +++ b/schemas/cert_model_schema.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "http://json-schema.org/draft/2020-12/schema#", "type": "object", "required": ["$schema", "kind", "name", "long_name"], diff --git a/schemas/config_schema.json b/schemas/config_schema.json index 493e5b157..9e932e0e4 100644 --- a/schemas/config_schema.json +++ b/schemas/config_schema.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "http://json-schema.org/draft/2020-12/schema#", "$defs": { "params": { diff --git a/schemas/csr_schema.json b/schemas/csr_schema.json index ae0e26d18..9ccea5490 100644 --- a/schemas/csr_schema.json +++ b/schemas/csr_schema.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "http://json-schema.org/draft/2020-12/schema#", "title": "CSR description", "description": "A CSR register specification", diff --git a/schemas/ext_schema.json b/schemas/ext_schema.json index 8c281c4e6..faedeaac0 100644 --- a/schemas/ext_schema.json +++ b/schemas/ext_schema.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "http://json-schema.org/draft/2020-12/schema#", "$defs": { "param_data": { @@ -25,7 +25,7 @@ "description": "When a parameter is defined by multiple extensions, declare the other extensions here. The parameter *must* mean the same thing in all extensions." }, "schema": { - "$ref": "json-schema-draft-07.json#" + "$ref": "json-schema-draft/2020-12.json#" }, "when": { "$ref": "schema_defs.json#/$defs/when_condition" @@ -200,7 +200,7 @@ "type": "object", "properties": { "schema": { - "$ref": "json-schema-draft-07.json#", + "$ref": "json-schema-draft/2020-12.json#", "description": "Extra schema constraints for the parameter" }, "extra_validation": { diff --git a/schemas/implemented_exts_schema.json b/schemas/implemented_exts_schema.json index cf4d6dd29..ccdefe440 100644 --- a/schemas/implemented_exts_schema.json +++ b/schemas/implemented_exts_schema.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "http://json-schema.org/draft/2020-12/schema#", "type": "object", "properties": { diff --git a/schemas/inst_schema.json b/schemas/inst_schema.json index ac1c0082d..0d0f6d917 100644 --- a/schemas/inst_schema.json +++ b/schemas/inst_schema.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "http://json-schema.org/draft/2020-12/schema#", "$defs": { "field_location": { diff --git a/schemas/inst_variable_metadatas.json b/schemas/inst_variable_metadatas.json index 154691970..e7d8580ba 100644 --- a/schemas/inst_variable_metadatas.json +++ b/schemas/inst_variable_metadatas.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "http://json-schema.org/draft/2020-12/schema#", "type": "object", "patternProperties": { diff --git a/schemas/json-schema-draft-07.json b/schemas/json-schema-draft-07.json deleted file mode 100644 index 3f39fddaf..000000000 --- a/schemas/json-schema-draft-07.json +++ /dev/null @@ -1,245 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "http://json-schema.org/draft-07/schema#", - "title": "Core schema meta-schema", - "definitions": { - "schemaArray": { - "type": "array", - "minItems": 1, - "items": { - "$ref": "#" - } - }, - "nonNegativeInteger": { - "type": "integer", - "minimum": 0 - }, - "nonNegativeIntegerDefault0": { - "allOf": [ - { - "$ref": "#/definitions/nonNegativeInteger" - }, - { - "default": 0 - } - ] - }, - "simpleTypes": { - "enum": [ - "array", - "boolean", - "integer", - "null", - "number", - "object", - "string" - ] - }, - "stringArray": { - "type": "array", - "items": { - "type": "string" - }, - "uniqueItems": true, - "default": [] - } - }, - "type": [ - "object", - "boolean" - ], - "properties": { - "$id": { - "type": "string", - "format": "uri-reference" - }, - "$schema": { - "type": "string", - "format": "uri" - }, - "$ref": { - "type": "string", - "format": "uri-reference" - }, - "$comment": { - "type": "string" - }, - "title": { - "type": "string" - }, - "description": { - "type": "string" - }, - "default": true, - "readOnly": { - "type": "boolean", - "default": false - }, - "writeOnly": { - "type": "boolean", - "default": false - }, - "examples": { - "type": "array", - "items": true - }, - "multipleOf": { - "type": "number", - "exclusiveMinimum": 0 - }, - "maximum": { - "type": "number" - }, - "exclusiveMaximum": { - "type": "number" - }, - "minimum": { - "type": "number" - }, - "exclusiveMinimum": { - "type": "number" - }, - "maxLength": { - "$ref": "#/definitions/nonNegativeInteger" - }, - "minLength": { - "$ref": "#/definitions/nonNegativeIntegerDefault0" - }, - "pattern": { - "type": "string", - "format": "regex" - }, - "additionalItems": { - "$ref": "#" - }, - "items": { - "anyOf": [ - { - "$ref": "#" - }, - { - "$ref": "#/definitions/schemaArray" - } - ], - "default": true - }, - "maxItems": { - "$ref": "#/definitions/nonNegativeInteger" - }, - "minItems": { - "$ref": "#/definitions/nonNegativeIntegerDefault0" - }, - "uniqueItems": { - "type": "boolean", - "default": false - }, - "contains": { - "$ref": "#" - }, - "maxProperties": { - "$ref": "#/definitions/nonNegativeInteger" - }, - "minProperties": { - "$ref": "#/definitions/nonNegativeIntegerDefault0" - }, - "required": { - "$ref": "#/definitions/stringArray" - }, - "additionalProperties": { - "$ref": "#" - }, - "definitions": { - "type": "object", - "additionalProperties": { - "$ref": "#" - }, - "default": {} - }, - "properties": { - "type": "object", - "additionalProperties": { - "$ref": "#" - }, - "default": {} - }, - "patternProperties": { - "type": "object", - "additionalProperties": { - "$ref": "#" - }, - "propertyNames": { - "format": "regex" - }, - "default": {} - }, - "dependencies": { - "type": "object", - "additionalProperties": { - "anyOf": [ - { - "$ref": "#" - }, - { - "$ref": "#/definitions/stringArray" - } - ] - } - }, - "propertyNames": { - "$ref": "#" - }, - "const": true, - "enum": { - "type": "array", - "items": true, - "minItems": 1, - "uniqueItems": true - }, - "type": { - "anyOf": [ - { - "$ref": "#/definitions/simpleTypes" - }, - { - "type": "array", - "items": { - "$ref": "#/definitions/simpleTypes" - }, - "minItems": 1, - "uniqueItems": true - } - ] - }, - "format": { - "type": "string" - }, - "contentMediaType": { - "type": "string" - }, - "contentEncoding": { - "type": "string" - }, - "if": { - "$ref": "#" - }, - "then": { - "$ref": "#" - }, - "else": { - "$ref": "#" - }, - "allOf": { - "$ref": "#/definitions/schemaArray" - }, - "anyOf": { - "$ref": "#/definitions/schemaArray" - }, - "oneOf": { - "$ref": "#/definitions/schemaArray" - }, - "not": { - "$ref": "#" - } - }, - "default": true -} diff --git a/schemas/manual_version_schema.json b/schemas/manual_version_schema.json index 9557413ff..5c93b1887 100644 --- a/schemas/manual_version_schema.json +++ b/schemas/manual_version_schema.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "http://json-schema.org/draft/2020-12/schema#", "$defs": { "volume": { diff --git a/schemas/schema_defs.json b/schemas/schema_defs.json index 92458826d..1c4bf101d 100644 --- a/schemas/schema_defs.json +++ b/schemas/schema_defs.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "http://json-schema.org/draft/2020-12/schema#", "title": "Common patterns used by all schemas", @@ -217,7 +217,7 @@ "type": "object", "properties": { "schema": { - "$ref": "json-schema-draft-07.json#" + "$ref": "json-schema-draft/2020-12.json#" }, "when": { "$ref": "#/$defs/when_condition"