svn commit: r667507 - in /hadoop/core/branches/branch-0.18: CHANGES.txt build.xml

[dd...@apache.org]

Author: ddas
Date: Fri Jun 13 05:39:18 2008
New Revision: 667507

URL: http://svn.apache.org/viewvc?rev=667507&view=rev
Log:
Merge -r 667505:667506 from trunk onto 0.18 branch. Fixes HADOOP-3548.

Modified:
    hadoop/core/branches/branch-0.18/CHANGES.txt
    hadoop/core/branches/branch-0.18/build.xml

Modified: hadoop/core/branches/branch-0.18/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/CHANGES.txt?rev=667507&r1=667506&r2=667507&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/CHANGES.txt Fri Jun 13 05:39:18 2008
@@ -580,6 +580,9 @@
     HADOOP-3517. Fixes a problem in the reducer due to which the last InMemory
     merge may be missed. (Arun Murthy via ddas)
 
+    HADOOP-3548. Fixes build.xml to copy all *.jar files to the dist.
+    (Owen O'Malley via ddas)
+
 Release 0.17.0 - 2008-05-18
 
   INCOMPATIBLE CHANGES

Modified: hadoop/core/branches/branch-0.18/build.xml
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/build.xml?rev=667507&r1=667506&r2=667507&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/build.xml (original)
+++ hadoop/core/branches/branch-0.18/build.xml Fri Jun 13 05:39:18 2008
@@ -843,12 +843,10 @@
       <fileset dir="${build.webapps}"/>
     </copy>
 
-    <copy file="${build.dir}/${final.name}-core.jar" todir="${dist.dir}"/>
-
-    <copy file="${build.dir}/${final.name}-examples.jar" todir="${dist.dir}"/>
+    <copy todir="${dist.dir}"> 
+      <fileset file="${build.dir}/${final.name}-*.jar"/>
+    </copy>
     
-    <copy file="${build.dir}/${final.name}-test.jar" todir="${dist.dir}"/>
-
     <copy todir="${dist.dir}/bin">
       <fileset dir="bin"/>
     </copy>