diff --git a/composites/ebean-postgis/pom.xml b/composites/ebean-postgis/pom.xml new file mode 100644 index 000000000..ad963c712 --- /dev/null +++ b/composites/ebean-postgis/pom.xml @@ -0,0 +1,72 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 13.22.0 + ../.. + + + ebean-postgis + ebean-postgis composite + ebean-postgis + + + 2.5.1 + 42.6.0 + + + + + + io.ebean + ebean-api + 13.22.0 + + + + io.ebean + ebean-core + 13.22.0 + + + + io.ebean + ebean-datasource + ${ebean-datasource.version} + + + + io.ebean + ebean-migration + ${ebean-migration.version} + + + + + io.ebean + ebean-querybean + 13.22.0 + + + + io.ebean + ebean-platform-postgres + 13.22.0 + + + + net.postgis + postgis-jdbc + ${postgis.jdbc.version} + + + + org.postgresql + postgresql + ${postgres.jdbc.version} + + + + diff --git a/composites/ebean-postgis/src/main/java/io/ebean/postgis/assembly/Assembly.java b/composites/ebean-postgis/src/main/java/io/ebean/postgis/assembly/Assembly.java new file mode 100644 index 000000000..fea71cbb3 --- /dev/null +++ b/composites/ebean-postgis/src/main/java/io/ebean/postgis/assembly/Assembly.java @@ -0,0 +1,7 @@ +package io.ebean.postgis.assembly; + +/** + * Nothing interesting here - required placeholder for javadoc. + */ +public class Assembly { +} diff --git a/composites/ebean-postgis/src/main/java/module-info.java b/composites/ebean-postgis/src/main/java/module-info.java new file mode 100644 index 000000000..63bf6fcb1 --- /dev/null +++ b/composites/ebean-postgis/src/main/java/module-info.java @@ -0,0 +1,10 @@ +module io.ebean.postgis { + + requires transitive io.ebean.api; + requires transitive io.ebean.core; + requires transitive io.ebean.datasource; + requires transitive io.ebean.querybean; + requires transitive io.ebean.platform.postgres; + // requires transitive io.ebean.postgis.types; + +} diff --git a/composites/pom.xml b/composites/pom.xml index c2700b6a7..d5e0a79fb 100644 --- a/composites/pom.xml +++ b/composites/pom.xml @@ -23,6 +23,7 @@ ebean-nuodb ebean-oracle ebean-postgres + ebean-postgis ebean-sqlite ebean-sqlserver diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index cd0c86d68..f5e823961 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -30,7 +30,7 @@ org.postgresql postgresql - 42.4.3 + 42.6.0 true diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 10ba23215..48a4c1467 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -151,7 +151,7 @@ org.postgresql postgresql - 42.5.1 + 42.6.0 true diff --git a/ebean-postgis/.editorconfig b/ebean-postgis-types/.editorconfig similarity index 100% rename from ebean-postgis/.editorconfig rename to ebean-postgis-types/.editorconfig diff --git a/ebean-postgis/LICENSE b/ebean-postgis-types/LICENSE similarity index 100% rename from ebean-postgis/LICENSE rename to ebean-postgis-types/LICENSE diff --git a/ebean-postgis-types/README.md b/ebean-postgis-types/README.md new file mode 100644 index 000000000..455d8a2be --- /dev/null +++ b/ebean-postgis-types/README.md @@ -0,0 +1,3 @@ +# ebean.postgis.types + +Ebean support for Postgres Geometry types diff --git a/ebean-postgis/pom.xml b/ebean-postgis-types/pom.xml similarity index 93% rename from ebean-postgis/pom.xml rename to ebean-postgis-types/pom.xml index e015cb359..d8826e9fc 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -7,11 +7,8 @@ 13.22.0 - ebean postgis - ebean postgis module - https://ebean.io/ - - ebean-postgis + ebean postgis types + ebean-postgis-types 2.5.1 @@ -50,7 +47,7 @@ org.postgresql postgresql - 42.5.1 + 42.6.0 provided diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/PostgisExtraTypeFactory.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/PostgisExtraTypeFactory.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/PostgisExtraTypeFactory.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/PostgisExtraTypeFactory.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/PostgisGeoTypeBindProvider.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/PostgisGeoTypeBindProvider.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/PostgisGeoTypeBindProvider.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/PostgisGeoTypeBindProvider.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/PostgisGeoTypeBinder.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/PostgisGeoTypeBinder.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/PostgisGeoTypeBinder.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/PostgisGeoTypeBinder.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisLineString.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisLineString.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisLineString.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisLineString.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisMultiLineString.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiLineString.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisMultiLineString.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiLineString.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPoint.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPoint.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPoint.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPoint.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPolygon.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPolygon.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPolygon.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPolygon.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisPoint.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisPoint.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisPoint.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisPoint.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisPolygon.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisPolygon.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisPolygon.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisPolygon.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteLineString.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteLineString.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteLineString.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteLineString.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiLineString.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiLineString.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiLineString.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiLineString.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPoint.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPoint.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPoint.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPoint.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPolygon.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPolygon.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPolygon.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPolygon.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePoint.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePoint.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePoint.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePoint.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePolygon.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePolygon.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePolygon.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePolygon.java diff --git a/ebean-postgis/src/main/java9/module-info.java b/ebean-postgis-types/src/main/java9/module-info.java similarity index 93% rename from ebean-postgis/src/main/java9/module-info.java rename to ebean-postgis-types/src/main/java9/module-info.java index a24837bc8..8d00fe655 100644 --- a/ebean-postgis/src/main/java9/module-info.java +++ b/ebean-postgis-types/src/main/java9/module-info.java @@ -4,7 +4,7 @@ import io.ebeaninternal.api.GeoTypeProvider; /** * Provides GeoTypeProvider and ExtraTypeFactory. */ -module io.ebean.postgis { +module io.ebean.postgis.types { provides ExtraTypeFactory with io.ebean.postgis.PostgisExtraTypeFactory; provides GeoTypeProvider with io.ebean.postgis.PostgisGeoTypeBindProvider; diff --git a/ebean-postgis/src/main/resources/META-INF/services/io.ebean.core.type.ExtraTypeFactory b/ebean-postgis-types/src/main/resources/META-INF/services/io.ebean.core.type.ExtraTypeFactory similarity index 100% rename from ebean-postgis/src/main/resources/META-INF/services/io.ebean.core.type.ExtraTypeFactory rename to ebean-postgis-types/src/main/resources/META-INF/services/io.ebean.core.type.ExtraTypeFactory diff --git a/ebean-postgis/src/main/resources/META-INF/services/io.ebeaninternal.api.GeoTypeProvider b/ebean-postgis-types/src/main/resources/META-INF/services/io.ebeaninternal.api.GeoTypeProvider similarity index 100% rename from ebean-postgis/src/main/resources/META-INF/services/io.ebeaninternal.api.GeoTypeProvider rename to ebean-postgis-types/src/main/resources/META-INF/services/io.ebeaninternal.api.GeoTypeProvider diff --git a/ebean-postgis/src/test/java/org/example/domain/BaseEntity.java b/ebean-postgis-types/src/test/java/org/example/domain/BaseEntity.java similarity index 100% rename from ebean-postgis/src/test/java/org/example/domain/BaseEntity.java rename to ebean-postgis-types/src/test/java/org/example/domain/BaseEntity.java diff --git a/ebean-postgis/src/test/java/org/example/domain/CachedBean.java b/ebean-postgis-types/src/test/java/org/example/domain/CachedBean.java similarity index 100% rename from ebean-postgis/src/test/java/org/example/domain/CachedBean.java rename to ebean-postgis-types/src/test/java/org/example/domain/CachedBean.java diff --git a/ebean-postgis/src/test/java/org/example/domain/MyBean.java b/ebean-postgis-types/src/test/java/org/example/domain/MyBean.java similarity index 100% rename from ebean-postgis/src/test/java/org/example/domain/MyBean.java rename to ebean-postgis-types/src/test/java/org/example/domain/MyBean.java diff --git a/ebean-postgis/src/test/java/org/example/domain/OtherBeanGeoLatte.java b/ebean-postgis-types/src/test/java/org/example/domain/OtherBeanGeoLatte.java similarity index 100% rename from ebean-postgis/src/test/java/org/example/domain/OtherBeanGeoLatte.java rename to ebean-postgis-types/src/test/java/org/example/domain/OtherBeanGeoLatte.java diff --git a/ebean-postgis/src/test/java/org/example/domain/TestCacheSerialization.java b/ebean-postgis-types/src/test/java/org/example/domain/TestCacheSerialization.java similarity index 100% rename from ebean-postgis/src/test/java/org/example/domain/TestCacheSerialization.java rename to ebean-postgis-types/src/test/java/org/example/domain/TestCacheSerialization.java diff --git a/ebean-postgis/src/test/java/org/example/domain/TestInsertQuery.java b/ebean-postgis-types/src/test/java/org/example/domain/TestInsertQuery.java similarity index 100% rename from ebean-postgis/src/test/java/org/example/domain/TestInsertQuery.java rename to ebean-postgis-types/src/test/java/org/example/domain/TestInsertQuery.java diff --git a/ebean-postgis/src/test/java/org/example/domain/TestOtherInsertQuery.java b/ebean-postgis-types/src/test/java/org/example/domain/TestOtherInsertQuery.java similarity index 100% rename from ebean-postgis/src/test/java/org/example/domain/TestOtherInsertQuery.java rename to ebean-postgis-types/src/test/java/org/example/domain/TestOtherInsertQuery.java diff --git a/ebean-postgis/src/test/java/org/example/domain/TestQuery.java b/ebean-postgis-types/src/test/java/org/example/domain/TestQuery.java similarity index 100% rename from ebean-postgis/src/test/java/org/example/domain/TestQuery.java rename to ebean-postgis-types/src/test/java/org/example/domain/TestQuery.java diff --git a/ebean-postgis/src/test/resources/application-test.yml b/ebean-postgis-types/src/test/resources/application-test.yml similarity index 100% rename from ebean-postgis/src/test/resources/application-test.yml rename to ebean-postgis-types/src/test/resources/application-test.yml diff --git a/ebean-postgis/src/test/resources/logback-test.xml b/ebean-postgis-types/src/test/resources/logback-test.xml similarity index 100% rename from ebean-postgis/src/test/resources/logback-test.xml rename to ebean-postgis-types/src/test/resources/logback-test.xml diff --git a/ebean-postgis/src/test/resources/notused-test-ebean.properties b/ebean-postgis-types/src/test/resources/notused-test-ebean.properties similarity index 100% rename from ebean-postgis/src/test/resources/notused-test-ebean.properties rename to ebean-postgis-types/src/test/resources/notused-test-ebean.properties diff --git a/ebean-postgis/README.md b/ebean-postgis/README.md deleted file mode 100644 index a88d4c0b6..000000000 --- a/ebean-postgis/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# ebean-com.avaje.ebean.postgis -Ebean support for Postgres Geometry types - org.com.avaje.ebean.postgis and org.geolatte.geom diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 7b4bfc571..014f9e5a2 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -196,7 +196,7 @@ org.postgresql postgresql - 42.5.1 + 42.6.0 org.checkerframework diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml index 13e2eab2b..7cc9f09a7 100644 --- a/platforms/postgres/pom.xml +++ b/platforms/postgres/pom.xml @@ -28,7 +28,7 @@ org.postgresql postgresql - 42.5.1 + 42.6.0 test diff --git a/pom.xml b/pom.xml index f1cad248b..2d849afb3 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ querybean-generator kotlin-querybean-generator ebean-querybean - ebean-postgis + ebean-postgis-types ebean-redis platforms composites