Merge pull request #235 from jmesnil/com.networknt-json-schema-valida…

…tor-1.4.0 Bump com.networknt:json-schema-validator from 1.0.82 to 1.4.0
wildfly-extras · Mar 22, 2024 · 01a5917 · 01a5917
2 parents 282c3d5 + 5a9f8e8
commit 01a5917
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/core/src/main/java/org/wildfly/channel/Blocklist.java b/core/src/main/java/org/wildfly/channel/Blocklist.java
@@ -53,7 +53,7 @@ public class Blocklist {
    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(YAML_FACTORY)
       .configure(FAIL_ON_UNKNOWN_PROPERTIES, false)
       .configure(ORDER_MAP_ENTRIES_BY_KEYS, true);
-   private static final JsonSchemaFactory SCHEMA_FACTORY = JsonSchemaFactory.builder(JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V201909)).objectMapper(OBJECT_MAPPER).build();
+   private static final JsonSchemaFactory SCHEMA_FACTORY = JsonSchemaFactory.builder(JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V201909)).jsonMapper(OBJECT_MAPPER).build();
 
    private static final Map<String, JsonSchema> SCHEMAS = new HashMap<>();
 

diff --git a/core/src/main/java/org/wildfly/channel/ChannelManifestMapper.java b/core/src/main/java/org/wildfly/channel/ChannelManifestMapper.java
@@ -59,7 +59,7 @@ public class ChannelManifestMapper {
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(YAML_FACTORY)
             .configure(FAIL_ON_UNKNOWN_PROPERTIES, false)
             .configure(ORDER_MAP_ENTRIES_BY_KEYS, true);
-    private static final JsonSchemaFactory SCHEMA_FACTORY = JsonSchemaFactory.builder(JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V201909)).objectMapper(OBJECT_MAPPER).build();
+    private static final JsonSchemaFactory SCHEMA_FACTORY = JsonSchemaFactory.builder(JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V201909)).jsonMapper(OBJECT_MAPPER).build();
     private static final Map<String, JsonSchema> SCHEMAS = new HashMap<>();
 
     static {

diff --git a/core/src/main/java/org/wildfly/channel/ChannelMapper.java b/core/src/main/java/org/wildfly/channel/ChannelMapper.java
@@ -62,7 +62,7 @@ public class ChannelMapper {
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(YAML_FACTORY)
             .configure(FAIL_ON_UNKNOWN_PROPERTIES, false)
             .configure(ORDER_MAP_ENTRIES_BY_KEYS, true);
-    private static final JsonSchemaFactory SCHEMA_FACTORY = JsonSchemaFactory.builder(JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V201909)).objectMapper(OBJECT_MAPPER).build();
+    private static final JsonSchemaFactory SCHEMA_FACTORY = JsonSchemaFactory.builder(JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V201909)).jsonMapper(OBJECT_MAPPER).build();
     private static final Map<String, JsonSchema> SCHEMAS = new HashMap<>();
 
     static {

diff --git a/core/src/test/java/org/wildfly/channel/ChannelWithBlocklistTestCase.java b/core/src/test/java/org/wildfly/channel/ChannelWithBlocklistTestCase.java
@@ -503,7 +503,7 @@ public void testChannelWithInvalidBlacklist() throws Exception {
             fail("InvalidChannelException should have been thrown.");
         } catch (InvalidChannelMetadataException e) {
             assertEquals(1, e.getValidationMessages().size());
-            assertTrue(e.getValidationMessages().get(0).contains("versions: is missing"), e.getValidationMessages().get(0));
+            assertTrue(e.getValidationMessages().get(0).contains("required property 'versions' not found"), e.getValidationMessages().get(0));
         }
     }
 

diff --git a/pom.xml b/pom.xml
@@ -26,7 +26,7 @@
         <maven.compiler.target>11</maven.compiler.target>
         <version.com.fasterxml.jackson>2.17.0</version.com.fasterxml.jackson>
         <version.com.fasterxml.jackson.databind>2.17.0</version.com.fasterxml.jackson.databind>
-        <version.com.networknt.json-schema-validator>1.0.82</version.com.networknt.json-schema-validator>
+        <version.com.networknt.json-schema-validator>1.4.0</version.com.networknt.json-schema-validator>
         <version.junit5>5.10.2</version.junit5>
         <version.org.jboss.logging>3.5.3.Final</version.org.jboss.logging>
         <version.org.apache.commons.commons-lang3>3.14.0</version.org.apache.commons.commons-lang3>