github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-24 01:51:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix jacoco transmission to sonar

Browse Source
This commit is contained in:
Jeremy Long
2017-06-24 15:58:11 -04:00
parent a4ea892f20
commit c555f60f47
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -34,7 +34,7 @@ matrix:
env: env:
- JDK="JDK8" - JDK="JDK8"
- sonar.java.coveragePlugin=jacoco - sonar.java.coveragePlugin=jacoco
- sonar.jacoco.reportPath=build-reporting/target/coverage-reports/jacoco.xml - sonar.jacoco.reportPath=build-reporting/target/jacoco.xml
script: script:
- if [ ! -z "$TRAVIS_TAG" ]; then travis_wait 20 mvn install sonar:sonar -DreleaseTesting; else travis_wait 15 mvn install sonar:sonar -DreleaseTesting; fi - if [ ! -z "$TRAVIS_TAG" ]; then travis_wait 20 mvn install sonar:sonar -DreleaseTesting; else travis_wait 15 mvn install sonar:sonar -DreleaseTesting; fi

21
build-reporting/pom.xml
View File

@@ -74,6 +74,27 @@ Copyright (c) 2017 - Jeremy Long. All Rights Reserved.
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
<executions> <executions>
<execution>
<id>report-merge</id>
<phase>verify</phase>
<goals>
<goal>merge</goal>
</goals>
<configuration>
<fileSets>
<fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
<directory>${project.basedir}/../</directory>
<includes>
<include>dependency-check-utils/target/coverage-reports/*.exec</include>
<include>dependency-check-core/target/coverage-reports/*.exec</include>
<include>dependency-check-cli/target/coverage-reports/*.exec</include>
<include>dependency-check-ant/target/coverage-reports/*.exec</include>
<include>dependency-check-maven/target/coverage-reports/*.exec</include>
</includes>
</fileSet>
</fileSets>
</configuration>
</execution>
<execution> <execution>
<id>report-aggregate</id> <id>report-aggregate</id>
<phase>verify</phase> <phase>verify</phase>