Skip to content

Commit 3c08495

Browse files
RelequestualRelequestual
authored
Merge pull request #763 from handrews/dates
Fixes to dates, author credits, HTTPS
2 parents 9aa3537 + c12a08b commit 3c08495

17 files changed

+144
-183
lines changed

‎hyper-schema.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
2-
"$schema": "http://json-schema.org/draft/2019-04/hyper-schema#",
3-
"$id": "http://json-schema.org/draft/2019-04/hyper-schema",
2+
"$schema": "https://json-schema.org/draft/2019-08/hyper-schema#",
3+
"$id": "https://json-schema.org/draft/2019-08/hyper-schema",
44
"$vocabulary": {
5-
"https://json-schema.org/draft/2019-04/vocab/core": true,
6-
"https://json-schema.org/draft/2019-04/vocab/applicator": true,
7-
"https://json-schema.org/draft/2019-04/vocab/validation": true,
8-
"https://json-schema.org/draft/2019-04/vocab/meta-data": true,
9-
"https://json-schema.org/draft/2019-04/vocab/format": true,
10-
"https://json-schema.org/draft/2019-04/vocab/content": true,
11-
"https://json-schema.org/draft/2019-04/vocab/hyper-schema": true
5+
"https://json-schema.org/draft/2019-08/vocab/core": true,
6+
"https://json-schema.org/draft/2019-08/vocab/applicator": true,
7+
"https://json-schema.org/draft/2019-08/vocab/validation": true,
8+
"https://json-schema.org/draft/2019-08/vocab/meta-data": true,
9+
"https://json-schema.org/draft/2019-08/vocab/format": true,
10+
"https://json-schema.org/draft/2019-08/vocab/content": true,
11+
"https://json-schema.org/draft/2019-08/vocab/hyper-schema": true
1212
},
1313
"$recursiveAnchor": true,
1414

1515
"title": "JSON Hyper-Schema",
1616
"allOf": [
17-
{"$ref": "http://json-schema.org/draft/2019-04/schema"},
18-
{"$ref": "http://json-schema.org/draft/2019-04/meta/hyper-schema"}
17+
{"$ref": "https://json-schema.org/draft/2019-08/schema"},
18+
{"$ref": "https://json-schema.org/draft/2019-08/meta/hyper-schema"}
1919
],
2020
"links": [
2121
{

‎jsonschema-core.xml

Lines changed: 54 additions & 61 deletions
Large diffs are not rendered by default.

‎jsonschema-hyperschema.xml

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,8 @@
3131
</title>
3232

3333
<author fullname="Henry Andrews" initials="H" surname="Andrews" role="editor">
34-
<organization>Riverbed Technology</organization>
3534
<address>
36-
<postal>
37-
<street>680 Folsom St.</street>
38-
<city>San Francisco</city>
39-
<region>CA</region>
40-
<country>USA</country>
41-
</postal>
42-
<email>[email protected]</email>
35+
<email>[email protected]</email>
4336
</address>
4437
</author>
4538

@@ -77,7 +70,7 @@
7770
</t>
7871
<t>
7972
For additional information, see
80-
<eref target="http://json-schema.org/"/>.
73+
<eref target="https://json-schema.org/"/>.
8174
</t>
8275
<t>
8376
To provide feedback, use this issue tracker, the communication methods listed on the
@@ -289,24 +282,24 @@
289282
<section title="Meta-Schemas and Output Schema">
290283
<t>
291284
The current URI for the JSON Hyper-Schema meta-schema is
292-
<eref target="http://json-schema.org/draft/2019-04/hyper-schema#"/>.
285+
<eref target="https://json-schema.org/draft/2019-08/hyper-schema#"/>.
293286
</t>
294287
<t>
295288
The current URI for this vocabulary, known as the Hyper-Schema vocabulary, is:
296-
<eref target="https://json-schema.org/draft/2019-04/vocab/hyper-schema"/>.
289+
<eref target="https://json-schema.org/draft/2019-08/vocab/hyper-schema"/>.
297290
</t>
298291
<t>
299292
The current URI for the corresponding meta-schema, which differs from the
300293
convenience meta-schema above in that it describes only the hyper-schema
301294
keywords ("base" and "link") is:
302-
<eref target="https://json-schema.org/draft/2019-04/meta/hyper-schema"/>.
295+
<eref target="https://json-schema.org/draft/2019-08/meta/hyper-schema"/>.
303296
</t>
304297
<t>
305298
The <xref target="ldo">link description format</xref> can be used without JSON
306299
Schema, and use of this format can be declared by referencing the normative
307300
link description schema as the schema for the data structure that uses the links.
308301
The URI of the normative link description schema is:
309-
<eref target="http://json-schema.org/draft/2019-04/links#"/>.
302+
<eref target="https://json-schema.org/draft/2019-08/links#"/>.
310303
</t>
311304
<t>
312305
JSON Hyper-Schema implementations are free to provide output in any format.
@@ -317,7 +310,7 @@
317310
It is RECOMMENDED that implementations be capable of producing output
318311
in this format to facilitated testing. The URI of the JSON Schema
319312
describing the recommended output format is
320-
<eref target="http://json-schema.org/draft/2019-04/output/hyper-schema#"/>.
313+
<eref target="https://json-schema.org/draft/2019-08/output/hyper-schema#"/>.
321314
</t>
322315
<t>
323316
Updated vocabulary and meta-schema URIs MAY be published between
@@ -1625,7 +1618,7 @@ Link: <https://schema.example.com/entry>; rel="describedBy"
16251618
<![CDATA[
16261619
{
16271620
"$id": "https://schema.example.com/entry",
1628-
"$schema": "http://json-schema.org/draft/2019-04/hyper-schema#",
1621+
"$schema": "https://json-schema.org/draft/2019-08/hyper-schema#",
16291622
"base": "https://example.com/api/",
16301623
"links": [
16311624
{
@@ -1699,7 +1692,7 @@ Link: <https://schema.example.com/entry>; rel="describedBy"
16991692
<artwork>
17001693
<![CDATA[{
17011694
"$id": "https://schema.example.com/thing",
1702-
"$schema": "http://json-schema.org/draft/2019-04/hyper-schema#",
1695+
"$schema": "https://json-schema.org/draft/2019-08/hyper-schema#",
17031696
"base": "https://example.com/api/",
17041697
"type": "object",
17051698
"required": ["data"],
@@ -1815,7 +1808,7 @@ Link: <https://schema.example.com/entry>; rel="describedBy"
18151808
<artwork>
18161809
<![CDATA[{
18171810
"$id": "https://schema.example.com/interesting-stuff",
1818-
"$schema": "http://json-schema.org/draft/2019-04/hyper-schema#",
1811+
"$schema": "https://json-schema.org/draft/2019-08/hyper-schema#",
18191812
"required": ["stuffWorthEmailingAbout", "email", "title"],
18201813
"properties": {
18211814
"title": {
@@ -2002,7 +1995,7 @@ Link: <https://example.com/api/trees/1/nodes/456>; rev="up"
20021995
<artwork>
20031996
<![CDATA[{
20041997
"$id": "https://schema.example.com/tree-node",
2005-
"$schema": "http://json-schema.org/draft/2019-04/hyper-schema#",
1998+
"$schema": "https://json-schema.org/draft/2019-08/hyper-schema#",
20061999
"base": "trees/{treeId}/",
20072000
"properties": {
20082001
"id": {"type": "integer"},
@@ -2064,7 +2057,7 @@ Link: <https://example.com/api/trees/1/nodes/456>; rev="up"
20642057
<artwork>
20652058
<![CDATA[{
20662059
"$id": "https://schema.example.com/thing",
2067-
"$schema": "http://json-schema.org/draft/2019-04/hyper-schema#",
2060+
"$schema": "https://json-schema.org/draft/2019-08/hyper-schema#",
20682061
"base": "https://example.com/api/",
20692062
"type": "object",
20702063
"required": ["data"],
@@ -2117,7 +2110,7 @@ Link: <https://example.com/api/trees/1/nodes/456>; rev="up"
21172110
<artwork>
21182111
<![CDATA[{
21192112
"$id": "https://schema.example.com/thing-collection",
2120-
"$schema": "http://json-schema.org/draft/2019-04/hyper-schema#",
2113+
"$schema": "https://json-schema.org/draft/2019-08/hyper-schema#",
21212114
"base": "https://example.com/api/",
21222115
"type": "object",
21232116
"required": ["elements"],

‎jsonschema-validation.xml

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,8 @@
4141
</author>
4242

4343
<author fullname="Henry Andrews" initials="H" surname="Andrews" role="editor">
44-
<organization>Riverbed Technology</organization>
4544
<address>
46-
<postal>
47-
<street>680 Folsom St.</street>
48-
<city>San Francisco</city>
49-
<region>CA</region>
50-
<country>USA</country>
51-
</postal>
52-
<email>[email protected]</email>
45+
<email>[email protected]</email>
5346
</address>
5447
</author>
5548

@@ -61,17 +54,6 @@
6154
</address>
6255
</author>
6356

64-
<author fullname="Geraint Luff" initials="G" surname="Luff">
65-
<address>
66-
<postal>
67-
<street></street>
68-
<city>Cambridge</city>
69-
<country>UK</country>
70-
</postal>
71-
<email>[email protected]</email>
72-
</address>
73-
</author>
74-
7557
<date year="2019"/>
7658
<workgroup>Internet Engineering Task Force</workgroup>
7759
<keyword>JSON</keyword>
@@ -94,7 +76,7 @@
9476
<eref target="https://github.com/json-schema-org/json-schema-spec/issues"/>.
9577
</t>
9678
<t>
97-
For additional information, see <eref target="http://json-schema.org/"/>.
79+
For additional information, see <eref target="https://json-schema.org/"/>.
9880
</t>
9981
<t>
10082
To provide feedback, use this issue tracker, the communication methods listed on the
@@ -195,7 +177,7 @@
195177
<section title="Meta-Schema">
196178
<t>
197179
The current URI for the JSON Schema Validation meta-schema is
198-
<eref target="http://json-schema.org/draft/2019-04/schenma#"/>.
180+
<eref target="http://json-schema.org/draft/2019-08/schema#"/>.
199181
For schema author convenience, this meta-schema describes all vocabularies
200182
defined in this specification and the JSON Schema Core specification.
201183
Individual vocabulary and vocabulary meta-schema URIs are given for
@@ -221,11 +203,11 @@
221203
</t>
222204
<t>
223205
The current URI for this vocabulary, known as the Validation vocabulary, is:
224-
<eref target="https://json-schema.org/draft/2019-04/vocab/validation"/>.
206+
<eref target="https://json-schema.org/draft/2019-08/vocab/validation"/>.
225207
</t>
226208
<t>
227209
The current URI for the corresponding meta-schema is:
228-
<eref target="https://json-schema.org/draft/2019-04/meta/validation"/>.
210+
<eref target="https://json-schema.org/draft/2019-08/meta/validation"/>.
229211
</t>
230212

231213
<section title="Validation Keywords for Any Instance Type" anchor="general">
@@ -546,11 +528,11 @@
546528
</t>
547529
<t>
548530
The current URI for this vocabulary, known as the Format vocabulary, is:
549-
<eref target="https://json-schema.org/draft/2019-04/vocab/format"/>.
531+
<eref target="https://json-schema.org/draft/2019-08/vocab/format"/>.
550532
</t>
551533
<t>
552534
The current URI for the corresponding meta-schema is:
553-
<eref target="https://json-schema.org/draft/2019-04/meta/format"/>.
535+
<eref target="https://json-schema.org/draft/2019-08/meta/format"/>.
554536
</t>
555537

556538
</section>
@@ -809,11 +791,11 @@
809791
</t>
810792
<t>
811793
The current URI for this vocabulary, known as the Content vocabulary, is:
812-
<eref target="https://json-schema.org/draft/2019-04/vocab/content"/>.
794+
<eref target="https://json-schema.org/draft/2019-08/vocab/content"/>.
813795
</t>
814796
<t>
815797
The current URI for the corresponding meta-schema is:
816-
<eref target="https://json-schema.org/draft/2019-04/meta/content"/>.
798+
<eref target="https://json-schema.org/draft/2019-08/meta/content"/>.
817799
</t>
818800
</section>
819801

@@ -998,11 +980,11 @@
998980
</t>
999981
<t>
1000982
The current URI for this vocabulary, known as the Meta-Data vocabulary, is:
1001-
<eref target="https://json-schema.org/draft/2019-04/vocab/meta-data"/>.
983+
<eref target="https://json-schema.org/draft/2019-08/vocab/meta-data"/>.
1002984
</t>
1003985
<t>
1004986
The current URI for the corresponding meta-schema is:
1005-
<eref target="https://json-schema.org/draft/2019-04/meta/meta-data"/>.
987+
<eref target="https://json-schema.org/draft/2019-08/meta/meta-data"/>.
1006988
</t>
1007989

1008990
<section title='"title" and "description"'>

‎links.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"$schema": "http://json-schema.org/draft/2019-04/hyper-schema#",
3-
"$id": "http://json-schema.org/draft/2019-04/links",
2+
"$schema": "https://json-schema.org/draft/2019-08/hyper-schema#",
3+
"$id": "https://json-schema.org/draft/2019-08/links",
44
"title": "Link Description Object",
55
"allOf": [
66
{ "required": [ "rel", "href" ] },
@@ -36,7 +36,7 @@
3636
"format": "uri-template"
3737
},
3838
"hrefSchema": {
39-
"$recursiveRef": "http://json-schema.org/draft/2019-04/hyper-schema",
39+
"$recursiveRef": "https://json-schema.org/draft/2019-08/hyper-schema",
4040
"default": false
4141
},
4242
"templatePointers": {
@@ -63,23 +63,23 @@
6363
"type": "string"
6464
},
6565
"targetSchema": {
66-
"$recursiveRef": "http://json-schema.org/draft/2019-04/hyper-schema",
66+
"$recursiveRef": "https://json-schema.org/draft/2019-08/hyper-schema",
6767
"default": true
6868
},
6969
"targetMediaType": {
7070
"type": "string"
7171
},
7272
"targetHints": { },
7373
"headerSchema": {
74-
"$recursiveRef": "http://json-schema.org/draft/2019-04/hyper-schema",
74+
"$recursiveRef": "https://json-schema.org/draft/2019-08/hyper-schema",
7575
"default": true
7676
},
7777
"submissionMediaType": {
7878
"type": "string",
7979
"default": "application/json"
8080
},
8181
"submissionSchema": {
82-
"$recursiveRef": "http://json-schema.org/draft/2019-04/hyper-schema",
82+
"$recursiveRef": "https://json-schema.org/draft/2019-08/hyper-schema",
8383
"default": true
8484
},
8585
"$comment": {

‎meta/applicator.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"$schema": "http://json-schema.org/draft/2019-04/schema#",
3-
"$id": "https://json-schema.org/draft/2019-04/meta/applicator",
2+
"$schema": "https://json-schema.org/draft/2019-08/schema#",
3+
"$id": "https://json-schema.org/draft/2019-08/meta/applicator",
44
"$vocabulary": {
5-
"https://json-schema.org/draft/2019-04/vocab/applicator": true
5+
"https://json-schema.org/draft/2019-08/vocab/applicator": true
66
},
77
"$recursiveAnchor": true,
88

‎meta/content.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"$schema": "http://json-schema.org/draft/2019-04/schema#",
3-
"$id": "http://json-schema.org/draft/2019-04/meta/content",
2+
"$schema": "https://json-schema.org/draft/2019-08/schema#",
3+
"$id": "https://json-schema.org/draft/2019-08/meta/content",
44
"$vocabulary": {
5-
"https://json-schema.org/draft/2019-04/vocab/content": true
5+
"https://json-schema.org/draft/2019-08/vocab/content": true
66
},
77
"$recursiveAnchor": true,
88

‎meta/core.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"$schema": "http://json-schema.org/draft/2019-04/schema#",
3-
"$id": "https://json-schema.org/draft/2019-04/meta/core",
2+
"$schema": "https://json-schema.org/draft/2019-08/schema#",
3+
"$id": "https://json-schema.org/draft/2019-08/meta/core",
44
"$vocabulary": {
5-
"https://json-schema.org/draft/2019-04/vocab/core": true
5+
"https://json-schema.org/draft/2019-08/vocab/core": true
66
},
77
"$recursiveAnchor": true,
88

‎meta/format.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"$schema": "http://json-schema.org/draft/2019-04/schema#",
3-
"$id": "http://json-schema.org/draft/2019-04/meta/format",
2+
"$schema": "https://json-schema.org/draft/2019-08/schema#",
3+
"$id": "https://json-schema.org/draft/2019-08/meta/format",
44
"$vocabulary": {
5-
"https://json-schema.org/draft/2019-04/vocab/format": true
5+
"https://json-schema.org/draft/2019-08/vocab/format": true
66
},
77
"$recursiveAnchor": true,
88

‎meta/hyper-schema.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"$schema": "http://json-schema.org/draft/2019-04/hyper-schema#",
3-
"$id": "http://json-schema.org/draft/2019-04/meta/hyper-schema",
2+
"$schema": "https://json-schema.org/draft/2019-08/hyper-schema#",
3+
"$id": "https://json-schema.org/draft/2019-08/meta/hyper-schema",
44
"$vocabulary": {
5-
"https://json-schema.org/draft/2019-04/vocab/hyper-schema": true
5+
"https://json-schema.org/draft/2019-08/vocab/hyper-schema": true
66
},
77
"$recursiveAnchor": true,
88

@@ -16,7 +16,7 @@
1616
"links": {
1717
"type": "array",
1818
"items": {
19-
"$ref": "http://json-schema.org/draft/2019-04/links"
19+
"$ref": "https://json-schema.org/draft/2019-08/links"
2020
}
2121
}
2222
},

‎meta/meta-data.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"$schema": "http://json-schema.org/draft/2019-04/schema#",
3-
"$id": "http://json-schema.org/draft/2019-04/meta/meta-data",
2+
"$schema": "https://json-schema.org/draft/2019-08/schema#",
3+
"$id": "https://json-schema.org/draft/2019-08/meta/meta-data",
44
"$vocabulary": {
5-
"https://json-schema.org/draft/2019-04/vocab/meta-data": true
5+
"https://json-schema.org/draft/2019-08/vocab/meta-data": true
66
},
77
"$recursiveAnchor": true,
88

‎meta/validation.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"$schema": "http://json-schema.org/draft/2019-04/schema#",
3-
"$id": "http://json-schema.org/draft/2019-04/meta/validation",
2+
"$schema": "https://json-schema.org/draft/2019-08/schema#",
3+
"$id": "https://json-schema.org/draft/2019-08/meta/validation",
44
"$vocabulary": {
5-
"https://json-schema.org/draft/2019-04/vocab/validation": true
5+
"https://json-schema.org/draft/2019-08/vocab/validation": true
66
},
77
"$recursiveAnchor": true,
88

0 commit comments

Comments
 (0)