Skip to content

Commit 5fc900d

Browse files
philliprossphillipross
committed
Maven pom.xml file updates
- Updated build helper maven plugin from v1.9.1 to v1.10 - Updated surefire and failsafe maven plugins from v2.19 to v2.19.1 - Added jxr and shade maven plugins
1 parent 282680d commit 5fc900d

11 files changed

+57
-97
lines changed

‎.idea/libraries/Maven__junit_junit_4_10.xml‎

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

‎.idea/libraries/Maven__org_apache_ant_ant_1_7_0.xml‎

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

‎.idea/libraries/Maven__org_apache_ant_ant_launcher_1_7_0.xml‎

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

‎.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml‎

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

‎.idea/libraries/Maven__org_testng_testng_6_9_9.xml‎ renamed to ‎.idea/libraries/Maven__org_testng_testng_6_9_10.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_yaml_snakeyaml_1_15.xml‎

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

‎jdbc/postgis-jdbc.iml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,8 @@
1616
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
1717
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
1818
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
19-
<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.9" level="project" />
20-
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
21-
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
19+
<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.10" level="project" />
2220
<orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
23-
<orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant:1.7.0" level="project" />
24-
<orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant-launcher:1.7.0" level="project" />
25-
<orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.15" level="project" />
2621
<orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
2722
</component>
2823
</module>

‎jdbc_jtsparser/postgis-jdbc-jtsparser.iml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,8 @@
1818
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
1919
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
2020
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
21-
<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.9" level="project" />
22-
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
23-
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
21+
<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.10" level="project" />
2422
<orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
25-
<orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant:1.7.0" level="project" />
26-
<orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant-launcher:1.7.0" level="project" />
27-
<orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.15" level="project" />
2823
<orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
2924
</component>
3025
</module>

‎pom.xml‎

Lines changed: 49 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,29 +106,31 @@
106106
<failsafe.useSystemClassLoader>true</failsafe.useSystemClassLoader>
107107

108108
<!-- Plugin versioning -->
109-
<build-helper-maven-plugin.version>1.9.1</build-helper-maven-plugin.version>
109+
<build-helper-maven-plugin.version>1.10</build-helper-maven-plugin.version>
110110
<download-maven-plugin.version>1.2.1</download-maven-plugin.version>
111111
<maven-clean-plugin.version>3.0.0</maven-clean-plugin.version>
112112
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
113113
<maven-dependency-plugin.version>2.10</maven-dependency-plugin.version>
114114
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
115115
<maven-ear-plugin.version>2.10.1</maven-ear-plugin.version>
116116
<maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
117-
<maven-failsafe-plugin.version>2.19</maven-failsafe-plugin.version>
117+
<maven-failsafe-plugin.version>2.19.1</maven-failsafe-plugin.version>
118118
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
119119
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
120120
<maven-jar-plugin.version>2.6</maven-jar-plugin.version>
121121
<maven-jarsigner-plugin.version>1.4</maven-jarsigner-plugin.version>
122122
<maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
123+
<maven-jxr-plugin.version>2.5</maven-jxr-plugin.version>
123124
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
124125
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
126+
<maven-shade-plugin.version>2.4.2</maven-shade-plugin.version>
125127
<maven-source-plugin.version>2.4</maven-source-plugin.version>
126-
<maven-surefire-plugin.version>2.19</maven-surefire-plugin.version>
128+
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
127129
<maven-war-plugin.version>2.6</maven-war-plugin.version>
128130
<!-- Dependency versions -->
129131
<dependency.logback.version>1.1.3</dependency.logback.version>
130132
<dependency.slfj.version>1.7.13</dependency.slfj.version>
131-
<dependency.testng.version>6.9.9</dependency.testng.version>
133+
<dependency.testng.version>6.9.10</dependency.testng.version>
132134
</properties>
133135

134136
<dependencies>
@@ -254,6 +256,11 @@
254256
<artifactId>maven-javadoc-plugin</artifactId>
255257
<version>${maven-javadoc-plugin.version}</version>
256258
</plugin>
259+
<plugin>
260+
<groupId>org.apache.maven.plugins</groupId>
261+
<artifactId>maven-jxr-plugin</artifactId>
262+
<version>${maven-jxr-plugin.version}</version>
263+
</plugin>
257264
<plugin>
258265
<groupId>org.apache.maven.plugins</groupId>
259266
<artifactId>maven-release-plugin</artifactId>
@@ -270,6 +277,44 @@
270277
<artifactId>maven-resources-plugin</artifactId>
271278
<version>${maven-resources-plugin.version}</version>
272279
</plugin>
280+
<plugin>
281+
<groupId>org.apache.maven.plugins</groupId>
282+
<artifactId>maven-shade-plugin</artifactId>
283+
<version>${maven-shade-plugin.version}</version>
284+
<!--<configuration>
285+
<minimizeJar>true</minimizeJar>
286+
<artifactSet>
287+
<excludes>
288+
<exclude>com.google.code.findbugs:jsr305</exclude>
289+
<exclude>junit:junit</exclude>
290+
<exclude>org.slf4j:*</exclude>
291+
<exclude>org.bouncycastle:*</exclude>
292+
</excludes>
293+
</artifactSet>
294+
<relocations>
295+
<relocation>
296+
<pattern>com.google</pattern>
297+
<shadedPattern>com.joyent.manta.com.google</shadedPattern>
298+
</relocation>
299+
<relocation>
300+
<pattern>org.apache</pattern>
301+
<shadedPattern>com.joyent.manta.org.apache</shadedPattern>
302+
</relocation>
303+
<relocation>
304+
<pattern>com.fasterxml</pattern>
305+
<shadedPattern>com.joyent.manta.com.fasterxml</shadedPattern>
306+
</relocation>
307+
</relocations>
308+
</configuration>
309+
<executions>
310+
<execution>
311+
<phase>package</phase>
312+
<goals>
313+
<goal>shade</goal>
314+
</goals>
315+
</execution>
316+
</executions>-->
317+
</plugin>
273318
<plugin>
274319
<groupId>org.apache.maven.plugins</groupId>
275320
<artifactId>maven-source-plugin</artifactId>

‎postgis-java-aggregator.iml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,8 @@
1111
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
1212
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
1313
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
14-
<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.9" level="project" />
15-
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
16-
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
14+
<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.10" level="project" />
1715
<orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
18-
<orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant:1.7.0" level="project" />
19-
<orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant-launcher:1.7.0" level="project" />
20-
<orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.15" level="project" />
2116
<orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
2217
</component>
2318
</module>

0 commit comments

Comments
 (0)