You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by to...@apache.org on 2011/08/02 19:26:11 UTC
svn commit: r1153209 - in /hadoop/common/trunk/mapreduce: ./
src/contrib/capacity-scheduler/ src/contrib/data_join/
src/contrib/dynamic-scheduler/ src/contrib/eclipse-plugin/
src/contrib/fairscheduler/ src/contrib/gridmix/ src/contrib/index/
src/contri...
Author: tomwhite
Date: Tue Aug 2 17:26:09 2011
New Revision: 1153209
URL: http://svn.apache.org/viewvc?rev=1153209&view=rev
Log:
MAPREDUCE-2741. Make ant build system work with hadoop-common JAR generated by Maven. Contributed Alejandro Abdelnur.
Modified:
hadoop/common/trunk/mapreduce/CHANGES.txt
hadoop/common/trunk/mapreduce/ivy.xml
hadoop/common/trunk/mapreduce/src/contrib/capacity-scheduler/ivy.xml
hadoop/common/trunk/mapreduce/src/contrib/data_join/ivy.xml
hadoop/common/trunk/mapreduce/src/contrib/dynamic-scheduler/ivy.xml
hadoop/common/trunk/mapreduce/src/contrib/eclipse-plugin/ivy.xml
hadoop/common/trunk/mapreduce/src/contrib/fairscheduler/ivy.xml
hadoop/common/trunk/mapreduce/src/contrib/gridmix/ivy.xml
hadoop/common/trunk/mapreduce/src/contrib/index/ivy.xml
hadoop/common/trunk/mapreduce/src/contrib/mumak/ivy.xml
hadoop/common/trunk/mapreduce/src/contrib/raid/ivy.xml
hadoop/common/trunk/mapreduce/src/contrib/streaming/ivy.xml
hadoop/common/trunk/mapreduce/src/contrib/vaidya/ivy.xml
hadoop/common/trunk/mapreduce/src/contrib/vertica/ivy.xml
Modified: hadoop/common/trunk/mapreduce/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/mapreduce/CHANGES.txt?rev=1153209&r1=1153208&r2=1153209&view=diff
==============================================================================
--- hadoop/common/trunk/mapreduce/CHANGES.txt (original)
+++ hadoop/common/trunk/mapreduce/CHANGES.txt Tue Aug 2 17:26:09 2011
@@ -372,6 +372,9 @@ Trunk (unreleased changes)
in CompletedJobStatusStore, TaskLog, EventWriter and TotalOrderPartitioner.
(Devaraj K via szetszwo)
+ MAPREDUCE-2741. Make ant build system work with hadoop-common JAR
+ generated by Maven. (Alejandro Abdelnur via tomwhite)
+
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/common/trunk/mapreduce/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/mapreduce/ivy.xml?rev=1153209&r1=1153208&r2=1153209&view=diff
==============================================================================
--- hadoop/common/trunk/mapreduce/ivy.xml (original)
+++ hadoop/common/trunk/mapreduce/ivy.xml Tue Aug 2 17:26:09 2011
@@ -57,6 +57,7 @@
<artifact conf="master"/>
</publications>
<dependencies>
+ <dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}" conf="compile->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common"
rev="${hadoop-common.version}" conf="compile->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common-test"
@@ -105,6 +106,8 @@
<exclude module="jetty"/>
<exclude module="slf4j-simple"/>
</dependency>
+ <dependency org="junit" name="junit" rev="${junit.version}"
+ conf="test->default"/>
<dependency org="org.mockito" name="mockito-all" rev="${mockito-all.version}"
conf="test->default"/>
<dependency org="org.vafer" name="jdeb" rev="${jdeb.version}" conf="package->master"/>
@@ -116,6 +119,12 @@
<dependency org="org.aspectj" name="aspectjtools" rev="${aspectj.version}"
conf="compile->default"/>
+ <!-- Exclusions for transitive dependencies pulled in by log4j -->
+ <exclude org="com.sun.jdmk"/>
+ <exclude org="com.sun.jmx"/>
+ <exclude org="javax.jms"/>
+ <exclude org="javax.mail"/>
+
</dependencies>
</ivy-module>
Modified: hadoop/common/trunk/mapreduce/src/contrib/capacity-scheduler/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/mapreduce/src/contrib/capacity-scheduler/ivy.xml?rev=1153209&r1=1153208&r2=1153209&view=diff
==============================================================================
--- hadoop/common/trunk/mapreduce/src/contrib/capacity-scheduler/ivy.xml (original)
+++ hadoop/common/trunk/mapreduce/src/contrib/capacity-scheduler/ivy.xml Tue Aug 2 17:26:09 2011
@@ -41,6 +41,7 @@
<artifact conf="master"/>
</publications>
<dependencies>
+ <dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common"
rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common-test"
@@ -75,5 +76,12 @@
<exclude module="jetty"/>
<exclude module="slf4j-simple"/>
</dependency>
+
+ <!-- Exclusions for transitive dependencies pulled in by log4j -->
+ <exclude org="com.sun.jdmk"/>
+ <exclude org="com.sun.jmx"/>
+ <exclude org="javax.jms"/>
+ <exclude org="javax.mail"/>
+
</dependencies>
</ivy-module>
Modified: hadoop/common/trunk/mapreduce/src/contrib/data_join/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/mapreduce/src/contrib/data_join/ivy.xml?rev=1153209&r1=1153208&r2=1153209&view=diff
==============================================================================
--- hadoop/common/trunk/mapreduce/src/contrib/data_join/ivy.xml (original)
+++ hadoop/common/trunk/mapreduce/src/contrib/data_join/ivy.xml Tue Aug 2 17:26:09 2011
@@ -41,11 +41,20 @@
<artifact conf="master"/>
</publications>
<dependencies>
+ <dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common-test" rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="${hadoop-hdfs.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-hdfs-test" rev="${hadoop-hdfs.version}" conf="common->default"/>
<dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}" conf="common->default"/>
<dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master"/>
+ <dependency org="junit" name="junit" rev="${junit.version}" conf="common->default"/>
+
+ <!-- Exclusions for transitive dependencies pulled in by log4j -->
+ <exclude org="com.sun.jdmk"/>
+ <exclude org="com.sun.jmx"/>
+ <exclude org="javax.jms"/>
+ <exclude org="javax.mail"/>
+
</dependencies>
</ivy-module>
Modified: hadoop/common/trunk/mapreduce/src/contrib/dynamic-scheduler/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/mapreduce/src/contrib/dynamic-scheduler/ivy.xml?rev=1153209&r1=1153208&r2=1153209&view=diff
==============================================================================
--- hadoop/common/trunk/mapreduce/src/contrib/dynamic-scheduler/ivy.xml (original)
+++ hadoop/common/trunk/mapreduce/src/contrib/dynamic-scheduler/ivy.xml Tue Aug 2 17:26:09 2011
@@ -37,6 +37,7 @@
</publications>
<dependencies>
+ <dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="org.mortbay.jetty" name="jetty" rev="${jetty.version}" conf="common->master"/>
<dependency org="org.mortbay.jetty" name="jetty-util" rev="${jetty-util.version}" conf="common->master"/>
@@ -50,5 +51,12 @@
<dependency org="org.mortbay.jetty" name="servlet-api-2.5" rev="${servlet-api-2.5.version}" conf="common->master"/>
<dependency org="junit" name="junit" rev="${junit.version}" conf="common->default"/>
<dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}" conf="common->master"/>
+
+ <!-- Exclusions for transitive dependencies pulled in by log4j -->
+ <exclude org="com.sun.jdmk"/>
+ <exclude org="com.sun.jmx"/>
+ <exclude org="javax.jms"/>
+ <exclude org="javax.mail"/>
+
</dependencies>
</ivy-module>
Modified: hadoop/common/trunk/mapreduce/src/contrib/eclipse-plugin/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/mapreduce/src/contrib/eclipse-plugin/ivy.xml?rev=1153209&r1=1153208&r2=1153209&view=diff
==============================================================================
--- hadoop/common/trunk/mapreduce/src/contrib/eclipse-plugin/ivy.xml (original)
+++ hadoop/common/trunk/mapreduce/src/contrib/eclipse-plugin/ivy.xml Tue Aug 2 17:26:09 2011
@@ -41,9 +41,17 @@
<artifact conf="master"/>
</publications>
<dependencies>
+ <dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="${hadoop-hdfs.version}" conf="common->default"/>
<dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}" conf="common->default"/>
<dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master"/>
+
+ <!-- Exclusions for transitive dependencies pulled in by log4j -->
+ <exclude org="com.sun.jdmk"/>
+ <exclude org="com.sun.jmx"/>
+ <exclude org="javax.jms"/>
+ <exclude org="javax.mail"/>
+
</dependencies>
</ivy-module>
Modified: hadoop/common/trunk/mapreduce/src/contrib/fairscheduler/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/mapreduce/src/contrib/fairscheduler/ivy.xml?rev=1153209&r1=1153208&r2=1153209&view=diff
==============================================================================
--- hadoop/common/trunk/mapreduce/src/contrib/fairscheduler/ivy.xml (original)
+++ hadoop/common/trunk/mapreduce/src/contrib/fairscheduler/ivy.xml Tue Aug 2 17:26:09 2011
@@ -40,6 +40,7 @@
<artifact conf="master"/>
</publications>
<dependencies>
+ <dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common"
rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common-test"
@@ -100,5 +101,12 @@
name="jsp-2.1"
rev="${jetty.version}"
conf="common->master"/>
+
+ <!-- Exclusions for transitive dependencies pulled in by log4j -->
+ <exclude org="com.sun.jdmk"/>
+ <exclude org="com.sun.jmx"/>
+ <exclude org="javax.jms"/>
+ <exclude org="javax.mail"/>
+
</dependencies>
</ivy-module>
Modified: hadoop/common/trunk/mapreduce/src/contrib/gridmix/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/mapreduce/src/contrib/gridmix/ivy.xml?rev=1153209&r1=1153208&r2=1153209&view=diff
==============================================================================
--- hadoop/common/trunk/mapreduce/src/contrib/gridmix/ivy.xml (original)
+++ hadoop/common/trunk/mapreduce/src/contrib/gridmix/ivy.xml Tue Aug 2 17:26:09 2011
@@ -36,6 +36,10 @@
<artifact conf="master"/>
</publications>
<dependencies>
+ <dependency org="org.apache.hadoop"
+ name="hadoop-annotations"
+ rev="${hadoop-common.version}"
+ conf="common->default"/>
<dependency org="org.apache.hadoop"
name="hadoop-common"
rev="${hadoop-common.version}"
@@ -122,5 +126,12 @@
name="paranamer"
rev="${paranamer.version}"
conf="common->default"/>
+
+ <!-- Exclusions for transitive dependencies pulled in by log4j -->
+ <exclude org="com.sun.jdmk"/>
+ <exclude org="com.sun.jmx"/>
+ <exclude org="javax.jms"/>
+ <exclude org="javax.mail"/>
+
</dependencies>
</ivy-module>
Modified: hadoop/common/trunk/mapreduce/src/contrib/index/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/mapreduce/src/contrib/index/ivy.xml?rev=1153209&r1=1153208&r2=1153209&view=diff
==============================================================================
--- hadoop/common/trunk/mapreduce/src/contrib/index/ivy.xml (original)
+++ hadoop/common/trunk/mapreduce/src/contrib/index/ivy.xml Tue Aug 2 17:26:09 2011
@@ -41,6 +41,7 @@
<artifact conf="master"/>
</publications>
<dependencies>
+ <dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common-test" rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="${hadoop-hdfs.version}" conf="common->default"/>
@@ -48,5 +49,13 @@
<dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}" conf="common->default"/>
<dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master"/>
<dependency org="org.apache.lucene" name="lucene-core" rev="${lucene-core.version}" conf="common->default"/>
+ <dependency org="junit" name="junit" rev="${junit.version}" conf="common->default"/>
+
+ <!-- Exclusions for transitive dependencies pulled in by log4j -->
+ <exclude org="com.sun.jdmk"/>
+ <exclude org="com.sun.jmx"/>
+ <exclude org="javax.jms"/>
+ <exclude org="javax.mail"/>
+
</dependencies>
</ivy-module>
Modified: hadoop/common/trunk/mapreduce/src/contrib/mumak/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/mapreduce/src/contrib/mumak/ivy.xml?rev=1153209&r1=1153208&r2=1153209&view=diff
==============================================================================
--- hadoop/common/trunk/mapreduce/src/contrib/mumak/ivy.xml (original)
+++ hadoop/common/trunk/mapreduce/src/contrib/mumak/ivy.xml Tue Aug 2 17:26:09 2011
@@ -39,6 +39,10 @@
<artifact conf="master"/>
</publications>
<dependencies>
+ <dependency org="org.apache.hadoop"
+ name="hadoop-annotations"
+ rev="${hadoop-common.version}"
+ conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common"
rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common-test"
@@ -122,5 +126,12 @@
<exclude module="jetty"/>
<exclude module="slf4j-simple"/>
</dependency>
+
+ <!-- Exclusions for transitive dependencies pulled in by log4j -->
+ <exclude org="com.sun.jdmk"/>
+ <exclude org="com.sun.jmx"/>
+ <exclude org="javax.jms"/>
+ <exclude org="javax.mail"/>
+
</dependencies>
</ivy-module>
Modified: hadoop/common/trunk/mapreduce/src/contrib/raid/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/mapreduce/src/contrib/raid/ivy.xml?rev=1153209&r1=1153208&r2=1153209&view=diff
==============================================================================
--- hadoop/common/trunk/mapreduce/src/contrib/raid/ivy.xml (original)
+++ hadoop/common/trunk/mapreduce/src/contrib/raid/ivy.xml Tue Aug 2 17:26:09 2011
@@ -36,6 +36,7 @@
<artifact conf="master"/>
</publications>
<dependencies>
+ <dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="org.apache.hadoop"
name="hadoop-common"
rev="${hadoop-common.version}"
@@ -122,5 +123,12 @@
name="paranamer"
rev="${paranamer.version}"
conf="common->default"/>
+
+ <!-- Exclusions for transitive dependencies pulled in by log4j -->
+ <exclude org="com.sun.jdmk"/>
+ <exclude org="com.sun.jmx"/>
+ <exclude org="javax.jms"/>
+ <exclude org="javax.mail"/>
+
</dependencies>
</ivy-module>
Modified: hadoop/common/trunk/mapreduce/src/contrib/streaming/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/mapreduce/src/contrib/streaming/ivy.xml?rev=1153209&r1=1153208&r2=1153209&view=diff
==============================================================================
--- hadoop/common/trunk/mapreduce/src/contrib/streaming/ivy.xml (original)
+++ hadoop/common/trunk/mapreduce/src/contrib/streaming/ivy.xml Tue Aug 2 17:26:09 2011
@@ -40,6 +40,7 @@
<artifact conf="master"/>
</publications>
<dependencies>
+ <dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common"
rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common-test"
@@ -76,5 +77,12 @@
</dependency>
<dependency org="org.slf4j" name="slf4j-api"
rev="${slf4j-api.version}" conf="common->master"/>
+
+ <!-- Exclusions for transitive dependencies pulled in by log4j -->
+ <exclude org="com.sun.jdmk"/>
+ <exclude org="com.sun.jmx"/>
+ <exclude org="javax.jms"/>
+ <exclude org="javax.mail"/>
+
</dependencies>
</ivy-module>
Modified: hadoop/common/trunk/mapreduce/src/contrib/vaidya/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/mapreduce/src/contrib/vaidya/ivy.xml?rev=1153209&r1=1153208&r2=1153209&view=diff
==============================================================================
--- hadoop/common/trunk/mapreduce/src/contrib/vaidya/ivy.xml (original)
+++ hadoop/common/trunk/mapreduce/src/contrib/vaidya/ivy.xml Tue Aug 2 17:26:09 2011
@@ -41,8 +41,16 @@
<artifact conf="master"/>
</publications>
<dependencies>
+ <dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master"/>
<dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}" conf="common->default"/>
+
+ <!-- Exclusions for transitive dependencies pulled in by log4j -->
+ <exclude org="com.sun.jdmk"/>
+ <exclude org="com.sun.jmx"/>
+ <exclude org="javax.jms"/>
+ <exclude org="javax.mail"/>
+
</dependencies>
</ivy-module>
Modified: hadoop/common/trunk/mapreduce/src/contrib/vertica/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/mapreduce/src/contrib/vertica/ivy.xml?rev=1153209&r1=1153208&r2=1153209&view=diff
==============================================================================
--- hadoop/common/trunk/mapreduce/src/contrib/vertica/ivy.xml (original)
+++ hadoop/common/trunk/mapreduce/src/contrib/vertica/ivy.xml Tue Aug 2 17:26:09 2011
@@ -40,6 +40,7 @@
<artifact conf="master"/>
</publications>
<dependencies>
+ <dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="org.apache.hadoop"
name="hadoop-common"
rev="${hadoop-common.version}"
@@ -64,5 +65,12 @@
name="log4j"
rev="${log4j.version}"
conf="common->master"/>
+
+ <!-- Exclusions for transitive dependencies pulled in by log4j -->
+ <exclude org="com.sun.jdmk"/>
+ <exclude org="com.sun.jmx"/>
+ <exclude org="javax.jms"/>
+ <exclude org="javax.mail"/>
+
</dependencies>
</ivy-module>