Merge pull request #1 from json-schema-org/master

pull in updates

Author: gregsdennis

.travis.yml

@@ -1,9 +1,8 @@
 language: python
 install:
-- pip install "xml2rfc<2.10"
+- pip install "xml2rfc~=2.20"
 before_script:
 - TAG=$(git tag -l --points-at HEAD)
 script:
-- xml2rfc jsonschema-core.xml --basename=jsonschema-core-$TAG --text --html
-- xml2rfc jsonschema-validation.xml --basename=jsonschema-validation-$TAG --text --html
-- xml2rfc jsonschema-hyperschema.xml --basename=jsonschema-hyperschema-$TAG --text --html
+- xml2rfc -V
+- make all

README.md

@@ -13,10 +13,11 @@ Please read our [guidelines for contributing](CONTRIBUTING.md).
 ## Status
 For the current status of issues and pull requests, please see the following labels
 
-[![Available](https://img.shields.io/waffle/label/json-schema-org/json-schema-spec/Status:%20Available.svg?style=flat)](https://github.com/json-schema-org/json-schema-spec/issues?q=is%3Aopen+is%3Aissue+label%3A%22Status%3A+Available%22) [![In Progress](https://img.shields.io/waffle/label/json-schema-org/json-schema-spec/Status:%20In%20Progress.svg?style=flat)](https://github.com/json-schema-org/json-schema-spec/labels/Status:%20In%20Progress) [![Review Needed](https://img.shields.io/waffle/label/json-schema-org/json-schema-spec/Status:%20Review%20Needed.svg?style=flat)](https://github.com/json-schema-org/json-schema-spec/labels/Status%3A%20Review%20Needed)
+[![Available](https://img.shields.io/github/issues/json-schema-org/json-schema-spec/Status:%20Available.svg?color=brightgreen)](https://github.com/json-schema-org/json-schema-spec/issues?q=is%3Aopen+is%3Aissue+label%3A%22Status%3A+Available%22) [![In Progress](https://img.shields.io/github/issues/json-schema-org/json-schema-spec/Status:%20In%20Progress.svg)](https://github.com/json-schema-org/json-schema-spec/labels/Status:%20In%20Progress) [![Review Needed](https://img.shields.io/github/issues/json-schema-org/json-schema-spec/Status:%20Review%20Needed.svg)](https://github.com/json-schema-org/json-schema-spec/labels/Status%3A%20Review%20Needed)
+
+[![Critical](https://img.shields.io/github/issues/json-schema-org/json-schema-spec/Priority:%20Critical.svg?color=critical
+)](https://github.com/json-schema-org/json-schema-spec/labels/Priority%3A%20Critical) [![High](https://img.shields.io/github/issues/json-schema-org/json-schema-spec/Priority:%20High.svg?color=important)](https://github.com/json-schema-org/json-schema-spec/labels/Priority%3A%20High) [![Medium](https://img.shields.io/github/issues/json-schema-org/json-schema-spec/Priority:%20Medium.svg)](https://github.com/json-schema-org/json-schema-spec/labels/Priority%3A%20Medium) [![Low](https://img.shields.io/github/issues/json-schema-org/json-schema-spec/Priority:%20Low.svg)](https://github.com/json-schema-org/json-schema-spec/labels/Priority%3A%20Low) 
 
-[![Critical](https://img.shields.io/waffle/label/json-schema-org/json-schema-spec/Priority:%20Critical.svg?style=flat
-)](https://github.com/json-schema-org/json-schema-spec/labels/Priority%3A%20Critical) [![High](https://img.shields.io/waffle/label/json-schema-org/json-schema-spec/Priority:%20High.svg?style=flat)](https://github.com/json-schema-org/json-schema-spec/labels/Priority%3A%20High) [![Medium](https://img.shields.io/waffle/label/json-schema-org/json-schema-spec/Priority:%20Medium.svg?style=flat)](https://github.com/json-schema-org/json-schema-spec/labels/Priority%3A%20Medium) [![Low](https://img.shields.io/waffle/label/json-schema-org/json-schema-spec/Priority:%20Low.svg?style=flat)](https://github.com/json-schema-org/json-schema-spec/labels/Priority%3A%20Low) 
 
 Labels are assigned based on [Sensible Github Labels](https://github.com/Relequestual/sensible-github-labels).
 

hyper-schema.json

@@ -1,22 +1,22 @@
 {
-    "$schema": "http://json-schema.org/draft-08/hyper-schema#",
-    "$id": "http://json-schema.org/draft-08/hyper-schema",
+    "$schema": "http://json-schema.org/draft/2019-04/hyper-schema#",
+    "$id": "http://json-schema.org/draft/2019-04/hyper-schema",
+    "$vocabulary": {
+        "https://json-schema.org/draft/2019-04/vocab/core": true,
+        "https://json-schema.org/draft/2019-04/vocab/applicator": true,
+        "https://json-schema.org/draft/2019-04/vocab/validation": true,
+        "https://json-schema.org/draft/2019-04/vocab/meta-data": true,
+        "https://json-schema.org/draft/2019-04/vocab/format": true,
+        "https://json-schema.org/draft/2019-04/vocab/content": true,
+        "https://json-schema.org/draft/2019-04/vocab/hyper-schema": true
+    },
     "$recursiveAnchor": true,
 
     "title": "JSON Hyper-Schema",
-    "$ref": "http://json-schema.org/draft-08/schema",
-    "properties": {
-        "base": {
-            "type": "string",
-            "format": "uri-template"
-        },
-        "links": {
-            "type": "array",
-            "items": {
-                "$ref": "http://json-schema.org/draft-08/links"
-            }
-        }
-    },
+    "allOf": [
+        {"$ref": "http://json-schema.org/draft/2019-04/schema"},
+        {"$ref": "http://json-schema.org/draft/2019-04/meta/hyper-schema"}
+    ],
     "links": [
         {
             "rel": "self",