From 231ad3b2201e1b95f7e216021e8fa3417bd4d596 Mon Sep 17 00:00:00 2001 From: Jason Desrosiers Date: Thu, 21 Oct 2021 09:30:09 -0700 Subject: [PATCH] Updates to make hyper-schema fixes/additions available --- .gitmodules | 1 + _includes/draft/2019-09 | 2 +- _includes/draft/2020-12 | 2 +- specification-links.md | 1 + specification.md | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 3ac879c1..ec9c71cd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -26,6 +26,7 @@ [submodule "_includes/draft/2019-09"] path = _includes/draft/2019-09 url = https://github.com/json-schema-org/json-schema-spec.git + branch = 2019-09 [submodule "_includes/draft/2020-12"] path = _includes/draft/2020-12 url = https://github.com/json-schema-org/json-schema-spec.git diff --git a/_includes/draft/2019-09 b/_includes/draft/2019-09 index 03fe369b..f25113a1 160000 --- a/_includes/draft/2019-09 +++ b/_includes/draft/2019-09 @@ -1 +1 @@ -Subproject commit 03fe369b6192bcd6052e96bac8a5b0cfd15d5c07 +Subproject commit f25113a1300b11938541c5c31ff9f908a06861f4 diff --git a/_includes/draft/2020-12 b/_includes/draft/2020-12 index 0e08f035..117c05e5 160000 --- a/_includes/draft/2020-12 +++ b/_includes/draft/2020-12 @@ -1 +1 @@ -Subproject commit 0e08f03573753bebe2841023dd6fcc822490ea07 +Subproject commit 117c05e55ae0a798a10907f61348c81318971f9d diff --git a/specification-links.md b/specification-links.md index c20aa358..c77c896c 100644 --- a/specification-links.md +++ b/specification-links.md @@ -293,6 +293,7 @@ For links to the somewhat more readably formatted versions on this web site, and - Relative JSON Pointer: [draft-bhutton-relative-json-pointer-00](https://tools.ietf.org/html/draft-bhutton-relative-json-pointer-00) ([changes](https://tools.ietf.org/html/draft-bhutton-relative-json-pointer-00#appendix-A)) - General use meta-schemas - [JSON Schema meta-schema](draft/2020-12/schema) + - [JSON Hyper-Schema meta-schema](draft/2020-12/hyper-schema) (2019-09 Hyper-Schema with 2020-12 Validation) - Individual vocabulary meta-schemas - [Core Vocabulary meta-schema](draft/2020-12/meta/core) - [Applicator Vocabulary meta-schema](draft/2020-12/meta/applicator) diff --git a/specification.md b/specification.md index 63f9d73a..ab8e91c2 100644 --- a/specification.md +++ b/specification.md @@ -42,6 +42,7 @@ Please note, additional vocabulary specific schema files are needed to fully con |--------------------------------------------------------------|------------------------------------------------------------| | [Core/Validation Dialect meta-schema](draft/2020-12/schema) | Used for schemas written for pure validation. | +| [Hyper-Schema Dialect meta-schema](draft/2020-12/hyper-schema) | Used for schemas written for validation (2020-12) and hyper-linking (2019-09).| | [Recommended Output meta-schema](draft/2020-12/output/schema)| Recommended output structure of the application process. | ## Single-vocabulary meta-schemas