diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 29846f9896..9b87444d5f 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1069,9 +1069,13 @@ Release 0.23.5 - UNRELEASED
NEW FEATURES
IMPROVEMENTS
+
HADOOP-8923. JNI-based user-group mapping modules can be too chatty on
lookup failures. (Kihwal Lee via suresh)
+ HADOOP-8930. Cumulative code coverage calculation (Andrey Klochkov via
+ bobby)
+
OPTIMIZATIONS
BUG FIXES
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 372a5eda10..b5b113cf68 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -655,12 +655,6 @@
4.0.0
compile
-
- com.cenqua.clover
- clover
-
- 3.0.2
-
org.hsqldb
hsqldb
@@ -730,11 +724,6 @@
findbugs-maven-plugin
2.3.2
-
- com.atlassian.maven.plugins
- maven-clover2-plugin
- 3.0.5
-
org.apache.maven.plugins
maven-checkstyle-plugin
@@ -909,54 +898,6 @@
Mac_OS_X-${sun.arch.data.model}
-
-
- clover
-
- false
-
- clover
-
-
-
- ${user.home}/.clover.license
- ${project.build.directory}/clover/hadoop-coverage.db
-
-
-
-
- com.atlassian.maven.plugins
- maven-clover2-plugin
-
- true
- true
- ${cloverLicenseLocation}
- ${cloverDatabase}
- 50%
- ${project.build.directory}/clover
- true
- true
-
-
-
- clover-setup
- process-sources
-
- setup
-
-
-
- clover
- test
-
- clover
-
-
-
-
-
-
-
test-patch
diff --git a/pom.xml b/pom.xml
index 30f680ff6c..bb7f9b3379 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
Apache Hadoop Main
pom
+
+
+
+ com.cenqua.clover
+ clover
+
+ 3.0.2
+
+
+
+
apache.staging.https
@@ -243,6 +254,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
+
+ com.atlassian.maven.plugins
+ maven-clover2-plugin
+ 3.0.5
+
@@ -483,6 +499,52 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
-
+
+ clover
+
+ false
+
+ clover
+
+
+
+ ${user.home}/.clover.license
+ ${project.build.directory}/clover/hadoop-coverage.db
+
+
+
+
+ com.atlassian.maven.plugins
+ maven-clover2-plugin
+
+ true
+ true
+ ${cloverLicenseLocation}
+ ${cloverDatabase}
+ 50%
+ ${project.build.directory}/clover
+ true
+ true
+
+
+
+ clover-setup
+ process-sources
+
+ setup
+
+
+
+ clover
+ test
+
+ clover
+
+
+
+
+
+
+