summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRam Krishna Verma <ram.krishna.verma@est.tech>2020-01-16 12:42:26 +0000
committerGerrit Code Review <gerrit@onap.org>2020-01-16 12:42:26 +0000
commitabd70b47b97c4bcc6d22f84d4f47b16f313a7213 (patch)
tree84fa3ea7190e912530ac1bd6f7e4bbe91c0999c3
parentfa73330ee40a5c7f409324015238ec34cfa396d0 (diff)
parent55232f5aba68ff14be9f85b90337b883e2be6f6d (diff)
Merge "Update sonar config"
-rw-r--r--packages/pom.xml8
-rw-r--r--pom.xml73
2 files changed, 7 insertions, 74 deletions
diff --git a/packages/pom.xml b/packages/pom.xml
index b7f1cfba..267f02dd 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -2,7 +2,7 @@
============LICENSE_START=======================================================
ONAP Policy Engine - Drools PDP
================================================================================
- Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2017, 2019-2020 AT&T Intellectual Property. All rights reserved.
Modifications Copyright (C) 2019 Bell Canada.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,6 +31,12 @@
<packaging>pom</packaging>
<name>Policy Packages</name>
<description>ONAP Policy Drools PDP Installation Packages</description>
+
+ <properties>
+ <!-- There is no code in this sub-module, only holds interfaces. So skip sonar. -->
+ <sonar.skip>true</sonar.skip>
+ </properties>
+
<profiles>
<profile>
<id>default</id>
diff --git a/pom.xml b/pom.xml
index 2c1c174d..c4166810 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,13 +46,6 @@
<snapshots.path>content/repositories/snapshots/</snapshots.path>
<staging.path>content/repositories/staging/</staging.path>
- <!-- 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>
-
<!-- Project common dependency versions -->
<json.path.version>2.4.0</json.path.version>
<hibernate.core.version>5.2.10.Final</hibernate.core.version>
@@ -127,32 +120,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>
@@ -228,46 +195,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>