HHH-14442 Upgrade geolatte-geom to 1.6.1

This commit is contained in:
Karel Maesen 2021-02-03 22:16:17 +01:00
parent cfc7b97250
commit f0a81898dc
14 changed files with 17 additions and 50 deletions

View File

@ -29,7 +29,7 @@ ext {
assertjVersion = '3.14.0'
geolatteVersion = '1.4.0'
geolatteVersion = '1.6.1'
shrinkwrapVersion = '1.2.6'
shrinkwrapDescriptorsVersion = '2.0.0'

1
hibernate-spatial/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.sdkmanrc

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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'

View File

@ -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

View File

@ -1,23 +0,0 @@
#
# Hibernate, Relational Persistence for Idiomatic Java
#
# 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>.
#
hibernate.dialect org.hibernate.spatial.dialect.sqlserver.SqlServer2008SpatialDialect
hibernate.connection.driver_class com.microsoft.sqlserver.jdbc.SQLServerDriver
hibernate.connection.url jdbc:sqlserver://localhost:1433;databaseName=TestDb
hibernate.connection.username hibern8
hibernate.connection.password langpaswoord123A%1
hibernate.connection.pool_size 5
hibernate.show_sql true
hibernate.format_sql true
hibernate.max_fetch_depth 5
hibernate.cache.region_prefix hibernate.test
hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory

View File

@ -1,11 +0,0 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* 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>.
*/
repositories {
mavenLocal( )
}
jdbcDependency 'com.microsoft.sqlserver:mssql-jdbc:6.4.0.jre8'

View File

@ -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) {

View File

@ -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)