Merge 63104fe into 3e0bea9

snowplow · Jun 17, 2020 · 84bb8a3 · 84bb8a3
2 parents 3e0bea9 + 63104fe
commit 84bb8a3
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: scala
 os: linux
 dist: trusty
 scala:
-- 2.12.8
+- 2.12.11
 - 2.13.2
 jdk:
 - openjdk8
@@ -18,7 +18,7 @@ deploy:
   provider: script
   script: "./.travis/deploy.sh $TRAVIS_TAG"
   on:
-    condition: '"${TRAVIS_SCALA_VERSION}" == "2.12.8"'
+    condition: '"${TRAVIS_SCALA_VERSION}" == "2.12.11"'
     tags: true
 env:
   global:

diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
@@ -38,7 +38,7 @@ object BuildSettings {
   lazy val buildSettings = Seq[Setting[_]](
     organization := "com.snowplowanalytics",
     scalaVersion := "2.13.2",
-    crossScalaVersions := Seq("2.12.8", "2.13.2"),
+    crossScalaVersions := Seq("2.12.11", "2.13.2"),
 
     addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.11.0" cross CrossVersion.full),
 

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -15,7 +15,8 @@ object Dependencies {
   object V {
     // Java
     val validator        = "1.0.39"
-    val slf4j            = "1.7.26"
+    val slf4j            = "1.7.30"
+    val jackson          = "2.10.3"
     // Scala
     val igluCore         = "1.0.0"
     val cats             = "2.1.1"
@@ -30,9 +31,8 @@ object Dependencies {
   object Libraries {
     // Java
     // Excluding binary-incompatible Jackson and include the latest from 2.9 series
-    val validatorFull    = "com.networknt"              %  "json-schema-validator"   % V.validator
-    val validator        = validatorFull.exclude("com.fasterxml.jackson.core", "jackson-databind")
-    val jackson          = "com.fasterxml.jackson.core" % "jackson-databind"         % "2.9.10.1"
+    val validator        = "com.networknt"              %  "json-schema-validator"   % V.validator
+    val jackson          = "com.fasterxml.jackson.core" % "jackson-databind"         % V.jackson
 
     // Scala
     val igluCore         = "com.snowplowanalytics"      %% "iglu-core"               % V.igluCore

diff --git a/project/travis-deploy-key.pub b/project/travis-deploy-key.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDhuzkjCRSVcCHiA1kvGOXdv0K1KlilM014SIutkbMuz39AD9iBgewzvBDK+F/CDvlOs4NLdUvEsBL84cO6V5Usqu4SG0K2e5JQRidsVqUNhHRTYlac8Q5hIvwYBZnCWl/x72Sqp4uHkzRnS0nxTzJxmol1U/7gYOBPtbiAi6SCiZS6QmRArTAFpB84lD4mTOriPxoMfSi0GRdY5WTxHTkQFHKYkEy1flsXLsAkuRnzN9vwS5xCRHH4P1mj34rqUuMy7vjTm6o+GMzkYzlDYFUGBMNEdafTabh+C+5Gd8OPHFdO7r8NPqJNWidLau92QMtSV9PS6OKd0V0fTL1Dja4K3QMxYphlOxnDVuH9A2M6+jBW4uLeTsLA/uUVmTpKa6gqJ2TQFv5yocqgW/FFc8NdQ2IGD+DAn8RD8RVGmpqERbidFgJzCiZFqdzlLuKbXAipHmX12yNfPrWr45iTM5qGRYpWr17n3pZvcZgiDoJIB473KaYAudpCQsHjm7mTzoCC7t8/UGGs0HNkmIGEtBgZLNvuYjwKgqD0nG0Dhudqo/K2j+bBLbqxWIAf1ETzNrAlnNyQu8EOusAY0nov/kLd02dyMDJw1M2Drm2+f5ZV0wav4d3QFMhdfe1PRrI3Dccfu4/s8LeFtzN8r0VP5MsuU3eDby2zbqu57BcHNIcgrw== sbt-site@travis
diff --git a/src/main/scala/com.snowplowanalytics.iglu/client/validator/CirceValidator.scala b/src/main/scala/com.snowplowanalytics.iglu/client/validator/CirceValidator.scala
@@ -77,8 +77,7 @@ object CirceValidator extends Validator[Json] {
        |    "default": {},
        |    "multipleOf": {
        |      "type": "number",
-       |      "minimum": 0,
-       |      "exclusiveMinimum": true
+       |      "minimum": 0
        |    },
        |    "maximum": {
        |      "type": "number"
@@ -90,10 +89,6 @@ object CirceValidator extends Validator[Json] {
        |    "minimum": {
        |      "type": "number"
        |    },
-       |    "exclusiveMinimum": {
-       |      "type": "boolean",
-       |      "default": false
-       |    },
        |    "maxLength": { "$ref": "#/definitions/positiveInteger" },
        |    "minLength": { "$ref": "#/definitions/positiveIntegerDefault0" },
        |    "pattern": {
@@ -177,8 +172,7 @@ object CirceValidator extends Validator[Json] {
        |    "not": { "$ref": "#" }
        |  },
        |  "dependencies": {
-       |    "exclusiveMaximum": [ "maximum" ],
-       |    "exclusiveMinimum": [ "minimum" ]
+       |    "exclusiveMaximum": [ "maximum" ]
        |  },
        |  "default": {}
        |}""".stripMargin

diff --git a/src/main/scala/io/circe/jackson/snowplow/package.scala b/src/main/scala/io/circe/jackson/snowplow/package.scala
@@ -61,13 +61,17 @@ package object snowplow {
             }
         }
     },
-    TextNode.valueOf(_),
+    s => TextNode.valueOf(s),
     array => JsonNodeFactory.instance.arrayNode.addAll(array.map(circeToJackson).asJava),
     obj =>
-      JsonNodeFactory.instance.objectNode
-        .setAll(obj.toMap.map { case (k, v) => (k, circeToJackson(v)) }.toMap.asJava)
+      objectNodeSetAll(JsonNodeFactory.instance.objectNode, obj.toMap.map {
+        case (k, v) => (k, circeToJackson(v))
+      }.asJava)
   )
 
+  def objectNodeSetAll(node: ObjectNode, fields: java.util.Map[String, JsonNode]): JsonNode =
+    node.setAll[JsonNode](fields)
+
   private def getJsonNodeFromStringContent(content: String): JsonNode =
     mapper.readTree(content)
 }