Merge pull request #219 from snowplow/backport/jsv_upgrade

JSV upgrade for 1.x
snowplow · Nov 21, 2022 · 2a54296 · 2a54296
2 parents 1f4a195 + 1ae42da
commit 2a54296
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/modules/core/src/main/scala/com.snowplowanalytics.iglu/client/validator/CirceValidator.scala b/modules/core/src/main/scala/com.snowplowanalytics.iglu/client/validator/CirceValidator.scala
@@ -199,7 +199,12 @@ object CirceValidator extends Validator[Json] {
   private val V4SchemaInstance = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V4)
 
   private val IgluMetaschemaFactory =
-    JsonSchemaFactory.builder(V4SchemaInstance).addMetaSchema(IgluMetaschema).build()
+    JsonSchemaFactory
+      .builder(V4SchemaInstance)
+      .addMetaSchema(IgluMetaschema)
+      .forceHttps(false)
+      .removeEmptyFragmentSuffix(false)
+      .build()
 
   private val SchemaValidatorsConfig: SchemaValidatorsConfig = {
     val config = new SchemaValidatorsConfig()

diff --git a/modules/core/src/test/resources/raw-jsonschema/beer-schema.json b/modules/core/src/test/resources/raw-jsonschema/beer-schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "https://json-schema.org/draft-04/schema",
   "description": "Simple schema for testing Validatable",
   "type": "object",
   "properties": {

diff --git a/...re/src/test/scala/com.snowplowanalytics.iglu.client/validator/CachingValidationSpec.scala b/...re/src/test/scala/com.snowplowanalytics.iglu.client/validator/CachingValidationSpec.scala
@@ -262,11 +262,11 @@ class CachingValidationSpec extends Specification with DataTables {
     val expected = ValidatorError.InvalidData(
       NonEmptyList.of(
         ValidatorReport(
-          "$.address: does not match the ipv4 pattern ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$",
+          "$.address: does not match the ipv4 pattern ^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$",
           Some("$.address"),
           List(
             "ipv4",
-            "^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"
+            "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$"
           ),
           Some("format")
         )

diff --git a/...s/core/src/test/scala/com.snowplowanalytics.iglu.client/validator/RawValidationSpec.scala b/...s/core/src/test/scala/com.snowplowanalytics.iglu.client/validator/RawValidationSpec.scala
@@ -208,11 +208,11 @@ class RawValidationSpec extends Specification with DataTables {
     val expected = ValidatorError.InvalidData(
       NonEmptyList.of(
         ValidatorReport(
-          "$.address: does not match the ipv4 pattern ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$",
+          "$.address: does not match the ipv4 pattern ^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$",
           Some("$.address"),
           List(
             "ipv4",
-            "^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"
+            "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$"
           ),
           Some("format")
         )

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -14,7 +14,7 @@ import sbt._
 object Dependencies {
   object V {
     // Java
-    val validator        = "1.0.39"
+    val validator        = "1.0.70"
     val slf4j            = "1.7.30"
     val jackson          = "2.10.5.1"
     // Scala