diff --git a/pom.xml b/pom.xml index e538064ca4ce199110a9db80c587c4241ec22b51..718e74b4e7107626f0a41b605c95f274d153c0df 100644 --- a/pom.xml +++ b/pom.xml @@ -19,10 +19,10 @@ <id>jitpack.io</id> <url>https://jitpack.io</url> </repository> - <repository> + <!--repository> <id>Hibernate Spatial repo</id> <url>http://www.hibernatespatial.org/repository</url> - </repository> + </repository--> </repositories> <dependencies> @@ -34,8 +34,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-spatial</artifactId> - <version>4.3</version> - <scope>provided</scope> + <version>5.0.10.Final</version> <exclusions> <exclusion> <artifactId>postgresql</artifactId> @@ -137,6 +136,18 @@ <artifactId>passay</artifactId> <version>1.1.0</version> </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>5.0.10.Final</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>9.4.1211</version> + <scope>provided</scope> + </dependency> <dependency> <groupId>javax</groupId> <artifactId>javaee-web-api</artifactId> @@ -183,12 +194,12 @@ <artifactId>jaxen</artifactId> <version>1.1.1</version> </dependency> -<dependency> +<!--dependency> <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> - <version>9.4-1206-jdbc42</version> + <version>9.4-1211</version> <scope>provided</scope> -</dependency> +</dependency--> </dependencies> <build> diff --git a/src/main/java/no/nibio/vips/logic/entity/Gis.java b/src/main/java/no/nibio/vips/logic/entity/Gis.java index 75a7079af75caa37c7a44a77b341ea65a9ef7229..99a8caf115261ffb0bfd564fe1a19acc0e5ed88b 100644 --- a/src/main/java/no/nibio/vips/logic/entity/Gis.java +++ b/src/main/java/no/nibio/vips/logic/entity/Gis.java @@ -32,7 +32,7 @@ import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.Table; import javax.xml.bind.annotation.XmlRootElement; -import org.hibernate.annotations.Type; +//import org.hibernate.annotations.Type; /** * @copyright 2015 <a href="http://www.nibio.no/">NIBIO</a> @@ -54,7 +54,7 @@ public class Gis implements Serializable { @Column(name = "gis_id") private Integer gisId; @JsonIgnore - @Type(type = "org.hibernate.spatial.GeometryType") + //@Type(type = "org.hibernate.spatial.GeometryType") @Column(name = "gis_geom", columnDefinition = "Geometry") private Geometry gisGeom; diff --git a/src/main/java/no/nibio/vips/logic/entity/Organization.java b/src/main/java/no/nibio/vips/logic/entity/Organization.java index 1f2db83f87eb921694f4b1eb78cb5fad61491f3a..46397415e483e57315bc37d7600783dd08844168 100644 --- a/src/main/java/no/nibio/vips/logic/entity/Organization.java +++ b/src/main/java/no/nibio/vips/logic/entity/Organization.java @@ -86,7 +86,7 @@ public class Organization implements Serializable { @Column(name = "default_vips_core_user_id") private Integer defaultVipsCoreUserId; @JsonIgnore - @Type(type = "org.hibernate.spatial.GeometryType") + //@Type(type = "org.hibernate.spatial.GeometryType") @Column(name = "default_map_center", columnDefinition = "Geometry") private Point defaultMapCenter; @OneToMany(mappedBy = "parentOrganizationId", fetch = FetchType.EAGER) diff --git a/src/main/java/no/nibio/vips/logic/gis/GeometryEntity.java b/src/main/java/no/nibio/vips/logic/gis/GeometryEntity.java index 96503a183d12473692ead79bfd04c12d08d8b0e2..81fc2d344275a100080660c09915f3539d203e37 100644 --- a/src/main/java/no/nibio/vips/logic/gis/GeometryEntity.java +++ b/src/main/java/no/nibio/vips/logic/gis/GeometryEntity.java @@ -53,7 +53,7 @@ public class GeometryEntity implements Serializable { @GeneratedValue(strategy = GenerationType.AUTO) private Long id; - @Type(type = "org.hibernate.spatial.GeometryType") + //@Type(type = "org.hibernate.spatial.GeometryType") @Column(name = "geometry_value", columnDefinition = "Geometry") private Geometry geometryValue;