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

@@ -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

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>