diff --git a/.travis.yml b/.travis.yml index 8b586656406..e98f5c574d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,6 @@ before_script: - export MAVEN_SKIP_RC=true script: - - mvn -B clean install && cd hapi-fhir-cobertura && mvn -B -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID -P COBERTURA clean test jacoco:report coveralls:report + - mvn -B clean install && cd hapi-fhir-cobertura && mvn -B -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID -P COBERTURA clean cobertura:cobertura coveralls:report diff --git a/hapi-fhir-cobertura/pom.xml b/hapi-fhir-cobertura/pom.xml index 2032667209c..f784335b753 100644 --- a/hapi-fhir-cobertura/pom.xml +++ b/hapi-fhir-cobertura/pom.xml @@ -176,10 +176,36 @@ true - - + + org.codehaus.mojo + cobertura-maven-plugin + + false + + html + xml + + 256m + + + ca.uhn.fhir.model.dstu.valueset.* + + + **/valueset/*.class + **/exceptions/*.class + + + + + + + verify + + check + + + + @@ -188,6 +214,11 @@ coveralls-maven-plugin 3.1.0 + + + ${basedir}/target/coverage.xml + + UTF-8 travis-ci ${env.TRAVIS_JOB_ID} @@ -241,7 +272,7 @@ maven-surefire-plugin alphabetical - -Xms512m -Xmx1024m ${argLine} + -Xms512m -Xmx1024m @@ -260,25 +291,26 @@ - org.jacoco - jacoco-maven-plugin - 0.7.5.201505241946 + org.codehaus.mojo + cobertura-maven-plugin + + + true + + - prepare-agent + verify - prepare-agent - - - - jacoco-site - post-integration-test - - report + check + @@ -299,6 +331,22 @@ + + org.codehaus.mojo + cobertura-maven-plugin + + + + cobertura + + + + true + + + + + org.apache.maven.plugins maven-project-info-reports-plugin diff --git a/pom.xml b/pom.xml index 450911b50cd..2d3fc019ac7 100644 --- a/pom.xml +++ b/pom.xml @@ -615,6 +615,11 @@ maven-war-plugin 2.6 + + org.codehaus.mojo + cobertura-maven-plugin + 2.7 + org.codehaus.mojo animal-sniffer-maven-plugin