Skip to content

Commit ff11fe0

Browse files
authored
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)
1 parent 6f4ae6a commit ff11fe0

18 files changed

+119
-90
lines changed

.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_8.xml renamed to .idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_8.xml renamed to .idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__com_beust_jcommander_1_48.xml renamed to .idea/libraries/Maven__com_beust_jcommander_1_72.xml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__org_apache_extras_beanshell_bsh_2_0b6.xml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__org_postgresql_postgresql_9_4_1212_jre7.xml renamed to .idea/libraries/Maven__org_postgresql_postgresql_9_4_1208_jre7.xml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_22.xml renamed to .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__org_testng_testng_6_10.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.idea/libraries/Maven__org_testng_testng_6_14_3.xml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jdbc/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<dependency>
2828
<groupId>org.postgresql</groupId>
2929
<artifactId>postgresql</artifactId>
30-
<version>[9.4.1208.jre7,)</version>
30+
<version>9.4.1208.jre7</version>
3131
</dependency>
3232
</dependencies>
3333

jdbc/postgis-jdbc.iml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
44
<output url="file://$MODULE_DIR$/target/classes" />
55
<output-test url="file://$MODULE_DIR$/target/test-classes" />
66
<content url="file://$MODULE_DIR$">
@@ -12,11 +12,12 @@
1212
</content>
1313
<orderEntry type="inheritedJdk" />
1414
<orderEntry type="sourceFolder" forTests="false" />
15-
<orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4.1212.jre7" level="project" />
16-
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.1.8" level="project" />
17-
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.8" level="project" />
18-
<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.22" level="project" />
19-
<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.10" level="project" />
20-
<orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
15+
<orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4.1208.jre7" level="project" />
16+
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
17+
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
18+
<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
19+
<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.14.3" level="project" />
20+
<orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.72" level="project" />
21+
<orderEntry type="library" scope="TEST" name="Maven: org.apache-extras.beanshell:bsh:2.0b6" level="project" />
2122
</component>
2223
</module>

0 commit comments

Comments
 (0)