From 4805df83668658f2c685a741f2014e5872f5dbc9 Mon Sep 17 00:00:00 2001
From: Alejandro Abdelnur <tucu@apache.org>
Date: Thu, 29 Mar 2012 21:50:30 +0000
Subject: [PATCH] Merge -r 1307123:1307124 from trunk to branch. FIXES:
 MAPREDUCE-4082

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307129 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-mapreduce-project/CHANGES.txt                           | 3 +++
 .../hadoop-mapreduce-client-app/pom.xml                        | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 769687dd556..4e6c320e4d2 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -92,6 +92,9 @@ Release 2.0.0 - UNRELEASED
     MAPREDUCE-4081. TestMROutputFormat.java does not compile (Jason Lowe via
     bobby)
 
+    MAPREDUCE-4082. hadoop-mapreduce-client-app's mrapp-generated-classpath 
+    file should not be in the module JAR (tucu)
+
 Release 0.23.2 - 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 9fe050c2dd8..52802bbd197 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
@@ -97,7 +97,7 @@
               <goal>build-classpath</goal>
             </goals>
             <configuration>
-              <outputFile>target/classes/mrapp-generated-classpath</outputFile>
+              <outputFile>target/test-classes/mrapp-generated-classpath</outputFile>
             </configuration>
           </execution>
         </executions>