Repository: hadoop Updated Branches: refs/heads/branch-2 b1499ab0f -> 7d833a305
HADOOP-12369. Point hadoop-project/pom.xml java.security.krb5.conf within target folder. (cherry picked from commit 0eb9b1932590ba6c60ac996d03269dffb4e095cc) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7d833a30 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7d833a30 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7d833a30 Branch: refs/heads/branch-2 Commit: 7d833a305895e098affbf8800a5d6a936bd224ca Parents: b1499ab Author: Andrew Wang <[email protected]> Authored: Tue Sep 1 10:57:32 2015 -0700 Committer: Andrew Wang <[email protected]> Committed: Tue Sep 1 10:59:39 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 5 ++++- hadoop-project/pom.xml | 2 +- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7d833a30/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 75206af..77a6f78 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -181,6 +181,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) + BUG FIXES HADOOP-12124. Add HTrace support for FsShell (cmccabe) @@ -252,7 +255,7 @@ Release 2.8.0 - UNRELEASED HADOOP-12325. RPC Metrics : Add the ability track and log slow RPCs. (Anu Engineer via xyao) - OPTIMIZATIONS + OPTIMIZATIONS HADOOP-11785. Reduce the number of listStatus operation in distcp buildListing (Zoran Dimitrijevic via Colin P. McCabe) http://git-wip-us.apache.org/repos/asf/hadoop/blob/7d833a30/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index d4dbeee..1a01d72 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -1179,7 +1179,7 @@ <test.build.classes>${test.build.classes}</test.build.classes> <java.net.preferIPv4Stack>true</java.net.preferIPv4Stack> - <java.security.krb5.conf>${basedir}/src/test/resources/krb5.conf</java.security.krb5.conf> + <java.security.krb5.conf>${project.build.directory}/test-classes/krb5.conf</java.security.krb5.conf> <java.security.egd>${java.security.egd}</java.security.egd> <require.test.libhadoop>${require.test.libhadoop}</require.test.libhadoop> </systemPropertyVariables> http://git-wip-us.apache.org/repos/asf/hadoop/blob/7d833a30/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml ---------------------------------------------------------------------- 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 bc40195..04f8640 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>${test.build.classes}</test.build.classes> <java.net.preferIPv4Stack>true</java.net.preferIPv4Stack> - <java.security.krb5.conf>${basedir}/src/test/resources/krb5.conf</java.security.krb5.conf> + <java.security.krb5.conf>${project.build.directory}/test-classes/krb5.conf</java.security.krb5.conf> <java.security.egd>${java.security.egd}</java.security.egd> <require.test.libhadoop>${require.test.libhadoop}</require.test.libhadoop> </systemPropertyVariables>
