Merge branch 'master' into cleanup

This commit is contained in:
nicksavers 2014-07-02 15:08:40 +02:00
commit 145f753ae5
2 changed files with 29 additions and 8 deletions

View File

@ -1,4 +1,4 @@
language: java
after_success:
- mvn clean antlr4:antlr4 cobertura:cobertura coveralls:cobertura
- mvn clean jacoco:report coveralls:jacoco

View File

@ -242,14 +242,22 @@
<version>2.2.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.6</version>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.1.201405082137</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
</executions>
<configuration>
<format>xml</format>
<maxmem>256m</maxmem>
<!-- aggregated reports for multi-module projects -->
<aggregate>true</aggregate>
<excludes>
<exclude>org/ethereum/gui/**/*.class</exclude>
<exclude>org/ethereum/**/*Test.class</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
@ -296,6 +304,19 @@
<ignore></ignore>
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<versionRange>[0.7.1.201405082137,)</versionRange>
<goals>
<goal>prepare-agent</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>