diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 70252d6ea1..e91529008f 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -762,6 +762,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12367. Move TestFileUtil's test resources to resources folder. (wang via yliu) + HADOOP-12369. Point hadoop-project/pom.xml java.security.krb5.conf + within target folder. (wang) + OPTIMIZATIONS HADOOP-11785. Reduce the number of listStatus operation in distcp diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 86102c674d..986347593f 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -1132,7 +1132,7 @@ ${test.build.classes} true - ${basedir}/src/test/resources/krb5.conf + ${project.build.directory}/test-classes/krb5.conf ${java.security.egd} ${require.test.libhadoop} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml index 52994e7d5a..635f693844 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml @@ -198,7 +198,7 @@ ${test.build.classes} true - ${basedir}/src/test/resources/krb5.conf + ${project.build.directory}/test-classes/krb5.conf ${java.security.egd} ${require.test.libhadoop}