Merge "Update sonar config"

3 files changed, 16 insertions, 78 deletions

diff --git a/controlloop/pom.xml b/controlloop/pom.xml
index b2a73b9c3..e99845eee 100644
--- a/controlloop/pom.xml
+++ b/controlloop/pom.xml
@@ -2,14 +2,14 @@
   ============LICENSE_START=======================================================
   drools-applications
   ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017, 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.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,8 +26,14 @@
     <artifactId>drools-applications</artifactId>
     <version>1.6.0-SNAPSHOT</version>
   </parent>
+
   <groupId>org.onap.policy.drools-applications.controlloop</groupId>
   <artifactId>controlloop</artifactId>
+
+  <properties>
+    <jacoco.dataFile>${project.basedir}/../../../target/code-coverage/jacoco-ut.exec</jacoco.dataFile>
+  </properties>
+
   <modules>
     <module>common</module>
     <module>templates</module>
diff --git a/pom.xml b/pom.xml
index 0181dca2f..a0edf4562 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,13 +44,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 -->
         <version.policy.common>1.6.2-SNAPSHOT</version.policy.common>
         <policy.models.version>2.2.1-SNAPSHOT</policy.models.version>
@@ -60,32 +53,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>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
                 <configuration>
@@ -152,47 +119,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 33dccf3e6..2a729dfa2 100644
--- a/testsuites/pom.xml
+++ b/testsuites/pom.xml
@@ -3,7 +3,7 @@
   testsuites
   ================================================================================
   Copyright (C) 2018 Ericsson. All rights reserved.
-  Modifications Copyright (C) 2018 AT&T. All rights reserved.
+  Modifications Copyright (C) 2018, 2020 AT&T. 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.
@@ -27,6 +27,12 @@
     </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>