BUG-2665: jacoco configuration

 - removed experimental excludes
 - added global include configuration covering all packages from
   org.opendaylight.openflowplugin.*

Change-Id: Ic19d74766eebbedd963be40289f008e89c8b4be6
Signed-off-by: Michal Rehak <mirehak@cisco.com>

diff --git a/applications/lldp-speaker/pom.xml b/applications/lldp-speaker/pom.xml
index 10d085b82e9a6964b7ec74d00a6242f591d19338..5d033df1b8c5f11bd1cea56d86fbdec535fcc7e6 100644 (file)
--- a/applications/lldp-speaker/pom.xml
+++ b/applications/lldp-speaker/pom.xml
@@ -60,18 +60,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>
-                            ${project.basedir}/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/**/*.java
-                        </exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>

diff --git a/applications/of-switch-config-pusher/pom.xml b/applications/of-switch-config-pusher/pom.xml
index 94338010aeb1b1d8704e36585a2b74f5d1868c46..4543630ee0266065890621e82c935db440fa91ac 100644 (file)
--- a/applications/of-switch-config-pusher/pom.xml
+++ b/applications/of-switch-config-pusher/pom.xml
@@ -46,17 +46,6 @@
     
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>
-                            ${project.basedir}/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/**/*.java
-                        </exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>

diff --git a/applications/table-miss-enforcer/pom.xml b/applications/table-miss-enforcer/pom.xml
index 0d089ad7f6c72b8d969dd65016be1f4478de8e3b..56b5150c9f61454f949039eaf93b32fe11d83693 100644 (file)
--- a/applications/table-miss-enforcer/pom.xml
+++ b/applications/table-miss-enforcer/pom.xml
@@ -49,17 +49,6 @@
 
     <build>
      <plugins>
-         <plugin>
-             <groupId>org.jacoco</groupId>
-             <artifactId>jacoco-maven-plugin</artifactId>
-             <configuration>
-                 <excludes>
-                     <exclude>
-                         ${project.basedir}/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/**/*.java
-                     </exclude>
-                 </excludes>
-             </configuration>
-         </plugin>
          <plugin>
              <groupId>org.opendaylight.yangtools</groupId>
              <artifactId>yang-maven-plugin</artifactId>

diff --git a/openflowplugin/pom.xml b/openflowplugin/pom.xml
index 4a77e4683c26ea2d2cfcfb53d769fddf4b6ce9fe..df1e94a504093a038de5456923346afb6ffd7306 100644 (file)
--- a/openflowplugin/pom.xml
+++ b/openflowplugin/pom.xml
@@ -21,17 +21,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>
-                            ${project.basedir}/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/**/*.java
-                        </exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>

diff --git a/pom.xml b/pom.xml
index 1fa08911e4f81d4b4431ea40e8737c129f3bcbae..593e80274564653c401a6edbcd7032a8d78db1f3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -331,8 +331,16 @@
                         </configuration>
                     </execution>
                 </executions>
+
+                <configuration>
+                  <includes>
+                    <include>org.opendaylight.openflowplugin.*</include>
+                  </includes>
+                </configuration>
+
             </plugin>
         </plugins>
+
         <pluginManagement>
           <plugins>
             <plugin>