Update SONAR config

Issue-ID: AAI-2793
Change-Id: Ifa440d05795e494e15009d6e8721f0f7208483c9
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>

diff --git a/esr-mgr/dependency-reduced-pom.xml b/esr-mgr/dependency-reduced-pom.xml
index 67c922b..4b45dbf 100644 (file)
--- a/esr-mgr/dependency-reduced-pom.xml
+++ b/esr-mgr/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>\r
     <artifactId>aai-esr-server</artifactId>\r
     <groupId>org.onap.aai.esr-server</groupId>\r
-    <version>1.2.1-SNAPSHOT</version>\r
+    <version>1.5.0-SNAPSHOT</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>esr-mgr</artifactId>\r
@@ -116,13 +116,6 @@
                 </goals>\r
               </execution>\r
             </executions>\r
-            <dependencies>\r
-              <dependency>\r
-                <groupId>io.swagger</groupId>\r
-                <artifactId>swagger-hibernate-validations</artifactId>\r
-                <version>1.5.6</version>\r
-              </dependency>\r
-            </dependencies>\r
             <configuration>\r
               <apiSources>\r
                 <apiSource>\r
@@ -173,10 +166,38 @@
         </exclusion>\r
       </exclusions>\r
     </dependency>\r
+    <dependency>\r
+      <groupId>org.apache.ant</groupId>\r
+      <artifactId>ant</artifactId>\r
+      <version>1.10.5</version>\r
+      <scope>test</scope>\r
+      <exclusions>\r
+        <exclusion>\r
+          <artifactId>ant-launcher</artifactId>\r
+          <groupId>org.apache.ant</groupId>\r
+        </exclusion>\r
+      </exclusions>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.powermock</groupId>\r
+      <artifactId>powermock-api-easymock</artifactId>\r
+      <version>1.6.5</version>\r
+      <scope>test</scope>\r
+      <exclusions>\r
+        <exclusion>\r
+          <artifactId>cglib-nodep</artifactId>\r
+          <groupId>cglib</groupId>\r
+        </exclusion>\r
+        <exclusion>\r
+          <artifactId>powermock-api-support</artifactId>\r
+          <groupId>org.powermock</groupId>\r
+        </exclusion>\r
+      </exclusions>\r
+    </dependency>\r
     <dependency>\r
       <groupId>org.powermock</groupId>\r
       <artifactId>powermock-module-junit4</artifactId>\r
-      <version>1.4.10</version>\r
+      <version>1.5.5</version>\r
       <scope>test</scope>\r
       <exclusions>\r
         <exclusion>\r
@@ -188,7 +209,7 @@
     <dependency>\r
       <groupId>org.powermock</groupId>\r
       <artifactId>powermock-api-mockito</artifactId>\r
-      <version>1.4.10</version>\r
+      <version>1.5.5</version>\r
       <scope>test</scope>\r
       <exclusions>\r
         <exclusion>\r
@@ -202,14 +223,30 @@
       </exclusions>\r
     </dependency>\r
     <dependency>\r
-      <groupId>org.apache.ant</groupId>\r
-      <artifactId>ant</artifactId>\r
-      <version>1.8.2</version>\r
+      <groupId>org.hamcrest</groupId>\r
+      <artifactId>hamcrest-library</artifactId>\r
+      <version>1.3</version>\r
       <scope>test</scope>\r
       <exclusions>\r
         <exclusion>\r
-          <artifactId>ant-launcher</artifactId>\r
-          <groupId>org.apache.ant</groupId>\r
+          <artifactId>hamcrest-core</artifactId>\r
+          <groupId>org.hamcrest</groupId>\r
+        </exclusion>\r
+      </exclusions>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.easymock</groupId>\r
+      <artifactId>easymock</artifactId>\r
+      <version>3.0</version>\r
+      <scope>test</scope>\r
+      <exclusions>\r
+        <exclusion>\r
+          <artifactId>objenesis</artifactId>\r
+          <groupId>org.objenesis</groupId>\r
+        </exclusion>\r
+        <exclusion>\r
+          <artifactId>cglib-nodep</artifactId>\r
+          <groupId>cglib</groupId>\r
         </exclusion>\r
       </exclusions>\r
     </dependency>\r

diff --git a/pom.xml b/pom.xml
index 2a1c7c4..c6f093c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,21 @@
         <junit.version>4.10</junit.version>
                <jetty.version>9.4.22.v20191022</jetty.version>         
         <org.apache.ant.version>1.10.5</org.apache.ant.version>
+
+       <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>
 
     <dependencyManagement>
@@ -301,5 +316,154 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+
+       <plugins>
+         <!-- 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>
+               <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>   
 </project>