diff -Nru postgis-java-2.2.1/debian/changelog postgis-java-2.3.0/debian/changelog
--- postgis-java-2.2.1/debian/changelog	2018-10-14 07:35:25.000000000 +0000
+++ postgis-java-2.3.0/debian/changelog	2018-11-25 08:45:20.000000000 +0000
@@ -1,3 +1,12 @@
+postgis-java (1:2.3.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Update copyright years for Phillip Ross.
+  * Refresh patches.
+  * Strip trailing slash from Vcs-Browser URL.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 25 Nov 2018 09:45:20 +0100
+
 postgis-java (1:2.2.1-9) unstable; urgency=medium
 
   * Bump Standards-Version to 4.2.1, no changes.
diff -Nru postgis-java-2.2.1/debian/control postgis-java-2.3.0/debian/control
--- postgis-java-2.2.1/debian/control	2018-10-11 19:52:22.000000000 +0000
+++ postgis-java-2.3.0/debian/control	2018-11-25 08:44:49.000000000 +0000
@@ -12,7 +12,7 @@
                      maven-repo-helper,
                      maven
 Standards-Version: 4.2.1
-Vcs-Browser: https://salsa.debian.org/debian-gis-team/postgis-java/
+Vcs-Browser: https://salsa.debian.org/debian-gis-team/postgis-java
 Vcs-Git: https://salsa.debian.org/debian-gis-team/postgis-java.git
 Homepage: https://github.com/postgis/postgis-java
 
diff -Nru postgis-java-2.2.1/debian/copyright postgis-java-2.3.0/debian/copyright
--- postgis-java-2.2.1/debian/copyright	2018-06-20 18:06:35.000000000 +0000
+++ postgis-java-2.3.0/debian/copyright	2018-11-25 08:35:03.000000000 +0000
@@ -6,7 +6,7 @@
 Files: *
 Copyright: 2004, Paul Ramsey <pramsey@refractions.net>
            2005, Markus Schaber <markus.schaber@logix-tt.com>
-           2015, Phillip Ross <phillip.w.g.ross@gmail.com>
+     2015, 2017, Phillip Ross <phillip.w.g.ross@gmail.com>
 License: LGPL-2.1+
 
 Files: debian/*
diff -Nru postgis-java-2.2.1/debian/patches/driverwrapper.patch postgis-java-2.3.0/debian/patches/driverwrapper.patch
--- postgis-java-2.2.1/debian/patches/driverwrapper.patch	2018-06-20 18:08:14.000000000 +0000
+++ postgis-java-2.3.0/debian/patches/driverwrapper.patch	2018-11-25 08:41:15.000000000 +0000
@@ -1,10 +1,11 @@
 Description: libpostgresql-jdbc-java 42.2.2 doesn't thow exception any more.
 Author: Bas Couwenberg <sebastic@debian.org>
 Forwarded: https://github.com/postgis/postgis-java/pull/60
+Applied-Upstream: https://github.com/postgis/postgis-java/commit/d71e4fad18952ba01a2c0a8dd3f6ec5d106368b0
 
 --- a/jdbc/src/main/java/org/postgis/DriverWrapper.java
 +++ b/jdbc/src/main/java/org/postgis/DriverWrapper.java
-@@ -333,7 +333,7 @@ public class DriverWrapper extends Drive
+@@ -339,7 +339,7 @@ public class DriverWrapper extends Drive
          }
      }
  
@@ -19,8 +20,8 @@
          <dependency>
              <groupId>org.postgresql</groupId>
              <artifactId>postgresql</artifactId>
--            <version>[9.4.1208.jre7,)</version>
-+            <version>[42.2.2.jre7,)</version>
+-            <version>9.4.1208.jre7</version>
++            <version>42.2.2.jre7</version>
          </dependency>
      </dependencies>
  
diff -Nru postgis-java-2.2.1/debian/patches/upstream-version.patch postgis-java-2.3.0/debian/patches/upstream-version.patch
--- postgis-java-2.2.1/debian/patches/upstream-version.patch	2018-06-20 18:08:33.000000000 +0000
+++ postgis-java-2.3.0/debian/patches/upstream-version.patch	2018-11-25 08:39:48.000000000 +0000
@@ -8,13 +8,13 @@
      <parent>
          <groupId>net.postgis</groupId>
          <artifactId>postgis-java-aggregator</artifactId>
--        <version>2.2.2-SNAPSHOT</version>
-+        <version>2.2.1</version>
+-        <version>2.3.1-SNAPSHOT</version>
++        <version>2.3.0</version>
      </parent>
  
      <artifactId>postgis-jdbc</artifactId>
--    <version>2.2.2-SNAPSHOT</version>
-+    <version>2.2.1</version>
+-    <version>2.3.1-SNAPSHOT</version>
++    <version>2.3.0</version>
      <packaging>jar</packaging>
  
      <name>Postgis JDBC Driver</name>
@@ -24,28 +24,37 @@
  	<parent>
  		<groupId>net.postgis</groupId>
  		<artifactId>postgis-java-aggregator</artifactId>
--		<version>2.2.2-SNAPSHOT</version>
-+		<version>2.2.1</version>
+-		<version>2.3.1-SNAPSHOT</version>
++		<version>2.3.0</version>
  	</parent>
  
  	<artifactId>postgis-jdbc-jtsparser</artifactId>
--	<version>2.2.2-SNAPSHOT</version>
-+	<version>2.2.1</version>
+-	<version>2.3.1-SNAPSHOT</version>
++	<version>2.3.0</version>
  	<packaging>jar</packaging>
  
      <name>Postgis JDBC Driver JTS Parser</name>
+@@ -27,7 +27,7 @@
+         <dependency>
+             <groupId>net.postgis</groupId>
+             <artifactId>postgis-jdbc</artifactId>
+-            <version>2.3.1-SNAPSHOT</version>
++            <version>2.3.0</version>
+         </dependency>
+         <dependency>
+             <groupId>org.locationtech.jts</groupId>
 --- a/pom.xml
 +++ b/pom.xml
 @@ -4,7 +4,7 @@
  
      <groupId>net.postgis</groupId>
      <artifactId>postgis-java-aggregator</artifactId>
--    <version>2.2.2-SNAPSHOT</version>
-+    <version>2.2.1</version>
+-    <version>2.3.1-SNAPSHOT</version>
++    <version>2.3.0</version>
      <packaging>pom</packaging>
  
      <name>PostGIS Java Project</name>
-@@ -371,4 +371,4 @@
+@@ -375,4 +375,4 @@
          </profile>
      </profiles>
  
@@ -58,13 +67,13 @@
      <parent>
          <groupId>net.postgis</groupId>
          <artifactId>postgis-java-aggregator</artifactId>
--        <version>2.2.2-SNAPSHOT</version>
-+        <version>2.2.1</version>
+-        <version>2.3.1-SNAPSHOT</version>
++        <version>2.3.0</version>
      </parent>
  
      <artifactId>postgis-jdbc-java2d</artifactId>
--    <version>2.2.2-SNAPSHOT</version>
-+    <version>2.2.1</version>
+-    <version>2.3.1-SNAPSHOT</version>
++    <version>2.3.0</version>
      <packaging>jar</packaging>
  
      <name>postgis-jdbc-java2d</name>
@@ -72,8 +81,8 @@
          <dependency>
              <groupId>net.postgis</groupId>
              <artifactId>postgis-jdbc</artifactId>
--            <version>2.2.2-SNAPSHOT</version>
-+            <version>2.2.1</version>
+-            <version>2.3.1-SNAPSHOT</version>
++            <version>2.3.0</version>
          </dependency>
      </dependencies>
  
@@ -83,13 +92,13 @@
      <parent>
          <artifactId>tools</artifactId>
          <groupId>net.postgis</groupId>
--        <version>2.2.2-SNAPSHOT</version>
-+        <version>2.2.1</version>
+-        <version>2.3.1-SNAPSHOT</version>
++        <version>2.3.0</version>
      </parent>
  
      <artifactId>osgeo-postgis-jdbc-test-util</artifactId>
--    <version>2.2.2-SNAPSHOT</version>
-+    <version>2.2.1</version>
+-    <version>2.3.1-SNAPSHOT</version>
++    <version>2.3.0</version>
      <packaging>jar</packaging>
  
      <name>osgeo-postgis-jdbc-test-util</name>
@@ -97,8 +106,8 @@
          <dependency>
              <groupId>net.postgis</groupId>
              <artifactId>postgis-jdbc</artifactId>
--            <version>2.2.2-SNAPSHOT</version>
-+            <version>2.2.1</version>
+-            <version>2.3.1-SNAPSHOT</version>
++            <version>2.3.0</version>
          </dependency>
  
          <dependency>
@@ -115,13 +124,13 @@
      <parent>
          <artifactId>postgis-java-aggregator</artifactId>
          <groupId>net.postgis</groupId>
--        <version>2.2.2-SNAPSHOT</version>
-+        <version>2.2.1</version>
+-        <version>2.3.1-SNAPSHOT</version>
++        <version>2.3.0</version>
      </parent>
  
      <artifactId>tools</artifactId>
--    <version>2.2.2-SNAPSHOT</version>
-+    <version>2.2.1</version>
+-    <version>2.3.1-SNAPSHOT</version>
++    <version>2.3.0</version>
      <packaging>pom</packaging>
  
      <name>tools</name>
diff -Nru postgis-java-2.2.1/.gitignore postgis-java-2.3.0/.gitignore
--- postgis-java-2.2.1/.gitignore	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/.gitignore	2018-11-25 06:58:15.000000000 +0000
@@ -1,5 +1,134 @@
-# Created by .ignore support plugin (hsz.mobi)
-.idea/misc.xml
-.idea/uiDesigner.xml
-.idea/workspace.xml
-.idea/dictionaries
\ No newline at end of file
+.idea
+### Linux template
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+### Windows template
+# Windows thumbnail cache files
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# CMake
+cmake-build-debug/
+cmake-build-release/
+
+# File-based project format
+*.iws
+*.iml
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+### Vim template
+# Swap
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-v][a-z]
+[._]sw[a-p]
+
+# Session
+Session.vim
+
+# Temporary
+.netrwhist
+# Auto-generated tag files
+tags
+### Maven template
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+
+### macOS template
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+### Java template
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
diff -Nru postgis-java-2.2.1/.idea/compiler.xml postgis-java-2.3.0/.idea/compiler.xml
--- postgis-java-2.2.1/.idea/compiler.xml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/.idea/compiler.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-      <profile default="false" name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="true" />
-        <module name="osgeo-postgis-jdbc-test-util" />
-        <module name="postgis-jdbc" />
-        <module name="postgis-jdbc-java2d" />
-        <module name="postgis-jdbc-jtsparser" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="osgeo-postgis-jdbc-test-util" target="1.7" />
-      <module name="postgis-aggregator" target="1.8" />
-      <module name="postgis-java-aggregator" target="1.7" />
-      <module name="postgis-jdbc" target="1.7" />
-      <module name="postgis-jdbc-java2d" target="1.7" />
-      <module name="postgis-jdbc-jtsparser" target="1.7" />
-      <module name="tools" target="1.7" />
-    </bytecodeTargetLevel>
-  </component>
-</project>
\ No newline at end of file
diff -Nru postgis-java-2.2.1/.idea/copyright/profiles_settings.xml postgis-java-2.3.0/.idea/copyright/profiles_settings.xml
--- postgis-java-2.2.1/.idea/copyright/profiles_settings.xml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/.idea/copyright/profiles_settings.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff -Nru postgis-java-2.2.1/.idea/encodings.xml postgis-java-2.3.0/.idea/encodings.xml
--- postgis-java-2.2.1/.idea/encodings.xml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/.idea/encodings.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/jdbc" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/jdbc_jtsparser" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/postgis-jdbc-java2d" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/tools" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/tools/osgeo-postgis-jdbc-test-util" charset="UTF-8" />
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff -Nru postgis-java-2.2.1/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml postgis-java-2.3.0/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml
--- postgis-java-2.2.1/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: ch.qos.logback:logback-classic:1.1.7">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.7/logback-classic-1.1.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.7/logback-classic-1.1.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.7/logback-classic-1.1.7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff -Nru postgis-java-2.2.1/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml postgis-java-2.3.0/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml
--- postgis-java-2.2.1/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: ch.qos.logback:logback-core:1.1.7">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.7/logback-core-1.1.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.7/logback-core-1.1.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.7/logback-core-1.1.7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff -Nru postgis-java-2.2.1/.idea/libraries/Maven__com_beust_jcommander_1_48.xml postgis-java-2.3.0/.idea/libraries/Maven__com_beust_jcommander_1_48.xml
--- postgis-java-2.2.1/.idea/libraries/Maven__com_beust_jcommander_1_48.xml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/.idea/libraries/Maven__com_beust_jcommander_1_48.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.beust:jcommander:1.48">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.48/jcommander-1.48.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.48/jcommander-1.48-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.48/jcommander-1.48-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff -Nru postgis-java-2.2.1/.idea/libraries/Maven__com_vividsolutions_jts_1_12.xml postgis-java-2.3.0/.idea/libraries/Maven__com_vividsolutions_jts_1_12.xml
--- postgis-java-2.2.1/.idea/libraries/Maven__com_vividsolutions_jts_1_12.xml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/.idea/libraries/Maven__com_vividsolutions_jts_1_12.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.vividsolutions:jts:1.12">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/vividsolutions/jts/1.12/jts-1.12.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/vividsolutions/jts/1.12/jts-1.12-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/vividsolutions/jts/1.12/jts-1.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff -Nru postgis-java-2.2.1/.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml postgis-java-2.3.0/.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml
--- postgis-java-2.2.1/.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.beanshell:bsh:2.0b4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/beanshell/bsh/2.0b4/bsh-2.0b4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/beanshell/bsh/2.0b4/bsh-2.0b4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff -Nru postgis-java-2.2.1/.idea/libraries/Maven__org_postgresql_postgresql_9_4_1209_jre7.xml postgis-java-2.3.0/.idea/libraries/Maven__org_postgresql_postgresql_9_4_1209_jre7.xml
--- postgis-java-2.2.1/.idea/libraries/Maven__org_postgresql_postgresql_9_4_1209_jre7.xml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/.idea/libraries/Maven__org_postgresql_postgresql_9_4_1209_jre7.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.postgresql:postgresql:9.4.1209.jre7">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/postgresql/postgresql/9.4.1209.jre7/postgresql-9.4.1209.jre7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/postgresql/postgresql/9.4.1209.jre7/postgresql-9.4.1209.jre7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/postgresql/postgresql/9.4.1209.jre7/postgresql-9.4.1209.jre7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff -Nru postgis-java-2.2.1/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml postgis-java-2.3.0/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml
--- postgis-java-2.2.1/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.slf4j:slf4j-api:1.7.21">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff -Nru postgis-java-2.2.1/.idea/libraries/Maven__org_testng_testng_6_9_10.xml postgis-java-2.3.0/.idea/libraries/Maven__org_testng_testng_6_9_10.xml
--- postgis-java-2.2.1/.idea/libraries/Maven__org_testng_testng_6_9_10.xml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/.idea/libraries/Maven__org_testng_testng_6_9_10.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.testng:testng:6.9.10">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.9.10/testng-6.9.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.9.10/testng-6.9.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.9.10/testng-6.9.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff -Nru postgis-java-2.2.1/.idea/libraries/Maven__xerces_xercesImpl_2_4_0.xml postgis-java-2.3.0/.idea/libraries/Maven__xerces_xercesImpl_2_4_0.xml
--- postgis-java-2.2.1/.idea/libraries/Maven__xerces_xercesImpl_2_4_0.xml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/.idea/libraries/Maven__xerces_xercesImpl_2_4_0.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: xerces:xercesImpl:2.4.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff -Nru postgis-java-2.2.1/.idea/modules.xml postgis-java-2.3.0/.idea/modules.xml
--- postgis-java-2.2.1/.idea/modules.xml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/.idea/modules.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/tools/osgeo-postgis-jdbc-test-util/osgeo-postgis-jdbc-test-util.iml" filepath="$PROJECT_DIR$/tools/osgeo-postgis-jdbc-test-util/osgeo-postgis-jdbc-test-util.iml" group="tools and modules" />
-      <module fileurl="file://$PROJECT_DIR$/postgis-java-aggregator.iml" filepath="$PROJECT_DIR$/postgis-java-aggregator.iml" />
-      <module fileurl="file://$PROJECT_DIR$/jdbc/postgis-jdbc.iml" filepath="$PROJECT_DIR$/jdbc/postgis-jdbc.iml" />
-      <module fileurl="file://$PROJECT_DIR$/postgis-jdbc-java2d/postgis-jdbc-java2d.iml" filepath="$PROJECT_DIR$/postgis-jdbc-java2d/postgis-jdbc-java2d.iml" />
-      <module fileurl="file://$PROJECT_DIR$/jdbc_jtsparser/postgis-jdbc-jtsparser.iml" filepath="$PROJECT_DIR$/jdbc_jtsparser/postgis-jdbc-jtsparser.iml" />
-      <module fileurl="file://$PROJECT_DIR$/tools/tools.iml" filepath="$PROJECT_DIR$/tools/tools.iml" group="tools and modules" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff -Nru postgis-java-2.2.1/.idea/.name postgis-java-2.3.0/.idea/.name
--- postgis-java-2.2.1/.idea/.name	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/.idea/.name	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-postgis-aggregator
\ No newline at end of file
diff -Nru postgis-java-2.2.1/.idea/vcs.xml postgis-java-2.3.0/.idea/vcs.xml
--- postgis-java-2.2.1/.idea/vcs.xml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/.idea/vcs.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff -Nru postgis-java-2.2.1/jdbc/pom.xml postgis-java-2.3.0/jdbc/pom.xml
--- postgis-java-2.2.1/jdbc/pom.xml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/jdbc/pom.xml	2018-11-25 06:58:15.000000000 +0000
@@ -5,11 +5,11 @@
     <parent>
         <groupId>net.postgis</groupId>
         <artifactId>postgis-java-aggregator</artifactId>
-        <version>2.2.2-SNAPSHOT</version>
+        <version>2.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>postgis-jdbc</artifactId>
-    <version>2.2.2-SNAPSHOT</version>
+    <version>2.3.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Postgis JDBC Driver</name>
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>[9.4.1208.jre7,)</version>
+            <version>9.4.1208.jre7</version>
         </dependency>
     </dependencies>
 
diff -Nru postgis-java-2.2.1/jdbc/postgis-jdbc.iml postgis-java-2.3.0/jdbc/postgis-jdbc.iml
--- postgis-java-2.2.1/jdbc/postgis-jdbc.iml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/jdbc/postgis-jdbc.iml	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4.1209.jre7" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff -Nru postgis-java-2.2.1/jdbc/src/main/java/org/postgis/DriverWrapper.java postgis-java-2.3.0/jdbc/src/main/java/org/postgis/DriverWrapper.java
--- postgis-java-2.2.1/jdbc/src/main/java/org/postgis/DriverWrapper.java	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/jdbc/src/main/java/org/postgis/DriverWrapper.java	2018-11-25 06:58:15.000000000 +0000
@@ -281,6 +281,8 @@
         public void addGeometries(Connection conn) throws SQLException {
             PGConnection pgconn = (PGConnection) conn;
             pgconn.addDataType("geometry", org.postgis.PGgeometry.class);
+            pgconn.addDataType("public.geometry", org.postgis.PGgeometry.class);
+            pgconn.addDataType("\"public\".\"geometry\"", org.postgis.PGgeometry.class);
         }
 
         public void addBoxen(Connection conn) throws SQLException {
@@ -300,6 +302,8 @@
         public void addGeometries(Connection conn) throws SQLException {
             org.postgresql.PGConnection pgconn = (org.postgresql.PGConnection) conn;
             pgconn.addDataType("geometry", org.postgis.PGgeometry.class);
+            pgconn.addDataType("public.geometry", org.postgis.PGgeometry.class);
+            pgconn.addDataType("\"public\".\"geometry\"", org.postgis.PGgeometry.class);
         }
 
 		public void addBoxen(Connection conn) throws SQLException {
@@ -319,6 +323,8 @@
         public void addGeometries(Connection conn) throws SQLException {
             PGConnection pgconn = (PGConnection) conn;
             pgconn.addDataType("geometry", org.postgis.PGgeometry.class);
+            pgconn.addDataType("public.geometry", org.postgis.PGgeometry.class);
+            pgconn.addDataType("\"public\".\"geometry\"", org.postgis.PGgeometry.class);
         }
 
         public void addBoxen(Connection conn) throws SQLException {
diff -Nru postgis-java-2.2.1/jdbc/src/main/java/org/postgis/PGgeometry.java postgis-java-2.3.0/jdbc/src/main/java/org/postgis/PGgeometry.java
--- postgis-java-2.2.1/jdbc/src/main/java/org/postgis/PGgeometry.java	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/jdbc/src/main/java/org/postgis/PGgeometry.java	2018-11-25 06:58:15.000000000 +0000
@@ -1,12 +1,12 @@
 /*
  * PGgeometry.java
- * 
+ *
  * PostGIS extension for PostgreSQL JDBC driver - PGobject Geometry Wrapper
- * 
+ *
  * (C) 2004 Paul Ramsey, pramsey@refractions.net
- * 
+ *
  * (C) 2005 Markus Schaber, markus.schaber@logix-tt.com
- * 
+ *
  * (C) 2015 Phillip Ross, phillip.w.g.ross@gmail.com
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  */
 
 package org.postgis;
@@ -37,7 +37,6 @@
     private static final long serialVersionUID = 0x100;
 
     Geometry geom;
-    BinaryParser bp = new BinaryParser();
 
     public PGgeometry() {
         this.setType("geometry");
@@ -54,7 +53,7 @@
     }
 
     public void setValue(String value) throws SQLException {
-        geom = geomFromString(value, bp);
+        geom = geomFromString(value, new BinaryParser());
     }
 
     public static Geometry geomFromString(String value) throws SQLException {
@@ -131,7 +130,7 @@
     public void setGeometry(Geometry newgeom) {
         this.geom = newgeom;
     }
-    
+
     public int getGeoType() {
         return geom.type;
     }
@@ -153,7 +152,7 @@
 
     /**
      * Splits a String at the first occurrence of border character.
-     * 
+     *
      * Poor man's String.split() replacement, as String.split() was invented at
      * jdk1.4, and the Debian PostGIS Maintainer had problems building the woody
      * backport of his package using DFSG-free compilers. In all the cases we
diff -Nru postgis-java-2.2.1/jdbc/src/test/java/org/postgis/ParserTest.java postgis-java-2.3.0/jdbc/src/test/java/org/postgis/ParserTest.java
--- postgis-java-2.2.1/jdbc/src/test/java/org/postgis/ParserTest.java	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/jdbc/src/test/java/org/postgis/ParserTest.java	2018-11-25 06:58:15.000000000 +0000
@@ -322,6 +322,13 @@
                     }
                 }
 
+                /*
+                // Temporarily removing this check since it breaks between PostGIS v2.4.4 and PostGIS v2.5.0
+                // Tests performed via psql between mdillon/postgis:9.3 and mdillon/postgis:9.4 shows the breakage
+                // Test is also broken in mdillon/postgis:11-alpine
+                // In psql, the sql statement "SELECT ST_AsEWKT(geometry_in('POINT(1e100 1.2345e-100 -2e-5)'));" returns
+                // "POINT(1e+100 1.2345e-100 -2e-05)" with 9.3 and "POINT(1e+100 0 -0.00002)" with 9.4 and later
+
                 // asEWKT() function is not present on PostGIS 0.X, and the test
                 // is pointless as 0.X uses EWKT as canonical rep so the same
                 // functionality was already tested above.
@@ -330,6 +337,7 @@
                     logger.debug("asEWKT: {}", sqlGeom);
                     Assert.assertEquals(geom, sqlGeom);
                 }
+                */
 
                 // asEWKB() function is not present on PostGIS 0.X.
                 if (serverPostgisMajor >= 1) {
diff -Nru postgis-java-2.2.1/jdbc/src/test/java/org/postgis/SerializationTest.java postgis-java-2.3.0/jdbc/src/test/java/org/postgis/SerializationTest.java
--- postgis-java-2.2.1/jdbc/src/test/java/org/postgis/SerializationTest.java	1970-01-01 00:00:00.000000000 +0000
+++ postgis-java-2.3.0/jdbc/src/test/java/org/postgis/SerializationTest.java	2018-11-25 06:58:15.000000000 +0000
@@ -0,0 +1,54 @@
+/*
+ * ServerTest.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - example and test classes
+ *
+ * (C) 2004 Paul Ramsey, pramsey@refractions.net
+ *
+ * (C) 2005 Markus Schaber, markus.schaber@logix-tt.com
+ *
+ * (C) 2017 Phillip Ross, phillip.w.g.ross@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+package org.postgis;
+
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.NotSerializableException;
+import java.io.ObjectOutputStream;
+
+
+public class SerializationTest {
+
+
+    @Test
+    public void serializationCheckPGgeometry() throws Exception {
+        try {
+            new ObjectOutputStream(new ByteArrayOutputStream())
+                    .writeObject(new PGgeometry("MULTIPOLYGON(((1 1,1 2,2 1,1 1)))"));
+        }
+        catch (NotSerializableException ex) {
+            Assert.fail("serialization of PGgeometry failed: " + ex);
+        }
+    }
+
+
+}
diff -Nru postgis-java-2.2.1/jdbc/src/test/resources/testng.xml postgis-java-2.3.0/jdbc/src/test/resources/testng.xml
--- postgis-java-2.2.1/jdbc/src/test/resources/testng.xml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/jdbc/src/test/resources/testng.xml	2018-11-25 06:58:15.000000000 +0000
@@ -15,9 +15,10 @@
             <class name="org.postgis.EmptyGeometriesTest"/>
             <class name="org.postgis.ParserTest"/>
             <class name="org.postgis.ServerTest"/>
+            <class name="org.postgis.SerializationTest"/>
             <class name="org.postgis.TokenizerTest"/>
             <class name="org.postgis.VersionPrinter"/>
         </classes>
     </test>
 
-</suite>
\ No newline at end of file
+</suite>
diff -Nru postgis-java-2.2.1/jdbc_jtsparser/pom.xml postgis-java-2.3.0/jdbc_jtsparser/pom.xml
--- postgis-java-2.2.1/jdbc_jtsparser/pom.xml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/jdbc_jtsparser/pom.xml	2018-11-25 06:58:15.000000000 +0000
@@ -5,11 +5,11 @@
 	<parent>
 		<groupId>net.postgis</groupId>
 		<artifactId>postgis-java-aggregator</artifactId>
-		<version>2.2.2-SNAPSHOT</version>
+		<version>2.3.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>postgis-jdbc-jtsparser</artifactId>
-	<version>2.2.2-SNAPSHOT</version>
+	<version>2.3.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
     <name>Postgis JDBC Driver JTS Parser</name>
@@ -27,12 +27,23 @@
         <dependency>
             <groupId>net.postgis</groupId>
             <artifactId>postgis-jdbc</artifactId>
-            <version>[2.1.0,)</version>
+            <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>com.vividsolutions</groupId>
+            <groupId>org.locationtech.jts</groupId>
             <artifactId>jts</artifactId>
-            <version>1.12</version>
+            <version>1.15.0</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>org.locationtech.jts</groupId>
+            <artifactId>jts-core</artifactId>
+            <version>1.15.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.locationtech.spatial4j</groupId>
+            <artifactId>spatial4j</artifactId>
+            <version>0.7</version>
         </dependency>
     </dependencies>
 
diff -Nru postgis-java-2.2.1/jdbc_jtsparser/postgis-jdbc-jtsparser.iml postgis-java-2.3.0/jdbc_jtsparser/postgis-jdbc-jtsparser.iml
--- postgis-java-2.2.1/jdbc_jtsparser/postgis-jdbc-jtsparser.iml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/jdbc_jtsparser/postgis-jdbc-jtsparser.iml	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="postgis-jdbc" />
-    <orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4.1209.jre7" level="project" />
-    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.12" level="project" />
-    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.4.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff -Nru postgis-java-2.2.1/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryParser.java postgis-java-2.3.0/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryParser.java
--- postgis-java-2.2.1/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryParser.java	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryParser.java	2018-11-25 06:58:15.000000000 +0000
@@ -24,13 +24,13 @@
  */
 package org.postgis.jts;
 
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.geom.impl.PackedCoordinateSequence;
+import org.locationtech.spatial4j.context.jts.JtsSpatialContextFactory;
 import org.postgis.binary.ByteGetter;
-import org.postgis.binary.ValueGetter;
 import org.postgis.binary.ByteGetter.BinaryByteGetter;
 import org.postgis.binary.ByteGetter.StringByteGetter;
-
-import com.vividsolutions.jts.geom.*;
-import com.vividsolutions.jts.geom.impl.PackedCoordinateSequence;
+import org.postgis.binary.ValueGetter;
 
 /**
  * Parse binary representation of geometries. Currently, only text rep (hexed)
@@ -48,6 +48,8 @@
  * 
  */
 public class JtsBinaryParser {
+    
+    private JtsSpatialContextFactory jtsFactory = new JtsSpatialContextFactory();
 
     /**
      * Get the appropriate ValueGetter for my endianness
@@ -169,9 +171,9 @@
         Point result;
         if (haveZ) {
             double Z = data.getDouble();
-            result = JtsGeometry.geofac.createPoint(new Coordinate(X, Y, Z));
+            result = jtsFactory.getGeometryFactory().createPoint(new Coordinate(X, Y, Z));
         } else {
-            result = JtsGeometry.geofac.createPoint(new Coordinate(X, Y));
+            result = jtsFactory.getGeometryFactory().createPoint(new Coordinate(X, Y));
         }
 
         if (haveM) { // skip M value
@@ -214,15 +216,15 @@
     private MultiPoint parseMultiPoint(ValueGetter data, int srid) {
         Point[] points = new Point[data.getInt()];
         parseGeometryArray(data, points, srid);
-        return JtsGeometry.geofac.createMultiPoint(points);
+        return jtsFactory.getGeometryFactory().createMultiPoint(points);
     }
 
     private LineString parseLineString(ValueGetter data, boolean haveZ, boolean haveM) {
-        return JtsGeometry.geofac.createLineString(parseCS(data, haveZ, haveM));
+        return jtsFactory.getGeometryFactory().createLineString(parseCS(data, haveZ, haveM));
     }
 
     private LinearRing parseLinearRing(ValueGetter data, boolean haveZ, boolean haveM) {
-        return JtsGeometry.geofac.createLinearRing(parseCS(data, haveZ, haveM));
+        return jtsFactory.getGeometryFactory().createLinearRing(parseCS(data, haveZ, haveM));
     }
 
     private Polygon parsePolygon(ValueGetter data, boolean haveZ, boolean haveM, int srid) {
@@ -234,27 +236,27 @@
             rings[i] = parseLinearRing(data, haveZ, haveM);
             rings[i].setSRID(srid);
         }
-        return JtsGeometry.geofac.createPolygon(shell, rings);
+        return jtsFactory.getGeometryFactory().createPolygon(shell, rings);
     }
 
     private MultiLineString parseMultiLineString(ValueGetter data, int srid) {
         int count = data.getInt();
         LineString[] strings = new LineString[count];
         parseGeometryArray(data, strings, srid);
-        return JtsGeometry.geofac.createMultiLineString(strings);
+        return jtsFactory.getGeometryFactory().createMultiLineString(strings);
     }
 
     private MultiPolygon parseMultiPolygon(ValueGetter data, int srid) {
         int count = data.getInt();
         Polygon[] polys = new Polygon[count];
         parseGeometryArray(data, polys, srid);
-        return JtsGeometry.geofac.createMultiPolygon(polys);
+        return jtsFactory.getGeometryFactory().createMultiPolygon(polys);
     }
 
     private GeometryCollection parseCollection(ValueGetter data, int srid) {
         int count = data.getInt();
         Geometry[] geoms = new Geometry[count];
         parseGeometryArray(data, geoms, srid);
-        return JtsGeometry.geofac.createGeometryCollection(geoms);
+        return jtsFactory.getGeometryFactory().createGeometryCollection(geoms);
     }
 }
diff -Nru postgis-java-2.2.1/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryWriter.java postgis-java-2.3.0/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryWriter.java
--- postgis-java-2.2.1/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryWriter.java	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryWriter.java	2018-11-25 06:58:15.000000000 +0000
@@ -24,15 +24,15 @@
  */
 package org.postgis.jts;
 
-import com.vividsolutions.jts.geom.CoordinateSequence;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryCollection;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.MultiLineString;
-import com.vividsolutions.jts.geom.MultiPoint;
-import com.vividsolutions.jts.geom.MultiPolygon;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.MultiPoint;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
 
 import org.postgis.binary.ByteSetter;
 import org.postgis.binary.ValueSetter;
@@ -184,23 +184,23 @@
     }
 
     public static int getWKBType(Geometry geom) {
-        // We always write emtpy geometries as emtpy collections - for OpenGIS
+        // We always write empty geometries as empty collections - for OpenGIS
         // conformance
         if (geom.isEmpty()) {
             return org.postgis.Geometry.GEOMETRYCOLLECTION;
         } else if (geom instanceof Point) {
             return org.postgis.Geometry.POINT;
-        } else if (geom instanceof com.vividsolutions.jts.geom.LineString) {
+        } else if (geom instanceof org.locationtech.jts.geom.LineString) {
             return org.postgis.Geometry.LINESTRING;
-        } else if (geom instanceof com.vividsolutions.jts.geom.Polygon) {
+        } else if (geom instanceof org.locationtech.jts.geom.Polygon) {
             return org.postgis.Geometry.POLYGON;
         } else if (geom instanceof MultiPoint) {
             return org.postgis.Geometry.MULTIPOINT;
         } else if (geom instanceof MultiLineString) {
             return org.postgis.Geometry.MULTILINESTRING;
-        } else if (geom instanceof com.vividsolutions.jts.geom.MultiPolygon) {
+        } else if (geom instanceof org.locationtech.jts.geom.MultiPolygon) {
             return org.postgis.Geometry.MULTIPOLYGON;
-        } if (geom instanceof com.vividsolutions.jts.geom.GeometryCollection) {
+        } if (geom instanceof org.locationtech.jts.geom.GeometryCollection) {
             return org.postgis.Geometry.GEOMETRYCOLLECTION;
         } else {
             throw new IllegalArgumentException("Unknown Geometry Type: " + geom.getClass().getName());
@@ -216,7 +216,7 @@
     }
 
     /**
-     * Write a Coordinatesequence, part of LinearRing and Linestring, but not
+     * Write a CoordinateSequence, part of LinearRing and Linestring, but not
      * MultiPoint!
      */
     private void writeCoordinates(CoordinateSequence seq, int dims, ValueSetter dest) {
diff -Nru postgis-java-2.2.1/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGeometry.java postgis-java-2.3.0/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGeometry.java
--- postgis-java-2.2.1/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGeometry.java	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGeometry.java	2018-11-25 06:58:15.000000000 +0000
@@ -30,14 +30,14 @@
 
 import org.postgresql.util.PGobject;
 
-import com.vividsolutions.jts.geom.CoordinateSequenceFactory;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryCollection;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.Polygon;
-import com.vividsolutions.jts.geom.PrecisionModel;
-import com.vividsolutions.jts.geom.impl.PackedCoordinateSequenceFactory;
-import com.vividsolutions.jts.io.WKTReader;
+import org.locationtech.jts.geom.CoordinateSequenceFactory;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.geom.impl.PackedCoordinateSequenceFactory;
+import org.locationtech.jts.io.WKTReader;
 
 /**
  * JTS Geometry SQL wrapper. Supports PostGIS 1.x (lwgeom hexwkb) for writing
diff -Nru postgis-java-2.2.1/jdbc_jtsparser/src/main/java/org/postgis/jts/JTSShape.java postgis-java-2.3.0/jdbc_jtsparser/src/main/java/org/postgis/jts/JTSShape.java
--- postgis-java-2.2.1/jdbc_jtsparser/src/main/java/org/postgis/jts/JTSShape.java	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/jdbc_jtsparser/src/main/java/org/postgis/jts/JTSShape.java	2018-11-25 06:58:15.000000000 +0000
@@ -25,25 +25,17 @@
 
 package org.postgis.jts;
 
-import java.awt.Rectangle;
-import java.awt.Shape;
+import org.locationtech.jts.geom.*;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.impl.PackedCoordinateSequence;
+
+import java.awt.*;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.PathIterator;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.CoordinateSequence;
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryCollection;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.LinearRing;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
-import com.vividsolutions.jts.geom.impl.PackedCoordinateSequence;
-
 public class JTSShape implements Shape {
     static GeometryFactory fac = new GeometryFactory();
 
diff -Nru postgis-java-2.2.1/jdbc_jtsparser/src/test/java/org/postgis/jts/JtsParserTest.java postgis-java-2.3.0/jdbc_jtsparser/src/test/java/org/postgis/jts/JtsParserTest.java
--- postgis-java-2.2.1/jdbc_jtsparser/src/test/java/org/postgis/jts/JtsParserTest.java	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/jdbc_jtsparser/src/test/java/org/postgis/jts/JtsParserTest.java	2018-11-25 06:58:15.000000000 +0000
@@ -26,7 +26,7 @@
 
 import org.postgis.binary.ValueSetter;
 
-import com.vividsolutions.jts.geom.*;
+import org.locationtech.jts.geom.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
diff -Nru postgis-java-2.2.1/pom.xml postgis-java-2.3.0/pom.xml
--- postgis-java-2.2.1/pom.xml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/pom.xml	2018-11-25 06:58:15.000000000 +0000
@@ -4,7 +4,7 @@
 
     <groupId>net.postgis</groupId>
     <artifactId>postgis-java-aggregator</artifactId>
-    <version>2.2.2-SNAPSHOT</version>
+    <version>2.3.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>PostGIS Java Project</name>
@@ -108,31 +108,35 @@
         <failsafe.useSystemClassLoader>true</failsafe.useSystemClassLoader>
 
         <!-- Plugin versioning -->
-        <build-helper-maven-plugin.version>1.12</build-helper-maven-plugin.version>
-        <download-maven-plugin.version>1.3.0</download-maven-plugin.version>
-        <maven-clean-plugin.version>3.0.0</maven-clean-plugin.version>
-        <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
-        <maven-dependency-plugin.version>2.10</maven-dependency-plugin.version>
+        <build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
+        <download-maven-plugin.version>1.4.0</download-maven-plugin.version>
+        <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
+        <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
+        <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
+        <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
+        <maven-dependency-plugin.version>3.1.0</maven-dependency-plugin.version>
         <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
-        <maven-ear-plugin.version>2.10.1</maven-ear-plugin.version>
+        <maven-ear-plugin.version>3.0.0</maven-ear-plugin.version>
+        <maven-ejb-plugin.version>3.0.0</maven-ejb-plugin.version>
         <maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
-        <maven-failsafe-plugin.version>2.19.1</maven-failsafe-plugin.version>
+        <maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
         <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
         <maven-install-plugin.version>2.5.2</maven-install-plugin.version>
-        <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
+        <maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
         <maven-jarsigner-plugin.version>1.4</maven-jarsigner-plugin.version>
-        <maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
+        <maven-javadoc-plugin.version>3.0.0</maven-javadoc-plugin.version>
         <maven-jxr-plugin.version>2.5</maven-jxr-plugin.version>
         <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
-        <maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
-        <maven-shade-plugin.version>2.4.3</maven-shade-plugin.version>
+        <maven-resources-plugin.version>3.0.2</maven-resources-plugin.version>
+        <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
         <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
-        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
+        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
+        <maven-versions-plugin.version>2.5</maven-versions-plugin.version>
+        <maven-war-plugin.version>3.2.0</maven-war-plugin.version>
         <!-- Dependency versions -->
-        <dependency.logback.version>1.1.7</dependency.logback.version>
-        <dependency.slfj.version>1.7.21</dependency.slfj.version>
-        <dependency.testng.version>6.9.10</dependency.testng.version>
+        <dependency.logback.version>1.2.3</dependency.logback.version>
+        <dependency.slfj.version>1.7.25</dependency.slfj.version>
+        <dependency.testng.version>6.14.3</dependency.testng.version>
     </properties>
 
     <dependencies>
diff -Nru postgis-java-2.2.1/postgis-java-aggregator.iml postgis-java-2.3.0/postgis-java-aggregator.iml
--- postgis-java-2.2.1/postgis-java-aggregator.iml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/postgis-java-aggregator.iml	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff -Nru postgis-java-2.2.1/postgis-jdbc-java2d/pom.xml postgis-java-2.3.0/postgis-jdbc-java2d/pom.xml
--- postgis-java-2.2.1/postgis-jdbc-java2d/pom.xml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/postgis-jdbc-java2d/pom.xml	2018-11-25 06:58:15.000000000 +0000
@@ -5,11 +5,11 @@
     <parent>
         <groupId>net.postgis</groupId>
         <artifactId>postgis-java-aggregator</artifactId>
-        <version>2.2.2-SNAPSHOT</version>
+        <version>2.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>postgis-jdbc-java2d</artifactId>
-    <version>2.2.2-SNAPSHOT</version>
+    <version>2.3.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>postgis-jdbc-java2d</name>
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>net.postgis</groupId>
             <artifactId>postgis-jdbc</artifactId>
-            <version>2.2.2-SNAPSHOT</version>
+            <version>2.3.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff -Nru postgis-java-2.2.1/postgis-jdbc-java2d/postgis-jdbc-java2d.iml postgis-java-2.3.0/postgis-jdbc-java2d/postgis-jdbc-java2d.iml
--- postgis-java-2.2.1/postgis-jdbc-java2d/postgis-jdbc-java2d.iml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/postgis-jdbc-java2d/postgis-jdbc-java2d.iml	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="postgis-jdbc" />
-    <orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4.1209.jre7" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff -Nru postgis-java-2.2.1/tools/osgeo-postgis-jdbc-test-util/osgeo-postgis-jdbc-test-util.iml postgis-java-2.3.0/tools/osgeo-postgis-jdbc-test-util/osgeo-postgis-jdbc-test-util.iml
--- postgis-java-2.2.1/tools/osgeo-postgis-jdbc-test-util/osgeo-postgis-jdbc-test-util.iml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/tools/osgeo-postgis-jdbc-test-util/osgeo-postgis-jdbc-test-util.iml	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="postgis-jdbc" />
-    <orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4.1209.jre7" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff -Nru postgis-java-2.2.1/tools/osgeo-postgis-jdbc-test-util/pom.xml postgis-java-2.3.0/tools/osgeo-postgis-jdbc-test-util/pom.xml
--- postgis-java-2.2.1/tools/osgeo-postgis-jdbc-test-util/pom.xml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/tools/osgeo-postgis-jdbc-test-util/pom.xml	2018-11-25 06:58:15.000000000 +0000
@@ -5,11 +5,11 @@
     <parent>
         <artifactId>tools</artifactId>
         <groupId>net.postgis</groupId>
-        <version>2.2.2-SNAPSHOT</version>
+        <version>2.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>osgeo-postgis-jdbc-test-util</artifactId>
-    <version>2.2.2-SNAPSHOT</version>
+    <version>2.3.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>osgeo-postgis-jdbc-test-util</name>
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>net.postgis</groupId>
             <artifactId>postgis-jdbc</artifactId>
-            <version>2.2.2-SNAPSHOT</version>
+            <version>2.3.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff -Nru postgis-java-2.2.1/tools/pom.xml postgis-java-2.3.0/tools/pom.xml
--- postgis-java-2.2.1/tools/pom.xml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/tools/pom.xml	2018-11-25 06:58:15.000000000 +0000
@@ -5,11 +5,11 @@
     <parent>
         <artifactId>postgis-java-aggregator</artifactId>
         <groupId>net.postgis</groupId>
-        <version>2.2.2-SNAPSHOT</version>
+        <version>2.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>tools</artifactId>
-    <version>2.2.2-SNAPSHOT</version>
+    <version>2.3.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>tools</name>
diff -Nru postgis-java-2.2.1/tools/tools.iml postgis-java-2.3.0/tools/tools.iml
--- postgis-java-2.2.1/tools/tools.iml	2016-07-28 18:40:29.000000000 +0000
+++ postgis-java-2.3.0/tools/tools.iml	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
-  </component>
-</module>
\ No newline at end of file