Fix Sonar coverage

[clamp.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 520f705..e98ff5e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
                <modelVersion>4.0.0</modelVersion>
                <groupId>org.onap.clamp</groupId>
                <artifactId>clds</artifactId>
-               <version>3.0.1-SNAPSHOT</version>
+               <version>3.0.3-SNAPSHOT</version>
                <name>clamp</name>
 
                <parent>
@@ -68,15 +68,19 @@
                                <eelf.core.version>1.0.0</eelf.core.version>
                                <camel.version>2.22.0</camel.version>
                                <springboot.version>2.0.6.RELEASE</springboot.version>
-
+                               
                                <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
                                <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
                                <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
                                <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
                                <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
-                               <sonar.javascript.lcov.reportPaths>${project.build.directory}/clamp-ui/coverage/lcov.info</sonar.javascript.lcov.reportPaths>
                                <sonar.projectVersion>${project.version}</sonar.projectVersion>
-                               <sonar.sources>src/main,${project.build.directory}/clamp-ui/designer</sonar.sources>
+                               <!-- Enable language to disable javascript analysis -->
+                               <sonar.language>java</sonar.language>
+                               <!-- Parameters for Javascript coverage 
+                                       <sonar.sources>src/main,${project.build.directory}/clamp-ui/designer</sonar.sources>
+                                       <sonar.javascript.lcov.reportPaths>${project.build.directory}/clamp-ui/coverage/lcov.info</sonar.javascript.lcov.reportPaths>
+                                -->
                                <sonar.exclusions>src/main/resources/**,**/clamp-ui/designer/lib/*</sonar.exclusions>
 
                                <docker.push.registry>localhost:5000</docker.push.registry>
@@ -86,7 +90,7 @@
                                <docker.skip.tag>true</docker.skip.tag>
                                <skip.staging.artifacts>false</skip.staging.artifacts>
                                <python.http.proxy.param/>
-                               <tomcat.version>8.5.32</tomcat.version>
+                               <tomcat.version>8.5.34</tomcat.version>
                </properties>
 
                <profiles>
@@ -393,7 +397,7 @@
                                <dependency>
                                                <groupId>org.onap.policy.engine</groupId>
                                                <artifactId>PolicyEngineAPI</artifactId>
-                                               <version>1.3.0</version>
+                                               <version>1.3.1</version>
                                                <exclusions>
                                                                <exclusion>
                                                                                <groupId>com.google.guava</groupId>
@@ -447,6 +451,10 @@
                                                                                <groupId>commons-fileupload</groupId>
                                                                                <artifactId>commons-fileupload</artifactId>
                                                                </exclusion>
+                                                               <exclusion>
+                                                                               <groupId>com.att.research.xacml</groupId>
+                                                                               <artifactId>xacml</artifactId>
+                                                               </exclusion>
                                                </exclusions>
                                </dependency>
                                <dependency>
@@ -848,18 +856,18 @@
                                                <plugin>
                                                                <groupId>org.apache.maven.plugins</groupId>
                                                                <artifactId>maven-surefire-plugin</artifactId>
-                                                               <version>2.19.1</version>
+                                                               <version>2.22.1</version>
                                                                <configuration>
                                                                                <forkCount>1</forkCount>
-                                                                               <reuseForks>false</reuseForks>
+                                                                               <reuseForks>true</reuseForks>
+                                                                               <useSystemClassLoader>false</useSystemClassLoader>
                                                                </configuration>
                                                </plugin>
 
                                                <plugin>
                                                                <groupId>org.apache.maven.plugins</groupId>
                                                                <artifactId>maven-failsafe-plugin</artifactId>
-                                                               <version>2.17</version>
-
+                                                               <version>2.22.1</version>
                                                                <executions>
                                                                                <execution>
                                                                                                <id>integration-tests</id>
@@ -868,11 +876,15 @@
                                                                                                                <goal>verify</goal>
                                                                                                </goals>
                                                                                                <configuration>
+                                                                                                               <additionalClasspathElements>
+                                                                                                                       <additionalClasspathElement>${project.build.directory}/classes</additionalClasspathElement>
+                                                                                                               </additionalClasspathElements>
                                                                                                                <includes>
                                                                                                                                <include>**/*ItCase.java</include>
                                                                                                                </includes>
                                                                                                                <forkCount>1</forkCount>
                                                                                                                <reuseForks>false</reuseForks>
+                                                                                                               <useSystemClassLoader>false</useSystemClassLoader>
                                                                                                </configuration>
                                                                                </execution>
                                                                </executions>
@@ -1030,12 +1042,13 @@
                                                <plugin>
                                                                <groupId>org.jacoco</groupId>
                                                                <artifactId>jacoco-maven-plugin</artifactId>
-                                                               <version>0.7.7.201606060606</version>
+                                                               <version>0.8.2</version>
                                                                <configuration>
                                                                                <dumpOnExit>true</dumpOnExit>
                                                                                <includes>
                                                                                                <include>org.onap.clamp.*</include>
                                                                                </includes>
+                                                                               <propertyName>surefireArgLine</propertyName>
                                                                </configuration>
                                                                <executions>
                                                                                <execution>