From 75f8caf8d35213914c36651d624186a56168b471 Mon Sep 17 00:00:00 2001
From: Mahadev Konar <mahadev@apache.org>
Date: Wed, 25 Jan 2012 00:16:42 +0000
Subject: [PATCH] MAPREDUCE-3712. The mapreduce tar does not contain the
 hadoop-mapreduce-client-jobclient-tests.jar. (mahadev) - Merging r1235566
 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1235567 13f79535-47bb-0310-9956-ffa450edef68
---
 .../resources/assemblies/hadoop-mapreduce-dist.xml    | 11 +++++++++++
 hadoop-mapreduce-project/CHANGES.txt                  |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
index 57f3c66dad3..281ce0ddcdd 100644
--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
+++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
@@ -127,6 +127,17 @@
         <unpack>false</unpack>
       </binaries>
     </moduleSet>
+    <moduleSet>
+      <includes>
+        <include>org.apache.hadoop:hadoop-mapreduce-client-jobclient</include>
+      </includes>
+      <binaries>
+        <attachmentClassifier>tests</attachmentClassifier>
+        <outputDirectory>share/hadoop/${hadoop.component}</outputDirectory>
+        <includeDependencies>false</includeDependencies>
+        <unpack>false</unpack>
+      </binaries>
+    </moduleSet>
   </moduleSets>
   <dependencySets>
     <dependencySet>
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index a15db7a16e2..175660ef710 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -504,6 +504,9 @@ Release 0.23.1 - Unreleased
     MAPREDUCE-3714. Fixed EventFetcher and Fetcher threads to shut-down properly
     so that reducers don't hang in corner cases. (vinodkv)
 
+    MAPREDUCE-3712. The mapreduce tar does not contain the hadoop-mapreduce-client-
+    jobclient-tests.jar. (mahadev)
+
 Release 0.23.0 - 2011-11-01 
 
   INCOMPATIBLE CHANGES