Commit f5e34ec2 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Feature change spatial library

See merge request redmic-project/third-party/jsonschema-generator!4
parents 79d78525 7310fc53

build.sbt

+3 −5
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ lazy val commonSettings = Seq( 
)





val jacksonVersion = "2.8.4"

val jacksonModuleScalaVersion = "2.8.4"

val jacksonVersion = "2.9.7"

val jacksonModuleScalaVersion = "2.9.7"

val slf4jVersion = "1.7.7"
@@ -61,9 +61,7 @@ lazy val deps = Seq( 
  "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % jacksonVersion % "test",

  "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % jacksonVersion % "test",

  "joda-time" % "joda-time" % "2.9.4" % "test",

  "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % jacksonVersion % "test",

  "com.vividsolutions" % "jts" % "1.13" % "test",

  "com.bedatadriven" % "jackson-datatype-jts" % "2.2" % "test"

  "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % jacksonVersion % "test"

)



lazy val root = (project in file("."))

pom.xml

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
	<parent>

		<groupId>org.springframework.boot</groupId>

		<artifactId>spring-boot-starter-parent</artifactId>

		<version>2.0.0.RELEASE</version>

		<version>2.1.0.RELEASE</version>

		<relativePath />

	</parent>
@@ -12,7 +12,7 @@ 
	<groupId>es.redmic.lib</groupId>

	<artifactId>jackson-jsonschema</artifactId>

	<packaging>jar</packaging>

	<version>0.6.0</version>

	<version>0.7.0</version>

	<name>Jackson JsonSchema</name>

	<description>JsonSchema generator</description>

src/main/scala/com/kjetland/jackson/jsonSchema/JsonSchemaGenerator.scala

+2 −2
Original line number Diff line number Diff line
@@ -487,9 +487,9 @@ class JsonSchemaGenerator 


      =

      {

        // Crea esquema para geometrías, haciendo compatible con vividsolutions

        // Crea esquema para geometrías, haciendo compatible con locationtech

        val superClass = _type.getSuperClass

        if (_type.getRawClass.getName.contains("vividsolutions")) {

        if (_type.getRawClass.getName.contains("locationtech")) {



          setType(node, currentProperty, "object")

          //node.put("type", "object")