From 2f9eb9aaf8281d77d5d014abf7975d263b91d819 Mon Sep 17 00:00:00 2001
From: Rob Adams <readams@readams.net>
Date: Thu, 7 Aug 2014 14:39:32 -0700
Subject: [PATCH] Modify build after breakage caused by JaCoCo.  Unfortunately
 requires switching to JaCoCo.

Change-Id: Ie47aaf10d079e39a1c0a97788f07212aba91952f
Signed-off-by: Rob Adams <readams@readams.net>
---
 groupbasedpolicy/pom.xml | 78 ++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 43 deletions(-)

diff --git a/groupbasedpolicy/pom.xml b/groupbasedpolicy/pom.xml
index 51abcbce4..8fedd9bd7 100644
--- a/groupbasedpolicy/pom.xml
+++ b/groupbasedpolicy/pom.xml
@@ -84,10 +84,6 @@
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-flow-service</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller.model</groupId>
-      <artifactId>model-flow-management</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-inventory</artifactId>
@@ -119,20 +115,16 @@
         <configuration>
           <instructions>
             <Import-Package>*</Import-Package>
-            <Export-Package>org.opendaylight.controller.config.yang.config.endpoint_provider</Export-Package>
+            <Export-Package>
+	      org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.*,
+	      org.opendaylight.controller.config.yang.config.endpoint_provider,
+	      org.opendaylight.groupbasedpolicy.endpoint,
+	      org.opendaylight.groupbasedpolicy.resolver
+	    </Export-Package>
           </instructions>
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <redirectTestOutputToFile>true</redirectTestOutputToFile>
-          <!-- needed for cobertura -->
-          <argLine>-XX:-UseSplitVerifier</argLine>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
@@ -152,20 +144,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Code coverage analysis -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.6</version>
-        <configuration>
-          <instrumentation>
-            <excludes>
-              <exclude>org/opendaylight/yang/**/*.class</exclude>
-              <exclude>org/opendaylight/controller/config/yang/**/*.class</exclude>
-            </excludes>
-          </instrumentation>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yang-maven-plugin</artifactId>
@@ -210,24 +188,38 @@
           </execution>
         </executions>
       </plugin>
-    </plugins>
-  </build>
-
-  <!-- Project reporting -->
-  <reporting>
-    <plugins>
-      <!-- Code coverage analysis -->
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.6</version>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <formats>
-            <format>html</format>
-            <format>xml</format>
-          </formats>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
         </configuration>
       </plugin>
+      <plugin>
+	<groupId>org.jacoco</groupId>
+	<artifactId>jacoco-maven-plugin</artifactId>
+	<executions>
+          <execution>
+            <id>pre-unit-test</id>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>post-unit-test</id>
+            <phase>test</phase>
+            <goals>
+              <goal>report</goal>
+            </goals>
+            <configuration>
+              <dataFile>${sonar.jacoco.reportPath}</dataFile>
+	      <includes>
+		<include>org/opendaylight/groupbasedpolicy/**/*.class</include>
+	      </includes>
+            </configuration>
+          </execution>
+	</executions>
+      </plugin>
     </plugins>
-  </reporting>
+  </build>
 </project>
-- 
2.36.6