diff --git a/.travis.yml b/.travis.yml index cdf82795e..658125b67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ matrix: env: - JDK="JDK8" - sonar.java.coveragePlugin=jacoco - - sonar.jacoco.reportPath=build-reporting/target/coverage-reports/jacoco.xml + - sonar.jacoco.reportPath=build-reporting/target/jacoco.xml script: - if [ ! -z "$TRAVIS_TAG" ]; then travis_wait 20 mvn install sonar:sonar -DreleaseTesting; else travis_wait 15 mvn install sonar:sonar -DreleaseTesting; fi diff --git a/build-reporting/pom.xml b/build-reporting/pom.xml index 011fbb12a..24f3ef475 100644 --- a/build-reporting/pom.xml +++ b/build-reporting/pom.xml @@ -74,6 +74,27 @@ Copyright (c) 2017 - Jeremy Long. All Rights Reserved. org.jacoco jacoco-maven-plugin + + report-merge + verify + + merge + + + + + ${project.basedir}/../ + + dependency-check-utils/target/coverage-reports/*.exec + dependency-check-core/target/coverage-reports/*.exec + dependency-check-cli/target/coverage-reports/*.exec + dependency-check-ant/target/coverage-reports/*.exec + dependency-check-maven/target/coverage-reports/*.exec + + + + + report-aggregate verify