aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRam Krishna Verma <ram.krishna.verma@est.tech>2020-01-15 09:25:10 +0000
committerGerrit Code Review <gerrit@onap.org>2020-01-15 09:25:10 +0000
commit298fb5e011da7db66ac49ffdb8cca5ed3dacc8a0 (patch)
tree60ac92e6be917b4d2bc35a2c90c2638e8491d1bd
parent6e50bcdfe9e75ac750310499c21e80bf8eaf276f (diff)
parent20eef609d27bb5aaf6bf720b37fb29bbe55c003e (diff)
Merge "Update sonar config"
-rw-r--r--packages/pom.xml6
-rw-r--r--pom.xml70
-rw-r--r--testsuites/pom.xml11
3 files changed, 14 insertions, 73 deletions
diff --git a/packages/pom.xml b/packages/pom.xml
index b9352419..b7c0d604 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -1,6 +1,6 @@
<!--
============LICENSE_START=======================================================
- Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -30,6 +30,10 @@
<packaging>pom</packaging>
<name>Policy api packages</name>
+ <properties>
+ <!-- There is no code in this sub-module, only holds interfaces. So skip sonar. -->
+ <sonar.skip>true</sonar.skip>
+ </properties>
<profiles>
<profile>
diff --git a/pom.xml b/pom.xml
index ea183dad..f8effec9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,12 +41,6 @@
<description>Code that define our external API.</description>
<properties>
- <!-- sonar/jacoco overrides -->
- <!-- Overriding oparent default sonar/jacoco settings Combine all our reports into one file shared across sub-modules -->
- <sonar.jacoco.reportPath>${project.basedir}/../target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
- <sonar.jacoco.itReportPath>${project.basedir}/../target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
- <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-
<policy.common.version>1.6.2-SNAPSHOT</policy.common.version>
<policy.models.version>2.2.1-SNAPSHOT</policy.models.version>
</properties>
@@ -106,32 +100,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>pre-unit-test</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- <configuration>
- <destFile>${sonar.jacoco.reportPath}</destFile>
- <append>true</append>
- </configuration>
- </execution>
- <execution>
- <id>post-unit-test</id>
- <phase>test</phase>
- <goals>
- <goal>report</goal>
- </goals>
- <configuration>
- <dataFile>${sonar.jacoco.reportPath}</dataFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<executions>
<execution>
@@ -170,44 +138,6 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>${jacoco.version}</version>
- <configuration>
- <!-- Note: This exclusion list should match <sonar.exclusions> property above -->
- <excludes>
- <exclude>**/gen/**</exclude>
- <exclude>**/generated-sources/**</exclude>
- <exclude>**/yang-gen/**</exclude>
- <exclude>**/pax/**</exclude>
- </excludes>
- </configuration>
- <executions>
- <!-- Prepares the property pointing to the JaCoCo runtime agent which is passed as VM argument when
- Maven the Surefire plugin is executed. -->
- <execution>
- <id>pre-unit-test</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- <configuration>
- <destFile>${sonar.jacoco.reportPath}</destFile>
- </configuration>
- </execution>
- <!-- Ensures that the code coverage report for unit tests is created after unit tests have been run. -->
- <execution>
- <id>post-unit-test</id>
- <phase>test</phase>
- <goals>
- <goal>report</goal>
- </goals>
- <configuration>
- <dataFile>${sonar.jacoco.reportPath}</dataFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
diff --git a/testsuites/pom.xml b/testsuites/pom.xml
index 91787c7a..4d2951a8 100644
--- a/testsuites/pom.xml
+++ b/testsuites/pom.xml
@@ -2,7 +2,7 @@
============LICENSE_START=======================================================
ONAP Policy API
================================================================================
- Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -24,10 +24,17 @@
<artifactId>policy-api</artifactId>
<version>2.2.0-SNAPSHOT</version>
</parent>
+
<artifactId>testsuites</artifactId>
<packaging>pom</packaging>
+
+ <properties>
+ <!-- There is no code in this sub-module, only holds interfaces. So skip sonar. -->
+ <sonar.skip>true</sonar.skip>
+ </properties>
+
<modules>
<module>stability</module>
<module>performance</module>
</modules>
-</project> \ No newline at end of file
+</project>