Fix FileNotFound jacoco.exec in sal poms and remove duplicate jacoco

[controller.git] / opendaylight / md-sal / sal-binding-broker / pom.xml

diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml
index 5975999e1a8d77c2daf5b9e61e40b04577471da7..54b1eb6c6695068ded33e1e7026741cdadd4dbde 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/pom.xml
+++ b/opendaylight/md-sal/sal-binding-broker/pom.xml
@@ -19,7 +19,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>${bundle.plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -29,9 +28,6 @@
                             org.opendaylight.controller.sal.binding.impl,
                             org.opendaylight.controller.sal.binding.impl.*,
                             org.opendaylight.controller.sal.binding.codegen.*,
-                            org.eclipse.xtend2.lib,
-                            org.eclipse.xtend.lib,
-                            org.eclipse.xtext.xbase.*
                         </Private-Package>
                     </instructions>
                 </configuration>
@@ -39,32 +35,32 @@
             <plugin>
                 <groupId>org.eclipse.xtend</groupId>
                 <artifactId>xtend-maven-plugin</artifactId>
-                <version>2.4.2</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${basedir}/src/main/xtend-gen</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>2.4.1</version>
-                <configuration>
-                    <filesets>
-                        <fileset>
-                            <directory>${basedir}/src/main/xtend-gen</directory>
-                            <includes>
-                                <include>**</include>
-                            </includes>
-                        </fileset>
-                    </filesets>
-                </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>
 
@@ -74,14 +70,16 @@
             <artifactId>sal-common-util</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-common-impl</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <!-- >dependency> <groupId>org.opendaylight.controller</groupId> 
-            <artifactId>sal-core-api</artifactId> <version>1.0-SNAPSHOT</version> </dependency -->
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -106,17 +104,18 @@
             <version>3.17.1-GA</version>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.xtend</groupId>
-            <artifactId>org.eclipse.xtend.lib</artifactId>
-            <version>2.4.2</version>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
+            <groupId>org.eclipse.xtend</groupId>
+            <artifactId>org.eclipse.xtend.lib</artifactId>
         </dependency>
     </dependencies>
 </project>