github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-10-25 15:58:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump to 12.4.1

Browse Source
This commit is contained in:
rob bygrave
2020-09-18 01:21:50 +12:00
parent 73ea91d4c9
commit 06b1babed9
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+6 -6
View File
@@ -4,12 +4,12 @@
<groupId>io.ebean</groupId>
<artifactId>ebean-postgis</artifactId>
<version>12.2.2-SNAPSHOT</version>
<version>12.4.1-SNAPSHOT</version>
<parent>
<groupId>org.avaje</groupId>
<artifactId>java8-oss</artifactId>
<version>2.1</version>
<version>2.2</version>
</parent>
<properties>
@@ -27,7 +27,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean</artifactId>
<version>12.2.1</version>
<version>12.4.1</version>
<scope>provided</scope>
</dependency>
@@ -64,7 +64,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-test</artifactId>
<version>12.2.1</version>
<version>12.4.1</version>
<scope>test</scope>
</dependency>
@@ -91,11 +91,11 @@
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.15</version>
<version>2.17</version>
<extensions>true</extensions>
<configuration>
<tiles>
<tile>io.ebean.tile:enhancement:12.2.1</tile>
<tile>io.ebean.tile:enhancement:12.4.1</tile>
</tiles>
</configuration>
</plugin>
src/main/java/io/ebean/postgis/RegisterFactory.java
+4 -5
View File
@@ -1,13 +1,13 @@
package io.ebean.postgis;
import io.ebean.config.ServerConfig;
import io.ebeaninternal.api.ExtraTypeFactory;
import io.ebean.config.DatabaseConfig;
import io.ebean.postgis.latte.ScalarTypeGeoLatteLineString;
import io.ebean.postgis.latte.ScalarTypeGeoLatteMultiLineString;
import io.ebean.postgis.latte.ScalarTypeGeoLatteMultiPoint;
import io.ebean.postgis.latte.ScalarTypeGeoLatteMultiPolygon;
import io.ebean.postgis.latte.ScalarTypeGeoLattePoint;
import io.ebean.postgis.latte.ScalarTypeGeoLattePolygon;
import io.ebeaninternal.api.ExtraTypeFactory;
import io.ebeaninternal.server.type.ScalarType;
import java.util.ArrayList;
@@ -15,9 +15,8 @@ import java.util.List;
public class RegisterFactory implements ExtraTypeFactory {
@Override
public List<ScalarType<?>> createTypes(ServerConfig serverConfig, Object objectMapper) {
public List<ScalarType<?>> createTypes(DatabaseConfig config, Object objectMapper) {
List<ScalarType<?>> list = new ArrayList<ScalarType<?>>();
list.add(new ScalarTypePgisPoint());
@@ -27,7 +26,7 @@ public class RegisterFactory implements ExtraTypeFactory {
list.add(new ScalarTypePgisMultiPoint());
list.add(new ScalarTypePgisMultiLineString());
if (serverConfig.getClassLoadConfig().isPresent("org.geolatte.geom.Geometry")) {
if (config.getClassLoadConfig().isPresent("org.geolatte.geom.Geometry")) {
list.add(new ScalarTypeGeoLattePoint());
list.add(new ScalarTypeGeoLattePolygon());
list.add(new ScalarTypeGeoLatteLineString());