Skip to content

Commit fbf6945

Browse files
philliprossphillipross
committed
* Updates to OSGeo-Live test utility module
 - added .gitignore file containing dependency-reduced-pom.xml - added explicit dependencies for slf4j and logback
1 parent 61f2864 commit fbf6945

File tree

10 files changed

+49
-32
lines changed

10 files changed

+49
-32
lines changed

‎.idea/libraries/Maven__org_postgresql_postgresql_9_4_1208_jre7.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__postgresql_postgresql_9_1_901_1_jdbc4.xml

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

‎jdbc/postgis-jdbc.iml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
</content>
1313
<orderEntry type="inheritedJdk" />
1414
<orderEntry type="sourceFolder" forTests="false" />
15-
<orderEntry type="library" name="Maven: postgresql:postgresql:9.1-901-1.jdbc4" level="project" />
16-
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
17-
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
18-
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" 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.1.3" level="project" />
17+
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
18+
<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
1919
<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.10" level="project" />
2020
<orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
2121
<orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />

‎jdbc_jtsparser/postgis-jdbc-jtsparser.iml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
<orderEntry type="inheritedJdk" />
1313
<orderEntry type="sourceFolder" forTests="false" />
1414
<orderEntry type="module" module-name="postgis-jdbc" />
15-
<orderEntry type="library" name="Maven: postgresql:postgresql:9.1-901-1.jdbc4" level="project" />
15+
<orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4.1208.jre7" level="project" />
1616
<orderEntry type="library" name="Maven: com.vividsolutions:jts:1.12" level="project" />
1717
<orderEntry type="library" name="Maven: xerces:xercesImpl:2.4.0" level="project" />
18-
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
19-
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
20-
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
18+
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
19+
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
20+
<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
2121
<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.10" level="project" />
2222
<orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
2323
<orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />

‎postgis-java-aggregator.iml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
</content>
99
<orderEntry type="inheritedJdk" />
1010
<orderEntry type="sourceFolder" forTests="false" />
11-
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
12-
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
13-
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
11+
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
12+
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
13+
<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
1414
<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.10" level="project" />
1515
<orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
1616
<orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />

‎postgis-jdbc-java2d/postgis-jdbc-java2d.iml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
<orderEntry type="inheritedJdk" />
1313
<orderEntry type="sourceFolder" forTests="false" />
1414
<orderEntry type="module" module-name="postgis-jdbc" />
15-
<orderEntry type="library" name="Maven: postgresql:postgresql:9.1-901-1.jdbc4" level="project" />
16-
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
17-
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
18-
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" 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.1.3" level="project" />
17+
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
18+
<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
1919
<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.10" level="project" />
2020
<orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
2121
<orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />

‎tools/osgeo-postgis-jdbc-test-util/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dependency-reduced-pom.xml

‎tools/osgeo-postgis-jdbc-test-util/osgeo-postgis-jdbc-test-util.iml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<orderEntry type="inheritedJdk" />
1414
<orderEntry type="sourceFolder" forTests="false" />
1515
<orderEntry type="module" module-name="postgis-jdbc" />
16-
<orderEntry type="library" name="Maven: postgresql:postgresql:9.1-901-1.jdbc4" level="project" />
16+
<orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4.1208.jre7" level="project" />
1717
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
1818
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
1919
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />

‎tools/osgeo-postgis-jdbc-test-util/pom.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,22 @@
3434
<artifactId>postgis-jdbc</artifactId>
3535
<version>2.2.1-SNAPSHOT</version>
3636
</dependency>
37+
38+
<dependency>
39+
<groupId>ch.qos.logback</groupId>
40+
<artifactId>logback-classic</artifactId>
41+
<version>${dependency.logback.version}</version>
42+
</dependency>
43+
<dependency>
44+
<groupId>ch.qos.logback</groupId>
45+
<artifactId>logback-core</artifactId>
46+
<version>${dependency.logback.version}</version>
47+
</dependency>
48+
<dependency>
49+
<groupId>org.slf4j</groupId>
50+
<artifactId>slf4j-api</artifactId>
51+
<version>${dependency.slfj.version}</version>
52+
</dependency>
3753
</dependencies>
3854

3955
<build>

‎tools/tools.iml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
</content>
1212
<orderEntry type="inheritedJdk" />
1313
<orderEntry type="sourceFolder" forTests="false" />
14-
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
15-
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
16-
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
14+
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
15+
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
16+
<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
1717
<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.10" level="project" />
1818
<orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
1919
<orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />

0 commit comments

Comments
 (0)