Merge -r 1307622:1307623 from trunk to branch. FIXES: MAPREDUCE-4091

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307624 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce-project/CHANGES.txt

@@ -97,6 +97,8 @@ Release 2.0.0 - UNRELEASED
 
     MAPREDUCE-3916. various issues with running yarn proxyserver (devaraj via tucu)
 
+    MAPREDUCE-4091. tools testcases failing because of MAPREDUCE-4082 (tucu)
+
 Release 0.23.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

@@ -86,6 +86,11 @@
             <phase>test-compile</phase>
           </execution>
         </executions>
+        <configuration>
+          <excludes>
+            <exclude>mrapp-generated-classpath</exclude>
+          </excludes>
+        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
@@ -97,7 +102,7 @@
               <goal>build-classpath</goal>
             </goals>
             <configuration>
-              <outputFile>target/test-classes/mrapp-generated-classpath</outputFile>
+              <outputFile>target/classes/mrapp-generated-classpath</outputFile>
             </configuration>
           </execution>
         </executions>