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 2024/01/27 12:35:07 UTC

(camel) branch main updated: Upgrade json-validator version

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 0ab0adf8e48 Upgrade json-validator version
0ab0adf8e48 is described below

commit 0ab0adf8e48c5a92fdf513c087c5d73dd9207dd7
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Jan 27 13:34:51 2024 +0100

    Upgrade json-validator version
---
 .../apache/camel/component/jsonvalidator/DefaultJsonSchemaLoader.java  | 3 ++-
 .../camel/component/jsonvalidator/DefaultJsonUriSchemaLoader.java      | 2 +-
 parent/pom.xml                                                         | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/components/camel-json-validator/src/main/java/org/apache/camel/component/jsonvalidator/DefaultJsonSchemaLoader.java b/components/camel-json-validator/src/main/java/org/apache/camel/component/jsonvalidator/DefaultJsonSchemaLoader.java
index 4a035f49a76..957a31bb7b1 100644
--- a/components/camel-json-validator/src/main/java/org/apache/camel/component/jsonvalidator/DefaultJsonSchemaLoader.java
+++ b/components/camel-json-validator/src/main/java/org/apache/camel/component/jsonvalidator/DefaultJsonSchemaLoader.java
@@ -20,6 +20,7 @@ import java.io.InputStream;
 
 import com.networknt.schema.JsonSchema;
 import com.networknt.schema.JsonSchemaFactory;
+import com.networknt.schema.SpecVersion;
 import org.apache.camel.CamelContext;
 
 /**
@@ -31,7 +32,7 @@ public class DefaultJsonSchemaLoader implements JsonSchemaLoader {
     @Override
     @Deprecated
     public JsonSchema createSchema(CamelContext camelContext, InputStream inputStream) throws Exception {
-        JsonSchemaFactory factory = JsonSchemaFactory.getInstance();
+        JsonSchemaFactory factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V4);
         return factory.getSchema(inputStream);
     }
 
diff --git a/components/camel-json-validator/src/main/java/org/apache/camel/component/jsonvalidator/DefaultJsonUriSchemaLoader.java b/components/camel-json-validator/src/main/java/org/apache/camel/component/jsonvalidator/DefaultJsonUriSchemaLoader.java
index bf3199af620..3a5ea02e8da 100644
--- a/components/camel-json-validator/src/main/java/org/apache/camel/component/jsonvalidator/DefaultJsonUriSchemaLoader.java
+++ b/components/camel-json-validator/src/main/java/org/apache/camel/component/jsonvalidator/DefaultJsonUriSchemaLoader.java
@@ -60,7 +60,7 @@ public class DefaultJsonUriSchemaLoader implements JsonUriSchemaLoader {
         } else {
             uri = URI.create("classpath:" + schemaUri);
         }
-        return factory.getSchema(uri, config);
+        return factory.getSchema(uri, node, config);
     }
 
 }
diff --git a/parent/pom.xml b/parent/pom.xml
index 33a1d608159..8b7b27fce8a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -357,7 +357,7 @@
         <neoscada-version>0.4.0</neoscada-version>
         <netty-version>4.1.106.Final</netty-version>
         <netty-reactive-streams-version>2.0.5</netty-reactive-streams-version>
-        <networknt-json-schema-validator-version>1.2.0</networknt-json-schema-validator-version>
+        <networknt-json-schema-validator-version>1.3.0</networknt-json-schema-validator-version>
         <nimbus-jose-jwt>9.37.3</nimbus-jose-jwt>
         <nitrite-version>3.4.4</nitrite-version>
         <olingo2-version>2.0.13</olingo2-version>