Skip to content

Commit 8771e40

Browse files
philliprossphillipross
committed
Release preparation work for v2.2.0 release
- Added failsafe plugin for future work to separate unit tests from integration tests - Rearranged plugin declarations in pom.xml file - Updated from slf4 v1.7.12 to v1.7.13 - Added release plugin configuration to streamline release process
1 parent ef89ce3 commit 8771e40

File tree

7 files changed

+41
-14
lines changed

7 files changed

+41
-14
lines changed

‎.idea/encodings.xml

Lines changed: 1 addition & 0 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_12.xml renamed to ‎.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_13.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<orderEntry type="library" name="Maven: postgresql:postgresql:9.1-901-1.jdbc4" level="project" />
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" />
18-
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.12" level="project" />
18+
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
1919
<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.9" level="project" />
2020
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
2121
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />

‎jdbc_jtsparser/postgis-jdbc-jtsparser.iml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<orderEntry type="library" name="Maven: xerces:xercesImpl:2.4.0" level="project" />
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" />
20-
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.12" level="project" />
20+
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
2121
<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.9" level="project" />
2222
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
2323
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />

‎pom.xml

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@
102102
<maven.test.skip>false</maven.test.skip>
103103
<surefire.forkCount>1</surefire.forkCount>
104104
<surefire.useSystemClassLoader>true</surefire.useSystemClassLoader>
105+
<maven.integration.test.skip>false</maven.integration.test.skip>
106+
<failsafe.forkCount>1</failsafe.forkCount>
107+
<failsafe.useSystemClassLoader>true</failsafe.useSystemClassLoader>
108+
105109
<!-- Plugin versioning -->
106110
<build-helper-maven-plugin.version>1.9.1</build-helper-maven-plugin.version>
107111
<download-maven-plugin.version>1.2.1</download-maven-plugin.version>
@@ -111,19 +115,20 @@
111115
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
112116
<maven-ear-plugin.version>2.10.1</maven-ear-plugin.version>
113117
<maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
118+
<maven-failsafe-plugin.version>2.19</maven-failsafe-plugin.version>
114119
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
115120
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
116-
<maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
117121
<maven-jar-plugin.version>2.6</maven-jar-plugin.version>
118122
<maven-jarsigner-plugin.version>1.4</maven-jarsigner-plugin.version>
123+
<maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
119124
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
120125
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
121126
<maven-source-plugin.version>2.4</maven-source-plugin.version>
122127
<maven-surefire-plugin.version>2.19</maven-surefire-plugin.version>
123128
<maven-war-plugin.version>2.6</maven-war-plugin.version>
124129
<!-- Dependency versions -->
125130
<dependency.logback.version>1.1.3</dependency.logback.version>
126-
<dependency.slfj.version>1.7.12</dependency.slfj.version>
131+
<dependency.slfj.version>1.7.13</dependency.slfj.version>
127132
<dependency.testng.version>6.9.9</dependency.testng.version>
128133
</properties>
129134

@@ -207,6 +212,21 @@
207212
</execution>
208213
</executions>
209214
</plugin>
215+
<plugin>
216+
<groupId>org.apache.maven.plugins</groupId>
217+
<artifactId>maven-failsafe-plugin</artifactId>
218+
<version>${maven-failsafe-plugin.version}</version>
219+
<configuration>
220+
<forkCount>${failsafe.forkCount}</forkCount>
221+
<skip>${maven.integration.test.skip}</skip>
222+
<systemPropertyVariables>
223+
<derby.stream.error.file>
224+
${project.build.directory}/derby.log
225+
</derby.stream.error.file>
226+
</systemPropertyVariables>
227+
<useSystemClassLoader>${failsafe.useSystemClassLoader}</useSystemClassLoader>
228+
</configuration>
229+
</plugin>
210230
<plugin>
211231
<groupId>org.apache.maven.plugins</groupId>
212232
<artifactId>maven-gpg-plugin</artifactId>
@@ -224,18 +244,24 @@
224244
</plugin>
225245
<plugin>
226246
<groupId>org.apache.maven.plugins</groupId>
227-
<artifactId>maven-javadoc-plugin</artifactId>
228-
<version>${maven-javadoc-plugin.version}</version>
247+
<artifactId>maven-jarsigner-plugin</artifactId>
248+
<version>${maven-jarsigner-plugin.version}</version>
229249
</plugin>
230250
<plugin>
231251
<groupId>org.apache.maven.plugins</groupId>
232-
<artifactId>maven-jarsigner-plugin</artifactId>
233-
<version>${maven-jarsigner-plugin.version}</version>
252+
<artifactId>maven-javadoc-plugin</artifactId>
253+
<version>${maven-javadoc-plugin.version}</version>
234254
</plugin>
235255
<plugin>
236256
<groupId>org.apache.maven.plugins</groupId>
237257
<artifactId>maven-release-plugin</artifactId>
238258
<version>${maven-release-plugin.version}</version>
259+
<configuration>
260+
<autoVersionSubmodules>true</autoVersionSubmodules>
261+
<localCheckout>true</localCheckout>
262+
<pushChanges>false</pushChanges>
263+
<releaseProfiles>release-sign-artifacts</releaseProfiles>
264+
</configuration>
239265
</plugin>
240266
<plugin>
241267
<groupId>org.apache.maven.plugins</groupId>

‎postgis-java-aggregator.iml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<orderEntry type="sourceFolder" forTests="false" />
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" />
13-
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.12" level="project" />
13+
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
1414
<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.9" level="project" />
1515
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
1616
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<orderEntry type="library" name="Maven: postgresql:postgresql:9.1-901-1.jdbc4" level="project" />
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" />
18-
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.12" level="project" />
18+
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
1919
<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.9" level="project" />
2020
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
2121
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />

0 commit comments

Comments
 (0)