You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/11/18 10:08:00 UTC

[camel] branch master updated: Upgrade json-schema-validator and fixed invalid json sample data for the test.

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 69b4aa7  Upgrade json-schema-validator and fixed invalid json sample data for the test.
69b4aa7 is described below

commit 69b4aa76a8377392076901a2714fc9e4ab761f6d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Nov 18 10:59:13 2019 +0100

    Upgrade json-schema-validator and fixed invalid json sample data for the test.
---
 .../org/apache/camel/component/jsonvalidator/schema.json       | 10 +++-------
 .../apache/camel/component/jsonvalidator/schemawithformat.json | 10 +++-------
 parent/pom.xml                                                 |  2 +-
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/components/camel-json-validator/src/test/resources/org/apache/camel/component/jsonvalidator/schema.json b/components/camel-json-validator/src/test/resources/org/apache/camel/component/jsonvalidator/schema.json
index 158a12d..f5d493f 100644
--- a/components/camel-json-validator/src/test/resources/org/apache/camel/component/jsonvalidator/schema.json
+++ b/components/camel-json-validator/src/test/resources/org/apache/camel/component/jsonvalidator/schema.json
@@ -1,27 +1,23 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
   "definitions": {}, 
-  "id": "my-schema",
   "properties": {
     "id": {
       "default": 1, 
       "description": "An explanation about the purpose of this instance.", 
-      "id": "/properties/id", 
-      "title": "The id schema", 
+      "title": "The id schema",
       "type": "integer"
     }, 
     "name": {
       "default": "A green door", 
       "description": "An explanation about the purpose of this instance.", 
-      "id": "/properties/name", 
-      "title": "The name schema", 
+      "title": "The name schema",
       "type": "string"
     }, 
     "price": {
       "default": 12.5, 
       "description": "An explanation about the purpose of this instance.", 
-      "id": "/properties/price", 
-      "title": "The price schema", 
+      "title": "The price schema",
       "type": "number"
     }
   }, 
diff --git a/components/camel-json-validator/src/test/resources/org/apache/camel/component/jsonvalidator/schemawithformat.json b/components/camel-json-validator/src/test/resources/org/apache/camel/component/jsonvalidator/schemawithformat.json
index c943aff..54db01b 100644
--- a/components/camel-json-validator/src/test/resources/org/apache/camel/component/jsonvalidator/schemawithformat.json
+++ b/components/camel-json-validator/src/test/resources/org/apache/camel/component/jsonvalidator/schemawithformat.json
@@ -1,28 +1,24 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
   "definitions": {}, 
-  "id": "myother-schema",
   "properties": {
     "id": {
       "default": 1, 
       "description": "An explanation about the purpose of this instance.", 
-      "id": "/properties/id", 
-      "title": "The id schema", 
+      "title": "The id schema",
       "type": "integer"
     }, 
     "name": {
       "default": "A green door", 
       "description": "An explanation about the purpose of this instance. Must have even number of characters", 
-      "id": "/properties/name", 
-      "title": "The name schema", 
+      "title": "The name schema",
       "type": "string",
       "format": "evenlength"
     }, 
     "price": {
       "default": 12.5, 
       "description": "An explanation about the purpose of this instance.", 
-      "id": "/properties/price", 
-      "title": "The price schema", 
+      "title": "The price schema",
       "type": "number"
     }
   }, 
diff --git a/parent/pom.xml b/parent/pom.xml
index 54d9308..9e157f2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -480,7 +480,7 @@
         <netty-version>4.1.43.Final</netty-version>
         <netty-reactive-streams-version>2.0.3</netty-reactive-streams-version>
         <netty40-version>4.0.56.Final</netty40-version>
-        <networknt-json-schema-validator-version>1.0.11</networknt-json-schema-validator-version>
+        <networknt-json-schema-validator-version>1.0.26</networknt-json-schema-validator-version>
         <nitrite-version>3.3.0</nitrite-version>
         <noggit-bundle-version>0.5_1</noggit-bundle-version>
         <objenesis-version>2.6</objenesis-version>