Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg
--- a/.gitignore
+++ b/.gitignore
-# 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*
+
--- a/.idea/.name
+++ b/.idea/.name
-postgis-aggregator
\ No newline at end of file
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
-<?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
--- a/.idea/copyright/profiles_settings.xml
+++ b/.idea/copyright/profiles_settings.xml
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
-<?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
--- a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml
+++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml
-<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
--- a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml
+++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml
-<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
--- a/.idea/libraries/Maven__com_beust_jcommander_1_48.xml
+++ b/.idea/libraries/Maven__com_beust_jcommander_1_48.xml
-<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
--- a/.idea/libraries/Maven__com_vividsolutions_jts_1_12.xml
+++ b/.idea/libraries/Maven__com_vividsolutions_jts_1_12.xml
-<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
--- a/.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml
+++ b/.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml
-<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
--- a/.idea/libraries/Maven__org_postgresql_postgresql_9_4_1209_jre7.xml
+++ b/.idea/libraries/Maven__org_postgresql_postgresql_9_4_1209_jre7.xml
-<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
--- a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml
-<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
--- a/.idea/libraries/Maven__org_testng_testng_6_9_10.xml
+++ b/.idea/libraries/Maven__org_testng_testng_6_9_10.xml
-<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
--- a/.idea/libraries/Maven__xerces_xercesImpl_2_4_0.xml
+++ b/.idea/libraries/Maven__xerces_xercesImpl_2_4_0.xml
-<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
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
-<?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
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
-<?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
--- a/debian/changelog
+++ b/debian/changelog
+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.

--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends-Indep: default-jdk-headless (>= 2:1.7) | java7-sdk-headless,
                     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


--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ Source: https://github.com/postgis/postgis-git
 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/*

--- a/debian/patches/driverwrapper.patch
+++ b/debian/patches/driverwrapper.patch
@@ -5,7 +5,7 @@ Applied-Upstream: https://github.com/postgis/postgis-java/commit/d71e4fad18952ba

 --- 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
         }
     }
 
@@ -20,8 +20,8 @@ Applied-Upstream: https://github.com/postgis/postgis-java/commit/d71e4fad18952ba
         <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>