Skip to content

Update meta-schema dates, minor changelog typo #799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 9, 2019
Merged

Update meta-schema dates, minor changelog typo #799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2900034
Update meta-schemas to 2019-09
handrews Sep 8, 2019
4711bc1
Fix lack of keyword quotes in changelog
handrews Sep 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions hyper-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
"$schema": "https://json-schema.org/draft/2019-08/hyper-schema",
"$id": "https://json-schema.org/draft/2019-08/hyper-schema",
"$schema": "https://json-schema.org/draft/2019-09/hyper-schema",
"$id": "https://json-schema.org/draft/2019-09/hyper-schema",
"$vocabulary": {
"https://json-schema.org/draft/2019-08/vocab/core": true,
"https://json-schema.org/draft/2019-08/vocab/applicator": true,
"https://json-schema.org/draft/2019-08/vocab/validation": true,
"https://json-schema.org/draft/2019-08/vocab/meta-data": true,
"https://json-schema.org/draft/2019-08/vocab/format": false,
"https://json-schema.org/draft/2019-08/vocab/content": true,
"https://json-schema.org/draft/2019-08/vocab/hyper-schema": true
"https://json-schema.org/draft/2019-09/vocab/core": true,
"https://json-schema.org/draft/2019-09/vocab/applicator": true,
"https://json-schema.org/draft/2019-09/vocab/validation": true,
"https://json-schema.org/draft/2019-09/vocab/meta-data": true,
"https://json-schema.org/draft/2019-09/vocab/format": false,
"https://json-schema.org/draft/2019-09/vocab/content": true,
"https://json-schema.org/draft/2019-09/vocab/hyper-schema": true
},
"$recursiveAnchor": true,

"title": "JSON Hyper-Schema",
"allOf": [
{"$ref": "https://json-schema.org/draft/2019-08/schema"},
{"$ref": "https://json-schema.org/draft/2019-08/meta/hyper-schema"}
{"$ref": "https://json-schema.org/draft/2019-09/schema"},
{"$ref": "https://json-schema.org/draft/2019-09/meta/hyper-schema"}
],
"links": [
{
Expand Down
42 changes: 21 additions & 21 deletions jsonschema-core.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1094,11 +1094,11 @@
</t>
<t>
The current URI for the Core vocabulary is:
<eref target="https://json-schema.org/draft/2019-08/vocab/core"/>.
<eref target="https://json-schema.org/draft/2019-09/vocab/core"/>.
</t>
<t>
The current URI for the corresponding meta-schema is:
<eref target="https://json-schema.org/draft/2019-08/meta/core"/>.
<eref target="https://json-schema.org/draft/2019-09/meta/core"/>.
</t>
<t>
While the "$" prefix is not formally reserved for the Core vocabulary,
Expand Down Expand Up @@ -1895,11 +1895,11 @@
</t>
<t>
The current URI for this vocabulary, known as the Applicator vocabulary, is:
<eref target="https://json-schema.org/draft/2019-08/vocab/applicator"/>.
<eref target="https://json-schema.org/draft/2019-09/vocab/applicator"/>.
</t>
<t>
The current URI for the corresponding meta-schema is:
<eref target="https://json-schema.org/draft/2019-08/meta/applicator"/>.
<eref target="https://json-schema.org/draft/2019-09/meta/applicator"/>.
</t>
<t>
Updated vocabulary and meta-schema URIs MAY be published between
Expand Down Expand Up @@ -2491,7 +2491,7 @@
<figure>
<artwork>
<![CDATA[
https://json-schema.org/draft/2019-08/schema#/$defs/nonNegativeInteger/minimum
https://json-schema.org/draft/2019-09/schema#/$defs/nonNegativeInteger/minimum
]]>
</artwork>
</figure>
Expand Down Expand Up @@ -2567,7 +2567,7 @@ https://json-schema.org/draft/2019-08/schema#/$defs/nonNegativeInteger/minimum
<![CDATA[
{
"$id": "https://example.com/polygon",
"$schema": "https://json-schema.org/draft/2019-08/schema",
"$schema": "https://json-schema.org/draft/2019-09/schema",
"$defs": {
"point": {
"type": "object",
Expand Down Expand Up @@ -2780,15 +2780,15 @@ https://json-schema.org/draft/2019-08/schema#/$defs/nonNegativeInteger/minimum
<t>
Because this output structure can be quite large, a smaller example is given
here for brevity. The URI of the full output structure of the example above is:
<eref target="https://json-schema.org/draft/2019-08/output/verbose-example"/>.
<eref target="https://json-schema.org/draft/2019-09/output/verbose-example"/>.
</t>
<figure>
<artwork>
<![CDATA[
// schema
{
"$id": "https://example.com/polygon",
"$schema": "https://json-schema.org/draft/2019-08/schema",
"$schema": "https://json-schema.org/draft/2019-09/schema",
"type": "object",
"properties": {
"validProp": true,
Expand Down Expand Up @@ -2842,7 +2842,7 @@ https://json-schema.org/draft/2019-08/schema#/$defs/nonNegativeInteger/minimum
<t>
For convenience, JSON Schema has been provided to validate output generated
by implementations. Its URI is:
<eref target="https://json-schema.org/draft/2019-08/output/schema"/>.
<eref target="https://json-schema.org/draft/2019-09/output/schema"/>.
</t>
</section>

Expand Down Expand Up @@ -3390,7 +3390,7 @@ User-Agent: product-name/5.4.1 so-cool-json-schema/1.0.2 curl/7.43.0
<![CDATA[
// tree schema, extensible
{
"$schema": "https://json-schema.org/draft/2019-08/schema",
"$schema": "https://json-schema.org/draft/2019-09/schema",
"$id": "https://example.com/tree",
"$recursiveAnchor": true,

Expand All @@ -3408,7 +3408,7 @@ User-Agent: product-name/5.4.1 so-cool-json-schema/1.0.2 curl/7.43.0

// strict-tree schema, guards against misspelled properties
{
"$schema": "https://json-schema.org/draft/2019-08/schema",
"$schema": "https://json-schema.org/draft/2019-09/schema",
"$id": "https://example.com/strict-tree",
"$recursiveAnchor": true,

Expand Down Expand Up @@ -3546,19 +3546,19 @@ User-Agent: product-name/5.4.1 so-cool-json-schema/1.0.2 curl/7.43.0
<artwork>
<![CDATA[
{
"$schema": "https://json-schema.org/draft/2019-08/schema",
"$schema": "https://json-schema.org/draft/2019-09/schema",
"$id": "https://example.com/meta/general-use-example",
"$recursiveAnchor": true,
"$vocabulary": {
"https://json-schema.org/draft/2019-08/vocab/core": true,
"https://json-schema.org/draft/2019-08/vocab/applicator": true,
"https://json-schema.org/draft/2019-08/vocab/validation": true,
"https://json-schema.org/draft/2019-09/vocab/core": true,
"https://json-schema.org/draft/2019-09/vocab/applicator": true,
"https://json-schema.org/draft/2019-09/vocab/validation": true,
"https://example.com/vocab/example-vocab": true
},
"allOf": [
{"$ref": "https://json-schema.org/draft/2019-08/meta/core"},
{"$ref": "https://json-schema.org/draft/2019-08/meta/applicator"},
{"$ref": "https://json-schema.org/draft/2019-08/meta/validation"},
{"$ref": "https://json-schema.org/draft/2019-09/meta/core"},
{"$ref": "https://json-schema.org/draft/2019-09/meta/applicator"},
{"$ref": "https://json-schema.org/draft/2019-09/meta/validation"},
{"$ref": "https://example.com/meta/example-vocab",
],
"patternProperties": {
Expand All @@ -3581,7 +3581,7 @@ User-Agent: product-name/5.4.1 so-cool-json-schema/1.0.2 curl/7.43.0
<artwork>
<![CDATA[
{
"$schema": "https://json-schema.org/draft/2019-08/schema",
"$schema": "https://json-schema.org/draft/2019-09/schema",
"$id": "https://example.com/meta/example-vocab",
"$recursiveAnchor": true,
"$vocabulary": {
Expand Down Expand Up @@ -3737,8 +3737,8 @@ User-Agent: product-name/5.4.1 so-cool-json-schema/1.0.2 curl/7.43.0
<t>Allow "schema" media type parameter for "application/schema+json"</t>
<t>Better explanation of media type parameters and the HTTP Accept header</t>
<t>Use "$id" to establish canonical and base absolute-URIs only, no fragments</t>
<t>Replace plain-name-fragment-only form of $id with $anchor</t>
<t>Clarified that the behavior of JSON Pointers across $id boundary is unreliable</t>
<t>Replace plain-name-fragment-only form of "$id" with "$anchor"</t>
<t>Clarified that the behavior of JSON Pointers across "$id" boundary is unreliable</t>
</list>
</t>
<t hangText="draft-handrews-json-schema-01">
Expand Down
22 changes: 11 additions & 11 deletions jsonschema-hyperschema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,24 +282,24 @@
<section title="Meta-Schemas and Output Schema">
<t>
The current URI for the JSON Hyper-Schema meta-schema is
<eref target="https://json-schema.org/draft/2019-08/hyper-schema#"/>.
<eref target="https://json-schema.org/draft/2019-09/hyper-schema#"/>.
</t>
<t>
The current URI for this vocabulary, known as the Hyper-Schema vocabulary, is:
<eref target="https://json-schema.org/draft/2019-08/vocab/hyper-schema"/>.
<eref target="https://json-schema.org/draft/2019-09/vocab/hyper-schema"/>.
</t>
<t>
The current URI for the corresponding meta-schema, which differs from the
convenience meta-schema above in that it describes only the hyper-schema
keywords ("base" and "link") is:
<eref target="https://json-schema.org/draft/2019-08/meta/hyper-schema"/>.
<eref target="https://json-schema.org/draft/2019-09/meta/hyper-schema"/>.
</t>
<t>
The <xref target="ldo">link description format</xref> can be used without JSON
Schema, and use of this format can be declared by referencing the normative
link description schema as the schema for the data structure that uses the links.
The URI of the normative link description schema is:
<eref target="https://json-schema.org/draft/2019-08/links#"/>.
<eref target="https://json-schema.org/draft/2019-09/links#"/>.
</t>
<t>
JSON Hyper-Schema implementations are free to provide output in any format.
Expand All @@ -310,7 +310,7 @@
It is RECOMMENDED that implementations be capable of producing output
in this format to facilitated testing. The URI of the JSON Schema
describing the recommended output format is
<eref target="https://json-schema.org/draft/2019-08/output/hyper-schema#"/>.
<eref target="https://json-schema.org/draft/2019-09/output/hyper-schema#"/>.
</t>
<t>
Updated vocabulary and meta-schema URIs MAY be published between
Expand Down Expand Up @@ -1618,7 +1618,7 @@ Link: <https://schema.example.com/entry>; rel="describedBy"
<![CDATA[
{
"$id": "https://schema.example.com/entry",
"$schema": "https://json-schema.org/draft/2019-08/hyper-schema",
"$schema": "https://json-schema.org/draft/2019-09/hyper-schema",
"base": "https://example.com/api/",
"links": [
{
Expand Down Expand Up @@ -1692,7 +1692,7 @@ Link: <https://schema.example.com/entry>; rel="describedBy"
<artwork>
<![CDATA[{
"$id": "https://schema.example.com/thing",
"$schema": "https://json-schema.org/draft/2019-08/hyper-schema",
"$schema": "https://json-schema.org/draft/2019-09/hyper-schema",
"base": "https://example.com/api/",
"type": "object",
"required": ["data"],
Expand Down Expand Up @@ -1808,7 +1808,7 @@ Link: <https://schema.example.com/entry>; rel="describedBy"
<artwork>
<![CDATA[{
"$id": "https://schema.example.com/interesting-stuff",
"$schema": "https://json-schema.org/draft/2019-08/hyper-schema",
"$schema": "https://json-schema.org/draft/2019-09/hyper-schema",
"required": ["stuffWorthEmailingAbout", "email", "title"],
"properties": {
"title": {
Expand Down Expand Up @@ -1995,7 +1995,7 @@ Link: <https://example.com/api/trees/1/nodes/456>; rev="up"
<artwork>
<![CDATA[{
"$id": "https://schema.example.com/tree-node",
"$schema": "https://json-schema.org/draft/2019-08/hyper-schema",
"$schema": "https://json-schema.org/draft/2019-09/hyper-schema",
"base": "trees/{treeId}/",
"properties": {
"id": {"type": "integer"},
Expand Down Expand Up @@ -2057,7 +2057,7 @@ Link: <https://example.com/api/trees/1/nodes/456>; rev="up"
<artwork>
<![CDATA[{
"$id": "https://schema.example.com/thing",
"$schema": "https://json-schema.org/draft/2019-08/hyper-schema",
"$schema": "https://json-schema.org/draft/2019-09/hyper-schema",
"base": "https://example.com/api/",
"type": "object",
"required": ["data"],
Expand Down Expand Up @@ -2110,7 +2110,7 @@ Link: <https://example.com/api/trees/1/nodes/456>; rev="up"
<artwork>
<![CDATA[{
"$id": "https://schema.example.com/thing-collection",
"$schema": "https://json-schema.org/draft/2019-08/hyper-schema",
"$schema": "https://json-schema.org/draft/2019-09/hyper-schema",
"base": "https://example.com/api/",
"type": "object",
"required": ["elements"],
Expand Down
18 changes: 9 additions & 9 deletions jsonschema-validation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
<section title="Meta-Schema" anchor="meta-schema">
<t>
The current URI for the default JSON Schema meta-schema is
<eref target="http://json-schema.org/draft/2019-08/schema"/>.
<eref target="http://json-schema.org/draft/2019-09/schema"/>.
For schema author convenience, this meta-schema describes all vocabularies
defined in this specification and the JSON Schema Core specification,
as well as two former keywords which are reserved for a transitional period.
Expand Down Expand Up @@ -205,11 +205,11 @@
</t>
<t>
The current URI for this vocabulary, known as the Validation vocabulary, is:
<eref target="https://json-schema.org/draft/2019-08/vocab/validation"/>.
<eref target="https://json-schema.org/draft/2019-09/vocab/validation"/>.
</t>
<t>
The current URI for the corresponding meta-schema is:
<eref target="https://json-schema.org/draft/2019-08/meta/validation"/>.
<eref target="https://json-schema.org/draft/2019-09/meta/validation"/>.
</t>

<section title="Validation Keywords for Any Instance Type" anchor="general">
Expand Down Expand Up @@ -547,11 +547,11 @@
</t>
<t>
The current URI for this vocabulary, known as the Format vocabulary, is:
<eref target="https://json-schema.org/draft/2019-08/vocab/format"/>.
<eref target="https://json-schema.org/draft/2019-09/vocab/format"/>.
</t>
<t>
The current URI for the corresponding meta-schema is:
<eref target="https://json-schema.org/draft/2019-08/meta/format"/>.
<eref target="https://json-schema.org/draft/2019-09/meta/format"/>.
</t>

</section>
Expand Down Expand Up @@ -925,11 +925,11 @@
</t>
<t>
The current URI for this vocabulary, known as the Content vocabulary, is:
<eref target="https://json-schema.org/draft/2019-08/vocab/content"/>.
<eref target="https://json-schema.org/draft/2019-09/vocab/content"/>.
</t>
<t>
The current URI for the corresponding meta-schema is:
<eref target="https://json-schema.org/draft/2019-08/meta/content"/>.
<eref target="https://json-schema.org/draft/2019-09/meta/content"/>.
</t>
</section>

Expand Down Expand Up @@ -1122,11 +1122,11 @@
</t>
<t>
The current URI for this vocabulary, known as the Meta-Data vocabulary, is:
<eref target="https://json-schema.org/draft/2019-08/vocab/meta-data"/>.
<eref target="https://json-schema.org/draft/2019-09/vocab/meta-data"/>.
</t>
<t>
The current URI for the corresponding meta-schema is:
<eref target="https://json-schema.org/draft/2019-08/meta/meta-data"/>.
<eref target="https://json-schema.org/draft/2019-09/meta/meta-data"/>.
</t>

<section title='"title" and "description"'>
Expand Down
12 changes: 6 additions & 6 deletions links.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://json-schema.org/draft/2019-08/hyper-schema",
"$id": "https://json-schema.org/draft/2019-08/links",
"$schema": "https://json-schema.org/draft/2019-09/hyper-schema",
"$id": "https://json-schema.org/draft/2019-09/links",
"title": "Link Description Object",
"allOf": [
{ "required": [ "rel", "href" ] },
Expand Down Expand Up @@ -36,7 +36,7 @@
"format": "uri-template"
},
"hrefSchema": {
"$recursiveRef": "https://json-schema.org/draft/2019-08/hyper-schema",
"$recursiveRef": "https://json-schema.org/draft/2019-09/hyper-schema",
"default": false
},
"templatePointers": {
Expand All @@ -63,23 +63,23 @@
"type": "string"
},
"targetSchema": {
"$recursiveRef": "https://json-schema.org/draft/2019-08/hyper-schema",
"$recursiveRef": "https://json-schema.org/draft/2019-09/hyper-schema",
"default": true
},
"targetMediaType": {
"type": "string"
},
"targetHints": { },
"headerSchema": {
"$recursiveRef": "https://json-schema.org/draft/2019-08/hyper-schema",
"$recursiveRef": "https://json-schema.org/draft/2019-09/hyper-schema",
"default": true
},
"submissionMediaType": {
"type": "string",
"default": "application/json"
},
"submissionSchema": {
"$recursiveRef": "https://json-schema.org/draft/2019-08/hyper-schema",
"$recursiveRef": "https://json-schema.org/draft/2019-09/hyper-schema",
"default": true
},
"$comment": {
Expand Down
6 changes: 3 additions & 3 deletions meta/applicator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"$schema": "https://json-schema.org/draft/2019-08/schema",
"$id": "https://json-schema.org/draft/2019-08/meta/applicator",
"$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-08/vocab/applicator": true
"https://json-schema.org/draft/2019-09/vocab/applicator": true
},
"$recursiveAnchor": true,

Expand Down
6 changes: 3 additions & 3 deletions meta/content.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"$schema": "https://json-schema.org/draft/2019-08/schema",
"$id": "https://json-schema.org/draft/2019-08/meta/content",
"$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-08/vocab/content": true
"https://json-schema.org/draft/2019-09/vocab/content": true
},
"$recursiveAnchor": true,

Expand Down
Loading