Skip to content

Commit 17b74d7

Browse files
philliprossphillipross
committed
* Dependency updates
- logback updated from v.1.1.3 to v1.1.7 - download maven plugin updated from v1.2.1 to v1.3.0 - maven compiler plugin updated from v3.3 to v3.5.1 - maven shade plugin updated from v2.4.2 to v2.4.3 - maven source plugin updated from v2.4 to v3.0.0 - slf4j updated from v1..7.13 to v1.7.21
1 parent fbf6945 commit 17b74d7

File tree

10 files changed

+36
-69
lines changed

10 files changed

+36
-69
lines changed

‎.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_3.xml‎ renamed to ‎.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.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_3.xml‎ renamed to ‎.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.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_13.xml‎ renamed to ‎.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.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.

‎jdbc/postgis-jdbc.iml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<orderEntry type="inheritedJdk" />
1414
<orderEntry type="sourceFolder" forTests="false" />
1515
<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" />
16+
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
17+
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
18+
<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.21" 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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<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" 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" />
18+
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
19+
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
20+
<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.21" 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" />

‎pom.xml‎

Lines changed: 6 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@
109109

110110
<!-- Plugin versioning -->
111111
<build-helper-maven-plugin.version>1.10</build-helper-maven-plugin.version>
112-
<download-maven-plugin.version>1.2.1</download-maven-plugin.version>
112+
<download-maven-plugin.version>1.3.0</download-maven-plugin.version>
113113
<maven-clean-plugin.version>3.0.0</maven-clean-plugin.version>
114-
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
114+
<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
115115
<maven-dependency-plugin.version>2.10</maven-dependency-plugin.version>
116116
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
117117
<maven-ear-plugin.version>2.10.1</maven-ear-plugin.version>
@@ -125,13 +125,13 @@
125125
<maven-jxr-plugin.version>2.5</maven-jxr-plugin.version>
126126
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
127127
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
128-
<maven-shade-plugin.version>2.4.2</maven-shade-plugin.version>
129-
<maven-source-plugin.version>2.4</maven-source-plugin.version>
128+
<maven-shade-plugin.version>2.4.3</maven-shade-plugin.version>
129+
<maven-source-plugin.version>3.0.0</maven-source-plugin.version>
130130
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
131131
<maven-war-plugin.version>2.6</maven-war-plugin.version>
132132
<!-- Dependency versions -->
133-
<dependency.logback.version>1.1.3</dependency.logback.version>
134-
<dependency.slfj.version>1.7.13</dependency.slfj.version>
133+
<dependency.logback.version>1.1.7</dependency.logback.version>
134+
<dependency.slfj.version>1.7.21</dependency.slfj.version>
135135
<dependency.testng.version>6.9.10</dependency.testng.version>
136136
</properties>
137137

@@ -283,39 +283,6 @@
283283
<groupId>org.apache.maven.plugins</groupId>
284284
<artifactId>maven-shade-plugin</artifactId>
285285
<version>${maven-shade-plugin.version}</version>
286-
<!--<configuration>
287-
<minimizeJar>true</minimizeJar>
288-
<artifactSet>
289-
<excludes>
290-
<exclude>com.google.code.findbugs:jsr305</exclude>
291-
<exclude>junit:junit</exclude>
292-
<exclude>org.slf4j:*</exclude>
293-
<exclude>org.bouncycastle:*</exclude>
294-
</excludes>
295-
</artifactSet>
296-
<relocations>
297-
<relocation>
298-
<pattern>com.google</pattern>
299-
<shadedPattern>com.joyent.manta.com.google</shadedPattern>
300-
</relocation>
301-
<relocation>
302-
<pattern>org.apache</pattern>
303-
<shadedPattern>com.joyent.manta.org.apache</shadedPattern>
304-
</relocation>
305-
<relocation>
306-
<pattern>com.fasterxml</pattern>
307-
<shadedPattern>com.joyent.manta.com.fasterxml</shadedPattern>
308-
</relocation>
309-
</relocations>
310-
</configuration>
311-
<executions>
312-
<execution>
313-
<phase>package</phase>
314-
<goals>
315-
<goal>shade</goal>
316-
</goals>
317-
</execution>
318-
</executions>-->
319286
</plugin>
320287
<plugin>
321288
<groupId>org.apache.maven.plugins</groupId>

‎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" 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" />
11+
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
12+
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
13+
<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.21" 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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<orderEntry type="sourceFolder" forTests="false" />
1414
<orderEntry type="module" module-name="postgis-jdbc" />
1515
<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" />
16+
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
17+
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
18+
<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.21" 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/osgeo-postgis-jdbc-test-util.iml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
<orderEntry type="sourceFolder" forTests="false" />
1515
<orderEntry type="module" module-name="postgis-jdbc" />
1616
<orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4.1208.jre7" level="project" />
17-
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
18-
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
19-
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
17+
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
18+
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
19+
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
2020
<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.10" level="project" />
2121
<orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
2222
<orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />

‎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" 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" />
14+
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
15+
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
16+
<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.21" 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)