Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Alejandro Abdelnur 2012-04-23 22:33:24 +00:00
parent e360e796ef
commit 06428cdcc1
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

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

11
hadoop-project/pom.xml
View File

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