[postgis-java] 02/08: Merge tag 'upstream/2.2.1'

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository postgis-java.

commit be687e773b0985da949dcbf826fc6019ef11949e
Merge: 21dea09 c7ce222
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 29 08:39:52 2016 +0200

    Merge tag 'upstream/2.2.1'
    
    Upstream version 2.2.1

 .idea/compiler.xml                                 |  19 +-
 .idea/encodings.xml                                |   2 +
 ...aven__ch_qos_logback_logback_classic_1_1_7.xml} |   8 +-
 ...> Maven__ch_qos_logback_logback_core_1_1_7.xml} |   8 +-
 .idea/libraries/Maven__junit_junit_4_10.xml        |  13 --
 .../libraries/Maven__org_apache_ant_ant_1_7_0.xml  |  13 --
 .../Maven__org_apache_ant_ant_launcher_1_7_0.xml   |  13 --
 .../Maven__org_hamcrest_hamcrest_core_1_1.xml      |  13 --
 ...en__org_postgresql_postgresql_9_4_1209_jre7.xml |  13 ++
 ...3.xml => Maven__org_slf4j_slf4j_api_1_7_21.xml} |   8 +-
 ...9_9.xml => Maven__org_testng_testng_6_9_10.xml} |   8 +-
 .idea/libraries/Maven__org_yaml_snakeyaml_1_15.xml |  13 --
 ...aven__postgresql_postgresql_9_1_901_1_jdbc4.xml |  13 --
 .idea/modules.xml                                  |   2 +
 jdbc/pom.xml                                       |  10 +-
 jdbc/postgis-jdbc.iml                              |  15 +-
 jdbc/src/main/java/org/postgis/DriverWrapper.java  |   4 +-
 jdbc_jtsparser/pom.xml                             |   6 +-
 jdbc_jtsparser/postgis-jdbc-jtsparser.iml          |  15 +-
 .../main/java/org/postgis/jts/JtsGisWrapper.java   |   4 +-
 .../src/main/java/org/postgis/jts/JtsWrapper.java  |   4 +-
 pom.xml                                            |  43 ++--
 postgis-java-aggregator.iml                        |  13 +-
 postgis-jdbc-java2d/pom.xml                        |   8 +-
 postgis-jdbc-java2d/postgis-jdbc-java2d.iml        |  15 +-
 .../java/org/postgis/java2d/Java2DWrapper.java     |   4 +-
 tools/osgeo-postgis-jdbc-test-util/.gitignore      |   1 +
 .../osgeo-postgis-jdbc-test-util.iml               |  16 +-
 tools/osgeo-postgis-jdbc-test-util/pom.xml         |  99 +++++++++
 .../src/main/java/net/postgis/osgeo/util/Main.java | 236 +++++++++++++++++++++
 .../src/main/scripts/test.sh                       |  24 +++
 .../test/java/net/postgis/osgeo/util/UtilTest.java |  40 ++++
 .../src/test/resources/logback-test.xml            |  15 ++
 .../src/test/resources/testng.xml                  |  14 ++
 tools/pom.xml                                      |  21 ++
 jdbc/postgis-jdbc.iml => tools/tools.iml           |  15 +-
 36 files changed, 563 insertions(+), 205 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis-java.git