Merge commit '65802a7ebcd0b661c829307354ab0c24e1e05031'

* commit '65802a7ebcd0b661c829307354ab0c24e1e05031':
  Squashed 'json/' changes from 4cfead7ba..6eaf7dff4

json/README.md

@@ -103,6 +103,8 @@ The precise steps described do not need to be followed exactly, but the results
 
 To test a specific version:
 
+* For 2019-09 and later published drafts, implementations that are able to detect the draft of each schema via `$schema` SHOULD be configured to do so
+* For draft-07 and earlier, draft-next, and implementations unable to detect via `$schema`, implementations MUST be configured to expect the draft matching the test directory name
 * Load any remote references [described below](additional-assumptions) and configure your implementation to retrieve them via their URIs
 * Walk the filesystem tree for that version's subdirectory and for each `.json` file found:
 

json/remotes/draft-next/baseUriChange/folderInteger.json

@@ -0,0 +1,4 @@
+{
+    "$schema": "https://json-schema.org/draft/next/schema",
+    "type": "integer"
+}

json/remotes/draft-next/baseUriChangeFolder/folderInteger.json

@@ -0,0 +1,4 @@
+{
+    "$schema": "https://json-schema.org/draft/next/schema",
+    "type": "integer"
+}

json/remotes/draft-next/baseUriChangeFolderInSubschema/folderInteger.json

@@ -0,0 +1,4 @@
+{
+    "$schema": "https://json-schema.org/draft/next/schema",
+    "type": "integer"
+}

json/remotes/draft-next/extendible-dynamic-ref.json

@@ -0,0 +1,21 @@
+{
+    "$schema": "https://json-schema.org/draft/next/schema",
+    "description": "extendible array",
+    "$id": "http://localhost:1234/draft-next/extendible-dynamic-ref.json",
+    "type": "object",
+    "properties": {
+        "elements": {
+            "type": "array",
+            "items": {
+                "$dynamicRef": "#elements"
+            }
+        }
+    },
+    "required": ["elements"],
+    "additionalProperties": false,
+    "$defs": {
+        "elements": {
+            "$dynamicAnchor": "elements"
+        }
+    }
+}

json/remotes/draft-next/integer.json

@@ -0,0 +1,4 @@
+{
+    "$schema": "https://json-schema.org/draft/next/schema",
+    "type": "integer"
+}

json/remotes/draft-next/locationIndependentIdentifier.json

@@ -0,0 +1,12 @@
+{
+    "$schema": "https://json-schema.org/draft/next/schema",
+    "$defs": {
+        "refToInteger": {
+            "$ref": "#foo"
+        },
+        "A": {
+            "$anchor": "foo",
+            "type": "integer"
+        }
+    }
+}

json/remotes/draft-next/locationIndependentIdentifierDraft4.json

@@ -0,0 +1,12 @@
+{
+    "$schema": "https://json-schema.org/draft/next/schema",
+    "definitions": {
+        "refToInteger": {
+            "$ref": "#foo"
+        },
+        "A": {
+            "id": "#foo",
+            "type": "integer"
+        }
+    }
+}

json/remotes/draft-next/locationIndependentIdentifierPre2019.json

@@ -0,0 +1,12 @@
+{
+    "$schema": "https://json-schema.org/draft/next/schema",
+    "definitions": {
+        "refToInteger": {
+            "$ref": "#foo"
+        },
+        "A": {
+            "$id": "#foo",
+            "type": "integer"
+        }
+    }
+}

json/remotes/draft-next/metaschema-no-validation.json

@@ -1,4 +1,5 @@
 {
+    "$schema": "https://json-schema.org/draft/next/schema",
     "$id": "http://localhost:1234/draft-next/metaschema-no-validation.json",
     "$vocabulary": {
         "https://json-schema.org/draft/next/vocab/applicator": true,

json/remotes/draft-next/name-defs.json

@@ -0,0 +1,16 @@
+{
+    "$schema": "https://json-schema.org/draft/next/schema",
+    "$defs": {
+        "orNull": {
+            "anyOf": [
+                {
+                    "type": "null"
+                },
+                {
+                    "$ref": "#"
+                }
+            ]
+        }
+    },
+    "type": "string"
+}

json/remotes/draft-next/name.json

@@ -0,0 +1,16 @@
+{
+    "$schema": "https://json-schema.org/draft/next/schema",
+    "definitions": {
+        "orNull": {
+            "anyOf": [
+                {
+                    "type": "null"
+                },
+                {
+                    "$ref": "#"
+                }
+            ]
+        }
+    },
+    "type": "string"
+}

json/remotes/draft-next/nested/foo-ref-string.json

@@ -0,0 +1,7 @@
+{
+    "$schema": "https://json-schema.org/draft/next/schema",
+    "type": "object",
+    "properties": {
+        "foo": {"$ref": "string.json"}
+    }
+}

json/remotes/draft-next/nested/string.json

@@ -0,0 +1,4 @@
+{
+    "$schema": "https://json-schema.org/draft/next/schema",
+    "type": "string"
+}

json/remotes/draft-next/ref-and-definitions.json

@@ -0,0 +1,12 @@
+{
+    "$schema": "https://json-schema.org/draft/next/schema",
+    "$id": "http://localhost:1234/draft-next/ref-and-definitions.json",
+    "definitions": {
+        "inner": {
+            "properties": {
+                "bar": { "type": "string" }
+            }
+        }
+    },
+    "allOf": [ { "$ref": "#/definitions/inner" } ]
+}

json/remotes/draft-next/ref-and-defs.json

@@ -0,0 +1,12 @@
+{
+    "$schema": "https://json-schema.org/draft/next/schema",
+    "$id": "http://localhost:1234/draft-next/ref-and-defs.json",
+    "$defs": {
+        "inner": {
+            "properties": {
+                "bar": { "type": "string" }
+            }
+        }
+    },
+    "$ref": "#/$defs/inner"
+}

json/remotes/draft-next/subSchemas-defs.json

@@ -0,0 +1,11 @@
+{
+    "$schema": "https://json-schema.org/draft/next/schema",
+    "$defs": {
+        "integer": {
+            "type": "integer"
+        },
+        "refToInteger": {
+            "$ref": "#/$defs/integer"
+        }
+    }
+}

json/remotes/draft-next/subSchemas.json

@@ -0,0 +1,9 @@
+{
+    "$schema": "https://json-schema.org/draft/next/schema",
+    "integer": {
+        "type": "integer"
+    },
+    "refToInteger": {
+        "$ref": "#/integer"
+    }
+}

json/remotes/draft-next/tree.json

@@ -0,0 +1,17 @@
+{
+    "$schema": "https://json-schema.org/draft/next/schema",
+    "description": "tree schema, extensible",
+    "$id": "http://localhost:1234/draft-next/tree.json",
+    "$dynamicAnchor": "node",
+
+    "type": "object",
+    "properties": {
+        "data": true,
+        "children": {
+            "type": "array",
+            "items": {
+                "$dynamicRef": "#node"
+            }
+        }
+    }
+}

json/remotes/draft2019-09/baseUriChange/folderInteger.json

@@ -0,0 +1,4 @@
+{
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "type": "integer"
+}

json/remotes/draft2019-09/baseUriChangeFolder/folderInteger.json

@@ -0,0 +1,4 @@
+{
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "type": "integer"
+}

json/remotes/draft2019-09/baseUriChangeFolderInSubschema/folderInteger.json

@@ -0,0 +1,4 @@
+{
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "type": "integer"
+}

json/remotes/draft2019-09/extendible-dynamic-ref.json

@@ -0,0 +1,21 @@
+{
+    "description": "extendible array",
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "$id": "http://localhost:1234/draft2019-09/extendible-dynamic-ref.json",
+    "type": "object",
+    "properties": {
+        "elements": {
+            "type": "array",
+            "items": {
+                "$dynamicRef": "#elements"
+            }
+        }
+    },
+    "required": ["elements"],
+    "additionalProperties": false,
+    "$defs": {
+        "elements": {
+            "$dynamicAnchor": "elements"
+        }
+    }
+}

json/remotes/draft2019-09/integer.json

@@ -0,0 +1,4 @@
+{
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "type": "integer"
+}

json/remotes/draft2019-09/locationIndependentIdentifier.json

@@ -0,0 +1,12 @@
+{
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "$defs": {
+        "refToInteger": {
+            "$ref": "#foo"
+        },
+        "A": {
+            "$anchor": "foo",
+            "type": "integer"
+        }
+    }
+}

json/remotes/draft2019-09/locationIndependentIdentifierDraft4.json

@@ -0,0 +1,12 @@
+{
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "definitions": {
+        "refToInteger": {
+            "$ref": "#foo"
+        },
+        "A": {
+            "id": "#foo",
+            "type": "integer"
+        }
+    }
+}

json/remotes/draft2019-09/locationIndependentIdentifierPre2019.json

@@ -0,0 +1,12 @@
+{
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "definitions": {
+        "refToInteger": {
+            "$ref": "#foo"
+        },
+        "A": {
+            "$id": "#foo",
+            "type": "integer"
+        }
+    }
+}

json/remotes/draft2019-09/metaschema-no-validation.json

@@ -1,4 +1,5 @@
 {
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
     "$id": "http://localhost:1234/draft2019-09/metaschema-no-validation.json",
     "$vocabulary": {
         "https://json-schema.org/draft/2019-09/vocab/applicator": true,

json/remotes/draft2019-09/name-defs.json

@@ -0,0 +1,16 @@
+{
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "$defs": {
+        "orNull": {
+            "anyOf": [
+                {
+                    "type": "null"
+                },
+                {
+                    "$ref": "#"
+                }
+            ]
+        }
+    },
+    "type": "string"
+}

json/remotes/draft2019-09/name.json

@@ -0,0 +1,16 @@
+{
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "definitions": {
+        "orNull": {
+            "anyOf": [
+                {
+                    "type": "null"
+                },
+                {
+                    "$ref": "#"
+                }
+            ]
+        }
+    },
+    "type": "string"
+}

json/remotes/draft2019-09/nested/foo-ref-string.json

@@ -0,0 +1,7 @@
+{
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "type": "object",
+    "properties": {
+        "foo": {"$ref": "string.json"}
+    }
+}

json/remotes/draft2019-09/nested/string.json

@@ -0,0 +1,4 @@
+{
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "type": "string"
+}

json/remotes/draft2019-09/ref-and-definitions.json

@@ -0,0 +1,12 @@
+{
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "$id": "http://localhost:1234/draft2019-09/ref-and-definitions.json",
+    "definitions": {
+        "inner": {
+            "properties": {
+                "bar": { "type": "string" }
+            }
+        }
+    },
+    "allOf": [ { "$ref": "#/definitions/inner" } ]
+}

json/remotes/draft2019-09/ref-and-defs.json

@@ -0,0 +1,12 @@
+{
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "$id": "http://localhost:1234/draft2019-09/ref-and-defs.json",
+    "$defs": {
+        "inner": {
+            "properties": {
+                "bar": { "type": "string" }
+            }
+        }
+    },
+    "$ref": "#/$defs/inner"
+}

json/remotes/draft2019-09/subSchemas-defs.json

@@ -0,0 +1,11 @@
+{
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "$defs": {
+        "integer": {
+            "type": "integer"
+        },
+        "refToInteger": {
+            "$ref": "#/$defs/integer"
+        }
+    }
+}

json/remotes/draft2019-09/subSchemas.json

@@ -0,0 +1,9 @@
+{
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "integer": {
+        "type": "integer"
+    },
+    "refToInteger": {
+        "$ref": "#/integer"
+    }
+}