Skip to content

Fixes to dates, author credits, HTTPS #763

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 4 commits into from
Jul 19, 2019
Merged

Fixes to dates, author credits, HTTPS #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
53982c3
Update draft dates to August, and all HTTPS
handrews Jul 15, 2019
926c3e8
Fix typo in meta-schema URI
handrews Jul 15, 2019
580ab17
Update my contact information
handrews Jul 18, 2019
c12a08b
Fix an apparent crediting error
handrews Jul 18, 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": "http://json-schema.org/draft/2019-04/hyper-schema#",
"$id": "http://json-schema.org/draft/2019-04/hyper-schema",
"$schema": "https://json-schema.org/draft/2019-08/hyper-schema#",
"$id": "https://json-schema.org/draft/2019-08/hyper-schema",
"$vocabulary": {
"https://json-schema.org/draft/2019-04/vocab/core": true,
"https://json-schema.org/draft/2019-04/vocab/applicator": true,
"https://json-schema.org/draft/2019-04/vocab/validation": true,
"https://json-schema.org/draft/2019-04/vocab/meta-data": true,
"https://json-schema.org/draft/2019-04/vocab/format": true,
"https://json-schema.org/draft/2019-04/vocab/content": true,
"https://json-schema.org/draft/2019-04/vocab/hyper-schema": true
"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": true,
"https://json-schema.org/draft/2019-08/vocab/content": true,
"https://json-schema.org/draft/2019-08/vocab/hyper-schema": true
},
"$recursiveAnchor": true,

"title": "JSON Hyper-Schema",
"allOf": [
{"$ref": "http://json-schema.org/draft/2019-04/schema"},
{"$ref": "http://json-schema.org/draft/2019-04/meta/hyper-schema"}
{"$ref": "https://json-schema.org/draft/2019-08/schema"},
{"$ref": "https://json-schema.org/draft/2019-08/meta/hyper-schema"}
],
"links": [
{
Expand Down
115 changes: 54 additions & 61 deletions jsonschema-core.xml
View file
Open in desktop

Large diffs are not rendered by default.

33 changes: 13 additions & 20 deletions jsonschema-hyperschema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,8 @@
</title>

<author fullname="Henry Andrews" initials="H" surname="Andrews" role="editor">
<organization>Riverbed Technology</organization>
<address>
<postal>
<street>680 Folsom St.</street>
<city>San Francisco</city>
<region>CA</region>
<country>USA</country>
</postal>
<email>[email protected]</email>
<email>[email protected]</email>
</address>
</author>

Expand Down Expand Up @@ -77,7 +70,7 @@
</t>
<t>
For additional information, see
<eref target="http://json-schema.org/"/>.
<eref target="https://json-schema.org/"/>.
</t>
<t>
To provide feedback, use this issue tracker, the communication methods listed on the
Expand Down Expand Up @@ -289,24 +282,24 @@
<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/2019-04/hyper-schema#"/>.
<eref target="https://json-schema.org/draft/2019-08/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-04/vocab/hyper-schema"/>.
<eref target="https://json-schema.org/draft/2019-08/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-04/meta/hyper-schema"/>.
<eref target="https://json-schema.org/draft/2019-08/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="http://json-schema.org/draft/2019-04/links#"/>.
<eref target="https://json-schema.org/draft/2019-08/links#"/>.
</t>
<t>
JSON Hyper-Schema implementations are free to provide output in any format.
Expand All @@ -317,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="http://json-schema.org/draft/2019-04/output/hyper-schema#"/>.
<eref target="https://json-schema.org/draft/2019-08/output/hyper-schema#"/>.
</t>
<t>
Updated vocabulary and meta-schema URIs MAY be published between
Expand Down Expand Up @@ -1625,7 +1618,7 @@ Link: <https://schema.example.com/entry>; rel="describedBy"
<![CDATA[
{
"$id": "https://schema.example.com/entry",
"$schema": "http://json-schema.org/draft/2019-04/hyper-schema#",
"$schema": "https://json-schema.org/draft/2019-08/hyper-schema#",
"base": "https://example.com/api/",
"links": [
{
Expand Down Expand Up @@ -1699,7 +1692,7 @@ Link: <https://schema.example.com/entry>; rel="describedBy"
<artwork>
<![CDATA[{
"$id": "https://schema.example.com/thing",
"$schema": "http://json-schema.org/draft/2019-04/hyper-schema#",
"$schema": "https://json-schema.org/draft/2019-08/hyper-schema#",
"base": "https://example.com/api/",
"type": "object",
"required": ["data"],
Expand Down Expand Up @@ -1815,7 +1808,7 @@ Link: <https://schema.example.com/entry>; rel="describedBy"
<artwork>
<![CDATA[{
"$id": "https://schema.example.com/interesting-stuff",
"$schema": "http://json-schema.org/draft/2019-04/hyper-schema#",
"$schema": "https://json-schema.org/draft/2019-08/hyper-schema#",
"required": ["stuffWorthEmailingAbout", "email", "title"],
"properties": {
"title": {
Expand Down Expand Up @@ -2002,7 +1995,7 @@ Link: <https://example.com/api/trees/1/nodes/456>; rev="up"
<artwork>
<![CDATA[{
"$id": "https://schema.example.com/tree-node",
"$schema": "http://json-schema.org/draft/2019-04/hyper-schema#",
"$schema": "https://json-schema.org/draft/2019-08/hyper-schema#",
"base": "trees/{treeId}/",
"properties": {
"id": {"type": "integer"},
Expand Down Expand Up @@ -2064,7 +2057,7 @@ Link: <https://example.com/api/trees/1/nodes/456>; rev="up"
<artwork>
<![CDATA[{
"$id": "https://schema.example.com/thing",
"$schema": "http://json-schema.org/draft/2019-04/hyper-schema#",
"$schema": "https://json-schema.org/draft/2019-08/hyper-schema#",
"base": "https://example.com/api/",
"type": "object",
"required": ["data"],
Expand Down Expand Up @@ -2117,7 +2110,7 @@ Link: <https://example.com/api/trees/1/nodes/456>; rev="up"
<artwork>
<![CDATA[{
"$id": "https://schema.example.com/thing-collection",
"$schema": "http://json-schema.org/draft/2019-04/hyper-schema#",
"$schema": "https://json-schema.org/draft/2019-08/hyper-schema#",
"base": "https://example.com/api/",
"type": "object",
"required": ["elements"],
Expand Down
40 changes: 11 additions & 29 deletions jsonschema-validation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,8 @@
</author>

<author fullname="Henry Andrews" initials="H" surname="Andrews" role="editor">
<organization>Riverbed Technology</organization>
<address>
<postal>
<street>680 Folsom St.</street>
<city>San Francisco</city>
<region>CA</region>
<country>USA</country>
</postal>
<email>[email protected]</email>
<email>[email protected]</email>
</address>
</author>

Expand All @@ -61,17 +54,6 @@
</address>
</author>

<author fullname="Geraint Luff" initials="G" surname="Luff">
<address>
<postal>
<street></street>
<city>Cambridge</city>
<country>UK</country>
</postal>
<email>[email protected]</email>
</address>
</author>

<date year="2019"/>
<workgroup>Internet Engineering Task Force</workgroup>
<keyword>JSON</keyword>
Expand All @@ -94,7 +76,7 @@
<eref target="https://github.com/json-schema-org/json-schema-spec/issues"/>.
</t>
<t>
For additional information, see <eref target="http://json-schema.org/"/>.
For additional information, see <eref target="https://json-schema.org/"/>.
</t>
<t>
To provide feedback, use this issue tracker, the communication methods listed on the
Expand Down Expand Up @@ -195,7 +177,7 @@
<section title="Meta-Schema">
<t>
The current URI for the JSON Schema Validation meta-schema is
<eref target="http://json-schema.org/draft/2019-04/schenma#"/>.
<eref target="http://json-schema.org/draft/2019-08/schema#"/>.
For schema author convenience, this meta-schema describes all vocabularies
defined in this specification and the JSON Schema Core specification.
Individual vocabulary and vocabulary meta-schema URIs are given for
Expand All @@ -221,11 +203,11 @@
</t>
<t>
The current URI for this vocabulary, known as the Validation vocabulary, is:
<eref target="https://json-schema.org/draft/2019-04/vocab/validation"/>.
<eref target="https://json-schema.org/draft/2019-08/vocab/validation"/>.
</t>
<t>
The current URI for the corresponding meta-schema is:
<eref target="https://json-schema.org/draft/2019-04/meta/validation"/>.
<eref target="https://json-schema.org/draft/2019-08/meta/validation"/>.
</t>

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

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

Expand Down Expand Up @@ -998,11 +980,11 @@
</t>
<t>
The current URI for this vocabulary, known as the Meta-Data vocabulary, is:
<eref target="https://json-schema.org/draft/2019-04/vocab/meta-data"/>.
<eref target="https://json-schema.org/draft/2019-08/vocab/meta-data"/>.
</t>
<t>
The current URI for the corresponding meta-schema is:
<eref target="https://json-schema.org/draft/2019-04/meta/meta-data"/>.
<eref target="https://json-schema.org/draft/2019-08/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": "http://json-schema.org/draft/2019-04/hyper-schema#",
"$id": "http://json-schema.org/draft/2019-04/links",
"$schema": "https://json-schema.org/draft/2019-08/hyper-schema#",
"$id": "https://json-schema.org/draft/2019-08/links",
"title": "Link Description Object",
"allOf": [
{ "required": [ "rel", "href" ] },
Expand Down Expand Up @@ -36,7 +36,7 @@
"format": "uri-template"
},
"hrefSchema": {
"$recursiveRef": "http://json-schema.org/draft/2019-04/hyper-schema",
"$recursiveRef": "https://json-schema.org/draft/2019-08/hyper-schema",
"default": false
},
"templatePointers": {
Expand All @@ -63,23 +63,23 @@
"type": "string"
},
"targetSchema": {
"$recursiveRef": "http://json-schema.org/draft/2019-04/hyper-schema",
"$recursiveRef": "https://json-schema.org/draft/2019-08/hyper-schema",
"default": true
},
"targetMediaType": {
"type": "string"
},
"targetHints": { },
"headerSchema": {
"$recursiveRef": "http://json-schema.org/draft/2019-04/hyper-schema",
"$recursiveRef": "https://json-schema.org/draft/2019-08/hyper-schema",
"default": true
},
"submissionMediaType": {
"type": "string",
"default": "application/json"
},
"submissionSchema": {
"$recursiveRef": "http://json-schema.org/draft/2019-04/hyper-schema",
"$recursiveRef": "https://json-schema.org/draft/2019-08/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": "http://json-schema.org/draft/2019-04/schema#",
"$id": "https://json-schema.org/draft/2019-04/meta/applicator",
"$schema": "https://json-schema.org/draft/2019-08/schema#",
"$id": "https://json-schema.org/draft/2019-08/meta/applicator",
"$vocabulary": {
"https://json-schema.org/draft/2019-04/vocab/applicator": true
"https://json-schema.org/draft/2019-08/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": "http://json-schema.org/draft/2019-04/schema#",
"$id": "http://json-schema.org/draft/2019-04/meta/content",
"$schema": "https://json-schema.org/draft/2019-08/schema#",
"$id": "https://json-schema.org/draft/2019-08/meta/content",
"$vocabulary": {
"https://json-schema.org/draft/2019-04/vocab/content": true
"https://json-schema.org/draft/2019-08/vocab/content": true
},
"$recursiveAnchor": true,

Expand Down
6 changes: 3 additions & 3 deletions meta/core.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"$schema": "http://json-schema.org/draft/2019-04/schema#",
"$id": "https://json-schema.org/draft/2019-04/meta/core",
"$schema": "https://json-schema.org/draft/2019-08/schema#",
"$id": "https://json-schema.org/draft/2019-08/meta/core",
"$vocabulary": {
"https://json-schema.org/draft/2019-04/vocab/core": true
"https://json-schema.org/draft/2019-08/vocab/core": true
},
"$recursiveAnchor": true,

Expand Down
6 changes: 3 additions & 3 deletions meta/format.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"$schema": "http://json-schema.org/draft/2019-04/schema#",
"$id": "http://json-schema.org/draft/2019-04/meta/format",
"$schema": "https://json-schema.org/draft/2019-08/schema#",
"$id": "https://json-schema.org/draft/2019-08/meta/format",
"$vocabulary": {
"https://json-schema.org/draft/2019-04/vocab/format": true
"https://json-schema.org/draft/2019-08/vocab/format": true
},
"$recursiveAnchor": true,

Expand Down
8 changes: 4 additions & 4 deletions meta/hyper-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"$schema": "http://json-schema.org/draft/2019-04/hyper-schema#",
"$id": "http://json-schema.org/draft/2019-04/meta/hyper-schema",
"$schema": "https://json-schema.org/draft/2019-08/hyper-schema#",
"$id": "https://json-schema.org/draft/2019-08/meta/hyper-schema",
"$vocabulary": {
"https://json-schema.org/draft/2019-04/vocab/hyper-schema": true
"https://json-schema.org/draft/2019-08/vocab/hyper-schema": true
},
"$recursiveAnchor": true,

Expand All @@ -16,7 +16,7 @@
"links": {
"type": "array",
"items": {
"$ref": "http://json-schema.org/draft/2019-04/links"
"$ref": "https://json-schema.org/draft/2019-08/links"
}
}
},
Expand Down
6 changes: 3 additions & 3 deletions meta/meta-data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"$schema": "http://json-schema.org/draft/2019-04/schema#",
"$id": "http://json-schema.org/draft/2019-04/meta/meta-data",
"$schema": "https://json-schema.org/draft/2019-08/schema#",
"$id": "https://json-schema.org/draft/2019-08/meta/meta-data",
"$vocabulary": {
"https://json-schema.org/draft/2019-04/vocab/meta-data": true
"https://json-schema.org/draft/2019-08/vocab/meta-data": true
},
"$recursiveAnchor": true,

Expand Down
6 changes: 3 additions & 3 deletions meta/validation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"$schema": "http://json-schema.org/draft/2019-04/schema#",
"$id": "http://json-schema.org/draft/2019-04/meta/validation",
"$schema": "https://json-schema.org/draft/2019-08/schema#",
"$id": "https://json-schema.org/draft/2019-08/meta/validation",
"$vocabulary": {
"https://json-schema.org/draft/2019-04/vocab/validation": true
"https://json-schema.org/draft/2019-08/vocab/validation": true
},
"$recursiveAnchor": true,

Expand Down
Loading