Skip to content

Commit 3c5988b

Browse files
committed
Merge pull request #488 from hazendaz/master
Fixing jacoco execution so coveralls shows
2 parents 6ebc23b + 789c3af commit 3c5988b

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

pom.xml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
</distributionManagement>
128128

129129
<properties>
130-
<clirr.comparisonVersion>3.2.8</clirr.comparisonVersion>
130+
<clirr.comparisonVersion>3.3.0</clirr.comparisonVersion>
131131
<findbugs.onlyAnalyze>org.apache.ibatis.*</findbugs.onlyAnalyze>
132132
<osgi.export>org.apache.ibatis.*;version=${project.version};-noimport:=true</osgi.export>
133133
<osgi.import>*;resolution:=optional</osgi.import>
@@ -218,6 +218,7 @@
218218
<version>1.10.19</version>
219219
<scope>test</scope>
220220
</dependency>
221+
<!-- Do not go to 2.x until we are on jdk7 -->
221222
<dependency>
222223
<groupId>commons-dbcp</groupId>
223224
<artifactId>commons-dbcp</artifactId>
@@ -251,7 +252,7 @@
251252
<groupId>org.apache.maven.plugins</groupId>
252253
<artifactId>maven-surefire-plugin</artifactId>
253254
<configuration>
254-
<argLine>-Xmx1024m</argLine>
255+
<argLine>${argLine} -Xmx1024m</argLine>
255256
<systemProperties>
256257
<property>
257258
<name>derby.stream.error.file</name>
@@ -307,8 +308,10 @@
307308
<groupId>org.jacoco</groupId>
308309
<artifactId>jacoco-maven-plugin</artifactId>
309310
<configuration>
310-
<exclude>org.apache.ibatis.ognl.*</exclude>
311-
<exclude>org.apache.ibatis.javassist.*</exclude>
311+
<excludes>
312+
<exclude>org.apache.ibatis.ognl.*</exclude>
313+
<exclude>org.apache.ibatis.javassist.*</exclude>
314+
</excludes>
312315
</configuration>
313316
</plugin>
314317
</plugins>

0 commit comments

Comments
 (0)