HHH-14442 Upgrade geolatte-geom to 1.6.1

hibernate · Feb 9, 2021 · 5af975d · 5af975d
1 parent 1493180
commit 5af975d
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 50 deletions.
diff --git a/gradle/libraries.gradle b/gradle/libraries.gradle
@@ -29,7 +29,7 @@ ext {
 
     assertjVersion = '3.14.0'
 
-    geolatteVersion = '1.4.0'
+    geolatteVersion = '1.6.1'
 
     // Wildfly version targeted by module ZIP; Arquillian/Shrinkwrap versions used for CDI testing and testing the module ZIP
     wildflyVersion = '17.0.1.Final'

diff --git a/hibernate-spatial/.gitignore b/hibernate-spatial/.gitignore
@@ -0,0 +1 @@
+.sdkmanrc
diff --git a/hibernate-spatial/.sdkmanrc b/hibernate-spatial/.sdkmanrc
@@ -0,0 +1,4 @@
+# Enable auto-env through the sdkman_auto_env config
+# Add key=value pairs of SDKs to use below
+java=8.0.252.hs-adpt
+
diff --git a/hibernate-spatial/databases/oracle12c_connection_finder/resources/hibernate.properties b/hibernate-spatial/databases/oracle12c_connection_finder/resources/hibernate.properties
@@ -7,7 +7,7 @@
 
 hibernate.dialect org.hibernate.spatial.dialect.oracle.OracleSpatial10gDialect
 hibernate.connection.driver_class oracle.jdbc.OracleDriver
-hibernate.connection.url jdbc:oracle:thin:@localhost:1521:ORCLCDB
+hibernate.connection.url jdbc:oracle:thin:@localhost:1521:ORCL
 hibernate.connection.username C##hibernate
 hibernate.connection.password hibernate
 

diff --git a/hibernate-spatial/databases/oracle12c_spatial/resources/hibernate.properties b/hibernate-spatial/databases/oracle12c_spatial/resources/hibernate.properties
@@ -7,7 +7,7 @@
 
 hibernate.dialect org.hibernate.spatial.dialect.oracle.OracleSpatial10gDialect
 hibernate.connection.driver_class oracle.jdbc.OracleDriver
-hibernate.connection.url jdbc:oracle:thin:@localhost:1521:ORCLCDB
+hibernate.connection.url jdbc:oracle:thin:@localhost:1521:ORCL
 hibernate.connection.username C##hibernate
 hibernate.connection.password hibernate
 

diff --git a/hibernate-spatial/databases/oracle12c_spatial_native/resources/hibernate.properties b/hibernate-spatial/databases/oracle12c_spatial_native/resources/hibernate.properties
@@ -7,7 +7,7 @@
 
 hibernate.dialect org.hibernate.spatial.dialect.oracle.OracleSpatialSDO10gDialect
 hibernate.connection.driver_class oracle.jdbc.OracleDriver
-hibernate.connection.url jdbc:oracle:thin:@localhost:1521:ORCLCDB
+hibernate.connection.url jdbc:oracle:thin:@localhost:1521:ORCL
 hibernate.connection.username C##hibernate
 hibernate.connection.password hibernate
 

diff --git a/hibernate-spatial/databases/postgispg96/matrix.gradle b/hibernate-spatial/databases/postgispg96/matrix.gradle
@@ -4,4 +4,4 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-jdbcDependency "postgresql:postgresql:8.4-701.jdbc4"
+jdbcDependency 'org.postgresql:postgresql:42.2.2'
diff --git a/hibernate-spatial/databases/postgispg96/resources/hibernate.properties b/hibernate-spatial/databases/postgispg96/resources/hibernate.properties
@@ -5,16 +5,14 @@
 # See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
 #
 
-hibernate.test.new_metadata_mappings = true
+
 hibernate.dialect org.hibernate.spatial.dialect.postgis.PostgisPG95Dialect
 hibernate.connection.driver_class org.postgresql.Driver
-hibernate.connection.url jdbc:postgresql://localhost:9432
+hibernate.connection.url jdbc:postgresql://localhost:9432/
 hibernate.connection.username hibern8
 hibernate.connection.password hibern8
 
 
-hibernate.connection.pool_size 5
-
 hibernate.show_sql true
 hibernate.format_sql true
 

diff --git a/hibernate-spatial/databases/sqlserver2008_spatial/resources/hibernate.properties b/hibernate-spatial/databases/sqlserver2008_spatial/resources/hibernate.properties
diff --git a/hibernate-spatial/databases/sqlserver2012_spatial/matrix.gradle b/hibernate-spatial/databases/sqlserver2012_spatial/matrix.gradle
diff --git a/...bases/sqlserver2008_spatial/matrix.gradle → ...bases/sqlserver2017_spatial/matrix.gradle b/...bases/sqlserver2008_spatial/matrix.gradle → ...bases/sqlserver2017_spatial/matrix.gradle
diff --git a/...12_spatial/resources/hibernate.properties → ...17_spatial/resources/hibernate.properties b/...12_spatial/resources/hibernate.properties → ...17_spatial/resources/hibernate.properties
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/GeolatteGeometryEquality.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/GeolatteGeometryEquality.java
@@ -1,7 +1,7 @@
 package org.hibernate.spatial.testing;
 
 import org.geolatte.geom.Geometry;
-import org.geolatte.geom.GeometryPointEquality;
+import org.geolatte.geom.GeometryPositionEquality;
 import org.geolatte.geom.Position;
 
 /**
@@ -12,7 +12,7 @@ public class GeolatteGeometryEquality<P extends Position> implements GeometryEqu
 	private final org.geolatte.geom.GeometryEquality delegate;
 
 	public GeolatteGeometryEquality() {
-		this( new GeometryPointEquality() );
+		this( new GeometryPositionEquality() );
 	}
 
 	public GeolatteGeometryEquality(org.geolatte.geom.GeometryEquality delegate) {

diff --git a/hibernate-spatial/src/test/resources/hibernate.properties b/hibernate-spatial/src/test/resources/hibernate.properties
@@ -6,8 +6,6 @@
 #
 
 # Default unit/integration test config.
-hibernate.test.new_metadata_mappings = true
-hibernate.connection.pool_size 5
 
 hibernate.show_sql true
 
@@ -30,9 +28,9 @@ hibernate.connection.password @jdbc.pass@
 #
 #hibernate.dialect org.hibernate.spatial.dialect.postgis.PostgisPG95Dialect
 #hibernate.connection.driver_class org.postgresql.Driver
-#hibernate.connection.url jdbc:postgresql://localhost:5432/hibbrtru
-#hibernate.connection.username hibbrtru
-#hibernate.connection.password hibbrtru
+#hibernate.connection.url jdbc:postgresql://localhost:9432/
+#hibernate.connection.username hibern8
+#hibernate.connection.password hibern8
 
 ##
 ## GeoDb (H2 spatial extension)