Rename ebean-postgis -> ebean-postgis-types + add new composite ebean-postgis

With this, people can depend on ebean-postgis (the composite) and get all the
dependencies they need (which is ebean-platform-postgres + ebean-postgis-types
+ others).

This should just make it easier for people in that currently we need both
ebean-postgis + ebean-postgres which isn't obvious enough.

composites/ebean-postgis/pom.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>ebean-parent</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.22.0</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
+  <name>ebean-postgis</name>
+  <description>ebean-postgis composite</description>
+  <artifactId>ebean-postgis</artifactId>
+
+  <properties>
+    <postgis.jdbc.version>2.5.1</postgis.jdbc.version>
+    <postgres.jdbc.version>42.6.0</postgres.jdbc.version>
+  </properties>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>13.22.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.22.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.22.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-postgres</artifactId>
+      <version>13.22.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>net.postgis</groupId>
+      <artifactId>postgis-jdbc</artifactId>
+      <version>${postgis.jdbc.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>${postgres.jdbc.version}</version>
+    </dependency>
+
+  </dependencies>
+</project>

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 {
+}

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;
+
+}

composites/pom.xml

@@ -23,6 +23,7 @@
     <module>ebean-nuodb</module>
     <module>ebean-oracle</module>
     <module>ebean-postgres</module>
+    <module>ebean-postgis</module>
 <!--    <module>sqlanywhere</module>-->
     <module>ebean-sqlite</module>
     <module>ebean-sqlserver</module>

ebean-core-type/pom.xml

@@ -30,7 +30,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.4.3</version>
+      <version>42.6.0</version>
       <optional>true</optional>
     </dependency>
 

ebean-core/pom.xml

@@ -151,7 +151,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.5.1</version>
+      <version>42.6.0</version>
       <optional>true</optional>
     </dependency>
 

ebean-postgis-types/README.md

@@ -0,0 +1,3 @@
+# ebean.postgis.types
+
+Ebean support for Postgres Geometry types

ebean-postgis-types/pom.xml

@@ -7,11 +7,8 @@
     <version>13.22.0</version>
   </parent>
 
-  <name>ebean postgis</name>
-  <description>ebean postgis module</description>
-  <url>https://ebean.io/</url>
-
-  <artifactId>ebean-postgis</artifactId>
+  <name>ebean postgis types</name>
+  <artifactId>ebean-postgis-types</artifactId>
 
   <properties>
     <postgis.jdbc.version>2.5.1</postgis.jdbc.version>
@@ -50,7 +47,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.5.1</version>
+      <version>42.6.0</version>
       <scope>provided</scope>
     </dependency>
 

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;

ebean-postgis/README.md

@@ -1,2 +0,0 @@
-# ebean-com.avaje.ebean.postgis
-Ebean support for Postgres Geometry types - org.com.avaje.ebean.postgis and org.geolatte.geom

ebean-test/pom.xml

@@ -196,7 +196,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.5.1</version>
+      <version>42.6.0</version>
       <exclusions>
         <exclusion>
           <groupId>org.checkerframework</groupId>

platforms/postgres/pom.xml

@@ -28,7 +28,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.5.1</version>
+      <version>42.6.0</version>
       <scope>test</scope>
     </dependency>
 

pom.xml

@@ -86,7 +86,7 @@
     <module>querybean-generator</module>
     <module>kotlin-querybean-generator</module>
     <module>ebean-querybean</module>
-    <module>ebean-postgis</module>
+    <module>ebean-postgis-types</module>
     <module>ebean-redis</module>
     <module>platforms</module>
     <module>composites</module>