Merge pull request ajv-validator#25 from jstewmon/ajv-v6

update peer dependency to ajv >= 6.0.0
brainz80 · Jun 25, 2018 · 43c2a95 · 43c2a95
2 parents bc61807 + dc016fa
commit 43c2a95
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/keywords/add_keyword.js b/keywords/add_keyword.js
@@ -39,7 +39,7 @@ module.exports = function (ajv, keyword, jsonPatch, patchSchema) {
                 }
               }
             },
-            { "$ref": "http://json-schema.org/draft-06/schema#" }
+            { "$ref": "http://json-schema.org/draft-07/schema#" }
           ]
         },
         "with": patchSchema

diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
     "json-merge-patch": "^0.2.3"
   },
   "devDependencies": {
-    "ajv": "^5.0.0",
+    "ajv": "^6.5.1",
     "coveralls": "^2.11.12",
     "eslint": "^3.3.0",
     "if-node-version": "^1.0.0",
@@ -46,6 +46,6 @@
     "pre-commit": "^1.1.3"
   },
   "peerDependencies": {
-    "ajv": ">=5.0.0"
+    "ajv": ">=6.0.0"
   }
 }
diff --git a/spec/merge.spec.js b/spec/merge.spec.js
@@ -41,7 +41,7 @@ describe('keyword $merge', function() {
 
     function testMerge(ajv) {
       var sourceSchema = {
-        "id": "obj.json#",
+        "$id": "obj.json#",
         "type": "object",
         "properties": { "p": { "type": "string" } },
         "additionalProperties": false
@@ -68,7 +68,7 @@ describe('keyword $merge', function() {
 
     function testMerge(ajv) {
       var schema = {
-        "id": "obj.json#",
+        "$id": "obj.json#",
         "definitions": {
           "source": {
             "type": "object",
@@ -133,7 +133,7 @@ describe('keyword $merge', function() {
       ajv.addSchema(sourceSchema, "obj1.json#");
 
       var schema = {
-        "id": "obj2.json#",
+        "$id": "obj2.json#",
         "definitions": {
           "patch":{
             "type": "object",

diff --git a/spec/patch.spec.js b/spec/patch.spec.js
@@ -41,7 +41,7 @@ describe('keyword $patch', function() {
 
     function testPatch(ajv) {
       var sourceSchema = {
-        "id": "obj.json#",
+        "$id": "obj.json#",
         "type": "object",
         "properties": { "p": { "type": "string" } },
         "additionalProperties": false
@@ -68,7 +68,7 @@ describe('keyword $patch', function() {
 
     function testPatch(ajv) {
       var schema = {
-        "id": "obj.json#",
+        "$id": "obj.json#",
         "definitions": {
           "source": {
             "type": "object",
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                   }
                 },
-                { "$ref": "http://json-schema.org/draft-06/schema#" }
+                { "$ref": "http://json-schema.org/draft-07/schema#" }
               ]
             },
             "with": patchSchema
@@ Expand Down @@