From 84857960cb27fedb9e6a804ed75aec4be4a2819a Mon Sep 17 00:00:00 2001
From: Dominic Schabel <dominic.schabel@bosch-si.com>
Date: Sat, 18 Mar 2017 17:47:59 +0100
Subject: [PATCH] Adapt sonar properties (#458)

* Fixed deprecated use of jacoco reportPath with SonarQube 6.2

(see https://jira.sonarsource.com/browse/SONARJAVA-1887)

Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>

* Deep nested modules included into coverage reports as well

Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
---
 extensions/pom.xml                            |  4 ++++
 .../hawkbit-repository-jpa/pom.xml            |  1 -
 hawkbit-repository/pom.xml                    |  4 ++++
 pom.xml                                       | 21 +++++++------------
 sonarCircleCi.sh                              |  2 +-
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/extensions/pom.xml b/extensions/pom.xml
index 341ba6a9e..80f93caad 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -20,6 +20,10 @@
    <name>hawkBit :: Extensions</name>
    <description>Parent pom for hawkBit extensions</description>
 
+   <properties>
+      <jacoco.outputDir>${project.basedir}/../../target/</jacoco.outputDir>
+   </properties>
+
    <modules>
       <module>hawkbit-extension-uaa</module>
       <module>hawkbit-extension-artifact-repository-mongo</module>
diff --git a/hawkbit-repository/hawkbit-repository-jpa/pom.xml b/hawkbit-repository/hawkbit-repository-jpa/pom.xml
index 485d6783a..00001f600 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/pom.xml
+++ b/hawkbit-repository/hawkbit-repository-jpa/pom.xml
@@ -19,7 +19,6 @@
    <artifactId>hawkbit-repository-jpa</artifactId>
    <name>hawkBit :: Repository JPA Implementation</name>
 
-
    <repositories>
       <repository>
          <id>com.ethlo.eclipselink.tools</id>
diff --git a/hawkbit-repository/pom.xml b/hawkbit-repository/pom.xml
index 981f3225a..689dcd0a5 100644
--- a/hawkbit-repository/pom.xml
+++ b/hawkbit-repository/pom.xml
@@ -20,6 +20,10 @@
    <name>hawkBit :: Repository</name>
    <packaging>pom</packaging>
 
+   <properties>
+      <jacoco.outputDir>${project.basedir}/../../target/</jacoco.outputDir>
+   </properties>
+
    <modules>
       <module>hawkbit-repository-jpa</module>
       <module>hawkbit-repository-api</module>
diff --git a/pom.xml b/pom.xml
index 19b8b9c89..a74b46a98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,16 +165,16 @@
       <sonar.github.repository>eclipse/hawkbit</sonar.github.repository>
       <sonar.links.homepage>https://www.eclipse.org/hawkbit</sonar.links.homepage>
       <sonar.links.ci>https://circleci.com/gh/eclipse/hawkbit</sonar.links.ci>
-      <jacoco.version>0.7.7.201606060606</jacoco.version>
+      <sonar.exclusions>**/target/generated-sources/apt/**,**/src/test/**,**/src/main/java/org/eclipse/hawkbit/repository/test/**</sonar.exclusions>
+      <sonar.coverage.exclusions>**/src/main/java/org/eclipse/hawkbit/ui/**,**/target/generated-sources/apt/**,**/src/main/java/org/eclipse/hawkbit/repository/test/**,**/examples/**</sonar.coverage.exclusions>
+      <jacoco.version>0.7.9</jacoco.version>
       <jacoco.outputDir>${project.basedir}/../target/</jacoco.outputDir>
-      <jacoco.out.ut.file>jacoco-ut.exec</jacoco.out.ut.file>
-      <sonar.jacoco.reportPath>${jacoco.outputDir}/${jacoco.out.ut.file}</sonar.jacoco.reportPath>
-      <jacoco.out.it.file>jacoco-it.exec</jacoco.out.it.file>
-      <sonar.jacoco.itReportPath>${jacoco.outputDir}/${jacoco.out.it.file}</sonar.jacoco.itReportPath>
+      <jacoco.reportPath>${jacoco.outputDir}/jacoco-ut.exec</jacoco.reportPath>
+      <jacoco.itReportPath>${jacoco.outputDir}/jacoco-it.exec</jacoco.itReportPath>
+      <sonar.jacoco.reportPaths>${jacoco.reportPath},${jacoco.itReportPath}</sonar.jacoco.reportPaths>
       <!-- Sonar - END -->
    </properties>
 
-
    <build>
       <plugins>
          <plugin>
@@ -259,7 +259,7 @@
                      <goal>prepare-agent</goal>
                   </goals>
                   <configuration>
-                     <destFile>${sonar.jacoco.reportPath}</destFile>
+                     <destFile>${jacoco.reportPath}</destFile>
                      <propertyName>jacoco.agent.ut.arg</propertyName>
                      <append>true</append>
                   </configuration>
@@ -271,7 +271,7 @@
                      <goal>prepare-agent</goal>
                   </goals>
                   <configuration>
-                     <destFile>${sonar.jacoco.itReportPath}</destFile>
+                     <destFile>${jacoco.itReportPath}</destFile>
                      <propertyName>jacoco.agent.it.arg</propertyName>
                      <append>true</append>
                   </configuration>
@@ -294,11 +294,6 @@
 
       <pluginManagement>
          <plugins>
-            <plugin>
-               <groupId>org.sonarsource.scanner.maven</groupId>
-               <artifactId>sonar-maven-plugin</artifactId>
-               <version>3.2</version>
-            </plugin>
             <plugin>
                <groupId>org.eclipse.m2e</groupId>
                <artifactId>lifecycle-mapping</artifactId>
diff --git a/sonarCircleCi.sh b/sonarCircleCi.sh
index 3429d0cfb..066bda912 100644
--- a/sonarCircleCi.sh
+++ b/sonarCircleCi.sh
@@ -11,7 +11,7 @@
 echo $CI_PULL_REQUEST pull request
 # regular sonar on master
 if [ "$CIRCLE_BRANCH" = "master" ]; then
-  mvn verify license:check sonar:sonar -Dsonar.login=$SONAR_SERVER_TOKEN -Dsonar.exclusions=**/target/generated-sources/apt/**,**/src/test/**,**/src/main/java/org/eclipse/hawkbit/repository/test/** -Dsonar.coverage.exclusions=**/src/main/java/org/eclipse/hawkbit/ui/**,**/target/generated-sources/apt/**,**/src/main/java/org/eclipse/hawkbit/repository/test/**
+  mvn verify license:check sonar:sonar -Dsonar.login=$SONAR_SERVER_TOKEN
 # preview in case of pull request - disabled as circle does not fill those with pull reuqests from different directories
 else
   #if [ -n "$CI_PULL_REQUEST" ]; then