Skip to content

Commit b5270c5

Browse files
committed
Update all draft-next $schema, $id, $ref.
1 parent dd34368 commit b5270c5

File tree

89 files changed

+885
-195
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+885
-195
lines changed

Diff for: remotes/draft-next/baseUriChange/folderInteger.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2+
"$schema": "https://json-schema.org/draft/next/schema",
23
"type": "integer"
34
}
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2+
"$schema": "https://json-schema.org/draft/next/schema",
23
"type": "integer"
34
}
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2+
"$schema": "https://json-schema.org/draft/next/schema",
23
"type": "integer"
34
}

Diff for: remotes/draft-next/extendible-dynamic-ref.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
2+
"$schema": "https://json-schema.org/draft/next/schema",
23
"description": "extendible array",
3-
"$id": "http://localhost:1234/extendible-dynamic-ref.json",
4+
"$id": "http://localhost:1234/draft-next/extendible-dynamic-ref.json",
45
"type": "object",
56
"properties": {
67
"elements": {

Diff for: remotes/draft-next/integer.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2+
"$schema": "https://json-schema.org/draft/next/schema",
23
"type": "integer"
34
}

Diff for: remotes/draft-next/locationIndependentIdentifier.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"$schema": "https://json-schema.org/draft/next/schema",
23
"$defs": {
34
"refToInteger": {
45
"$ref": "#foo"

Diff for: remotes/draft-next/locationIndependentIdentifierDraft4.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"$schema": "https://json-schema.org/draft/next/schema",
23
"definitions": {
34
"refToInteger": {
45
"$ref": "#foo"

Diff for: remotes/draft-next/locationIndependentIdentifierPre2019.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"$schema": "https://json-schema.org/draft/next/schema",
23
"definitions": {
34
"refToInteger": {
45
"$ref": "#foo"

Diff for: remotes/draft-next/metaschema-no-validation.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"$schema": "https://json-schema.org/draft/next/schema",
23
"$id": "http://localhost:1234/draft-next/metaschema-no-validation.json",
34
"$vocabulary": {
45
"https://json-schema.org/draft/next/vocab/applicator": true,

Diff for: remotes/draft-next/name-defs.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"$schema": "https://json-schema.org/draft/next/schema",
23
"$defs": {
34
"orNull": {
45
"anyOf": [

Diff for: remotes/draft-next/name.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"$schema": "https://json-schema.org/draft/next/schema",
23
"definitions": {
34
"orNull": {
45
"anyOf": [

Diff for: remotes/draft-next/nested/foo-ref-string.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"$schema": "https://json-schema.org/draft/next/schema",
23
"type": "object",
34
"properties": {
45
"foo": {"$ref": "string.json"}

Diff for: remotes/draft-next/nested/string.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2+
"$schema": "https://json-schema.org/draft/next/schema",
23
"type": "string"
34
}

Diff for: remotes/draft-next/ref-and-definitions.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
2-
"$id": "http://localhost:1234/ref-and-definitions.json",
2+
"$schema": "https://json-schema.org/draft/next/schema",
3+
"$id": "http://localhost:1234/draft-next/ref-and-definitions.json",
34
"definitions": {
45
"inner": {
56
"properties": {

Diff for: remotes/draft-next/ref-and-defs.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
2-
"$id": "http://localhost:1234/ref-and-defs.json",
2+
"$schema": "https://json-schema.org/draft/next/schema",
3+
"$id": "http://localhost:1234/draft-next/ref-and-defs.json",
34
"$defs": {
45
"inner": {
56
"properties": {

Diff for: remotes/draft-next/subSchemas-defs.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"$schema": "https://json-schema.org/draft/next/schema",
23
"$defs": {
34
"integer": {
45
"type": "integer"

Diff for: remotes/draft-next/subSchemas.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"$schema": "https://json-schema.org/draft/next/schema",
23
"integer": {
34
"type": "integer"
45
},

Diff for: remotes/draft-next/tree.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
2+
"$schema": "https://json-schema.org/draft/next/schema",
23
"description": "tree schema, extensible",
3-
"$id": "http://localhost:1234/tree.json",
4+
"$id": "http://localhost:1234/draft-next/tree.json",
45
"$dynamicAnchor": "node",
56

67
"type": "object",

Diff for: tests/draft-next/additionalProperties.json

+10-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"description":
44
"additionalProperties being false does not allow other properties",
55
"schema": {
6+
"$schema": "https://json-schema.org/draft/next/schema",
67
"properties": {"foo": {}, "bar": {}},
78
"patternProperties": { "^v": {} },
89
"additionalProperties": false
@@ -43,6 +44,7 @@
4344
{
4445
"description": "non-ASCII pattern with additionalProperties",
4546
"schema": {
47+
"$schema": "https://json-schema.org/draft/next/schema",
4648
"patternProperties": {"^á": {}},
4749
"additionalProperties": false
4850
},
@@ -62,6 +64,7 @@
6264
{
6365
"description": "additionalProperties with schema",
6466
"schema": {
67+
"$schema": "https://json-schema.org/draft/next/schema",
6568
"properties": {"foo": {}, "bar": {}},
6669
"additionalProperties": {"type": "boolean"}
6770
},
@@ -87,6 +90,7 @@
8790
"description":
8891
"additionalProperties can exist by itself",
8992
"schema": {
93+
"$schema": "https://json-schema.org/draft/next/schema",
9094
"additionalProperties": {"type": "boolean"}
9195
},
9296
"tests": [
@@ -104,7 +108,10 @@
104108
},
105109
{
106110
"description": "additionalProperties are allowed by default",
107-
"schema": {"properties": {"foo": {}, "bar": {}}},
111+
"schema": {
112+
"$schema": "https://json-schema.org/draft/next/schema",
113+
"properties": {"foo": {}, "bar": {}}
114+
},
108115
"tests": [
109116
{
110117
"description": "additional properties are allowed",
@@ -116,6 +123,7 @@
116123
{
117124
"description": "additionalProperties does not look in applicators",
118125
"schema": {
126+
"$schema": "https://json-schema.org/draft/next/schema",
119127
"allOf": [
120128
{"properties": {"foo": {}}}
121129
],
@@ -132,6 +140,7 @@
132140
{
133141
"description": "additionalProperties with null valued instance properties",
134142
"schema": {
143+
"$schema": "https://json-schema.org/draft/next/schema",
135144
"additionalProperties": {
136145
"type": "null"
137146
}

Diff for: tests/draft-next/allOf.json

+21-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
{
33
"description": "allOf",
44
"schema": {
5+
"$schema": "https://json-schema.org/draft/next/schema",
56
"allOf": [
67
{
78
"properties": {
@@ -43,6 +44,7 @@
4344
{
4445
"description": "allOf with base schema",
4546
"schema": {
47+
"$schema": "https://json-schema.org/draft/next/schema",
4648
"properties": {"bar": {"type": "integer"}},
4749
"required": ["bar"],
4850
"allOf" : [
@@ -91,6 +93,7 @@
9193
{
9294
"description": "allOf simple types",
9395
"schema": {
96+
"$schema": "https://json-schema.org/draft/next/schema",
9497
"allOf": [
9598
{"maximum": 30},
9699
{"minimum": 20}
@@ -111,7 +114,10 @@
111114
},
112115
{
113116
"description": "allOf with boolean schemas, all true",
114-
"schema": {"allOf": [true, true]},
117+
"schema": {
118+
"$schema": "https://json-schema.org/draft/next/schema",
119+
"allOf": [true, true]
120+
},
115121
"tests": [
116122
{
117123
"description": "any value is valid",
@@ -122,7 +128,10 @@
122128
},
123129
{
124130
"description": "allOf with boolean schemas, some false",
125-
"schema": {"allOf": [true, false]},
131+
"schema": {
132+
"$schema": "https://json-schema.org/draft/next/schema",
133+
"allOf": [true, false]
134+
},
126135
"tests": [
127136
{
128137
"description": "any value is invalid",
@@ -133,7 +142,10 @@
133142
},
134143
{
135144
"description": "allOf with boolean schemas, all false",
136-
"schema": {"allOf": [false, false]},
145+
"schema": {
146+
"$schema": "https://json-schema.org/draft/next/schema",
147+
"allOf": [false, false]
148+
},
137149
"tests": [
138150
{
139151
"description": "any value is invalid",
@@ -145,6 +157,7 @@
145157
{
146158
"description": "allOf with one empty schema",
147159
"schema": {
160+
"$schema": "https://json-schema.org/draft/next/schema",
148161
"allOf": [
149162
{}
150163
]
@@ -160,6 +173,7 @@
160173
{
161174
"description": "allOf with two empty schemas",
162175
"schema": {
176+
"$schema": "https://json-schema.org/draft/next/schema",
163177
"allOf": [
164178
{},
165179
{}
@@ -176,6 +190,7 @@
176190
{
177191
"description": "allOf with the first empty schema",
178192
"schema": {
193+
"$schema": "https://json-schema.org/draft/next/schema",
179194
"allOf": [
180195
{},
181196
{ "type": "number" }
@@ -197,6 +212,7 @@
197212
{
198213
"description": "allOf with the last empty schema",
199214
"schema": {
215+
"$schema": "https://json-schema.org/draft/next/schema",
200216
"allOf": [
201217
{ "type": "number" },
202218
{}
@@ -218,6 +234,7 @@
218234
{
219235
"description": "nested allOf, to check validation semantics",
220236
"schema": {
237+
"$schema": "https://json-schema.org/draft/next/schema",
221238
"allOf": [
222239
{
223240
"allOf": [
@@ -244,6 +261,7 @@
244261
{
245262
"description": "allOf combined with anyOf, oneOf",
246263
"schema": {
264+
"$schema": "https://json-schema.org/draft/next/schema",
247265
"allOf": [ { "multipleOf": 2 } ],
248266
"anyOf": [ { "multipleOf": 3 } ],
249267
"oneOf": [ { "multipleOf": 5 } ]

Diff for: tests/draft-next/anchor.json

+15-6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
{
33
"description": "Location-independent identifier",
44
"schema": {
5+
"$schema": "https://json-schema.org/draft/next/schema",
56
"$ref": "#foo",
67
"$defs": {
78
"A": {
@@ -26,10 +27,11 @@
2627
{
2728
"description": "Location-independent identifier with absolute URI",
2829
"schema": {
29-
"$ref": "http://localhost:1234/bar#foo",
30+
"$schema": "https://json-schema.org/draft/next/schema",
31+
"$ref": "http://localhost:1234/draft-next/bar#foo",
3032
"$defs": {
3133
"A": {
32-
"$id": "http://localhost:1234/bar",
34+
"$id": "http://localhost:1234/draft-next/bar",
3335
"$anchor": "foo",
3436
"type": "integer"
3537
}
@@ -51,8 +53,9 @@
5153
{
5254
"description": "Location-independent identifier with base URI change in subschema",
5355
"schema": {
54-
"$id": "http://localhost:1234/root",
55-
"$ref": "http://localhost:1234/nested.json#foo",
56+
"$schema": "https://json-schema.org/draft/next/schema",
57+
"$id": "http://localhost:1234/draft-next/root",
58+
"$ref": "http://localhost:1234/draft-next/nested.json#foo",
5659
"$defs": {
5760
"A": {
5861
"$id": "nested.json",
@@ -82,6 +85,7 @@
8285
"description": "$anchor inside an enum is not a real identifier",
8386
"comment": "the implementation must not be confused by an $anchor buried in the enum",
8487
"schema": {
88+
"$schema": "https://json-schema.org/draft/next/schema",
8589
"$defs": {
8690
"anchor_in_enum": {
8791
"enum": [
@@ -138,7 +142,8 @@
138142
{
139143
"description": "same $anchor with different base uri",
140144
"schema": {
141-
"$id": "http://localhost:1234/foobar",
145+
"$schema": "https://json-schema.org/draft/next/schema",
146+
"$id": "http://localhost:1234/draft-next/foobar",
142147
"$defs": {
143148
"A": {
144149
"$id": "child1",
@@ -173,6 +178,7 @@
173178
{
174179
"description": "non-schema object containing an $anchor property",
175180
"schema": {
181+
"$schema": "https://json-schema.org/draft/next/schema",
176182
"$defs": {
177183
"const_not_anchor": {
178184
"const": {
@@ -203,7 +209,10 @@
203209
},
204210
{
205211
"description": "invalid anchors",
206-
"schema": { "$ref": "https://json-schema.org/draft/next/schema" },
212+
"schema": {
213+
"$schema": "https://json-schema.org/draft/next/schema",
214+
"$ref": "https://json-schema.org/draft/next/schema"
215+
},
207216
"tests": [
208217
{
209218
"description": "MUST start with a letter (and not #)",

0 commit comments

Comments
 (0)