diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 6fc6dcbc17a..c1611a29dd7 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -382,7 +382,7 @@ Trunk (Unreleased) HADOOP-9190. packaging docs is broken. (Andy Isaacson via atm) - BREAKDOWN OF HADOOP-8562 SUBTASKS + BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS HADOOP-8924. Hadoop Common creating package-info.java must not depend on sh. (Chris Nauroth via suresh) @@ -519,6 +519,9 @@ Trunk (Unreleased) HADOOP-9443. Port winutils static code analysis change to trunk. (Chuan Liu via suresh) + + HADOOP-9290. Some tests cannot load native library on windows. + (Chris Nauroth via suresh) Release 2.0.5-beta - UNRELEASED diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml index 1c69688c94b..4248e5bbb20 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml @@ -33,6 +33,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> hdfs + ${basedir}/../../../../../hadoop-common-project/hadoop-common/target diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml index d95c27e3568..f138b3db1af 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml @@ -30,7 +30,7 @@ pom - + ${basedir}/../../../hadoop-common-project/hadoop-common/target @@ -176,10 +176,6 @@ org.apache.maven.plugins maven-surefire-plugin - - - ${basedir}/../../../hadoop-common-project/hadoop-common/target - listener diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index c90d5629cf3..c6105bc7693 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -50,6 +50,10 @@ ${project.build.directory}/test-dir ${test.build.dir} + + + + ${basedir}/../../hadoop-common-project/hadoop-common/target @@ -811,8 +815,8 @@ -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError - ${basedir}/../../hadoop-common-project/hadoop-common/target - ${env.LD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib:${basedir}/../../hadoop-common-project/hadoop-common/target/native/target/usr/local/lib/ + ${hadoop.common.build.dir} + ${env.LD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib:${hadoop.common.build.dir}/native/target/usr/local/lib 4 @@ -891,7 +895,7 @@ - ${env.PATH};${basedir}/../../hadoop-common-project/hadoop-common/target/bin + ${env.PATH};${hadoop.common.build.dir}/bin diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml index 78eee7ea6bb..be282dc94db 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml @@ -28,32 +28,15 @@ hadoop-yarn-applications pom + + ${basedir}/../../../../hadoop-common-project/hadoop-common/target + + hadoop-yarn-applications-distributedshell hadoop-yarn-applications-unmanaged-am-launcher - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - ${basedir}/../../../../hadoop-common-project/hadoop-common/target - - - - listener - org.apache.hadoop.test.TimedOutTestsListener - - - - - - - clover diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml index 47f7082ac9d..6a2a73e3482 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml @@ -28,26 +28,9 @@ hadoop-yarn-server pom - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - ${basedir}/../../../../hadoop-common-project/hadoop-common/target - - - - listener - org.apache.hadoop.test.TimedOutTestsListener - - - - - - + + ${basedir}/../../../../hadoop-common-project/hadoop-common/target + diff --git a/hadoop-yarn-project/hadoop-yarn/pom.xml b/hadoop-yarn-project/hadoop-yarn/pom.xml index 738d6c5fcad..4764b19ff74 100644 --- a/hadoop-yarn-project/hadoop-yarn/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/pom.xml @@ -30,6 +30,7 @@ true 600000 ${basedir} + ${basedir}/../../../hadoop-common-project/hadoop-common/target @@ -159,10 +160,6 @@ org.apache.maven.plugins maven-surefire-plugin - - - ${basedir}/../../../hadoop-common-project/hadoop-common/target - listener