Update all examples to be valid against Draft 6

adamvoss · adamvoss · commit c292a43d8a0b · 2017-06-18T09:45:06.000-05:00
diff --git a/_includes/example1/schema1.json b/_includes/example1/schema1.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "http://json-schema.org/draft-04/schema#",
+    "$schema": "http://json-schema.org/draft-06/schema#",
     "title": "Product",
     "description": "A product from Acme's catalog",
     "type": "object"
diff --git a/_includes/example1/schema2.json b/_includes/example1/schema2.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "http://json-schema.org/draft-04/schema#",
+    "$schema": "http://json-schema.org/draft-06/schema#",
     "title": "Product",
     "description": "A product from Acme's catalog",
     "type": "object",
diff --git a/_includes/example1/schema3.json b/_includes/example1/schema3.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "http://json-schema.org/draft-04/schema#",
+    "$schema": "http://json-schema.org/draft-06/schema#",
     "title": "Product",
     "description": "A product from Acme's catalog",
     "type": "object",
diff --git a/_includes/example1/schema4.json b/_includes/example1/schema4.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "http://json-schema.org/draft-04/schema#",
+    "$schema": "http://json-schema.org/draft-06/schema#",
     "title": "Product",
     "description": "A product from Acme's catalog",
     "type": "object",
@@ -14,8 +14,7 @@
         },
         "price": {
             "type": "number",
-            "minimum": 0,
-            "exclusiveMinimum": true
+            "exclusiveMinimum": 0
         }
     },
     "required": ["id", "name", "price"]
diff --git a/_includes/example1/schema5.json b/_includes/example1/schema5.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "http://json-schema.org/draft-04/schema#",
+    "$schema": "http://json-schema.org/draft-06/schema#",
     "title": "Product",
     "description": "A product from Acme's catalog",
     "type": "object",
@@ -14,8 +14,7 @@
         },
         "price": {
             "type": "number",
-            "minimum": 0,
-            "exclusiveMinimum": true
+            "exclusiveMinimum": 0
         },
         "tags": {
             "type": "array",
diff --git a/_includes/example1/set_schema.json b/_includes/example1/set_schema.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "http://json-schema.org/draft-04/schema#",
+    "$schema": "http://json-schema.org/draft-06/schema#",
     "title": "Product set",
     "type": "array",
     "items": {
@@ -15,8 +15,7 @@
             },
             "price": {
                 "type": "number",
-                "minimum": 0,
-                "exclusiveMinimum": true
+                "exclusiveMinimum": 0
             },
             "tags": {
                 "type": "array",
diff --git a/_includes/example2/entry_schema1.json b/_includes/example2/entry_schema1.json
@@ -1,6 +1,6 @@
 {
     "id": "http://some.site.somewhere/entry-schema#",
-    "$schema": "http://json-schema.org/draft-04/schema#",
+    "$schema": "http://json-schema.org/draft-06/schema#",
     "description": "schema for an fstab entry",
     "type": "object",
     "required": [ "storage" ],
diff --git a/_includes/example2/entry_schema2.json b/_includes/example2/entry_schema2.json
@@ -1,6 +1,6 @@
 {
     "id": "http://some.site.somewhere/entry-schema#",
-    "$schema": "http://json-schema.org/draft-04/schema#",
+    "$schema": "http://json-schema.org/draft-06/schema#",
     "description": "schema for an fstab entry",
     "type": "object",
     "required": [ "storage" ],
diff --git a/_includes/example2/entry_schema3.json b/_includes/example2/entry_schema3.json
@@ -1,6 +1,6 @@
 {
     "id": "http://some.site.somewhere/entry-schema#",
-    "$schema": "http://json-schema.org/draft-04/schema#",
+    "$schema": "http://json-schema.org/draft-06/schema#",
     "description": "schema for an fstab entry",
     "type": "object",
     "required": [ "storage" ],
@@ -58,7 +58,7 @@
                 "server": {
                     "type": "string",
                     "oneOf": [
-                        { "format": "host-name" },
+                        { "format": "hostname" },
                         { "format": "ipv4" },
                         { "format": "ipv6" }
                     ]
diff --git a/_includes/example2/schema1.json b/_includes/example2/schema1.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "http://json-schema.org/draft-04/schema#",
+    "$schema": "http://json-schema.org/draft-06/schema#",
     "type": "object",
     "properties": {
         "/": {}
diff --git a/_includes/example2/schema2.json b/_includes/example2/schema2.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "http://json-schema.org/draft-04/schema#",
+    "$schema": "http://json-schema.org/draft-06/schema#",
     "type": "object",
     "properties": {
         "/": { "$ref": "http://some.site.somewhere/entry-schema#" }
diff --git a/_includes/example2/storage_schema3.json b/_includes/example2/storage_schema3.json
@@ -8,7 +8,7 @@
         "server": {
             "type": "string",
             "oneOf": [
-                { "format": "host-name" },
+                { "format": "hostname" },
                 { "format": "ipv4" },
                 { "format": "ipv6" }
             ]
diff --git a/example/address.json b/example/address.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "http://json-schema.org/draft-04/schema#",
+    "$schema": "http://json-schema.org/draft-06/schema#",
     "description": "An Address following the convention of http://microformats.org/wiki/hcard",
     "type": "object",
     "properties": {
diff --git a/example/calendar.json b/example/calendar.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "http://json-schema.org/draft-04/schema#",
+    "$schema": "http://json-schema.org/draft-06/schema#",
     "description": "A representation of an event",
     "type": "object",
     "required": [ "dtstart", "summary" ],
@@ -33,6 +33,6 @@
         },
         "category": { "type": "string" },
         "description": { "type": "string" },
-        "geo": { "$ref": "http: //json-schema.org/geo" }
+        "geo": { "$ref": "http://json-schema.org/geo" }
     }
 }
diff --git a/example/card.json b/example/card.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "http://json-schema.org/draft-04/schema#",
+    "$schema": "http://json-schema.org/draft-06/schema#",
     "description": "A representation of a person, company, organization, or place",
     "type": "object",
     "required": ["familyName", "givenName"],
diff --git a/example/geo.json b/example/geo.json
@@ -1,5 +1,6 @@
 {
-    "$schema": "http://json-schema.org/draft-04/schema#",
+    "id": "http://json-schema.org/geo",
+    "$schema": "http://json-schema.org/draft-06/schema#",
     "description": "A geographical coordinate",
     "type": "object",
     "properties": {
diff --git a/example1.md b/example1.md
@@ -35,7 +35,7 @@ The above schema has four properties called *keywords*. The *title* and *descrip
 
 The *type* keyword defines the first constraint on our JSON data: it has to be a JSON Object.
 
-Finally, the *$schema* keyword states that this schema is written according to the draft v4 specification.
+Finally, the *$schema* keyword states that this schema is written according to the draft-06 specification.
 
 Defining the properties
 -----------------------
@@ -62,7 +62,7 @@ In JSON Schema terms, we can update our schema to:
 
 ### Can price be 0?
 
-According to Acme's docs, there are no free products. In JSON schema a number can have a minimum. By default this minimum is inclusive, so we need to specify *exclusiveMinimum*. Therefore we can update our schema with *price*:
+According to Acme's docs, there are no free products. So we need to specify *exclusiveMinimum*. If we wanted to include 0 as a valid price, we would have specified *minimum* instead. Therefore, we can update our schema with *price*:
 
 ```json
 {% include example1/schema4.json %}
diff --git a/example2.md b/example2.md
@@ -22,7 +22,7 @@ We will start with a base schema expressing the following constraints:
 -   the member names (or property names) of this object must all be valid, absolute paths;
 -   there must be an entry for the root filesystem (ie, `/`).
 
-We also want the schema to be regarded as a draft v4 schema, we must therefore specify *$schema*:
+We also want the schema to be regarded as a draft v6 schema, we must therefore specify *$schema*:
 
 ```json
 {% include example2/schema1.json %}
@@ -163,6 +163,4 @@ While this is not a concern if you know that the schema you write will be used b
 
 -   *format* support is optional, and as such other tools may ignore this keyword: this can lead to a different validation outcome for the same data;
 -   it uses regular expressions: care should be taken not to use any advanced features (such as lookarounds), since they may not be supported at the other end;
--   it uses *$schema* to express the need to use draft v4 syntax, but not all tools support draft v4 (in fact, most don't support it).
-
-
+-   it uses *$schema* to express the need to use draft v6 compliant processing, but not all tools support draft v6 (in fact, most don't support it).

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "$schema": "http://json-schema.org/draft-04/schema#",`
	`2`	`+ "$schema": "http://json-schema.org/draft-06/schema#",`
`3`	`3`	`"title": "Product",`
`4`	`4`	`"description": "A product from Acme's catalog",`
`5`	`5`	`"type": "object"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"id": "http://some.site.somewhere/entry-schema#",`
`3`		`- "$schema": "http://json-schema.org/draft-04/schema#",`
	`3`	`+ "$schema": "http://json-schema.org/draft-06/schema#",`
`4`	`4`	`"description": "schema for an fstab entry",`
`5`	`5`	`"type": "object",`
`6`	`6`	`"required": [ "storage" ],`