c55d250025
Conflicts: hibernate-spatial/databases/mysql5_innodb/resources/hibernate.properties hibernate-spatial/hibernate-spatial.gradle hibernate-spatial/src/main/java/org/hibernate/spatial/criterion/DWithinExpression.java hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2geodb/GeoDBDialect.java hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2geodb/WKB.java hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleJDBCTypeFactory.java hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatial10gDialect.java hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGeometry.java hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGeometryTypeDescriptor.java hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGeometryValueBinder.java hibernate-spatial/src/main/java/org/hibernate/spatial/integration/SpatialIntegrator.java hibernate-spatial/src/test/java/org/hibernate/spatial/integration/GeomEntity.java hibernate-spatial/src/test/java/org/hibernate/spatial/integration/TestSpatialFunctions.java hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialFunctionalTestCase.java hibernate-spatial/src/test/java/org/hibernate/spatial/testing/TestSupportFactories.java hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBExpectationsFactory.java hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/mysql/MySQLExpectationsFactory.java hibernate-spatial/src/test/java/org/hibernate/spatial/testing/dialects/oracle/SDOGeometryExpectationsFactory.java hibernate-spatial/src/test/resources/hibernate.properties |
||
---|---|---|
.. | ||
hibernate.properties |