Update for sonarcloud.io

Issue-ID: AAI-2793
Signed-off-by: Forsyth, James (jf2512) <jf2512@att.com>
Change-Id: I42c7e869a12651ca09a9631ae928af4f9a3065ce

diff --git a/pom.xml b/pom.xml
index d318d99..dd06c26 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
        <parent>
                <groupId>org.onap.oparent</groupId>
                <artifactId>oparent</artifactId>
-               <version>2.0.0</version>
+               <version>2.1.0</version>
                <relativePath />
        </parent>
 
@@ -49,8 +49,19 @@
                <java.version>1.8</java.version>
                <aai.schema.source.folder>onap/aai_schema</aai.schema.source.folder>
                <aai.schema.target.folder>${project.build.directory}/aai-schema</aai.schema.target.folder>
-               <jacoco.report.directory>${project.build.directory}/code-coverage</jacoco.report.directory>
+
+               <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>
 
         <!-- docker related properties -->
                <docker.fabric.version>0.28.0</docker.fabric.version>
@@ -68,7 +79,7 @@
                <javax.ws.rs.version>2.1</javax.ws.rs.version>
                <mvn.jaxb2.version>0.13.2</mvn.jaxb2.version>
                <aai-schema.group.id>org.onap.aai.schema-service</aai-schema.group.id>
-               <aai-schema.version>1.6.0</aai-schema.version>
+               <aai-schema.version>1.6.3</aai-schema.version>
                <aai.rest.client.version>1.2.1</aai.rest.client.version>
                <sdc.distribution.client.version>1.3.0</sdc.distribution.client.version>
                <xmlunit.version>1.6</xmlunit.version>
@@ -491,39 +502,153 @@
                                        <classifier>client</classifier>
                                </configuration>
                        </plugin>
+
+
+                       <!-- once we connect aai-parent or oparent 3.0+ we can take out this 
+                            whole section -->
+
                        <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <configuration>
-                                       <excludes>
-                                               <exclude>org/onap/aai/babel/xml/generator/xsd/*</exclude>
-                                       </excludes>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>default-check</id>
-                                               <goals>
-                                                       <goal>check</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <dataFile>${jacoco.report.directory}/jacoco-ut.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>
+                         <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>