From: Alissa Bonas <abonas@redhat.com>
Date: Mon, 28 Oct 2013 16:41:29 +0000 (+0200)
Subject: Fix FileNotFound jacoco.exec in sal poms and remove duplicate jacoco
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~549
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=cebe73e6480bc9063c4cf0df0765f38e759b7223

Fix FileNotFound jacoco.exec in sal poms and remove duplicate jacoco
setting from pom.

The parent module should not have the jacoco plugin in plugins section, because it causes all the modules, even those without tests to inherit it.
Removed it from parent pom (kept it only in plugins management section)and added it to relevant poms of modules that have tests.

Change-Id: I4d33da1e490a7260d6f7809496dd67d10a45aca9
Signed-off-by: Alissa Bonas <abonas@redhat.com>
---

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index 0b52f3b571..73b69111f6 100644
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -67,13 +67,11 @@
         <jacoco.version>0.5.3.201107060350</jacoco.version>
         <!-- Sonar properties using jacoco to retrieve integration test results -->
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-        <!-- Sonar properties using jacoco to retrieve integration test results -->
         <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
         <sonar.jacoco.Reportpath>target/jacoco.exec</sonar.jacoco.Reportpath>
         <sonar.jacoco.itReportPath>target/jacoco-it.exec</sonar.jacoco.itReportPath>
         <sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>
         <sonar.branch>${user.name}-private-view</sonar.branch>
-        <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
         <sonar.language>java</sonar.language>
     </properties>
 
@@ -314,28 +312,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <configuration>
-                  <includes>org.opendaylight.controller.*</includes>
-                </configuration>
-                <executions>
-                  <execution>
-                    <id>pre-test</id>
-                    <goals>
-                      <goal>prepare-agent</goal>
-                    </goals>
-                  </execution>
-                  <execution>
-                    <id>post-test</id>
-                    <phase>test</phase>
-                    <goals>
-                      <goal>report</goal>
-                    </goals>
-                  </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
     <reporting>
diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml
index 0d86eca440..54b1eb6c66 100644
--- a/opendaylight/md-sal/sal-binding-broker/pom.xml
+++ b/opendaylight/md-sal/sal-binding-broker/pom.xml
@@ -39,6 +39,28 @@
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
             </plugin>
+            <plugin>
+                   <groupId>org.jacoco</groupId>
+                   <artifactId>jacoco-maven-plugin</artifactId>
+                   <configuration>
+                     <includes>org.opendaylight.controller.*</includes>
+                   </configuration>
+                   <executions>
+                     <execution>
+                       <id>pre-test</id>
+                       <goals>
+                         <goal>prepare-agent</goal>
+                       </goals>
+                     </execution>
+                     <execution>
+                       <id>post-test</id>
+                       <phase>test</phase>
+                       <goals>
+                         <goal>report</goal>
+                       </goals>
+                     </execution>
+                   </executions>
+               </plugin>
         </plugins>
     </build>
 
diff --git a/opendaylight/md-sal/sal-binding-it/pom.xml b/opendaylight/md-sal/sal-binding-it/pom.xml
index 20518bdff7..5f98deb73b 100644
--- a/opendaylight/md-sal/sal-binding-it/pom.xml
+++ b/opendaylight/md-sal/sal-binding-it/pom.xml
@@ -36,6 +36,28 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+           <groupId>org.jacoco</groupId>
+           <artifactId>jacoco-maven-plugin</artifactId>
+           <configuration>
+             <includes>org.opendaylight.controller.*</includes>
+           </configuration>
+           <executions>
+             <execution>
+               <id>pre-test</id>
+               <goals>
+                 <goal>prepare-agent</goal>
+               </goals>
+             </execution>
+             <execution>
+               <id>post-test</id>
+               <phase>test</phase>
+               <goals>
+                 <goal>report</goal>
+               </goals>
+             </execution>
+           </executions>
+     </plugin>
     </plugins>
     <pluginManagement>
       <plugins>
diff --git a/opendaylight/md-sal/sal-compability/pom.xml b/opendaylight/md-sal/sal-compability/pom.xml
index a66b82e01a..6d992de015 100644
--- a/opendaylight/md-sal/sal-compability/pom.xml
+++ b/opendaylight/md-sal/sal-compability/pom.xml
@@ -72,6 +72,28 @@
           </instructions>
         </configuration>
       </plugin>
+      <plugin>
+               <groupId>org.jacoco</groupId>
+               <artifactId>jacoco-maven-plugin</artifactId>
+               <configuration>
+                 <includes>org.opendaylight.controller.*</includes>
+               </configuration>
+               <executions>
+                 <execution>
+                   <id>pre-test</id>
+                   <goals>
+                     <goal>prepare-agent</goal>
+                   </goals>
+                 </execution>
+                 <execution>
+                   <id>post-test</id>
+                   <phase>test</phase>
+                   <goals>
+                     <goal>report</goal>
+                   </goals>
+                 </execution>
+               </executions>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/opendaylight/md-sal/samples/toaster-it/pom.xml b/opendaylight/md-sal/samples/toaster-it/pom.xml
index 1c0fb14e2b..f0e3c1a1ad 100644
--- a/opendaylight/md-sal/samples/toaster-it/pom.xml
+++ b/opendaylight/md-sal/samples/toaster-it/pom.xml
@@ -33,6 +33,28 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                   <groupId>org.jacoco</groupId>
+                   <artifactId>jacoco-maven-plugin</artifactId>
+                   <configuration>
+                     <includes>org.opendaylight.controller.*</includes>
+                   </configuration>
+                   <executions>
+                     <execution>
+                       <id>pre-test</id>
+                       <goals>
+                         <goal>prepare-agent</goal>
+                       </goals>
+                     </execution>
+                     <execution>
+                       <id>post-test</id>
+                       <phase>test</phase>
+                       <goals>
+                         <goal>report</goal>
+                       </goals>
+                     </execution>
+                   </executions>
+               </plugin>
         </plugins>
         <pluginManagement>
             <plugins>