From c555f60f47b1470de3f41f6acc71d732e6863f18 Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Sat, 24 Jun 2017 15:58:11 -0400
Subject: [PATCH] fix jacoco transmission to sonar

---
 .travis.yml             |  2 +-
 build-reporting/pom.xml | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

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.
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <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>
                         <id>report-aggregate</id>
                         <phase>verify</phase>