Merge "Update sonar config"

diff --combined pom.xml
index ea183da,4790b36..f8effec
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -41,12 -41,6 +41,6 @@@
      <description>Code that define our external API.</description>
  
      <properties>
-         <!-- 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>
- 
          <policy.common.version>1.6.2-SNAPSHOT</policy.common.version>
          <policy.models.version>2.2.1-SNAPSHOT</policy.models.version>
      </properties>
@@@ -75,6 -69,7 +69,6 @@@
          <dependency>
              <groupId>javax.servlet</groupId>
              <artifactId>javax.servlet-api</artifactId>
 -            <scope>provided</scope>
          </dependency>
          <dependency>
              <groupId>org.eclipse.jetty</groupId>
@@@ -105,32 -100,6 +99,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>
                  <artifactId>maven-checkstyle-plugin</artifactId>
                  <executions>
@@@ -169,44 -138,6 +137,6 @@@
          </plugins>
          <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>