Commit 8dabcd59 authored by Noel Alonso's avatar Noel Alonso
Browse files

Aumenta versiones y cambia módulo JTS para jackson

parent e358a7a9

pom.xml

+8 −21
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
	<groupId>es.redmic.lib</groupId>

	<artifactId>broker-lib</artifactId>

	<packaging>jar</packaging>

	<version>0.6.0</version>

	<version>0.7.0</version>

	<name>broker-lib</name>



	<properties>
@@ -26,14 +26,13 @@ 
		<!-- REDMIC -->

		<redmic.exceptions.version>0.6.0</redmic.exceptions.version>

		<redmic.jackson-jsonschema.version>0.6.0</redmic.jackson-jsonschema.version>



		<redmic.jts4jackson.version>0.0.1</redmic.jts4jackson.version>

		<!-- OTHERS -->

		<avro.version>1.8.2</avro.version>

		<confluent.version>5.0.1</confluent.version>

		<kafka.version>2.0.1</kafka.version>

		<hibernate-validator.version>6.0.8.Final</hibernate-validator.version>

		<geotools.version>19.0</geotools.version>

		<jackson-datatype-jts.version>2.4</jackson-datatype-jts.version>

		<geotools.version>20.1</geotools.version>



		<!-- Version plugins -->

		<jacoco.version>0.8.1</jacoco.version>
@@ -56,13 +55,13 @@ 
			<artifactId>jackson-jsonschema</artifactId>

			<version>${redmic.jackson-jsonschema.version}</version>

		</dependency>

		<!-- Others -->

			

		<dependency>

			<groupId>com.fasterxml.jackson.core</groupId>

			<artifactId>jackson-databind</artifactId>

			<scope>provided</scope>

			<groupId>es.redmic.lib</groupId>

			<artifactId>jts4jackson</artifactId>

			<version>${redmic.jts4jackson.version}</version>

		</dependency>



		<!-- Others -->

		<dependency>

			<groupId>com.fasterxml.jackson.datatype</groupId>

			<artifactId>jackson-datatype-joda</artifactId>
@@ -73,18 +72,6 @@ 
			<artifactId>jackson-dataformat-avro</artifactId>

		</dependency>



		<dependency>

			<groupId>com.bedatadriven</groupId>

			<artifactId>jackson-datatype-jts</artifactId>

			<version>${jackson-datatype-jts.version}</version>

			<exclusions>

				<exclusion>

					<groupId>com.fasterxml.jackson.core</groupId>

      				<artifactId>jackson-databind</artifactId>

				</exclusion>

			</exclusions>

		</dependency>



		<dependency>

			<groupId>javax.validation</groupId>

			<artifactId>validation-api</artifactId>

src/main/java/es/redmic/brokerlib/avro/geodata/common/FeatureDTO.java

+4 −3
Original line number Diff line number Diff line
@@ -3,20 +3,21 @@ package es.redmic.brokerlib.avro.geodata.common; 
import javax.validation.Valid;

import javax.validation.constraints.NotNull;



import com.bedatadriven.jackson.datatype.jts.JtsModule;

import org.locationtech.jts.geom.Geometry;



import com.fasterxml.jackson.annotation.JsonIgnore;

import com.fasterxml.jackson.databind.ObjectMapper;

import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaIgnore;

import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaNotNull;

import com.vividsolutions.jts.geom.Geometry;



import es.redmic.brokerlib.avro.common.CommonDTO;

import es.redmic.brokerlib.avro.geodata.utils.GeoJSONFeatureType;

import es.redmic.jts4jackson.module.JTSModule;



public abstract class FeatureDTO<TProperties extends PropertiesBaseDTO, TGeometry extends Geometry> extends CommonDTO {



	@JsonIgnore

	protected ObjectMapper mapper = new ObjectMapper().registerModules(new JtsModule());

	protected ObjectMapper mapper = new ObjectMapper().registerModule(new JTSModule());



	private String uuid;