Update SONAR config

Issue-ID: AAI-2793
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Change-Id: Ia1d4c7c97709b11933a47f9219bc6cfea7179064

diff --git a/pom.xml b/pom.xml
index 449106f..b0d09b0 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,20 @@
     <properties>
         <sitePath>/content/sites/site/org/onap/aai/sparky-be/${project.artifactId}/${project.version}</sitePath>
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
+
+       <sonar.jacoco.reportPath />
+       <sonar.jacoco.itReportPath />
+       <sonar.jacoco.reportMissing.force.zero />
+
+       <jacoco.line.coverage.limit>0.90</jacoco.line.coverage.limit>
+       <jacoco.version>0.8.5</jacoco.version>
+       <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+       <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+       <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+       <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+
+       <sonar.scanner.version>3.7.0.1746</sonar.scanner.version>
+
     </properties>
 
     <!-- we don't need to deploy the top level pom project -->
@@ -35,6 +49,155 @@
                 </plugin>
                </plugins>
              </pluginManagement>
+
+             <!-- once we connect aai-parent or oparent 3.0+ we can take out this
+                  whole section -->
+             <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>
+                   <exclude>org/onap/aai/babel/xml/generator/xsd/*</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>
+                     <!-- Sets the path to the file which contains the execution data
+                          . -->
+                     <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+                     <!-- Sets the name of the property containing the settings for JaCoCo
+                          runtime agent. -->
+                     <propertyName>surefireArgLine</propertyName>
+                   </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>
+                     <!-- Sets the path to the file which contains the execution data
+                          . -->
+                     <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+                     <!-- Sets the output directory for the code coverage report. -->
+                     <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                   </configuration>
+                 </execution>
+                 <execution>
+                   <id>pre-integration-test</id>
+                   <phase>pre-integration-test</phase>
+                   <goals>
+                     <goal>prepare-agent</goal>
+                   </goals>
+                   <configuration>
+                     <!-- Sets the path to the file which contains the execution data
+                          . -->
+                     <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+                     <!-- Sets the name of the property containing the settings for JaCoCo
+                          runtime agent. -->
+                     <propertyName>failsafeArgLine</propertyName>
+                   </configuration>
+                 </execution>
+                 <!-- Ensures that the code coverage report for integration tests after
+                      integration tests have been run. -->
+                 <execution>
+                   <id>post-integration-test</id>
+                   <phase>post-integration-test</phase>
+                   <goals>
+                     <goal>report</goal>
+                   </goals>
+                   <configuration>
+                     <!-- Sets the path to the file which contains the execution data
+                          . -->
+                     <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+                     <!-- Sets the output directory for the code coverage report. -->
+                     <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+                   </configuration>
+                 </execution>
+                 <execution>
+                   <id>default-check</id>
+                   <goals>
+                     <goal>check</goal>
+                   </goals>
+                   <configuration>
+                     <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+                     <rules>
+                       <rule implementation="org.jacoco.maven.RuleConfiguration">
+                         <element>BUNDLE</element>
+                         <limits>
+                           <limit implementation="org.jacoco.report.check.Limit">
+                             <counter>LINE</counter>
+                             <value>COVEREDRATIO</value>
+                             <minimum>${jacoco.line.coverage.limit}</minimum>
+                           </limit>
+                         </limits>
+                       </rule>
+                     </rules>
+                   </configuration>
+                 </execution>
+               </executions>
+             </plugin>
+             <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-surefire-plugin</artifactId>
+               <version>3.0.0-M4</version>
+               <configuration>
+                 <!-- Sets the VM argument line used when unit tests are run. -->
+                 <argLine>${surefireArgLine}</argLine>
+                 <!-- Excludes integration tests when unit tests are run. -->
+                 <excludes>
+                   <exclude>**/IT*.java</exclude>
+                 </excludes>
+               </configuration>
+             </plugin>
+             <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-failsafe-plugin</artifactId>
+               <version>3.0.0-M4</version>
+               <executions>
+                 <!-- Ensures that both integration-test and verify goals of the Failsafe
+                      Maven plugin are executed. -->
+                 <execution>
+                   <id>integration-tests</id>
+                   <goals>
+                     <goal>integration-test</goal>
+                     <goal>verify</goal>
+                   </goals>
+                   <configuration>
+                     <!-- Sets the VM argument line used when integration tests are run. -->
+                     <argLine>${failsafeArgLine}</argLine>
+                   </configuration>
+                 </execution>
+               </executions>
+             </plugin>
+             <plugin>
+               <groupId>org.sonarsource.scanner.maven</groupId>
+               <artifactId>sonar-maven-plugin</artifactId>
+               <version>${sonar.scanner.version}</version>
+             </plugin>
+             <!-- end removable sonar config, note the additional exclusion for babel above
+             -->
+           </plugins>
+
+
        </build>
        
     <distributionManagement>

diff --git a/sparkybe-onap-application/pom.xml b/sparkybe-onap-application/pom.xml
index 22d74a4..bdb37a7 100644 (file)
--- a/sparkybe-onap-application/pom.xml
+++ b/sparkybe-onap-application/pom.xml
@@ -15,7 +15,6 @@
 
     <properties>
         <java.version>1.8</java.version>
-        <version.jacoco.maven.plugin>0.7.9</version.jacoco.maven.plugin>
         <frontEndGroupdId>org.onap.aai</frontEndGroupdId>
         <frontEndArtifactId>sparky-fe</frontEndArtifactId>
         <frontEndVersion>1.5.0</frontEndVersion>
@@ -580,27 +579,6 @@
                 </executions>
             </plugin>
 
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>${version.jacoco.maven.plugin}</version>
-                <executions>
-                    <execution>
-                        <id>prepare-agent</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>report</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>

diff --git a/sparkybe-onap-service/pom.xml b/sparkybe-onap-service/pom.xml
index 3622e77..47cba7c 100644 (file)
--- a/sparkybe-onap-service/pom.xml
+++ b/sparkybe-onap-service/pom.xml
@@ -14,7 +14,6 @@
 
        <properties>
                <java.version>1.8</java.version>
-               <version.jacoco.maven.plugin>0.7.9</version.jacoco.maven.plugin>
                <frontEndGroupdId>org.onap.aai</frontEndGroupdId>
                <frontEndArtifactId>sparky-fe</frontEndArtifactId>
                <frontEndVersion>1.3.0</frontEndVersion>
@@ -28,7 +27,7 @@
                <sitePath>/content/sites/site/org/onap/aai/sparky-be/${project.artifactId}/${project.version}</sitePath>
                <onap.nexus.url>https://neexus.onap.org</onap.nexus.url>
                <jacoco.line.coverage.limit>0.55</jacoco.line.coverage.limit>
-               <spring.boot.version>1.5.21.RELEASE</spring.boot.version>
+               <spring.boot.version>1.5.22.RELEASE</spring.boot.version>
        </properties>
 
        <dependencyManagement>
@@ -478,48 +477,6 @@ some of the depedencies should probably have a scope of provided so they don't a
                                </executions>
                        </plugin>
  -->
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>${version.jacoco.maven.plugin}</version>
-                               <executions>
-                                       <execution>
-                                               <id>prepare-agent</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                       </execution>
-                                       <execution>
-                                               <id>report</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                       </execution>
-                                       <execution>
-                        <id>default-check</id>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <configuration>
-                            <dataFile>${project.build.directory}/jacoco.exec</dataFile>
-                            <rules>
-                                <!--  implementation is needed only for Maven 2  -->
-                                <rule implementation="org.jacoco.maven.RuleConfiguration">
-                                    <element>BUNDLE</element>
-                                    <limits>
-                                        <limit implementation="org.jacoco.report.check.Limit">
-                                            <counter>LINE</counter>
-                                            <value>COVEREDRATIO</value>
-                                            <minimum>${jacoco.line.coverage.limit}</minimum>
-                                        </limit>
-                                    </limits>
-                                </rule>
-                            </rules>
-                        </configuration>
-                    </execution>
-                               </executions>
-                       </plugin>
 
 <!--                   <plugin>
                                <groupId>org.codehaus.mojo</groupId>