diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 77cf39e8d49..fb92f50d495 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -1674,6 +1674,9 @@ Release 0.23.0 - Unreleased
MAPREDUCE-3203. Fix some javac warnings in MRAppMaster. (mahadev)
+ MAPREDUCE-3199. Fixed pom files to include correct log4j configuration for
+ tests. (vinodkv)
+
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
index 5770ad699eb..49eae4bebbe 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
@@ -26,7 +26,8 @@
${project.build.directory}/${project.name}
- ${project.parent.parent.basedir}
+
+ ${project.parent.basedir}/../
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
index 6cd3eef456d..cb199ac70a9 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
@@ -25,7 +25,8 @@
hadoop-mapreduce-client-common
- ${project.parent.parent.basedir}
+
+ ${project.parent.basedir}/../
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
index 5cf2e26e2bc..2c710a45e3e 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
@@ -25,9 +25,10 @@
hadoop-mapreduce-client-core
+
${project.parent.parent.basedir}
-
+
org.apache.hadoop
@@ -41,6 +42,15 @@
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+
+ file:///${project.parent.basedir}/../src/test/log4j.properties
+
+
+
org.apache.avro
avro-maven-plugin
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml
index 0bc9601dee2..e4c4d91219b 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml
@@ -25,6 +25,7 @@
hadoop-mapreduce-client-hs
+
${project.parent.parent.basedir}
@@ -50,15 +51,4 @@
test
-
-
-
- maven-surefire-plugin
-
-
-
-
-
-
-
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml
index 21804443193..3a64caa8265 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml
@@ -26,7 +26,8 @@
always
- ${project.parent.parent.basedir}
+
+ ${project.parent.basedir}/../
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml
index bdb1aba3075..3af3129fafa 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml
@@ -25,7 +25,8 @@
hadoop-mapreduce-client-shuffle
- ${project.parent.parent.basedir}
+
+ ${project.parent.basedir}/../
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
index de288836ba5..ffea5f7b9d4 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
@@ -27,7 +27,8 @@
pom
- ${project.parent.basedir}
+
+ ../
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-api/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-api/pom.xml
index 4ae00f814a1..4302f815cd2 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-api/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-api/pom.xml
@@ -25,6 +25,7 @@
hadoop-yarn-api
+
${project.parent.basedir}
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml
index 06c99ece4e4..b3a49bff1df 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml
@@ -25,6 +25,7 @@
hadoop-yarn-applications-distributedshell
+
${project.parent.parent.basedir}
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/pom.xml
index 971a273dfe6..9376b3e918d 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/pom.xml
@@ -25,6 +25,7 @@
hadoop-yarn-common
+
${project.parent.basedir}
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
index c7532ad5fa7..cda2d6cf10d 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
@@ -25,6 +25,7 @@
hadoop-yarn-server-common
+
${project.parent.parent.basedir}
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
index 38d956afdcd..671e8670b51 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
@@ -25,6 +25,7 @@
hadoop-yarn-server-nodemanager
+
${project.parent.parent.basedir}
/etc/hadoop
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml
index 193a9439bb4..99f8a6d4c79 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml
@@ -25,6 +25,7 @@
hadoop-yarn-server-resourcemanager
+
${project.parent.parent.basedir}
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml
index 1d6d691356c..fe95cdf530e 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml
@@ -24,6 +24,7 @@
hadoop-yarn-server-tests
+
${project.parent.parent.basedir}
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/pom.xml
index 33295a02d99..887950e3741 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/pom.xml
@@ -25,6 +25,7 @@
hadoop-yarn-site
+
${project.parent.parent.basedir}
diff --git a/hadoop-mapreduce-project/hadoop-yarn/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/pom.xml
index cc5098df1b5..bd76cf1d420 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-yarn/pom.xml
@@ -389,26 +389,6 @@
maven-clean-plugin
2.4.1
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
-
- 2.9
-
- false
- ${test.logs}
- ${test.timeout}
-
- ${java.home}
-
-
- ${project.build.directory}
- ${project.build.outputDirectory}
- file:///${yarn.basedir}/../src/test/log4j.properties
-
-
-
com.atlassian.maven.plugins
maven-clover2-plugin
diff --git a/hadoop-mapreduce-project/pom.xml b/hadoop-mapreduce-project/pom.xml
index 5ac9b4301ad..b1c30fb4d84 100644
--- a/hadoop-mapreduce-project/pom.xml
+++ b/hadoop-mapreduce-project/pom.xml
@@ -194,27 +194,6 @@
1.6
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
-
- 2.9
-
- false
- ${test.logs}
- ${test.timeout}
- ${fork.mode}
-
- ${java.home}
-
-
- ${project.build.directory}
- ${project.build.outputDirectory}
- file:///${mr.basedir}/src/test/log4j.properties
-
-
-
org.apache.maven.plugins
maven-assembly-plugin