MAPREDUCE-4413. MR lib dir contains jdiff (which is gpl) (Nemon Lou via aw)

hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml

@@ -195,6 +195,7 @@
         <exclude>org.slf4j:slf4j-api</exclude>
         <exclude>org.slf4j:slf4j-log4j12</exclude>
         <exclude>org.hsqldb:hsqldb</exclude>
+        <exclude>jdiff:jdiff:jar</exclude>
       </excludes>
     </dependencySet>
     <dependencySet>

hadoop-mapreduce-project/CHANGES.txt

@@ -168,6 +168,8 @@ Trunk (Unreleased)
     MAPREDUCE-6161. mapred hsadmin command missing from trunk (Allen Wittenauer
     via jlowe)
 
+    MAPREDUCE-4413. MR lib dir contains jdiff (which is gpl) (Nemon Lou via aw)
+
   BREAKDOWN OF MAPREDUCE-2841 (NATIVE TASK) SUBTASKS
 
     MAPREDUCE-5985. native-task: Fix build on macosx. Contributed by