Author: omalley
Date: Tue Mar 8 05:58:24 2011
New Revision: 1079230
URL: http://svn.apache.org/viewvc?rev=1079230&view=rev
Log:
commit a87de38a905a663aa58c01b1c699f76969a76b20
Author: Luke Lu <[email protected]>
Date: Mon Dec 20 15:10:00 2010 -0800
Fix dependencies in contrib projects
Modified:
hadoop/mapreduce/branches/yahoo-merge/src/contrib/capacity-scheduler/ivy.xml
hadoop/mapreduce/branches/yahoo-merge/src/contrib/data_join/ivy.xml
hadoop/mapreduce/branches/yahoo-merge/src/contrib/dynamic-scheduler/ivy.xml
hadoop/mapreduce/branches/yahoo-merge/src/contrib/eclipse-plugin/ivy.xml
hadoop/mapreduce/branches/yahoo-merge/src/contrib/fairscheduler/ivy.xml
hadoop/mapreduce/branches/yahoo-merge/src/contrib/gridmix/ivy.xml
hadoop/mapreduce/branches/yahoo-merge/src/contrib/index/ivy.xml
hadoop/mapreduce/branches/yahoo-merge/src/contrib/index/ivy/libraries.properties
hadoop/mapreduce/branches/yahoo-merge/src/contrib/mrunit/ivy.xml
hadoop/mapreduce/branches/yahoo-merge/src/contrib/mumak/ivy.xml
hadoop/mapreduce/branches/yahoo-merge/src/contrib/mumak/ivy/libraries.properties
hadoop/mapreduce/branches/yahoo-merge/src/contrib/raid/ivy.xml
hadoop/mapreduce/branches/yahoo-merge/src/contrib/streaming/ivy.xml
hadoop/mapreduce/branches/yahoo-merge/src/contrib/vaidya/ivy.xml
hadoop/mapreduce/branches/yahoo-merge/src/contrib/vertica/ivy.xml
Modified:
hadoop/mapreduce/branches/yahoo-merge/src/contrib/capacity-scheduler/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/contrib/capacity-scheduler/ivy.xml?rev=1079230&r1=1079229&r2=1079230&view=diff
==============================================================================
---
hadoop/mapreduce/branches/yahoo-merge/src/contrib/capacity-scheduler/ivy.xml
(original)
+++
hadoop/mapreduce/branches/yahoo-merge/src/contrib/capacity-scheduler/ivy.xml
Tue Mar 8 05:58:24 2011
@@ -49,31 +49,5 @@
rev="${hadoop-hdfs.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-hdfs-test"
rev="${hadoop-hdfs.version}" conf="test->default"/>
- <dependency org="commons-cli" name="commons-cli"
- rev="${commons-cli.version}" conf="common->default"/>
- <dependency org="commons-logging" name="commons-logging"
- rev="${commons-logging.version}" conf="common->default"/>
- <dependency org="junit" name="junit"
- rev="${junit.version}" conf="common->default"/>
- <dependency org="log4j" name="log4j"
- rev="${log4j.version}" conf="common->master"/>
- <dependency org="org.mortbay.jetty" name="jetty-util"
- rev="${jetty-util.version}" conf="common->master"/>
- <dependency org="org.mortbay.jetty" name="jetty"
- rev="${jetty.version}" conf="common->master"/>
- <dependency org="org.mortbay.jetty" name="jsp-api-2.1"
- rev="${jetty.version}" conf="common->master"/>
- <dependency org="org.mortbay.jetty" name="jsp-2.1"
- rev="${jetty.version}" conf="common->master"/>
- <dependency org="org.mortbay.jetty" name="servlet-api-2.5"
- rev="${servlet-api-2.5.version}" conf="common->master"/>
- <dependency org="commons-httpclient" name="commons-httpclient"
- rev="${commons-httpclient.version}" conf="common->master"/>
- <dependency org="org.apache.hadoop" name="avro"
- rev="${avro.version}" conf="common->default">
- <exclude module="ant"/>
- <exclude module="jetty"/>
- <exclude module="slf4j-simple"/>
- </dependency>
</dependencies>
</ivy-module>
Modified: hadoop/mapreduce/branches/yahoo-merge/src/contrib/data_join/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/contrib/data_join/ivy.xml?rev=1079230&r1=1079229&r2=1079230&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/src/contrib/data_join/ivy.xml
(original)
+++ hadoop/mapreduce/branches/yahoo-merge/src/contrib/data_join/ivy.xml Tue Mar
8 05:58:24 2011
@@ -45,7 +45,5 @@
<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"/>
</dependencies>
</ivy-module>
Modified:
hadoop/mapreduce/branches/yahoo-merge/src/contrib/dynamic-scheduler/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/contrib/dynamic-scheduler/ivy.xml?rev=1079230&r1=1079229&r2=1079230&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/src/contrib/dynamic-scheduler/ivy.xml
(original)
+++ hadoop/mapreduce/branches/yahoo-merge/src/contrib/dynamic-scheduler/ivy.xml
Tue Mar 8 05:58:24 2011
@@ -38,17 +38,5 @@
<dependencies>
<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"/>
- <dependency org="tomcat" name="jasper-runtime" rev="${jasper.version}"
conf="common->master"/>
- <dependency org="tomcat" name="jasper-compiler" rev="${jasper.version}"
conf="common->master"/>
- <dependency org="commons-el" name="commons-el" rev="${commons-el.version}"
conf="common->master"/>
- <dependency org="commons-logging" name="commons-logging"
rev="${commons-logging.version}" conf="common->master"/>
- <dependency org="log4j" name="log4j" rev="${log4j.version}"
conf="common->master"/>
- <dependency org="net.java.dev.jets3t" name="jets3t"
rev="${jets3t.version}" conf="common->master"/>
- <dependency org="commons-net" name="commons-net"
rev="${commons-net.version}" conf="common->master"/>
- <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"/>
</dependencies>
</ivy-module>
Modified:
hadoop/mapreduce/branches/yahoo-merge/src/contrib/eclipse-plugin/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/contrib/eclipse-plugin/ivy.xml?rev=1079230&r1=1079229&r2=1079230&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/src/contrib/eclipse-plugin/ivy.xml
(original)
+++ hadoop/mapreduce/branches/yahoo-merge/src/contrib/eclipse-plugin/ivy.xml
Tue Mar 8 05:58:24 2011
@@ -43,7 +43,5 @@
<dependencies>
<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"/>
</dependencies>
</ivy-module>
Modified:
hadoop/mapreduce/branches/yahoo-merge/src/contrib/fairscheduler/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/contrib/fairscheduler/ivy.xml?rev=1079230&r1=1079229&r2=1079230&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/src/contrib/fairscheduler/ivy.xml
(original)
+++ hadoop/mapreduce/branches/yahoo-merge/src/contrib/fairscheduler/ivy.xml Tue
Mar 8 05:58:24 2011
@@ -48,57 +48,5 @@
rev="${hadoop-hdfs.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-hdfs-test"
rev="${hadoop-hdfs.version}" conf="test->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="org.mortbay.jetty"
- name="servlet-api-2.5"
- rev="${servlet-api-2.5.version}"
- conf="common->default"/>
- <dependency org="junit"
- name="junit"
- rev="${junit.version}"
- conf="common->default"/>
- <dependency org="org.apache.hadoop"
- name="avro"
- rev="${avro.version}"
- conf="common->default">
- <exclude module="ant"/>
- <exclude module="jetty"/>
- <exclude module="slf4j-simple"/>
- </dependency>
- <dependency org="org.codehaus.jackson"
- name="jackson-mapper-asl"
- rev="${jackson.version}"
- conf="common->default"/>
- <dependency org="com.thoughtworks.paranamer"
- name="paranamer"
- rev="${paranamer.version}"
- conf="common->default"/>
- <dependency org="com.thoughtworks.paranamer"
- name="paranamer-ant"
- rev="${paranamer.version}"
- conf="common->default"/>
- <dependency org="org.mortbay.jetty"
- name="jetty-util"
- rev="${jetty-util.version}"
- conf="common->master"/>
- <dependency org="org.mortbay.jetty"
- name="jetty"
- rev="${jetty.version}"
- conf="common->master"/>
- <dependency org="org.mortbay.jetty"
- name="jsp-api-2.1"
- rev="${jetty.version}"
- conf="common->master"/>
- <dependency org="org.mortbay.jetty"
- name="jsp-2.1"
- rev="${jetty.version}"
- conf="common->master"/>
</dependencies>
</ivy-module>
Modified: hadoop/mapreduce/branches/yahoo-merge/src/contrib/gridmix/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/contrib/gridmix/ivy.xml?rev=1079230&r1=1079229&r2=1079230&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/src/contrib/gridmix/ivy.xml (original)
+++ hadoop/mapreduce/branches/yahoo-merge/src/contrib/gridmix/ivy.xml Tue Mar
8 05:58:24 2011
@@ -52,75 +52,5 @@
name="hadoop-hdfs-test"
rev="${hadoop-hdfs.version}"
conf="test->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"/>
-
- <!-- necessary for Mini*Clusters -->
- <dependency org="commons-httpclient"
- name="commons-httpclient"
- rev="${commons-httpclient.version}"
- conf="common->master"/>
- <dependency org="commons-codec"
- name="commons-codec"
- rev="${commons-codec.version}"
- conf="common->default"/>
- <dependency org="commons-net"
- name="commons-net"
- rev="${commons-net.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"/>
- <dependency org="org.mortbay.jetty"
- name="jsp-api-2.1"
- rev="${jetty.version}"
- conf="common->master"/>
- <dependency org="org.mortbay.jetty"
- name="jsp-2.1"
- rev="${jetty.version}"
- conf="common->master"/>
- <dependency org="org.mortbay.jetty"
- name="servlet-api-2.5"
- rev="${servlet-api-2.5.version}"
- conf="common->master"/>
- <dependency org="commons-cli"
- name="commons-cli"
- rev="${commons-cli.version}"
- conf="common->default"/>
- <dependency org="org.apache.hadoop"
- name="avro"
- rev="${avro.version}"
- conf="common->default">
- <exclude module="ant"/>
- <exclude module="jetty"/>
- <exclude module="slf4j-simple"/>
- </dependency>
- <dependency org="org.codehaus.jackson"
- name="jackson-mapper-asl"
- rev="${jackson.version}"
- conf="common->default"/>
- <dependency org="org.codehaus.jackson"
- name="jackson-core-asl"
- rev="${jackson.version}"
- conf="common->default"/>
- <dependency org="com.thoughtworks.paranamer"
- name="paranamer"
- rev="${paranamer.version}"
- conf="common->default"/>
</dependencies>
</ivy-module>
Modified: hadoop/mapreduce/branches/yahoo-merge/src/contrib/index/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/contrib/index/ivy.xml?rev=1079230&r1=1079229&r2=1079230&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/src/contrib/index/ivy.xml (original)
+++ hadoop/mapreduce/branches/yahoo-merge/src/contrib/index/ivy.xml Tue Mar 8
05:58:24 2011
@@ -45,8 +45,6 @@
<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="org.apache.lucene" name="lucene-core"
rev="${lucene-core.version}" conf="common->default"/>
</dependencies>
</ivy-module>
Modified:
hadoop/mapreduce/branches/yahoo-merge/src/contrib/index/ivy/libraries.properties
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/contrib/index/ivy/libraries.properties?rev=1079230&r1=1079229&r2=1079230&view=diff
==============================================================================
---
hadoop/mapreduce/branches/yahoo-merge/src/contrib/index/ivy/libraries.properties
(original)
+++
hadoop/mapreduce/branches/yahoo-merge/src/contrib/index/ivy/libraries.properties
Tue Mar 8 05:58:24 2011
@@ -14,3 +14,5 @@
#These are the versions of our dependencies (in alphabetical order)
#Please list the dependencies name with version if they are different from the
ones listed in the global libraries.propertiesfile
+
+lucene-core.version=2.3.1
Modified: hadoop/mapreduce/branches/yahoo-merge/src/contrib/mrunit/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/contrib/mrunit/ivy.xml?rev=1079230&r1=1079229&r2=1079230&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/src/contrib/mrunit/ivy.xml (original)
+++ hadoop/mapreduce/branches/yahoo-merge/src/contrib/mrunit/ivy.xml Tue Mar 8
05:58:24 2011
@@ -42,14 +42,6 @@
</publications>
<dependencies>
<dependency org="org.apache.hadoop" name="hadoop-common"
rev="${hadoop-common.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->master"/>
- <dependency org="org.apache.hadoop" name="avro" rev="${avro.version}"
conf="common->default">
- <exclude module="ant"/>
- <exclude module="jetty"/>
- <exclude module="slf4j-simple"/>
- </dependency>
</dependencies>
</ivy-module>
Modified: hadoop/mapreduce/branches/yahoo-merge/src/contrib/mumak/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/contrib/mumak/ivy.xml?rev=1079230&r1=1079229&r2=1079230&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/src/contrib/mumak/ivy.xml (original)
+++ hadoop/mapreduce/branches/yahoo-merge/src/contrib/mumak/ivy.xml Tue Mar 8
05:58:24 2011
@@ -47,80 +47,9 @@
rev="${hadoop-hdfs.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-hdfs-test"
rev="${hadoop-hdfs.version}" conf="test->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="org.codehaus.jackson"
- name="jackson-mapper-asl"
- rev="${jackson.version}"
- conf="common->default"/>
- <dependency org="org.codehaus.jackson"
- name="jackson-core-asl"
- rev="${jackson.version}"
- conf="common->default"/>
- <dependency org="junit"
- name="junit"
- rev="${junit.version}"
- conf="common->default"/>
- <dependency org="org.aspectj"
- name="aspectjrt"
- rev="${aspectj.version}"
- conf="common->default">
- </dependency>
- <dependency org="org.aspectj"
- name="aspectjtools"
- rev="${aspectj.version}"
- conf="common->default">
- </dependency>
- <!-- necessary for Mini*Clusters -->
- <dependency org="commons-httpclient"
- name="commons-httpclient"
- rev="${commons-httpclient.version}"
- conf="common->master"/>
- <dependency org="commons-codec"
- name="commons-codec"
- rev="${commons-codec.version}"
- conf="common->default"/>
- <dependency org="commons-net"
- name="commons-net"
- rev="${commons-net.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"/>
- <dependency org="org.mortbay.jetty"
- name="jsp-api-2.1"
- rev="${jetty.version}"
- conf="common->master"/>
- <dependency org="org.mortbay.jetty"
- name="jsp-2.1"
- rev="${jetty.version}"
- conf="common->master"/>
- <dependency org="org.mortbay.jetty"
- name="servlet-api-2.5"
- rev="${servlet-api-2.5.version}"
- conf="common->master"/>
- <dependency org="commons-cli"
- name="commons-cli"
- rev="${commons-cli.version}"
- conf="common->default"/>
- <dependency org="org.apache.hadoop"
- name="avro"
- rev="${avro.version}"
- conf="common->default">
- <exclude module="ant"/>
- <exclude module="jetty"/>
- <exclude module="slf4j-simple"/>
- </dependency>
+ <dependency org="org.aspectj" name="aspectjrt" rev="${aspectj.version}"
+ conf="common->default"/>
+ <dependency org="org.aspectj" name="aspectjtools" rev="${aspectj.version}"
+ conf="common->default"/>
</dependencies>
</ivy-module>
Modified:
hadoop/mapreduce/branches/yahoo-merge/src/contrib/mumak/ivy/libraries.properties
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/contrib/mumak/ivy/libraries.properties?rev=1079230&r1=1079229&r2=1079230&view=diff
==============================================================================
---
hadoop/mapreduce/branches/yahoo-merge/src/contrib/mumak/ivy/libraries.properties
(original)
+++
hadoop/mapreduce/branches/yahoo-merge/src/contrib/mumak/ivy/libraries.properties
Tue Mar 8 05:58:24 2011
@@ -19,5 +19,3 @@
#Please list the dependencies name with version if they are different from the
ones
#listed in the global libraries.properties file (in alphabetical order)
-jackson.version=1.0.1
-aspectj.version=1.6.5
Modified: hadoop/mapreduce/branches/yahoo-merge/src/contrib/raid/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/contrib/raid/ivy.xml?rev=1079230&r1=1079229&r2=1079230&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/src/contrib/raid/ivy.xml (original)
+++ hadoop/mapreduce/branches/yahoo-merge/src/contrib/raid/ivy.xml Tue Mar 8
05:58:24 2011
@@ -52,75 +52,5 @@
name="hadoop-hdfs-test"
rev="${hadoop-hdfs.version}"
conf="test->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"/>
-
- <!-- necessary for Mini*Clusters -->
- <dependency org="commons-httpclient"
- name="commons-httpclient"
- rev="${commons-httpclient.version}"
- conf="common->master"/>
- <dependency org="commons-codec"
- name="commons-codec"
- rev="${commons-codec.version}"
- conf="common->default"/>
- <dependency org="commons-net"
- name="commons-net"
- rev="${commons-net.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"/>
- <dependency org="org.mortbay.jetty"
- name="jsp-api-2.1"
- rev="${jetty.version}"
- conf="common->master"/>
- <dependency org="org.mortbay.jetty"
- name="jsp-2.1"
- rev="${jetty.version}"
- conf="common->master"/>
- <dependency org="org.mortbay.jetty"
- name="servlet-api-2.5"
- rev="${servlet-api-2.5.version}"
- conf="common->master"/>
- <dependency org="commons-cli"
- name="commons-cli"
- rev="${commons-cli.version}"
- conf="common->default"/>
- <dependency org="org.apache.hadoop"
- name="avro"
- rev="${avro.version}"
- conf="common->default">
- <exclude module="ant"/>
- <exclude module="jetty"/>
- <exclude module="slf4j-simple"/>
- </dependency>
- <dependency org="org.codehaus.jackson"
- name="jackson-mapper-asl"
- rev="${jackson.version}"
- conf="common->default"/>
- <dependency org="org.codehaus.jackson"
- name="jackson-core-asl"
- rev="${jackson.version}"
- conf="common->default"/>
- <dependency org="com.thoughtworks.paranamer"
- name="paranamer"
- rev="${paranamer.version}"
- conf="common->default"/>
</dependencies>
</ivy-module>
Modified: hadoop/mapreduce/branches/yahoo-merge/src/contrib/streaming/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/contrib/streaming/ivy.xml?rev=1079230&r1=1079229&r2=1079230&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/src/contrib/streaming/ivy.xml
(original)
+++ hadoop/mapreduce/branches/yahoo-merge/src/contrib/streaming/ivy.xml Tue Mar
8 05:58:24 2011
@@ -48,33 +48,5 @@
rev="${hadoop-hdfs.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-hdfs-test"
rev="${hadoop-hdfs.version}" conf="test->default"/>
- <dependency org="commons-cli" name="commons-cli"
- rev="${commons-cli.version}" conf="common->default"/>
- <dependency org="commons-logging" name="commons-logging"
- rev="${commons-logging.version}" conf="common->default"/>
- <dependency org="junit" name="junit"
- rev="${junit.version}" conf="common->default"/>
- <dependency org="org.mortbay.jetty" name="jetty-util"
- rev="${jetty-util.version}" conf="common->master"/>
- <dependency org="org.mortbay.jetty" name="jetty"
- rev="${jetty.version}" conf="common->master"/>
- <dependency org="org.mortbay.jetty" name="jsp-api-2.1"
- rev="${jetty.version}" conf="common->master"/>
- <dependency org="org.mortbay.jetty" name="jsp-2.1"
- rev="${jetty.version}" conf="common->master"/>
- <dependency org="org.mortbay.jetty" name="servlet-api-2.5"
- rev="${servlet-api-2.5.version}" conf="common->master"/>
- <dependency org="commons-httpclient" name="commons-httpclient"
- rev="${commons-httpclient.version}" conf="common->default"/>
- <dependency org="log4j" name="log4j"
- rev="${log4j.version}" conf="common->master"/>
- <dependency org="org.apache.hadoop" name="avro"
- rev="${avro.version}" conf="common->default">
- <exclude module="ant"/>
- <exclude module="jetty"/>
- <exclude module="slf4j-simple"/>
- </dependency>
- <dependency org="org.slf4j" name="slf4j-api"
- rev="${slf4j-api.version}" conf="common->master"/>
</dependencies>
</ivy-module>
Modified: hadoop/mapreduce/branches/yahoo-merge/src/contrib/vaidya/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/contrib/vaidya/ivy.xml?rev=1079230&r1=1079229&r2=1079230&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/src/contrib/vaidya/ivy.xml (original)
+++ hadoop/mapreduce/branches/yahoo-merge/src/contrib/vaidya/ivy.xml Tue Mar 8
05:58:24 2011
@@ -42,7 +42,5 @@
</publications>
<dependencies>
<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"/>
</dependencies>
</ivy-module>
Modified: hadoop/mapreduce/branches/yahoo-merge/src/contrib/vertica/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/contrib/vertica/ivy.xml?rev=1079230&r1=1079229&r2=1079230&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/src/contrib/vertica/ivy.xml (original)
+++ hadoop/mapreduce/branches/yahoo-merge/src/contrib/vertica/ivy.xml Tue Mar
8 05:58:24 2011
@@ -44,25 +44,5 @@
name="hadoop-common"
rev="${hadoop-common.version}"
conf="common->default"/>
- <dependency org="commons-logging"
- name="commons-logging"
- rev="${commons-logging.version}"
- conf="common->default"/>
- <dependency org="commons-httpclient"
- name="commons-httpclient"
- rev="${commons-httpclient.version}"
- conf="common->default"/>
- <dependency org="commons-cli"
- name="commons-cli"
- rev="${commons-cli.version}"
- conf="common->default"/>
- <dependency org="junit"
- name="junit"
- rev="${junit.version}"
- conf="common->default"/>
- <dependency org="log4j"
- name="log4j"
- rev="${log4j.version}"
- conf="common->master"/>
</dependencies>
</ivy-module>
