From d099dd2ce1697fc56af0b754aa8f5f1a6b7e44f4 Mon Sep 17 00:00:00 2001
From: vasraz <vasyl.razinkov@est.tech>
Date: Mon, 13 Jan 2020 14:14:04 +0000
Subject: Fix empty sonar scan

Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: I6a1b9f4e77487de609e43621e1b82fe80c2fcd5a
Issue-ID: SDC-2719
---
 jtosca/pom.xml    | 23 -----------------------
 pom.xml           |  8 +++-----
 sdc-tosca/pom.xml |  6 ------
 3 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/jtosca/pom.xml b/jtosca/pom.xml
index 2e47200..4714306 100644
--- a/jtosca/pom.xml
+++ b/jtosca/pom.xml
@@ -80,24 +80,6 @@
         </dependencies>
       </plugin>
 
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.7.8</version>
-        <executions>
-          <!-- Unit-Tests -->
-          <execution>
-            <id>prepare-agent</id>
-            <goals>
-              <goal>prepare-agent</goal>
-            </goals>
-            <configuration>
-              <destFile>${sonar.jacoco.reportPath}</destFile>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -126,11 +108,6 @@
           </includes>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.sonarsource.scanner.maven</groupId>
-        <artifactId>sonar-maven-plugin</artifactId>
-        <version>3.0.2</version>
-      </plugin>
       <plugin>
         <groupId>com.github.sylvainlaurent.maven</groupId>
         <artifactId>yaml-json-validator-maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 9984767..a3c1709 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,23 +37,21 @@
     <!-- Global project version -->
 
     <!-- Dependencies projects version -->
-    <!--<sonar.skipDesign>true</sonar.skipDesign>-->
-    <!--<sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>-->
     <sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath>
     <nexus.proxy>https://nexus.onap.org</nexus.proxy>
     <sitePath>/content/sites/site/org/onap/sdc/sdc-tosca/${project.version}</sitePath>
     <snapshots.path>snapshots</snapshots.path>
     <releases.path>releases</releases.path>
+
     <!-- Sonar properties -->
+    <sonar.language>java</sonar.language>
     <sonar.sourceEncoding>${project.build.sourceEncoding}</sonar.sourceEncoding>
-    <sonar.skipDesign>true</sonar.skipDesign>
     <sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>
     <sonar.sources>.</sonar.sources>
     <sonar.exclusions>**/scripts/**/*</sonar.exclusions>
     <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
     <sonar.inclusions>app/**/*.js,server-mock/**/*.js,src/**/*.js,src/main/**/*.java
     </sonar.inclusions>
-    <sonar.branch>${project.version}</sonar.branch>
 
   </properties>
 
@@ -194,7 +192,7 @@
       <plugin>
         <groupId>org.sonarsource.scanner.maven</groupId>
         <artifactId>sonar-maven-plugin</artifactId>
-        <version>3.0.2</version>
+        <version>3.7.0.1746</version>
       </plugin>
 
       <plugin>
diff --git a/sdc-tosca/pom.xml b/sdc-tosca/pom.xml
index 6044090..80b4182 100644
--- a/sdc-tosca/pom.xml
+++ b/sdc-tosca/pom.xml
@@ -144,12 +144,6 @@
         </configuration>
       </plugin>
 
-      <plugin>
-        <groupId>org.sonarsource.scanner.maven</groupId>
-        <artifactId>sonar-maven-plugin</artifactId>
-        <version>3.0.2</version>
-      </plugin>
-
       <plugin>
         <groupId>com.github.sylvainlaurent.maven</groupId>
         <artifactId>yaml-json-validator-maven-plugin</artifactId>
-- 
cgit 1.2.3-korg