From 5a9f8e8cbbf64128f56ef0cd58624e1df807dd05 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Mar 2024 16:34:00 +0000 Subject: [PATCH] Bump com.networknt:json-schema-validator from 1.0.82 to 1.4.0 Bumps [com.networknt:json-schema-validator](https://github.com/networknt/json-schema-validator) from 1.0.82 to 1.4.0. - [Release notes](https://github.com/networknt/json-schema-validator/releases) - [Changelog](https://github.com/networknt/json-schema-validator/blob/master/CHANGELOG.md) - [Commits](https://github.com/networknt/json-schema-validator/compare/1.0.82...1.4.0) --- updated-dependencies: - dependency-name: com.networknt:json-schema-validator dependency-type: direct:production update-type: version-update:semver-minor ... * update code to use `jsonMapper` instead of `objectMapper`. Signed-off-by: dependabot[bot] --- core/src/main/java/org/wildfly/channel/Blocklist.java | 2 +- .../main/java/org/wildfly/channel/ChannelManifestMapper.java | 2 +- core/src/main/java/org/wildfly/channel/ChannelMapper.java | 2 +- .../java/org/wildfly/channel/ChannelWithBlocklistTestCase.java | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/org/wildfly/channel/Blocklist.java b/core/src/main/java/org/wildfly/channel/Blocklist.java index 219d67bf..71439b93 100644 --- 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 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 index b873904d..fd127d79 100644 --- 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 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 index 19888687..e1d1f04c 100644 --- 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 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 index 1b08a931..dd7a8917 100644 --- 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 index 72dbd93d..882d5ad7 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 11 2.17.0 2.17.0 - 1.0.82 + 1.4.0 5.10.2 3.5.3.Final 3.14.0