Updated Jacoco report configuration

Author: petruki

.travis.yml

@@ -8,3 +8,6 @@ addons:
 cache:
   directories:
   - $HOME/.m2
+      
+script:
+  - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install sonar:sonar -Dsonar.projectKey=switcher-client-java

pom.xml

@@ -61,7 +61,7 @@
 		<!-- Sonar -->
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-		<sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath>
+		<sonar.jacoco.reportPath>${project.basedir}/target/coverage-reports/jacoco-unit.exec</sonar.jacoco.reportPath>
 		<sonar.language>java</sonar.language>
 	</properties>
 
@@ -172,25 +172,33 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        
-		<plugins>
+
+	<plugins>
 		<!-- Tells Sonar to pick up testing results -->
-			<plugin>
-			    <groupId>org.jacoco</groupId>
-			    <artifactId>jacoco-maven-plugin</artifactId>
-			    <configuration>
-			        <destFile>${sonar.jacoco.reportPath}</destFile>
-			        <append>true</append>
-			    </configuration>
-			    <executions>
-			        <execution>
-			            <id>agent</id>
-			            <goals>
-			                <goal>prepare-agent</goal>
-			            </goals>
-			        </execution>
-			    </executions>
-			</plugin>
+		<plugin>
+			<groupId>org.jacoco</groupId>
+			<artifactId>jacoco-maven-plugin</artifactId>
+			<configuration>
+				<destFile>${sonar.jacoco.reportPath}</destFile>
+				<dataFile>${sonar.jacoco.reportPath}</dataFile>
+				<append>true</append>
+			</configuration>
+			<executions>
+				<execution>
+					<id>jacoco-initialize</id>
+					<goals>
+						<goal>prepare-agent</goal>
+					</goals>
+				</execution>
+				<execution>
+					<id>jacoco-site</id>
+					<phase>package</phase>
+					<goals>
+						<goal>report</goal>
+					</goals>
+				</execution>
+			</executions>
+		</plugin>
 
         <!-- Generate and sign all artifacts 
 			<plugin>

sonar-project.properties

@@ -0,0 +1,18 @@
+sonar.language=java
+sonar.profile=petruki
+sonar.sourceEncoding=UTF-8
+
+sonar.projectKey=switcher-client-java
+sonar.projectName=Switcher Client
+sonar.projectVersion=1.0.1
+sonar.sources=src/main/java
+sonar.tests=src/test/java
+sonar.binaries=target/
+
+#sonar.java.coveragePlugin=jacoco
+#sonar.dynamicAnalysis=true
+sonar.jacoco.reportPath=target/coverage-reports/jacoco-unit.exec
+
+sonar.java.coveragePlugin=jacoco
+sonar.dynamicAnalysis=reuseReports
+sonar.surefire.reportsPath=target/surefire-reports