From e1bb12b04b343fbbf54fd762ca8fcdae5f9f4d9a Mon Sep 17 00:00:00 2001
From: Pamela Dragosh <pdragosh@research.att.com>
Date: Tue, 14 Jan 2020 20:29:46 -0500
Subject: Update sonar configuration

Use policy/parent configuration
No need to do packages and testsuites

Issue-ID: POLICY-2321
Change-Id: I192ae314a1c2f607f9dfc48e13ff793920185a28
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---
 packages/pom.xml   |  6 +++++
 pom.xml            | 70 ------------------------------------------------------
 testsuites/pom.xml | 11 +++++++--
 3 files changed, 15 insertions(+), 72 deletions(-)

diff --git a/packages/pom.xml b/packages/pom.xml
index b57b6cb9..cc1d5699 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -1,6 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2019 Nordix Foundation.
+   Modifications Copyright (C) 2020 AT&T Intellectual Property.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -33,6 +34,11 @@
     <name>${project.artifactId}</name>
     <description>The module for packaging the PAP component.</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 e0ec4424..f0680706 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,12 +40,6 @@
     <description>Code that implements the Policy Administration Backend.</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>
@@ -74,32 +68,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>
@@ -138,44 +106,6 @@
         </plugins>
         <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>
diff --git a/testsuites/pom.xml b/testsuites/pom.xml
index 7a077d9f..645a0045 100644
--- a/testsuites/pom.xml
+++ b/testsuites/pom.xml
@@ -2,7 +2,7 @@
   ============LICENSE_START=======================================================
   ONAP Policy PAP
   ================================================================================
-  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-pap</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>
-- 
cgit 1.2.3-korg