Author: tucu
Date: Mon Apr 23 22:33:24 2012
New Revision: 1329495
URL: http://svn.apache.org/viewvc?rev=1329495&view=rev
Log:
Merge -r 1329489:1329490 from trunk to branch. FIXES: HADOOP-8284
Modified:
hadoop/common/branches/branch-2/hadoop-project/pom.xml
Modified: hadoop/common/branches/branch-2/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/pom.xml?rev=1329495&r1=1329494&r2=1329495&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-project/pom.xml Mon Apr 23 22:33:24
2012
@@ -607,12 +607,6 @@
</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>
<version>3.4.2</version>
@@ -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>
