fixed sonar

Change-Id: I1b6683a3ceb8ed668469f63eed2c530c3b9b761f
Signed-off-by: David Goldberg <david.goldberg@contextream.com>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 96c71199ea4a3dcfff7d801b06c27d32587cf176..2e08bf46abd5f7e6679502e7db7eaa58b72f3fc5 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -15,7 +15,7 @@
        </scm>
        <properties>
                <lispflowmapping.version>1.1.11-SNAPSHOT</lispflowmapping.version>
-               <jacoco.version>0.5.3.201107060350</jacoco.version>
+               <jacoco.version>0.6.2.201302030002</jacoco.version>
                <enforcer.version>1.3.1</enforcer.version>
                <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -588,6 +588,32 @@
                                </plugin>
                        </plugins>
                </pluginManagement>
+               <plugins>
+     <plugin>
+       <groupId>org.jacoco</groupId>
+       <artifactId>jacoco-maven-plugin</artifactId>
+       <configuration>
+         <includes>
+           <include>org.opendaylight.lispflowmapping.*</include> 
+         </includes>
+       </configuration>
+       <executions>
+         <execution>
+           <id>pre-test</id>
+           <goals>
+             <goal>prepare-agent</goal>
+           </goals>
+         </execution>
+         <execution>
+           <id>post-test</id>
+           <goals>
+             <goal>report</goal>
+           </goals>
+           <phase>test</phase>
+         </execution>
+       </executions>
+     </plugin>
+   </plugins>
        </build>
 
 </project>

diff --git a/mappingservice/integrationtest/pom.xml b/mappingservice/integrationtest/pom.xml
index 34f2fec85838eb1b85a55f37368afcd4a53a75dd..52c74689b8b06f2fb81cdb1f825bd615f71492b4 100644 (file)
--- a/mappingservice/integrationtest/pom.xml
+++ b/mappingservice/integrationtest/pom.xml
@@ -12,15 +12,14 @@
   <name>LISP Flow Mapping Integration Tests</name>
   <version>1.1.11-SNAPSHOT</version>
   <properties>
+               <sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>
+               <sonar.branch>${user.name}-develop</sonar.branch>
+               <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+               <sonar.language>java</sonar.language>
     <exam.version>3.0.0</exam.version>
     <!-- Dependency Versions -->
     <junit.version>4.8.1</junit.version>
     <lispflowmapping.version>1.1.11-SNAPSHOT</lispflowmapping.version>
-    <sonar.jacoco.itReportPath>../implementaiton/target/jacoco-it.exec</sonar.jacoco.itReportPath>
-    <sonar.jacoco.reportPath>../implementation/target/jacoco.exec</sonar.jacoco.reportPath>
-    <!-- Sonar jacoco plugin to get integration test coverage info -->
-    <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-    <sonar.language>java</sonar.language>
     <url.version>1.5.0</url.version>
   </properties>
   <dependencies>
@@ -768,29 +767,29 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.5.3.201107060350</version>
-        <configuration>
-          <destFile>../implementation/target/jacoco-it.exec</destFile>
-          <includes>org.opendaylight.controller.*</includes>
-          <includes>org.opendaylight.lispflowmapping.*</includes>
-        </configuration>
-        <executions>
-          <execution>
-            <id>pre-test</id>
-            <goals>
-              <goal>prepare-agent</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>post-test</id>
-            <configuration>
-              <skip>true</skip>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
+       <groupId>org.jacoco</groupId>
+       <artifactId>jacoco-maven-plugin</artifactId>
+       <configuration>
+         <includes>
+           <include>org.opendaylight.org.opendaylight.lispflowmapping.*.*</include> 
+         </includes>
+       </configuration>
+       <executions>
+         <execution>
+           <id>pre-test</id>
+           <goals>
+             <goal>prepare-agent</goal>
+           </goals>
+         </execution>
+         <execution>
+           <id>post-test</id>
+           <goals>
+             <goal>report</goal>
+           </goals>
+           <phase>test</phase>
+         </execution>
+       </executions>
+     </plugin>
       <plugin>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>maven-paxexam-plugin</artifactId>