Skip to content

Commit 53982c3

Browse files
handrewshandrews
committed
Update draft dates to August, and all HTTPS
There's no reason in 2019 to even have http:// examples, plus our use of http:// vs https:// for meta-schemas was pretty much random.
1 parent 9aa3537 commit 53982c3

16 files changed

+140
-140
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: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<eref target="https://github.com/json-schema-org/json-schema-spec/issues"/>.
8888
</t>
8989
<t>
90-
For additional information, see <eref target="http://json-schema.org/"/>.
90+
For additional information, see <eref target="https://json-schema.org/"/>.
9191
</t>
9292
<t>
9393
To provide feedback, use this issue tracker, the communication methods listed on the
@@ -1036,11 +1036,11 @@
10361036
</t>
10371037
<t>
10381038
The current URI for the Core vocabulary is:
1039-
<eref target="https://json-schema.org/draft/2019-04/vocab/core"/>.
1039+
<eref target="https://json-schema.org/draft/2019-08/vocab/core"/>.
10401040
</t>
10411041
<t>
10421042
The current URI for the corresponding meta-schema is:
1043-
<eref target="https://json-schema.org/draft/2019-04/meta/core"/>.
1043+
<eref target="https://json-schema.org/draft/2019-08/meta/core"/>.
10441044
</t>
10451045
<t>
10461046
Updated vocabulary and meta-schema URIs MAY be published between
@@ -1066,16 +1066,16 @@
10661066
<artwork>
10671067
<![CDATA[
10681068
{
1069-
"$schema": "https://json-schema.org/draft/2019-04/core-app-example#",
1070-
"$id": "https://json-schema.org/draft/2019-04/core-app-example",
1069+
"$schema": "https://json-schema.org/draft/2019-08/core-app-example#",
1070+
"$id": "https://json-schema.org/draft/2019-08/core-app-example",
10711071
"$recursiveAnchor": true,
10721072
"$vocabulary": {
1073-
"https://json-schema.org/draft/2019-04/vocab/core": true,
1074-
"https://json-schema.org/draft/2019-04/vocab/applicator": true
1073+
"https://json-schema.org/draft/2019-08/vocab/core": true,
1074+
"https://json-schema.org/draft/2019-08/vocab/applicator": true
10751075
},
10761076
"allOf": [
1077-
{"$ref": "https://json-schema.org/draft/2019-04/meta/core"},
1078-
{"$ref": "https://json-schema.org/draft/2019-04/meta/applicator"}
1077+
{"$ref": "https://json-schema.org/draft/2019-08/meta/core"},
1078+
{"$ref": "https://json-schema.org/draft/2019-08/meta/applicator"}
10791079
],
10801080
"patternProperties": {
10811081
"^unevaluated.*$": false
@@ -1211,7 +1211,7 @@
12111211
<artwork>
12121212
<![CDATA[
12131213
{
1214-
"$id": "http://example.com/root.json",
1214+
"$id": "https://example.com/root.json",
12151215
"$defs": {
12161216
"A": { "$id": "#foo" },
12171217
"B": {
@@ -1239,43 +1239,43 @@
12391239
<list style="hanging">
12401240
<t hangText="# (document root)">
12411241
<list>
1242-
<t>http://example.com/root.json</t>
1243-
<t>http://example.com/root.json#</t>
1242+
<t>https://example.com/root.json</t>
1243+
<t>https://example.com/root.json#</t>
12441244
</list>
12451245
</t>
12461246
<t hangText="#/$defs/A">
12471247
<list>
1248-
<t>http://example.com/root.json#foo</t>
1249-
<t>http://example.com/root.json#/$defs/A</t>
1248+
<t>https://example.com/root.json#foo</t>
1249+
<t>https://example.com/root.json#/$defs/A</t>
12501250
</list>
12511251
</t>
12521252
<t hangText="#/$defs/B">
12531253
<list>
1254-
<t>http://example.com/other.json</t>
1255-
<t>http://example.com/other.json#</t>
1256-
<t>http://example.com/root.json#/$defs/B</t>
1254+
<t>https://example.com/other.json</t>
1255+
<t>https://example.com/other.json#</t>
1256+
<t>https://example.com/root.json#/$defs/B</t>
12571257
</list>
12581258
</t>
12591259
<t hangText="#/$defs/B/$defs/X">
12601260
<list>
1261-
<t>http://example.com/other.json#bar</t>
1262-
<t>http://example.com/other.json#/$defs/X</t>
1263-
<t>http://example.com/root.json#/$defs/B/$defs/X</t>
1261+
<t>https://example.com/other.json#bar</t>
1262+
<t>https://example.com/other.json#/$defs/X</t>
1263+
<t>https://example.com/root.json#/$defs/B/$defs/X</t>
12641264
</list>
12651265
</t>
12661266
<t hangText="#/$defs/B/$defs/Y">
12671267
<list>
1268-
<t>http://example.com/t/inner.json</t>
1269-
<t>http://example.com/t/inner.json#</t>
1270-
<t>http://example.com/other.json#/$defs/Y</t>
1271-
<t>http://example.com/root.json#/$defs/B/$defs/Y</t>
1268+
<t>https://example.com/t/inner.json</t>
1269+
<t>https://example.com/t/inner.json#</t>
1270+
<t>https://example.com/other.json#/$defs/Y</t>
1271+
<t>https://example.com/root.json#/$defs/B/$defs/Y</t>
12721272
</list>
12731273
</t>
12741274
<t hangText="#/$defs/C">
12751275
<list>
12761276
<t>urn:uuid:ee564b8a-7a87-4125-8c96-e9f123d6766f</t>
12771277
<t>urn:uuid:ee564b8a-7a87-4125-8c96-e9f123d6766f#</t>
1278-
<t>http://example.com/root.json#/$defs/C</t>
1278+
<t>https://example.com/root.json#/$defs/C</t>
12791279
</list>
12801280
</t>
12811281
</list>
@@ -1342,7 +1342,7 @@
13421342
<artwork>
13431343
<![CDATA[
13441344
{
1345-
"$schema": "http://json-schema.org/draft/2019-04/schema#",
1345+
"$schema": "https://json-schema.org/draft/2019-08/schema#",
13461346
"$id": "https://example.com/original",
13471347
13481348
"properties": {
@@ -1356,7 +1356,7 @@
13561356
}
13571357
13581358
{
1359-
"$schema": "http://json-schema.org/draft/2019-04/schema#",
1359+
"$schema": "https://json-schema.org/draft/2019-08/schema#",
13601360
"$id": "https://example.com/extension",
13611361
13621362
"$ref": "original",
@@ -1455,7 +1455,7 @@
14551455
<artwork>
14561456
<![CDATA[
14571457
{
1458-
"$schema": "http://json-schema.org/draft/2019-04/schema#",
1458+
"$schema": "https://json-schema.org/draft/2019-08/schema#",
14591459
"$id": "https://example.com/original",
14601460
"$recursiveAnchor": true,
14611461
@@ -1470,7 +1470,7 @@
14701470
}
14711471
14721472
{
1473-
"$schema": "http://json-schema.org/draft/2019-04/schema#",
1473+
"$schema": "https://json-schema.org/draft/2019-08/schema#",
14741474
"$id": "https://example.com/extension",
14751475
"$recursiveAnchor": true,
14761476
@@ -1611,7 +1611,7 @@
16111611
<artwork>
16121612
<![CDATA[
16131613
{
1614-
"$id": "http://example.net/root.json",
1614+
"$id": "https://example.net/root.json",
16151615
"items": {
16161616
"type": "array",
16171617
"items": { "$ref": "#item" }
@@ -1630,17 +1630,17 @@
16301630
<t>
16311631
When an implementation encounters the &lt;#/$defs/single&gt; schema,
16321632
it resolves the "$id" URI reference against the current base URI to form
1633-
&lt;http://example.net/root.json#item&gt;.
1633+
&lt;https://example.net/root.json#item&gt;.
16341634
</t>
16351635
<t>
16361636
When an implementation then looks inside the &lt;#/items&gt; schema, it
16371637
encounters the &lt;#item&gt; reference, and resolves this to
1638-
&lt;http://example.net/root.json#item&gt;, which it has seen defined in
1638+
&lt;https://example.net/root.json#item&gt;, which it has seen defined in
16391639
this same document and can therefore use automatically.
16401640
</t>
16411641
<t>
16421642
When an implementation encounters the reference to "other.json", it resolves
1643-
this to &lt;http://example.net/other.json&gt;, which is not defined in this
1643+
this to &lt;https://example.net/other.json&gt;, which is not defined in this
16441644
document. If a schema with that identifier has otherwise been supplied to
16451645
the implementation, it can also be used automatically.
16461646
<cref>
@@ -1912,11 +1912,11 @@
19121912
</t>
19131913
<t>
19141914
The current URI for this vocabulary, known as the Applicator vocabulary, is:
1915-
<eref target="https://json-schema.org/draft/2019-04/vocab/applicator"/>.
1915+
<eref target="https://json-schema.org/draft/2019-08/vocab/applicator"/>.
19161916
</t>
19171917
<t>
19181918
The current URI for the corresponding meta-schema is:
1919-
<eref target="https://json-schema.org/draft/2019-04/meta/applicator"/>.
1919+
<eref target="https://json-schema.org/draft/2019-08/meta/applicator"/>.
19201920
</t>
19211921
<t>
19221922
Updated vocabulary and meta-schema URIs MAY be published between
@@ -2511,7 +2511,7 @@
25112511
<figure>
25122512
<artwork>
25132513
<![CDATA[
2514-
http://json-schema.org/draft/2019-04/schema#/$defs/nonNegativeInteger/minimum
2514+
https://json-schema.org/draft/2019-08/schema#/$defs/nonNegativeInteger/minimum
25152515
]]>
25162516
</artwork>
25172517
</figure>
@@ -2586,8 +2586,8 @@ http://json-schema.org/draft/2019-04/schema#/$defs/nonNegativeInteger/minimum
25862586
<artwork>
25872587
<![CDATA[
25882588
{
2589-
"$id": "http://example.com/polygon#",
2590-
"$schema": "http://json-schema.org/draft/2019-04/schema#",
2589+
"$id": "https://example.com/polygon#",
2590+
"$schema": "https://json-schema.org/draft/2019-08/schema#",
25912591
"$defs": {
25922592
"point": {
25932593
"type": "object",
@@ -2682,21 +2682,21 @@ http://json-schema.org/draft/2019-04/schema#/$defs/nonNegativeInteger/minimum
26822682
{
26832683
"keywordLocation": "#/items/$ref",
26842684
"absoluteKeywordLocation":
2685-
"http://example.com/polygon#/$defs/point",
2685+
"https://example.com/polygon#/$defs/point",
26862686
"instanceLocation": "#/1",
26872687
"error": "A subschema had errors."
26882688
},
26892689
{
26902690
"keywordLocation": "#/items/$ref/required",
26912691
"absoluteKeywordLocation":
2692-
"http://example.com/polygon#/$defs/point/required",
2692+
"https://example.com/polygon#/$defs/point/required",
26932693
"instanceLocation": "#/1",
26942694
"error": "Required property 'y' not found."
26952695
},
26962696
{
26972697
"keywordLocation": "#/items/$ref/additionalProperties",
26982698
"absoluteKeywordLocation":
2699-
"http://example.com/polygon#/$defs/point/additionalProperties",
2699+
"https://example.com/polygon#/$defs/point/additionalProperties",
27002700
"instanceLocation": "#/1/z",
27012701
"error": "Additional property 'z' found but was invalid."
27022702
},
@@ -2749,22 +2749,22 @@ http://json-schema.org/draft/2019-04/schema#/$defs/nonNegativeInteger/minimum
27492749
"valid": false,
27502750
"keywordLocation": "#/items/$ref",
27512751
"absoluteKeywordLocation":
2752-
"http://example.com/polygon#/$defs/point",
2752+
"https://example.com/polygon#/$defs/point",
27532753
"instanceLocation": "#/1",
27542754
"errors": [
27552755
{
27562756
"valid": false,
27572757
"keywordLocation": "#/items/$ref/required",
27582758
"absoluteKeywordLocation":
2759-
"http://example.com/polygon#/$defs/point/required",
2759+
"https://example.com/polygon#/$defs/point/required",
27602760
"instanceLocation": "#/1",
27612761
"error": "Required property 'y' not found."
27622762
},
27632763
{
27642764
"valid": false,
27652765
"keywordLocation": "#/items/$ref/additionalProperties",
27662766
"absoluteKeywordLocation":
2767-
"http://example.com/polygon#/$defs/point/additionalProperties",
2767+
"https://example.com/polygon#/$defs/point/additionalProperties",
27682768
"instanceLocation": "#/1/z",
27692769
"error": "Additional property 'z' found but was invalid."
27702770
}
@@ -2800,15 +2800,15 @@ http://json-schema.org/draft/2019-04/schema#/$defs/nonNegativeInteger/minimum
28002800
<t>
28012801
Because this output structure can be quite large, a smaller example is given
28022802
here for brevity. The URI of the full output structure of the example above is:
2803-
<eref target="https://json-schema.org/draft/2019-04/output/verbose-example"/>.
2803+
<eref target="https://json-schema.org/draft/2019-08/output/verbose-example"/>.
28042804
</t>
28052805
<figure>
28062806
<artwork>
28072807
<![CDATA[
28082808
// schema
28092809
{
2810-
"$id": "http://example.com/polygon#",
2811-
"$schema": "http://json-schema.org/draft/2019-04/schema#",
2810+
"$id": "https://example.com/polygon#",
2811+
"$schema": "https://json-schema.org/draft/2019-08/schema#",
28122812
"type": "object",
28132813
"properties": {
28142814
"validProp": true,
@@ -2862,7 +2862,7 @@ http://json-schema.org/draft/2019-04/schema#/$defs/nonNegativeInteger/minimum
28622862
<t>
28632863
For convenience, JSON Schema has been provided to validate output generated
28642864
by implementations. Its URI is:
2865-
<eref target="https://json-schema.org/draft/2019-04/output/schema"/>.
2865+
<eref target="https://json-schema.org/draft/2019-08/output/schema"/>.
28662866
</t>
28672867
</section>
28682868

@@ -2894,7 +2894,7 @@ http://json-schema.org/draft/2019-04/schema#/$defs/nonNegativeInteger/minimum
28942894
<figure>
28952895
<artwork>
28962896
<![CDATA[
2897-
Link: <http://example.com/my-hyper-schema#>; rel="describedby"
2897+
Link: <https://example.com/my-hyper-schema#>; rel="describedby"
28982898
]]>
28992899
</artwork>
29002900
</figure>
@@ -2940,7 +2940,7 @@ Link: <http://example.com/my-hyper-schema#>; rel="describedby"
29402940
<artwork>
29412941
<![CDATA[
29422942
Content-Type: application/json;
2943-
schema="http://example.com/my-hyper-schema#"
2943+
schema="https://example.com/my-hyper-schema#"
29442944
]]>
29452945
</artwork>
29462946
</figure>
@@ -2954,7 +2954,7 @@ Content-Type: application/json;
29542954
<artwork>
29552955
<![CDATA[
29562956
Content-Type: application/json;
2957-
schema="http://example.com/alice http://example.com/bob"
2957+
schema="https://example.com/alice https://example.com/bob"
29582958
]]>
29592959
</artwork>
29602960
</figure>
@@ -2967,9 +2967,9 @@ Content-Type: application/json;
29672967
<artwork>
29682968
<![CDATA[
29692969
Accept: application/json;
2970-
schema="http://example.com/qiang http://example.com/li",
2970+
schema="https://example.com/qiang https://example.com/li",
29712971
application/json;
2972-
schema="http://example.com/kumar"
2972+
schema="https://example.com/kumar"
29732973
]]>
29742974
</artwork>
29752975
</figure>

0 commit comments

Comments
 (0)