diff --git a/gradle/libraries.gradle b/gradle/libraries.gradle index dc6b9754e2..c570704523 100644 --- 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' shrinkwrapVersion = '1.2.6' shrinkwrapDescriptorsVersion = '2.0.0' diff --git a/hibernate-spatial/.gitignore b/hibernate-spatial/.gitignore new file mode 100644 index 0000000000..e0b3904e6b --- /dev/null +++ b/hibernate-spatial/.gitignore @@ -0,0 +1 @@ +.sdkmanrc diff --git a/hibernate-spatial/.sdkmanrc b/hibernate-spatial/.sdkmanrc new file mode 100644 index 0000000000..92d04b893e --- /dev/null +++ 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 index d71e6c8d3f..706924c751 100644 --- 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 index ddb680a8e8..a58739e453 100644 --- 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 index 6c7104093f..77b55a1c2c 100644 --- 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 index 3b243402a5..5059cb9072 100644 --- 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 . */ -jdbcDependency "postgresql:postgresql:8.4-701.jdbc4" \ No newline at end of file +jdbcDependency 'org.postgresql:postgresql:42.2.2' \ No newline at end of file diff --git a/hibernate-spatial/databases/postgispg96/resources/hibernate.properties b/hibernate-spatial/databases/postgispg96/resources/hibernate.properties index 7071e5a31e..4d1aa47606 100644 --- 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 . # -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 deleted file mode 100644 index 0dd46f3396..0000000000 --- a/hibernate-spatial/databases/sqlserver2008_spatial/resources/hibernate.properties +++ /dev/null @@ -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 . -# - -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 diff --git a/hibernate-spatial/databases/sqlserver2012_spatial/matrix.gradle b/hibernate-spatial/databases/sqlserver2012_spatial/matrix.gradle deleted file mode 100644 index 21ac5e6da1..0000000000 --- a/hibernate-spatial/databases/sqlserver2012_spatial/matrix.gradle +++ /dev/null @@ -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 . - */ -repositories { - mavenLocal( ) -} - -jdbcDependency 'com.microsoft.sqlserver:mssql-jdbc:6.4.0.jre8' diff --git a/hibernate-spatial/databases/sqlserver2008_spatial/matrix.gradle b/hibernate-spatial/databases/sqlserver2017_spatial/matrix.gradle similarity index 100% rename from hibernate-spatial/databases/sqlserver2008_spatial/matrix.gradle rename to hibernate-spatial/databases/sqlserver2017_spatial/matrix.gradle diff --git a/hibernate-spatial/databases/sqlserver2012_spatial/resources/hibernate.properties b/hibernate-spatial/databases/sqlserver2017_spatial/resources/hibernate.properties similarity index 100% rename from hibernate-spatial/databases/sqlserver2012_spatial/resources/hibernate.properties rename to hibernate-spatial/databases/sqlserver2017_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 index 8ae2b5ca38..3b58d2aea1 100644 --- 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

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 index abef2d2a22..12af9edae9 100644 --- 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)