Merge pull request #393 from YanWittmann/master

Bump com.networknt:json-schema-validator to 1.4.0

Author: stevespringett

pom.xml

@@ -183,7 +183,7 @@
         <dependency>
             <groupId>com.networknt</groupId>
             <artifactId>json-schema-validator</artifactId>
-            <version>1.0.87</version>
+            <version>1.4.0</version>
         </dependency>
 
         <!-- Unit Test -->

src/main/java/org/cyclonedx/CycloneDxSchema.java

@@ -24,6 +24,7 @@
 import com.networknt.schema.JsonSchemaFactory;
 import com.networknt.schema.SchemaValidatorsConfig;
 import com.networknt.schema.SpecVersionDetector;
+import com.networknt.schema.resource.MapSchemaMapper;
 import org.cyclonedx.generators.json.BomJsonGenerator;
 import org.cyclonedx.generators.xml.BomXmlGenerator;
 import org.xml.sax.SAXException;
@@ -117,6 +118,8 @@ public JsonSchema getJsonSchema(CycloneDxSchema.Version schemaVersion, final Obj
   {
     final InputStream spdxInstream = getJsonSchemaAsStream(schemaVersion);
     final SchemaValidatorsConfig config = new SchemaValidatorsConfig();
+    config.setPreloadJsonSchema(false);
+
     final Map<String, String> offlineMappings = new HashMap<>();
     offlineMappings.put("http://cyclonedx.org/schema/spdx.schema.json",
         getClass().getClassLoader().getResource("spdx.schema.json").toExternalForm());
@@ -128,9 +131,13 @@ public JsonSchema getJsonSchema(CycloneDxSchema.Version schemaVersion, final Obj
         getClass().getClassLoader().getResource("bom-1.4.schema.json").toExternalForm());
     offlineMappings.put("http://cyclonedx.org/schema/bom-1.5.schema.json",
         getClass().getClassLoader().getResource("bom-1.5.schema.json").toExternalForm());
-    config.setUriMappings(offlineMappings);
+
     JsonNode schemaNode = mapper.readTree(spdxInstream);
-    JsonSchemaFactory factory = JsonSchemaFactory.getInstance(SpecVersionDetector.detect(schemaNode));
+    final MapSchemaMapper offlineSchemaMapper = new MapSchemaMapper(offlineMappings);
+    JsonSchemaFactory factory = JsonSchemaFactory.builder(JsonSchemaFactory.getInstance(SpecVersionDetector.detect(schemaNode)))
+      .jsonMapper(mapper)
+      .schemaMappers(s -> s.add(offlineSchemaMapper))
+      .build();
     return factory.getSchema(schemaNode, config);
   }