From cc296f05b8938a9ffb5ffce7f7a50c2805b2647f Mon Sep 17 00:00:00 2001 From: Ben Hutton Date: Wed, 8 Apr 2020 12:21:34 +0100 Subject: [PATCH 01/10] Merge pull request #883 from jdesrosiers/fix-applicator-schema Fix applicator meta-schema for unevaluatedProperties --- meta/applicator.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/meta/applicator.json b/meta/applicator.json index b17d35c5..a7c4a314 100644 --- a/meta/applicator.json +++ b/meta/applicator.json @@ -18,12 +18,7 @@ }, "contains": { "$recursiveRef": "#" }, "additionalProperties": { "$recursiveRef": "#" }, - "unevaluatedProperties": { - "type": "object", - "additionalProperties": { - "$recursiveRef": "#" - } - }, + "unevaluatedProperties": { "$recursiveRef": "#" }, "properties": { "type": "object", "additionalProperties": { "$recursiveRef": "#" }, From 1155fefb02370ed958cd79e72376a087d1d71976 Mon Sep 17 00:00:00 2001 From: Karen Etheridge Date: Wed, 27 May 2020 16:02:52 -0700 Subject: [PATCH 02/10] fix output schema check for absoluteKeywordLocation property it is possible to have both $ref and $recursiveRef in the traversed schema path (cherry picked from commit 36d9fe5063cf6e1389a72cae10c53d0e92564a20) --- output/schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/output/schema.json b/output/schema.json index 7cf4c4ac..ec24e0cc 100644 --- a/output/schema.json +++ b/output/schema.json @@ -46,7 +46,7 @@ }, { "if": { - "oneOf": [ + "anyOf": [ { "properties": { "keywordLocation": { From d4ea2dd7ca1d8e113966a1d962cf6f1fbb3abab1 Mon Sep 17 00:00:00 2001 From: Shawn Silverman Date: Fri, 15 May 2020 03:02:15 -0700 Subject: [PATCH 03/10] Fix patterns and paths in output schema Fix a raw "$" in two patterns and add a missing "$defs" in three paths (cherry picked from commit 1b485461fd15e4b516baceb6af24b116daecce91) --- output/schema.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/output/schema.json b/output/schema.json index ec24e0cc..ac81726c 100644 --- a/output/schema.json +++ b/output/schema.json @@ -50,16 +50,16 @@ { "properties": { "keywordLocation": { - "pattern": ".*/$ref/.*" + "pattern": ".*/\\$ref/.*" } - } + } }, { "properties": { "keywordLocation": { - "pattern": ".*/$recursiveRef/.*" + "pattern": ".*/\\$recursiveRef/.*" } - } + } } ] }, @@ -79,8 +79,8 @@ }, "required": [ "valid" ] }, - "basic": { "$ref": "#/outputUnit" }, - "detailed": { "$ref": "#/outputUnit" }, - "verbose": { "$ref": "#/outputUnit" } + "basic": { "$ref": "#/$defs/outputUnit" }, + "detailed": { "$ref": "#/$defs/outputUnit" }, + "verbose": { "$ref": "#/$defs/outputUnit" } } } From 895e82668af22fe17d395c85a66393ab3ddb03e6 Mon Sep 17 00:00:00 2001 From: Karen Etheridge Date: Wed, 27 May 2020 16:01:10 -0700 Subject: [PATCH 04/10] remove unneeded .* from unanchored patterns (cherry picked from commit 325e3c47c6db77c1affef4b9f15540f16d59cc7f) --- output/schema.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/output/schema.json b/output/schema.json index ac81726c..bef85935 100644 --- a/output/schema.json +++ b/output/schema.json @@ -50,14 +50,14 @@ { "properties": { "keywordLocation": { - "pattern": ".*/\\$ref/.*" + "pattern": "/\\$ref/" } } }, { "properties": { "keywordLocation": { - "pattern": ".*/\\$recursiveRef/.*" + "pattern": "/\\$recursiveRef/" } } } From e28aeec3946eb436a2d095517f25d39e1a0e78e5 Mon Sep 17 00:00:00 2001 From: Shawn Silverman Date: Sat, 1 Aug 2020 09:30:20 -0700 Subject: [PATCH 05/10] [900] Add missing "type" to applicator meta-schema (cherry picked from commit 4af51fc99152a88e726f0cf0b292b5a05612cdae) --- meta/applicator.json | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/applicator.json b/meta/applicator.json index a7c4a314..24a1cc4f 100644 --- a/meta/applicator.json +++ b/meta/applicator.json @@ -7,6 +7,7 @@ "$recursiveAnchor": true, "title": "Applicator vocabulary meta-schema", + "type": ["object", "boolean"], "properties": { "additionalItems": { "$recursiveRef": "#" }, "unevaluatedItems": { "$recursiveRef": "#" }, From 8a6c59017791b90253873dedce9d878087f4f49a Mon Sep 17 00:00:00 2001 From: Shawn Silverman Date: Thu, 11 Jun 2020 07:56:55 -0700 Subject: [PATCH 06/10] [954] Fix $recursiveAnchor in schema to match spec The spec allows values of false. This fixes the schema to match the spec. (cherry picked from commit 568e20f14ef562a56cb29eebff3c8180914680de) --- meta/core.json | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/core.json b/meta/core.json index b28fc990..eb708a56 100644 --- a/meta/core.json +++ b/meta/core.json @@ -33,7 +33,6 @@ }, "$recursiveAnchor": { "type": "boolean", - "const": true, "default": false }, "$vocabulary": { From f25113a1300b11938541c5c31ff9f908a06861f4 Mon Sep 17 00:00:00 2001 From: Jason Desrosiers Date: Sat, 11 Sep 2021 18:21:16 -0700 Subject: [PATCH 07/10] Fix 2019-09 hyperschema meta-schemas The links.json schema uses `$recursiveRef` wrong. In fact, `$recursiveRef` is not capable of expressing the relationship that was intended. With this version, schemas in the `links` keyword are pinned to the 2019-09 hyperschema dialect even if `$recursiveRef` is used to extend the 2019-09 hyperschema dialect. While not exactly what was intended, this covers all but advanced use-cases. --- links.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/links.json b/links.json index 7b1a578f..5c6cd0ff 100644 --- a/links.json +++ b/links.json @@ -1,5 +1,5 @@ { - "$schema": "https://json-schema.org/draft/2019-09/hyper-schema", + "$schema": "https://json-schema.org/draft/2019-09", "$id": "https://json-schema.org/draft/2019-09/links", "title": "Link Description Object", "allOf": [ @@ -36,7 +36,7 @@ "format": "uri-template" }, "hrefSchema": { - "$recursiveRef": "https://json-schema.org/draft/2019-09/hyper-schema", + "$ref": "https://json-schema.org/draft/2019-09/hyper-schema", "default": false }, "templatePointers": { @@ -63,7 +63,7 @@ "type": "string" }, "targetSchema": { - "$recursiveRef": "https://json-schema.org/draft/2019-09/hyper-schema", + "$ref": "https://json-schema.org/draft/2019-09/hyper-schema", "default": true }, "targetMediaType": { @@ -71,7 +71,7 @@ }, "targetHints": { }, "headerSchema": { - "$recursiveRef": "https://json-schema.org/draft/2019-09/hyper-schema", + "$ref": "https://json-schema.org/draft/2019-09/hyper-schema", "default": true }, "submissionMediaType": { @@ -79,7 +79,7 @@ "default": "application/json" }, "submissionSchema": { - "$recursiveRef": "https://json-schema.org/draft/2019-09/hyper-schema", + "$ref": "https://json-schema.org/draft/2019-09/hyper-schema", "default": true }, "$comment": { From 41014ea723120ce70b314d72f863c6929d9f3cfd Mon Sep 17 00:00:00 2001 From: Jason Desrosiers Date: Mon, 8 Nov 2021 13:03:02 -0800 Subject: [PATCH 08/10] Fix $schema for links.json --- links.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/links.json b/links.json index 5c6cd0ff..96a600fd 100644 --- a/links.json +++ b/links.json @@ -1,5 +1,5 @@ { - "$schema": "https://json-schema.org/draft/2019-09", + "$schema": "https://json-schema.org/draft/2019-09/schema", "$id": "https://json-schema.org/draft/2019-09/links", "title": "Link Description Object", "allOf": [ From 81e6abb770d4b60bec2e104fafd64bbdbb03c581 Mon Sep 17 00:00:00 2001 From: Greg Dennis Date: Thu, 2 Nov 2023 09:43:15 +1300 Subject: [PATCH 09/10] remove `$vocabulary` from vocab meta-schemas (2019-09) --- meta/applicator.json | 3 --- meta/content.json | 3 --- meta/core.json | 3 --- meta/format.json | 3 --- meta/hyper-schema.json | 3 --- meta/meta-data.json | 3 --- meta/validation.json | 3 --- 7 files changed, 21 deletions(-) diff --git a/meta/applicator.json b/meta/applicator.json index 24a1cc4f..80a04ca1 100644 --- a/meta/applicator.json +++ b/meta/applicator.json @@ -1,9 +1,6 @@ { "$schema": "https://json-schema.org/draft/2019-09/schema", "$id": "https://json-schema.org/draft/2019-09/meta/applicator", - "$vocabulary": { - "https://json-schema.org/draft/2019-09/vocab/applicator": true - }, "$recursiveAnchor": true, "title": "Applicator vocabulary meta-schema", diff --git a/meta/content.json b/meta/content.json index f6752a8e..7a9af975 100644 --- a/meta/content.json +++ b/meta/content.json @@ -1,9 +1,6 @@ { "$schema": "https://json-schema.org/draft/2019-09/schema", "$id": "https://json-schema.org/draft/2019-09/meta/content", - "$vocabulary": { - "https://json-schema.org/draft/2019-09/vocab/content": true - }, "$recursiveAnchor": true, "title": "Content vocabulary meta-schema", diff --git a/meta/core.json b/meta/core.json index eb708a56..2cf1fedd 100644 --- a/meta/core.json +++ b/meta/core.json @@ -1,9 +1,6 @@ { "$schema": "https://json-schema.org/draft/2019-09/schema", "$id": "https://json-schema.org/draft/2019-09/meta/core", - "$vocabulary": { - "https://json-schema.org/draft/2019-09/vocab/core": true - }, "$recursiveAnchor": true, "title": "Core vocabulary meta-schema", diff --git a/meta/format.json b/meta/format.json index 09bbfdda..87177f35 100644 --- a/meta/format.json +++ b/meta/format.json @@ -1,9 +1,6 @@ { "$schema": "https://json-schema.org/draft/2019-09/schema", "$id": "https://json-schema.org/draft/2019-09/meta/format", - "$vocabulary": { - "https://json-schema.org/draft/2019-09/vocab/format": true - }, "$recursiveAnchor": true, "title": "Format vocabulary meta-schema", diff --git a/meta/hyper-schema.json b/meta/hyper-schema.json index 3d230589..cd81bd87 100644 --- a/meta/hyper-schema.json +++ b/meta/hyper-schema.json @@ -1,9 +1,6 @@ { "$schema": "https://json-schema.org/draft/2019-09/hyper-schema", "$id": "https://json-schema.org/draft/2019-09/meta/hyper-schema", - "$vocabulary": { - "https://json-schema.org/draft/2019-09/vocab/hyper-schema": true - }, "$recursiveAnchor": true, "title": "JSON Hyper-Schema Vocabulary Schema", diff --git a/meta/meta-data.json b/meta/meta-data.json index da04cff6..28d3e8ab 100644 --- a/meta/meta-data.json +++ b/meta/meta-data.json @@ -1,9 +1,6 @@ { "$schema": "https://json-schema.org/draft/2019-09/schema", "$id": "https://json-schema.org/draft/2019-09/meta/meta-data", - "$vocabulary": { - "https://json-schema.org/draft/2019-09/vocab/meta-data": true - }, "$recursiveAnchor": true, "title": "Meta-data vocabulary meta-schema", diff --git a/meta/validation.json b/meta/validation.json index 9f59677b..5356df92 100644 --- a/meta/validation.json +++ b/meta/validation.json @@ -1,9 +1,6 @@ { "$schema": "https://json-schema.org/draft/2019-09/schema", "$id": "https://json-schema.org/draft/2019-09/meta/validation", - "$vocabulary": { - "https://json-schema.org/draft/2019-09/vocab/validation": true - }, "$recursiveAnchor": true, "title": "Validation vocabulary meta-schema", From 0aa7f3d6a166ee8d6149f6d0151cd1b28c8d89bd Mon Sep 17 00:00:00 2001 From: Julian Berman Date: Thu, 2 Nov 2023 22:55:16 -0400 Subject: [PATCH 10/10] Update the link to the JSON Schema website. Refs: json-schema-org/website#201 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d6528e65..1f749c94 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ Conformance tests for JSON Schema and its vocabularies may be found The JSON Schema web site is at http://json-schema.org/ -The source for the website is [maintained in a separate repository](https://github.com/json-schema-org/json-schema-org.github.io). +The source for the website is [maintained in a separate repository](https://github.com/json-schema-org/website). ## License