hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject hadoop git commit: MAPREDUCE-4413. MR lib dir contains jdiff (which is gpl) (Nemon Lou via aw)
Date Mon, 09 Feb 2015 22:02:56 GMT
Repository: hadoop
Updated Branches:
  refs/heads/trunk 63613c79c -> aab459c90


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


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/aab459c9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/aab459c9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/aab459c9

Branch: refs/heads/trunk
Commit: aab459c904bf2007c5b230af8c058793935faf89
Parents: 63613c7
Author: Allen Wittenauer <aw@apache.org>
Authored: Mon Feb 9 14:02:47 2015 -0800
Committer: Allen Wittenauer <aw@apache.org>
Committed: Mon Feb 9 14:02:47 2015 -0800

----------------------------------------------------------------------
 .../src/main/resources/assemblies/hadoop-mapreduce-dist.xml        | 1 +
 hadoop-mapreduce-project/CHANGES.txt                               | 2 ++
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/aab459c9/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
----------------------------------------------------------------------
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 247b09c..df08c6c 100644
--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
+++ b/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>

http://git-wip-us.apache.org/repos/asf/hadoop/blob/aab459c9/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index c71fee8..246f18d 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/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


Mime
View raw message