Fix sonar config

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

diff --git a/pom.xml b/pom.xml
index c01e9a0..745615c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
        <groupId>org.onap.aai.model-loader</groupId>
        <artifactId>model-loader</artifactId>
        <name>aai-model-loader</name>
-       <version>1.6.1-SNAPSHOT</version>
+       <version>1.6.2-SNAPSHOT</version>
 
        <dependencyManagement>
                <dependencies>
@@ -68,6 +68,20 @@
                <aai.base.image.version>1.6.0</aai.base.image.version>
                <!-- This will be used for the docker images as the default format of maven build has issues -->
                <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+
+               <sonar.jacoco.reportPath />
+               <sonar.jacoco.itReportPath />
+               <sonar.jacoco.reportMissing.force.zero />
+               
+               <jacoco.line.coverage.limit>0.75</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>
 
        <distributionManagement>
@@ -421,6 +435,153 @@
                                        </execution>
                                </executions>
                        </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>
+                         <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>
+                               <!-- 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 -->
+
+
+
                </plugins>
        </build>
 </project>

diff --git a/version.properties b/version.properties
index e8a5670..1e91e59 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -25,7 +25,7 @@
 
 major=1
 minor=6
-patch=1
+patch=2
 
 base_version=${major}.${minor}.${patch}