Move Jacoco to xml

[sdc/sdc-tosca.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 9fb21e2..9a8e844 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -37,23 +37,22 @@
     <!-- 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.coverage.jacoco.xmlReportPaths>
+               ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
+       </sonar.coverage.jacoco.xmlReportPaths>
     <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>
+    <sonar.inclusions>app/**/*.js,server-mock/**/*.js,src/**/*.js,src/main/**/*.java</sonar.inclusions>
 
   </properties>
 
@@ -86,6 +85,20 @@
       <scope>compile</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>3.13.2</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.3.2</version>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
   <reporting>
@@ -180,7 +193,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>