diff --git a/build.sbt b/build.sbt index 5f14592..8f86780 100755 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ lazy val commonSettings = Seq( organization := "com.kjetland", organizationName := "mbknor", scalaVersion := "2.12.4", - crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.8", "2.13.0-M5"), + crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.10", "2.13.1"), publishMavenStyle := true, publishArtifact in Test := false, pomIncludeRepository := { _ => false }, @@ -46,8 +46,8 @@ lazy val commonSettings = Seq( ) -val jacksonVersion = "2.9.8" -val jacksonModuleScalaVersion = "2.9.8" +val jacksonVersion = "2.10.1" +val jacksonModuleScalaVersion = "2.10.1" val slf4jVersion = "1.7.26" @@ -56,7 +56,7 @@ lazy val deps = Seq( "javax.validation" % "validation-api" % "2.0.1.Final", "org.slf4j" % "slf4j-api" % slf4jVersion, "io.github.classgraph" % "classgraph" % "4.8.21", - "org.scalatest" %% "scalatest" % "3.0.7" % "test", + "org.scalatest" %% "scalatest" % "3.0.8" % "test", "ch.qos.logback" % "logback-classic" % "1.2.3" % "test", "com.github.java-json-tools" % "json-schema-validator" % "2.2.10" % "test", "com.fasterxml.jackson.module" %% "jackson-module-scala" % jacksonModuleScalaVersion % "test", diff --git a/project/build.properties b/project/build.properties index 0cd8b07..6adcdc7 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.3 +sbt.version=1.3.3 diff --git a/src/main/scala/com/kjetland/jackson/jsonSchema/JsonSchemaGenerator.scala b/src/main/scala/com/kjetland/jackson/jsonSchema/JsonSchemaGenerator.scala index 051f62f..3fa6653 100755 --- a/src/main/scala/com/kjetland/jackson/jsonSchema/JsonSchemaGenerator.scala +++ b/src/main/scala/com/kjetland/jackson/jsonSchema/JsonSchemaGenerator.scala @@ -461,6 +461,7 @@ class JsonSchemaGenerator exampleValue => examples.add(exampleValue) } node.set("examples", examples) + () } // Look for @NotBlank @@ -662,6 +663,7 @@ class JsonSchemaGenerator exampleValue => examples.add(exampleValue) } node.set("examples", examples) + () } } @@ -991,6 +993,7 @@ class JsonSchemaGenerator val objectOptionsNode = JsonNodeFactory.instance.objectNode() objectOptionsNode.set("multiple_editor_select_via_property", multipleEditorSelectViaPropertyNode) thisObjectNode.set("options", objectOptionsNode) + () } } @@ -1234,6 +1237,7 @@ class JsonSchemaGenerator // Overwrite field val value = updateNode.get(fieldName) node.set(fieldName, value) + () case _ => } } @@ -1369,6 +1373,7 @@ class JsonSchemaGenerator definitionsHandler.getFinalDefinitionsNode().foreach { definitionsNode => rootNode.set("definitions", definitionsNode) + () } rootNode