cut v2.2-maintenance branch and cherry picked commits from master: (#64)

Addresses #53 (#58) Pinned artifacts to specific versions instead of using ranges (cherry picked from commit 17aaa87) maven dependency and plugin version updates (#59) (cherry picked from commit 21bb2a6) add support for public.geometry and "public"."geometry" (#57) (cherry picked from commit b017ff9)
postgis · Nov 25, 2018 · ff11fe0 · ff11fe0
1 parent 6f4ae6a
commit ff11fe0
Show file tree

Hide file tree

Showing 18 changed files with 119 additions and 90 deletions.
diff --git a/..._ch_qos_logback_logback_classic_1_1_8.xml → ..._ch_qos_logback_logback_classic_1_2_3.xml b/..._ch_qos_logback_logback_classic_1_1_8.xml → ..._ch_qos_logback_logback_classic_1_2_3.xml
diff --git a/...en__ch_qos_logback_logback_core_1_1_8.xml → ...en__ch_qos_logback_logback_core_1_2_3.xml b/...en__ch_qos_logback_logback_core_1_1_8.xml → ...en__ch_qos_logback_logback_core_1_2_3.xml
diff --git a/...ries/Maven__com_beust_jcommander_1_48.xml → ...ries/Maven__com_beust_jcommander_1_72.xml b/...ries/Maven__com_beust_jcommander_1_48.xml → ...ries/Maven__com_beust_jcommander_1_72.xml
diff --git a/.idea/libraries/Maven__org_apache_extras_beanshell_bsh_2_0b6.xml b/.idea/libraries/Maven__org_apache_extras_beanshell_bsh_2_0b6.xml
diff --git a/...g_postgresql_postgresql_9_4_1212_jre7.xml → ...g_postgresql_postgresql_9_4_1208_jre7.xml b/...g_postgresql_postgresql_9_4_1212_jre7.xml → ...g_postgresql_postgresql_9_4_1208_jre7.xml
diff --git a/...ies/Maven__org_slf4j_slf4j_api_1_7_22.xml → ...ies/Maven__org_slf4j_slf4j_api_1_7_25.xml b/...ies/Maven__org_slf4j_slf4j_api_1_7_22.xml → ...ies/Maven__org_slf4j_slf4j_api_1_7_25.xml
diff --git a/.idea/libraries/Maven__org_testng_testng_6_10.xml b/.idea/libraries/Maven__org_testng_testng_6_10.xml
diff --git a/.idea/libraries/Maven__org_testng_testng_6_14_3.xml b/.idea/libraries/Maven__org_testng_testng_6_14_3.xml
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
@@ -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 --git a/jdbc/postgis-jdbc.iml b/jdbc/postgis-jdbc.iml
@@ -1,6 +1,6 @@
 <?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">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -12,11 +12,12 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4.1212.jre7" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.1.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.22" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
+    <orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4.1208.jre7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.14.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.72" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache-extras.beanshell:bsh:2.0b6" level="project" />
   </component>
 </module>
diff --git a/jdbc/src/main/java/org/postgis/DriverWrapper.java b/jdbc/src/main/java/org/postgis/DriverWrapper.java
@@ -281,6 +281,8 @@ protected static final class TypesAdder74 extends TypesAdder {
         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 @@ protected static class TypesAdder72 extends TypesAdder {
         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 @@ protected static class TypesAdder80 extends TypesAdder {
         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 --git a/jdbc_jtsparser/pom.xml b/jdbc_jtsparser/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>net.postgis</groupId>
             <artifactId>postgis-jdbc</artifactId>
-            <version>[2.1.0,)</version>
+            <version>2.2.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.vividsolutions</groupId>

diff --git a/jdbc_jtsparser/postgis-jdbc-jtsparser.iml b/jdbc_jtsparser/postgis-jdbc-jtsparser.iml
@@ -1,6 +1,6 @@
 <?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">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -12,13 +12,14 @@
     <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.1212.jre7" level="project" />
+    <orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4.1208.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.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.22" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.14.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.72" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache-extras.beanshell:bsh:2.0b6" level="project" />
   </component>
 </module>
diff --git a/pom.xml b/pom.xml
@@ -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.6.0</maven-compiler-plugin.version>
-        <maven-dependency-plugin.version>3.0.0</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.2</maven-resources-plugin.version>
-        <maven-shade-plugin.version>2.4.3</maven-shade-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>3.0.0</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.8</dependency.logback.version>
-        <dependency.slfj.version>1.7.22</dependency.slfj.version>
-        <dependency.testng.version>6.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 --git a/postgis-java-aggregator.iml b/postgis-java-aggregator.iml
@@ -1,17 +1,18 @@
 <?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">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
     <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.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.22" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.14.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.72" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache-extras.beanshell:bsh:2.0b6" level="project" />
   </component>
 </module>