Skip to content

Initial update for draft-08 / handrews-*-02 #569

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 1 commit into from
Mar 30, 2018
Merged

Initial update for draft-08 / handrews-*-02 #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions hyper-schema-output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"$id": "http://json-schema.org/draft-7/hyper-schema-output",
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "http://json-schema.org/draft-08/hyper-schema-output",
"$schema": "http://json-schema.org/draft-08/schema#",
"type": "array",
"items": {
"allOf": [
{"$ref": "http://json-schema.org/draft-07/links#/definitions/noRequiredFields" }
{"$ref": "http://json-schema.org/draft-08/links#/definitions/noRequiredFields" }
],
"type": "object",
"required": [
Expand Down
10 changes: 5 additions & 5 deletions hyper-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"$schema": "http://json-schema.org/draft-07/hyper-schema#",
"$id": "http://json-schema.org/draft-07/hyper-schema#",
"$schema": "http://json-schema.org/draft-08/hyper-schema#",
"$id": "http://json-schema.org/draft-08/hyper-schema#",
"title": "JSON Hyper-Schema",
"definitions": {
"schemaArray": {
"allOf": [
{ "$ref": "http://json-schema.org/draft-07/schema#/definitions/schemaArray" },
{ "$ref": "http://json-schema.org/draft-08/schema#/definitions/schemaArray" },
{
"items": { "$ref": "#" }
}
]
}
},
"allOf": [ { "$ref": "http://json-schema.org/draft-07/schema#" } ],
"allOf": [ { "$ref": "http://json-schema.org/draft-08/schema#" } ],
"properties": {
"additionalItems": { "$ref": "#" },
"additionalProperties": { "$ref": "#"},
Expand Down Expand Up @@ -56,7 +56,7 @@
"links": {
"type": "array",
"items": {
"$ref": "http://json-schema.org/draft-07/links#"
"$ref": "http://json-schema.org/draft-08/links#"
}
}
},
Expand Down
11 changes: 8 additions & 3 deletions jsonschema-core.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<?rfc rfcedstyle="yes"?>
<?rfc comments="yes"?>
<?rfc inline="yes" ?>
<rfc category="info" docName="draft-handrews-json-schema-01" ipr="trust200902">
<rfc category="info" docName="draft-handrews-json-schema-02" ipr="trust200902">
<front>
<title abbrev="JSON Schema">JSON Schema: A Media Type for Describing JSON Documents</title>

Expand Down Expand Up @@ -1123,7 +1123,7 @@ User-Agent: product-name/5.4.1 so-cool-json-schema/1.0.2 curl/7.43.0
</author>
<date year="2017" month="November"/>
</front>
<seriesInfo name="Internet-Draft" value="draft-handrews-json-schema-validation-01" />
<seriesInfo name="Internet-Draft" value="draft-handrews-json-schema-validation-02" />
</reference>
<reference anchor="json-hyper-schema">
<front>
Expand All @@ -1136,7 +1136,7 @@ User-Agent: product-name/5.4.1 so-cool-json-schema/1.0.2 curl/7.43.0
</author>
<date year="2017" month="November"/>
</front>
<seriesInfo name="Internet-Draft" value="draft-handrews-json-schema-hyperschema-01" />
<seriesInfo name="Internet-Draft" value="draft-handrews-json-schema-hyperschema-02" />
</reference>
</references>

Expand Down Expand Up @@ -1170,6 +1170,11 @@ User-Agent: product-name/5.4.1 so-cool-json-schema/1.0.2 curl/7.43.0
</t>
<t>
<list style="hanging">
<t hangText="draft-handrews-json-schema-02">
<list style="symbols">
<t></t>
</list>
</t>
<t hangText="draft-handrews-json-schema-01">
<list style="symbols">
<t>This draft is purely a clarification with no functional changes</t>
Expand Down
25 changes: 15 additions & 10 deletions jsonschema-hyperschema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<?rfc rfcedstyle="yes"?>
<?rfc comments="yes"?>
<?rfc inline="yes" ?>
<rfc category="info" docName="draft-handrews-json-schema-hyperschema-01" ipr="trust200902">
<rfc category="info" docName="draft-handrews-json-schema-hyperschema-02" ipr="trust200902">
<front>
<title abbrev="JSON Hyper-Schema">
JSON Hyper-Schema: A Vocabulary for Hypermedia Annotation of JSON
Expand Down Expand Up @@ -286,14 +286,14 @@
<section title="Meta-Schemas and Output Schema">
<t>
The current URI for the JSON Hyper-Schema meta-schema is
<eref target="http://json-schema.org/draft-07/hyper-schema#"/>.
<eref target="http://json-schema.org/draft-08/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="http://json-schema.org/draft-07/links#"/>.
<eref target="http://json-schema.org/draft-08/links#"/>.
</t>
<t>
JSON Hyper-Schema implementations are free to provide output in any format.
Expand All @@ -304,7 +304,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="http://json-schema.org/draft-07/hyper-schema-output#"/>.
<eref target="http://json-schema.org/draft-08/hyper-schema-output#"/>.
</t>
</section>
<section title="Schema Keywords">
Expand Down Expand Up @@ -1569,7 +1569,7 @@ Link: <https://schema.example.com/entry> rel=describedBy
<![CDATA[
{
"$id": "https://schema.example.com/entry",
"$schema": "http://json-schema.org/draft-07/hyper-schema#",
"$schema": "http://json-schema.org/draft-08/hyper-schema#",
"base": "https://api.example.com/",
"links": [
{
Expand Down Expand Up @@ -1623,7 +1623,7 @@ Link: <https://schema.example.com/entry> rel=describedBy
<artwork>
<![CDATA[{
"$id": "https://schema.example.com/thing",
"$schema": "http://json-schema.org/draft-07/hyper-schema#",
"$schema": "http://json-schema.org/draft-08/hyper-schema#",
"base": "https://api.example.com/",
"type": "object",
"required": ["data"],
Expand Down Expand Up @@ -1739,7 +1739,7 @@ Link: <https://schema.example.com/entry> rel=describedBy
<artwork>
<![CDATA[{
"$id": "https://schema.example.com/interesting-stuff",
"$schema": "http://json-schema.org/draft-07/hyper-schema#",
"$schema": "http://json-schema.org/draft-08/hyper-schema#",
"required": ["stuffWorthEmailingAbout", "email", "title"],
"properties": {
"title": {
Expand Down Expand Up @@ -1926,7 +1926,7 @@ Link: <https://api.example.com/trees/1/nodes/456> rev=up
<artwork>
<![CDATA[{
"$id": "https://schema.example.com/tree-node",
"$schema": "http://json-schema.org/draft-07/hyper-schema#",
"$schema": "http://json-schema.org/draft-08/hyper-schema#",
"base": "trees/{treeId}/",
"properties": {
"id": {"type": "integer"},
Expand Down Expand Up @@ -1988,7 +1988,7 @@ Link: <https://api.example.com/trees/1/nodes/456> rev=up
<artwork>
<![CDATA[{
"$id": "https://schema.example.com/thing",
"$schema": "http://json-schema.org/draft-07/hyper-schema#",
"$schema": "http://json-schema.org/draft-08/hyper-schema#",
"base": "https://api.example.com/",
"type": "object",
"required": ["data"],
Expand Down Expand Up @@ -2041,7 +2041,7 @@ Link: <https://api.example.com/trees/1/nodes/456> rev=up
<artwork>
<![CDATA[{
"$id": "https://schema.example.com/thing-collection",
"$schema": "http://json-schema.org/draft-07/hyper-schema#",
"$schema": "http://json-schema.org/draft-08/hyper-schema#",
"base": "https://api.example.com/",
"type": "object",
"required": ["elements"],
Expand Down Expand Up @@ -2674,6 +2674,11 @@ Link: <https://api.example.com/trees/1/nodes/456> rev=up
</t>
<t>
<list style="hanging">
<t hangText="draft-handrews-json-schema-hyperschema-02">
<list style="symbols">
<t></t>
</list>
</t>
<t hangText="draft-handrews-json-schema-hyperschema-01">
<list style="symbols">
<t>This draft is purely a bug fix with no functional changes</t>
Expand Down
11 changes: 8 additions & 3 deletions jsonschema-validation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<?rfc rfcedstyle="yes"?>
<?rfc comments="yes"?>
<?rfc inline="yes" ?>
<rfc category="info" docName="draft-handrews-json-schema-validation-01" ipr="trust200902">
<rfc category="info" docName="draft-handrews-json-schema-validation-02" ipr="trust200902">
<front>
<title abbrev="JSON Schema Validation">
JSON Schema Validation: A Vocabulary for Structural Validation of JSON
Expand Down Expand Up @@ -337,7 +337,7 @@
<section title="Meta-Schema">
<t>
The current URI for the JSON Schema Validation is
<eref target="http://json-schema.org/draft-07/schema#"/>.
<eref target="http://json-schema.org/draft-08/schema#"/>.
</t>
</section>

Expand Down Expand Up @@ -1462,7 +1462,7 @@
</author>
<date year="2017" month="November"/>
</front>
<seriesInfo name="Internet-Draft" value="draft-handrews-json-schema-01" />
<seriesInfo name="Internet-Draft" value="draft-handrews-json-schema-02" />
</reference>
</references>

Expand Down Expand Up @@ -1501,6 +1501,11 @@
</t>
<t>
<list style="hanging">
<t hangText="draft-handrews-json-schema-validation-02">
<list style="symbols">
<t></t>
</list>
</t>
<t hangText="draft-handrews-json-schema-validation-01">
<list style="symbols">
<t>This draft is purely a clarification with no functional changes</t>
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": "http://json-schema.org/draft-07/hyper-schema#",
"$id": "http://json-schema.org/draft-07/links#",
"$schema": "http://json-schema.org/draft-08/hyper-schema#",
"$id": "http://json-schema.org/draft-08/links#",
"title": "Link Description Object",
"allOf": [
{ "required": [ "rel", "href" ] },
Expand Down Expand Up @@ -29,7 +29,7 @@
"format": "uri-template"
},
"hrefSchema": {
"$ref": "http://json-schema.org/draft-07/hyper-schema#"
"$ref": "http://json-schema.org/draft-08/hyper-schema#"
},
"templatePointers": {
"type": "object",
Expand All @@ -55,21 +55,21 @@
"type": "string"
},
"targetSchema": {
"$ref": "http://json-schema.org/draft-07/hyper-schema#"
"$ref": "http://json-schema.org/draft-08/hyper-schema#"
},
"targetMediaType": {
"type": "string"
},
"targetHints": { },
"headerSchema": {
"$ref": "http://json-schema.org/draft-07/hyper-schema#"
"$ref": "http://json-schema.org/draft-08/hyper-schema#"
},
"submissionMediaType": {
"type": "string",
"default": "application/json"
},
"submissionSchema": {
"$ref": "http://json-schema.org/draft-07/hyper-schema#"
"$ref": "http://json-schema.org/draft-08/hyper-schema#"
},
"$comment": {
"type": "string"
Expand Down
4 changes: 2 additions & 2 deletions schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "http://json-schema.org/draft-07/schema#",
"$schema": "http://json-schema.org/draft-08/schema#",
"$id": "http://json-schema.org/draft-08/schema#",
"title": "Core schema meta-schema",
"definitions": {
"schemaArray": {
Expand Down