Skip to content

Commit

Permalink
Merge 38fc363 into a8fea3b
Browse files Browse the repository at this point in the history
  • Loading branch information
markphilpot committed Feb 29, 2016
2 parents a8fea3b + 38fc363 commit 2f7f8cc
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 38 deletions.
9 changes: 8 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,11 @@ language: java
jdk:
- oraclejdk8

sudo: false
sudo: false

cache:
directories:
- $HOME/.m2

after_success:
- mvn clean test jacoco:report coveralls:report
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
[![Build Status](https://travis-ci.org/daedafusion/service-framework.svg?branch=master)](https://travis-ci.org/daedafusion/service-framework)

[![Coverage Status](https://coveralls.io/repos/github/daedafusion/service-framework/badge.svg?branch=master)](https://coveralls.io/github/daedafusion/service-framework?branch=master)

# service-framework
Service/Provider framework with plugin isolation

Expand Down
55 changes: 18 additions & 37 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,24 @@
<target>1.8</target>
</configuration>
</plugin>

<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>4.1.0</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.5.201505241946</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>

<pluginManagement>
Expand Down Expand Up @@ -217,42 +234,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
</plugin>

<!-- Required for Coveralls! -->
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>3.0.1</version>

<configuration>
<coverallsFile>target/coveralls.json</coverallsFile>
<!--<coverageFile>target/site/cobertura/coverage.xml</coverageFile>-->
</configuration>
</plugin>

<!-- Required for Coveralls! -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.6</version>

<configuration>
<formats>
<format>html</format>
<format>xml</format>
</formats>

<instrumentation>
<ignoreTrivial>true</ignoreTrivial>
<ignores>
<ignore>java.util.logging.*</ignore>
</ignores>
</instrumentation>

<maxmem>256m</maxmem>
<aggregate>true</aggregate>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down

0 comments on commit 2f7f8cc

Please sign in to comment.