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 0b52f3b57158082d501bf54c858c227d578576ab..73b69111f6dac754149ca1371ecd61e6fab49ffb 100644 (file)
--- 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 0d86eca440cd4fcafb6c3eea8ca9f2689c6a8cb7..54b1eb6c6695068ded33e1e7026741cdadd4dbde 100644 (file)
--- 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 20518bdff7e5cbc9fa5fa7f83691dd569b0dca6c..5f98deb73b148d96a30778297b7d56a5a00aceaa 100644 (file)
--- 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 a66b82e01ab7ab713caf7d1c93d871665ac0fefb..6d992de015d16ad239a9712d47a968df0883e57a 100644 (file)
--- 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 1c0fb14e2ba2d04a73a4ec06a306457d082fa803..f0e3c1a1addb1c85294ea8bb09708b5397f2faa5 100644 (file)
--- 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>