Update meta-schemas for changes in the last draft.

These changes were made for draft 05 but as that was intentionally published
with no new meta-schema, we are going straight to draft 06 with the
meta-schema identifiers.

Author: handrews

hyper-schema.json

@@ -1,9 +1,9 @@
 {
-    "$schema": "http://json-schema.org/draft-04/hyper-schema#",
-    "id": "http://json-schema.org/draft-04/hyper-schema#",
+    "$schema": "http://json-schema.org/draft-06/hyper-schema#",
+    "id": "http://json-schema.org/draft-06/hyper-schema#",
     "title": "JSON Hyper-Schema",
     "allOf": [
-        {"$ref": "http://json-schema.org/draft-04/schema#"}
+        {"$ref": "http://json-schema.org/draft-06/schema#"}
     ],
     "properties": {
         "additionalItems": {
@@ -46,13 +46,15 @@
         "oneOf": {"$ref": "#/definitions/schemaArray"},
         "not": { "$ref": "#" },
 
+        "base": {
+            "description": "URI Template resolved as for the 'href' keyword in the Link Description Object.  The resulting URI Refernce is resolved against the current URI base and sets the new URI base for URI references within the instance.",
+            "type": "string",
+            "format": "uriref"
+        },
         "links": {
             "type": "array",
             "items": {"$ref": "#/definitions/linkDescription"}
         },
-        "fragmentResolution": {
-            "type": "string"
-        },
         "media": {
             "type": "object",
             "properties": {
@@ -65,11 +67,6 @@
                     "type": "string"
                 }
             }
-        },
-        "pathStart": {
-            "description": "Instances' URIs must start with this value for this schema to apply to them",
-            "type": "string",
-            "format": "uri"
         }
     },
     "definitions": {
@@ -80,7 +77,7 @@
         "linkDescription": {
             "title": "Link Description Object",
             "type": "object",
-            "required": ["href", "rel"],
+            "required": ["href"],
             "properties": {
                 "href": {
                     "description": "a URI template, as defined by RFC 6570, with the addition of the $, ( and ) characters for pre-processing",
@@ -103,7 +100,7 @@
                     "type": "string"
                 },
                 "method": {
-                    "description": "method for requesting the target of the link (e.g. for HTTP this might be \"GET\" or \"DELETE\")",
+                    "description": "specifies that the client can construct a templated query (\"get\") or non-idempotent request (\"post\") to a resource.",
                     "type": "string"
                 },
                 "encType": {

schema.json

@@ -1,7 +1,7 @@
 {
-    "id": "http://json-schema.org/draft-04/schema#",
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "Core schema meta-schema",
+    "id": "http://json-schema.org/draft-06/schema#",
+    "$schema": "http://json-schema.org/draft-06/schema#",
+    "description": "Core and validation schema meta-schema",
     "definitions": {
         "schemaArray": {
             "type": "array",
@@ -13,7 +13,10 @@
             "minimum": 0
         },
         "positiveIntegerDefault0": {
-            "allOf": [ { "$ref": "#/definitions/positiveInteger" }, { "default": 0 } ]
+            "allOf": [
+                { "$ref": "#/definitions/positiveInteger" },
+                { "default": 0 }
+            ]
         },
         "simpleTypes": {
             "enum": [ "array", "boolean", "integer", "null", "number", "object", "string" ]
@@ -29,7 +32,7 @@
     "properties": {
         "id": {
             "type": "string",
-            "format": "uri"
+            "format": "uriref"
         },
         "$schema": {
             "type": "string",