Merge -r 1329489:1329490 from trunk to branch. FIXES: HADOOP-8284

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329495 13f79535-47bb-0310-9956-ffa450edef68

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -245,6 +245,9 @@ Release 2.0.0 - UNRELEASED
     HADOOP-7350. Use ServiceLoader to discover compression codec classes.
     (tomwhite)
 
+    HADOOP-8284. clover integration broken, also mapreduce poms are pulling
+    in clover as a dependency. (phunt via tucu)
+
   BREAKDOWN OF HADOOP-7454 SUBTASKS
 
     HADOOP-7455. HA: Introduce HA Service Protocol Interface. (suresh)

hadoop-project/pom.xml

@@ -606,12 +606,6 @@
         <version>1.1</version>
       </dependency>
 
-      <dependency>
-        <groupId>com.cenqua.clover</groupId>
-        <artifactId>clover</artifactId>
-        <version>3.0.2</version>
-      </dependency>
-
       <dependency>
         <groupId>org.apache.zookeeper</groupId>
         <artifactId>zookeeper</artifactId>
@@ -943,6 +937,7 @@
             <groupId>com.atlassian.maven.plugins</groupId>
             <artifactId>maven-clover2-plugin</artifactId>
             <configuration>
+              <includesAllSourceRoots>true</includesAllSourceRoots>
               <includesTestSourceRoots>true</includesTestSourceRoots>
               <licenseLocation>${cloverLicenseLocation}</licenseLocation>
               <cloverDatabase>${cloverDatabase}</cloverDatabase>
@@ -953,8 +948,8 @@
             </configuration>
             <executions>
               <execution>
-                <id>setup</id>
-                <phase>generate-sources</phase>
+                <id>clover-setup</id>
+                <phase>process-sources</phase>
                 <goals>
                   <goal>setup</goal>
                 </goals>