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 om...@apache.org on 2009/11/24 06:52:48 UTC
svn commit: r883594 - in /hadoop/mapreduce/trunk: ./ ivy/ lib/
src/contrib/block_forensics/ src/contrib/capacity-scheduler/
src/contrib/data_join/ src/contrib/dynamic-scheduler/
src/contrib/eclipse-plugin/ src/contrib/fairscheduler/ src/contrib/gridmix...
Author: omalley
Date: Tue Nov 24 05:52:46 2009
New Revision: 883594
URL: http://svn.apache.org/viewvc?rev=883594&view=rev
Log:
HADOOP-5107. Use Maven ant tasks to publish artifacts. (Giridharan Kesavan
via omalley)
Added:
hadoop/mapreduce/trunk/ivy/hadoop-mapred-examples-template.xml
hadoop/mapreduce/trunk/ivy/hadoop-mapred-template.xml
hadoop/mapreduce/trunk/ivy/hadoop-mapred-test-template.xml
hadoop/mapreduce/trunk/ivy/hadoop-mapred-tools-template.xml
Removed:
hadoop/mapreduce/trunk/ivy/hadoop-core.pom
hadoop/mapreduce/trunk/lib/hadoop-core-0.22.0-dev.jar
hadoop/mapreduce/trunk/lib/hadoop-core-test-0.22.0-dev.jar
hadoop/mapreduce/trunk/lib/hadoop-hdfs-0.22.0-dev.jar
hadoop/mapreduce/trunk/lib/hadoop-hdfs-test-0.22.0-dev.jar
Modified:
hadoop/mapreduce/trunk/CHANGES.txt
hadoop/mapreduce/trunk/build.xml
hadoop/mapreduce/trunk/ivy.xml
hadoop/mapreduce/trunk/ivy/ivysettings.xml
hadoop/mapreduce/trunk/ivy/libraries.properties
hadoop/mapreduce/trunk/src/contrib/block_forensics/ivy.xml
hadoop/mapreduce/trunk/src/contrib/capacity-scheduler/ivy.xml
hadoop/mapreduce/trunk/src/contrib/data_join/ivy.xml
hadoop/mapreduce/trunk/src/contrib/dynamic-scheduler/ivy.xml
hadoop/mapreduce/trunk/src/contrib/eclipse-plugin/ivy.xml
hadoop/mapreduce/trunk/src/contrib/fairscheduler/ivy.xml
hadoop/mapreduce/trunk/src/contrib/gridmix/ivy.xml
hadoop/mapreduce/trunk/src/contrib/index/ivy.xml
hadoop/mapreduce/trunk/src/contrib/mrunit/ivy.xml
hadoop/mapreduce/trunk/src/contrib/mumak/ivy.xml
hadoop/mapreduce/trunk/src/contrib/sqoop/ivy.xml
hadoop/mapreduce/trunk/src/contrib/streaming/ivy.xml
hadoop/mapreduce/trunk/src/contrib/vaidya/ivy.xml
hadoop/mapreduce/trunk/src/contrib/vertica/ivy.xml
Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=883594&r1=883593&r2=883594&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Tue Nov 24 05:52:46 2009
@@ -522,6 +522,9 @@
HDFS-641. Move all of the components that depend on map/reduce to
map/reduce. (omalley)
+ HADOOP-5107. Use Maven ant tasks to publish artifacts. (Giridharan Kesavan
+ via omalley)
+
BUG FIXES
MAPREDUCE-878. Rename fair scheduler design doc to
Modified: hadoop/mapreduce/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/build.xml?rev=883594&r1=883593&r2=883594&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/build.xml (original)
+++ hadoop/mapreduce/trunk/build.xml Tue Nov 24 05:52:46 2009
@@ -18,6 +18,7 @@
-->
<project name="Hadoop" default="compile"
+ xmlns:artifact="urn:maven-artifact-ant"
xmlns:ivy="antlib:org.apache.ivy.ant">
<!-- Load all the default properties, and any the user wants -->
@@ -27,9 +28,7 @@
<property name="Name" value="Hadoop-Mapred"/>
<property name="name" value="hadoop-mapred"/>
- <property name="version" value="0.22.0-dev"/>
- <property name="hadoop-core.version" value="0.22.0-dev"/>
- <property name="hadoop-hdfs.version" value="0.22.0-dev"/>
+ <property name="version" value="0.22.0-SNAPSHOT"/>
<property name="final.name" value="${name}-${version}"/>
<property name="test.final.name" value="${name}-test-${version}"/>
<property name="examples.final.name" value="${name}-examples-${version}"/>
@@ -141,7 +140,7 @@
<property name="jdiff.build.dir" value="${build.docs}/jdiff"/>
<property name="jdiff.xml.dir" value="${lib.dir}/jdiff"/>
- <property name="jdiff.stable" value="0.20.0"/>
+ <property name="jdiff.stable" value="0.21.0"/>
<property name="jdiff.stable.javadoc"
value="http://hadoop.apache.org/core/docs/r${jdiff.stable}/api/"/>
@@ -170,8 +169,13 @@
<!-- IVY properteis set here -->
<property name="ivy.dir" location="ivy" />
<loadproperties srcfile="${ivy.dir}/libraries.properties"/>
+ <property name="mvn.repo" value="http://repo2.maven.org/maven2"/>
<property name="ivy.jar" location="${ivy.dir}/ivy-${ivy.version}.jar"/>
- <property name="ivy_repo_url" value="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar"/>
+ <property name="repo" value="snapshots"/>
+ <property name="asfrepo" value="https://repository.apache.org/content/repositories/${repo}"/>
+ <property name="ant_task.jar" location="${ivy.dir}/maven-ant-tasks-${ant-task.version}.jar"/>
+ <property name="ant_task_repo_url" value="${mvn.repo}/org/apache/maven/maven-ant-tasks/${ant-task.version}/maven-ant-tasks-${ant-task.version}.jar"/>
+ <property name="ivy_repo_url" value="${mvn.repo}/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar"/>
<property name="ivysettings.xml" location="${ivy.dir}/ivysettings.xml" />
<property name="ivy.org" value="org.apache.hadoop"/>
<property name="build.dir" location="build" />
@@ -182,7 +186,11 @@
<property name="build.ivy.report.dir" location="${build.ivy.dir}/report" />
<property name="build.ivy.maven.dir" location="${build.ivy.dir}/maven" />
<property name="build.ivy.maven.pom" location="${build.ivy.maven.dir}/hadoop-mapred-${version}.pom" />
- <property name="build.ivy.maven.jar" location="${build.ivy.maven.dir}/hadoop-core-${version}.jar" />
+ <property name="build.ivy.maven.jar" location="${build.ivy.maven.dir}/hadoop-mapred-${version}.jar" />
+ <property name="hadoop-mapred.pom" location="${ivy.dir}/hadoop-mapred.xml"/>
+ <property name="hadoop-mapred-test.pom" location="${ivy.dir}/hadoop-mapred-test.xml"/>
+ <property name="hadoop-mapred-examples.pom" location="${ivy.dir}/hadoop-mapred-examples.xml"/>
+ <property name="hadoop-mapred-tools.pom" location="${ivy.dir}/hadoop-mapred-tools.xml"/>
<!--this is the naming policy for artifacts we want pulled down-->
<property name="ivy.artifact.retrieve.pattern" value="${ant.project.name}/[conf]/[artifact]-[revision].[ext]"/>
@@ -190,6 +198,9 @@
<!--this is how artifacts that get built are named-->
<property name="ivy.publish.pattern" value="hadoop-[revision]-core.[ext]"/>
<property name="hadoop-mapred.jar" location="${build.dir}/${final.name}.jar" />
+ <property name="hadoop-mapred-test.jar" location="${build.dir}/${test.final.name}.jar" />
+ <property name="hadoop-mapred-examples.jar" location="${build.dir}/${examples.final.name}.jar" />
+ <property name="hadoop-mapred-tools.jar" location="${build.dir}/${tools.final.name}.jar" />
<!-- jdiff.home property set -->
<property name="jdiff.home" value="${build.ivy.lib.dir}/${ant.project.name}/jdiff"/>
@@ -211,8 +222,6 @@
<path id="classpath">
<pathelement location="${build.classes}"/>
<pathelement location="${conf.dir}"/>
- <pathelement path="${lib.dir}/hadoop-core-${hadoop-core.version}.jar"/>
- <pathelement path="${lib.dir}/hadoop-hdfs-${hadoop-hdfs.version}.jar"/>
<path refid="ivy-common.classpath"/>
</path>
@@ -224,8 +233,6 @@
<pathelement location="${build.examples}"/>
<pathelement location="${build.tools}"/>
<pathelement path="${clover.jar}"/>
- <pathelement path="${lib.dir}/hadoop-core-test-${hadoop-core.version}.jar"/>
- <pathelement path="${lib.dir}/hadoop-hdfs-test-${hadoop-hdfs.version}.jar"/>
<path refid="classpath"/>
<pathelement location="${test.mapred.build.classes}" />
<path refid="ivy-test.classpath"/>
@@ -239,8 +246,6 @@
<pathelement location="${build.dir}"/>
</path>
- <!-- properties dependent on the items defined above. -->
- <!--<available classname="${rat.reporting.classname}" classpathref="classpath" property="rat.present" value="true"/> -->
<!-- ====================================================== -->
<!-- Macro definitions -->
@@ -287,7 +292,7 @@
</fileset>
</copy>
- <unzip src="${lib.dir}/hadoop-hdfs-${hadoop-hdfs.version}.jar"
+ <unzip src="${common.ivy.lib.dir}/hadoop-hdfs-${hadoop-hdfs.version}.jar"
dest="${build.dir}">
<patternset>
<include name="webapps/hdfs/**"/>
@@ -416,7 +421,7 @@
</target>
<!-- ================================================================== -->
- <!-- Make hadoop-mapred.jar -->
+ <!-- Make hadoop-mapred.jar -->
<!-- ================================================================== -->
<!-- -->
<!-- ================================================================== -->
@@ -1105,6 +1110,123 @@
</macro_tar>
</target>
+ <target name="ant-task-download" description="To download mvn-ant-task">
+ <get src="${ant_task_repo_url}" dest="${ant_task.jar}" usetimestamp="true"/>
+ </target>
+
+ <target name="mvn-taskdef" depends="ant-task-download">
+ <path id="mvn-ant-task.classpath" path="${ant_task.jar}"/>
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+ uri="urn:maven-artifact-ant"
+ classpathref="mvn-ant-task.classpath"/>
+ </target>
+
+ <target name="clean-cache" description="Clean. Delete ivy cache">
+ <delete dir="${user.home}/.ivy2/cache/org.apache.hadoop/hadoop-core"/>
+ <delete dir="${user.home}/.ivy2/cache/org.apache.hadoop/hadoop-core-test"/>
+ <delete dir="${user.home}/.ivy2/cache/org.apache.hadoop/hadoop-hdfs"/>
+ <delete dir="${user.home}/.ivy2/cache/org.apache.hadoop/hadoop-hdfs-test"/>
+ </target>
+
+ <target name="mvn-install-mapred" depends="mvn-taskdef,examples,tools,set-version">
+ <artifact:pom file="${hadoop-mapred.pom}" id="hadoop.mapred"/>
+ <artifact:pom file="${hadoop-mapred-examples.pom}" id="hadoop.mapred.examples"/>
+ <artifact:pom file="${hadoop-mapred-tools.pom}" id="hadoop.mapred.tools"/>
+
+ <artifact:install file="${hadoop-mapred.jar}">
+ <pom refid="hadoop.mapred"/>
+ </artifact:install>
+ <artifact:install file="${hadoop-mapred-examples.jar}">
+ <pom refid="hadoop.mapred.examples"/>
+ </artifact:install>
+ <artifact:install file="${hadoop-mapred-tools.jar}">
+ <pom refid="hadoop.mapred.tools"/>
+ </artifact:install>
+ </target>
+
+ <target name="mvn-install" depends="mvn-taskdef,examples,tools,jar-test,set-version">
+ <artifact:pom file="${hadoop-mapred.pom}" id="hadoop.mapred"/>
+ <artifact:pom file="${hadoop-mapred-test.pom}" id="hadoop.mapred.test"/>
+ <artifact:pom file="${hadoop-mapred-examples.pom}" id="hadoop.mapred.examples"/>
+ <artifact:pom file="${hadoop-mapred-tools.pom}" id="hadoop.mapred.tools"/>
+ <artifact:install file="${hadoop-mapred.jar}">
+ <pom refid="hadoop.mapred"/>
+ </artifact:install>
+ <artifact:install file="${hadoop-mapred-test.jar}">
+ <pom refid="hadoop.mapred.test"/>
+ </artifact:install>
+ <artifact:install file="${hadoop-mapred-examples.jar}">
+ <pom refid="hadoop.mapred.examples"/>
+ </artifact:install>
+ <artifact:install file="${hadoop-mapred-tools.jar}">
+ <pom refid="hadoop.mapred.tools"/>
+ </artifact:install>
+ </target>
+
+ <target name="mvn-deploy" depends="mvn-taskdef, examples, tools, jar-test, set-version">
+ <artifact:pom file="${hadoop-mapred.pom}" id="hadoop.mapred"/>
+ <artifact:pom file="${hadoop-mapred-test.pom}" id="hadoop.mapred.test"/>
+ <artifact:pom file="${hadoop-mapred-examples.pom}" id="hadoop.mapred.examples"/>
+ <artifact:pom file="${hadoop-mapred-tools.pom}" id="hadoop.mapred.tools"/>
+
+ <artifact:install-provider artifactId="wagon-http" version="1.0-beta-2"/>
+ <artifact:deploy file="${hadoop-mapred.jar}">
+ <remoteRepository id="apache.snapshots.https" url="${asfrepo}"/>
+ <pom refid="hadoop.mapred"/>
+ </artifact:deploy>
+ <artifact:deploy file="${hadoop-mapred-test.jar}">
+ <remoteRepository id="apache.snapshots.https" url="${asfrepo}"/>
+ <pom refid="hadoop.mapred.test"/>
+ </artifact:deploy>
+ <artifact:deploy file="${hadoop-mapred-examples.jar}">
+ <remoteRepository id="apache.snapshots.https" url="${asfrepo}"/>
+ <pom refid="hadoop.mapred.examples"/>
+ </artifact:deploy>
+ <artifact:deploy file="${hadoop-mapred-tools.jar}">
+ <remoteRepository id="apache.snapshots.https" url="${asfrepo}"/>
+ <pom refid="hadoop.mapred.tools"/>
+ </artifact:deploy>
+ </target>
+
+ <target name="set-version">
+ <delete file="${basedir}/ivy/hadoop-mapred.xml"/>
+ <delete file="${basedir}/ivy/hadoop-mapred-test.xml"/>
+ <delete file="${basedir}/ivy/hadoop-mapred-examples.xml"/>
+ <delete file="${basedir}/ivy/hadoop-mapred-tools.xml"/>
+ <copy file="${basedir}/ivy/hadoop-mapred-template.xml" tofile="${basedir}/ivy/hadoop-mapred.xml"/>
+ <copy file="${basedir}/ivy/hadoop-mapred-test-template.xml" tofile="${basedir}/ivy/hadoop-mapred-test.xml"/>
+ <copy file="${basedir}/ivy/hadoop-mapred-examples-template.xml" tofile="${basedir}/ivy/hadoop-mapred-examples.xml"/>
+ <copy file="${basedir}/ivy/hadoop-mapred-tools-template.xml" tofile="${basedir}/ivy/hadoop-mapred-tools.xml"/>
+ <replaceregexp byline="true">
+ <regexp pattern="@version"/>
+ <substitution expression="${version}"/>
+ <fileset dir="${basedir}/ivy">
+ <include name="hadoop-mapred.xml"/>
+ </fileset>
+ </replaceregexp>
+ <replaceregexp byline="true">
+ <regexp pattern="@version"/>
+ <substitution expression="${version}"/>
+ <fileset dir="${basedir}/ivy">
+ <include name="hadoop-mapred-test.xml"/>
+ </fileset>
+ </replaceregexp>
+ <replaceregexp byline="true">
+ <regexp pattern="@version"/>
+ <substitution expression="${version}"/>
+ <fileset dir="${basedir}/ivy">
+ <include name="hadoop-mapred-examples.xml"/>
+ </fileset>
+ </replaceregexp>
+ <replaceregexp byline="true">
+ <regexp pattern="@version"/>
+ <substitution expression="${version}"/>
+ <fileset dir="${basedir}/ivy">
+ <include name="hadoop-mapred-tools.xml"/>
+ </fileset>
+ </replaceregexp>
+ </target>
+
<!-- ================================================================== -->
<!-- Perform audit activities for the release -->
<!-- ================================================================== -->
@@ -1131,6 +1253,15 @@
<target name="clean" depends="clean-contrib" description="Clean. Delete the build files, and their directories">
<delete dir="${build.dir}"/>
<delete dir="${docs.src}/build"/>
+ <delete file="${hadoop-mapred.pom}"/>
+ <delete file="${hadoop-mapred-test.pom}"/>
+ <delete file="${hadoop-mapred-examples.pom}"/>
+ <delete file="${hadoop-mapred-tools.pom}"/>
+ </target>
+
+ <target name="veryclean" depends="clean" description="veryclean. Delete ivy and ant maven task jar">
+ <delete file="${ant_task.jar}"/>
+ <delete file="${ivy.jar}"/>
</target>
<!-- ================================================================== -->
@@ -1529,72 +1660,6 @@
</echo>
</target>
- <target name="assert-hadoop-jar-exists" depends="ivy-init">
- <fail>
- <condition >
- <not>
- <available file="${hadoop.jar}" />
- </not>
- </condition>
- Not found: ${hadoop.jar}
- Please run the target "jar" in the main build file
- </fail>
-
- </target>
-
- <target name="ready-to-publish" depends="jar,assert-hadoop-jar-exists,ivy-resolve"/>
-
- <target name="ivy-publish-local" depends="ready-to-publish,ivy-resolve">
- <ivy:publish
- settingsRef="${ant.project.name}.ivy.settings"
- resolver="local"
- pubrevision="${version}"
- overwrite="true"
- artifactspattern="${build.dir}/${ivy.publish.pattern}" />
- </target>
-
-
- <!-- this is here for curiosity, to see how well the makepom task works
- Answer: it depends whether you want transitive dependencies excluded or not
- -->
- <target name="makepom" depends="ivy-resolve">
- <ivy:makepom settingsRef="${ant.project.name}.ivy.settings"
- ivyfile="ivy.xml"
- pomfile="${build.ivy.maven.dir}/generated.pom">
- <ivy:mapping conf="default" scope="default"/>
- <ivy:mapping conf="master" scope="master"/>
- <ivy:mapping conf="runtime" scope="runtime"/>
- </ivy:makepom>
- </target>
-
-
- <target name="copy-jar-to-maven" depends="ready-to-publish">
- <copy file="${hadoop.jar}"
- tofile="${build.ivy.maven.jar}"/>
- <checksum file="${build.ivy.maven.jar}" algorithm="md5"/>
- </target>
-
- <target name="copypom" depends="ivy-init-dirs">
-
- <presetdef name="expandingcopy" >
- <copy overwrite="true">
- <filterchain>
- <expandproperties/>
- </filterchain>
- </copy>
- </presetdef>
-
- <expandingcopy file="ivy/hadoop-core.pom"
- tofile="${build.ivy.maven.pom}"/>
- <checksum file="${build.ivy.maven.pom}" algorithm="md5"/>
- </target>
-
- <target name="maven-artifacts" depends="copy-jar-to-maven,copypom" />
-
- <target name="published" depends="ivy-publish-local,maven-artifacts">
-
- </target>
-
<!-- taskcontroller targets -->
<target name="init-task-controller-build">
<mkdir dir="${build.c++.task-controller}" />
Modified: hadoop/mapreduce/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/ivy.xml?rev=883594&r1=883593&r2=883594&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/ivy.xml (original)
+++ hadoop/mapreduce/trunk/ivy.xml Tue Nov 24 05:52:46 2009
@@ -27,50 +27,24 @@
<!--these match the Maven configurations-->
<conf name="default" extends="master,runtime"/>
<conf name="master" description="contains the artifact but no dependencies"/>
- <conf name="runtime" description="runtime but not the artifact"
- extends="client,server,s3-server,kfs"/>
-
- <conf name="mandatory" description="contains the critical dependencies"
- extends="commons-logging,log4j"/>
+ <conf name="compile" description="contains the artifact but no dependencies"/>
+ <conf name="runtime" description="runtime but not the artifact"/>
<!--
These public configurations contain the core dependencies for running hadoop client or server.
The server is effectively a superset of the client.
-->
- <conf name="client" description="client-side dependencies"
- extends="mandatory,httpclient"/>
- <conf name="server" description="server-side dependencies"
- extends="client"/>
- <conf name="s3-client" description="dependencies for working with S3/EC2 infrastructure"
- extends="client"/>
- <conf name="s3-server" description="dependencies for running on S3/EC2 infrastructure"
- extends="s3-client,server"/>
- <conf name="kfs" description="dependencies for KFS file system support"/>
- <conf name="ftp" description="dependencies for workign with FTP filesytems"
- extends="mandatory"/>
- <conf name="jetty" description="Jetty provides the in-VM HTTP daemon" extends="commons-logging"/>
-
<!--Private configurations. -->
- <conf name="common" visibility="private" extends="runtime,mandatory,httpclient,ftp,jetty"
- description="common artifacts"/>
- <conf name="javadoc" visibility="private" description="artiracts required while performing doc generation"
- extends="common,mandatory,jetty,lucene"/>
- <!--Testing pulls in everything-->
- <conf name="test" extends="common,s3-server,kfs" visibility="private"
- description="the classpath needed to run tests"/>
+ <conf name="common" visibility="private" extends="compile,runtime" description="common artifacts"/>
+ <conf name="javadoc" visibility="private" description="artiracts required while performing doc generation" extends="common"/>
+ <conf name="test" extends="common" visibility="private" description="the classpath needed to run tests"/>
- <conf name="test-hdfswithmr" extends="test" visibility="private"
- description="the classpath needed to run tests"/>
+ <conf name="test-hdfswithmr" extends="test" visibility="private" description="the classpath needed to run tests"/>
- <conf name="releaseaudit" visibility="private"
- description="Artifacts required for releaseaudit target"/>
+ <conf name="releaseaudit" visibility="private" description="Artifacts required for releaseaudit target"/>
- <conf name="commons-logging" visibility="private"/>
- <conf name="httpclient" visibility="private" extends="commons-logging"/>
- <conf name="log4j" visibility="private"/>
- <conf name="lucene" visibility="private"/>
- <conf name="jdiff" visibility="private" extends="log4j,s3-client,jetty,server"/>
+ <conf name="jdiff" visibility="private" extends="common"/>
<conf name="checkstyle" visibility="private"/>
</configurations>
@@ -79,212 +53,47 @@
<!--get the artifact from our module name-->
<artifact conf="master"/>
</publications>
- <dependencies>
-
- <!--used client side-->
- <dependency org="commons-cli"
- name="commons-cli"
- rev="${commons-cli.version}"
- conf="client->default"/>
- <dependency org="checkstyle"
- name="checkstyle"
- rev="${checkstyle.version}"
- conf="checkstyle->default"/>
- <dependency org="jdiff"
- name="jdiff"
- rev="${jdiff.version}"
- conf="jdiff->default"/>
- <dependency org="xerces"
- name="xerces"
- rev="${xerces.version}"
- conf="jdiff->default">
- </dependency>
-
- <dependency org="xmlenc"
- name="xmlenc"
- rev="${xmlenc.version}"
- conf="server->default"/>
-
- <!--Configuration: httpclient-->
-
- <!--
- commons-httpclient asks for too many files.
- All it needs is commons-codec and commons-logging JARs
- -->
- <dependency org="commons-httpclient"
- name="commons-httpclient"
- rev="${commons-httpclient.version}"
- conf="httpclient->master">
- </dependency>
-
- <dependency org="commons-codec"
- name="commons-codec"
- rev="${commons-codec.version}"
- conf="httpclient->default"/>
-
- <dependency org="commons-net"
- name="commons-net"
- rev="${commons-net.version}"
- conf="ftp->default"/>
-
- <!--Configuration: Jetty -->
-
-<!-- <dependency org="javax.servlet"
- name="servlet-api"
- rev="${servlet-api.version}"
- conf="jetty->master"/> -->
- <dependency org="org.mortbay.jetty"
- name="jetty"
- rev="${jetty.version}"
- conf="jetty->master"/>
- <dependency org="org.mortbay.jetty"
- name="jetty-util"
- rev="${jetty-util.version}"
- conf="jetty->master"/>
-
- <dependency org="tomcat"
- name="jasper-runtime"
- rev="${jasper.version}"
- conf="jetty->master"/>
- <dependency org="tomcat"
- name="jasper-compiler"
- rev="${jasper.version}"
- conf="jetty->master"/>
- <dependency org="org.mortbay.jetty"
- name="jsp-api-2.1"
- rev="${jetty.version}"
- conf="jetty->master"/>
- <dependency org="org.mortbay.jetty"
- name="jsp-2.1"
- rev="${jetty.version}"
- conf="jetty->master"/>
- <dependency org="commons-el"
- name="commons-el"
- rev="${commons-el.version}"
- conf="jetty->master"/>
-
-
- <!--Configuration: commons-logging -->
-
- <!--it is essential that only the master JAR of commons logging
- is pulled in, as its dependencies are usually a mess, including things
- like out of date servlet APIs, bits of Avalon, etc.
- -->
- <dependency org="commons-logging"
- name="commons-logging"
- rev="${commons-logging.version}"
- conf="commons-logging->master"/>
-
-
- <!--Configuration: commons-logging -->
-
- <!--log4J is not optional until commons-logging.properties is stripped out of the JAR -->
- <dependency org="log4j"
- name="log4j"
- rev="${log4j.version}"
- conf="log4j->master"/>
-
- <!--Configuration: s3-client -->
- <!--there are two jets3t projects in the repository; this one goes up to 0.6 and
- is assumed to be the live one-->
- <dependency org="net.java.dev.jets3t"
- name="jets3t"
- rev="${jets3t.version}"
- conf="s3-client->master"/>
- <dependency org="commons-net"
- name="commons-net"
- rev="${commons-net.version}"
- conf="s3-client->master"/>
- <dependency org="org.mortbay.jetty"
- name="servlet-api-2.5"
- rev="${servlet-api-2.5.version}"
- conf="s3-client->master"/>
- <dependency org="net.sf.kosmosfs"
- name="kfs"
- rev="${kfs.version}"
- conf="kfs->default"/>
-
- <!--Configuration: test -->
- <!--artifacts needed for testing -->
-
- <dependency org="org.apache.ftpserver"
- name="ftplet-api"
- rev="${ftplet-api.version}"
- conf="test->default"/>
- <dependency org="org.apache.mina"
- name="mina-core"
- rev="${mina-core.version}"
- conf="test->default"/>
- <dependency org="org.apache.ftpserver"
- name="ftpserver-core"
- rev="${ftpserver-core.version}"
- conf="test->default"/>
- <dependency org="org.apache.ftpserver"
- name="ftpserver-deprecated"
- rev="${ftpserver-deprecated.version}"
- conf="test->default"/>
-
- <dependency org="junit"
- name="junit"
- rev="${junit.version}"
- conf="common->default"/>
- <dependency org="org.apache.rat"
- name="apache-rat-tasks"
- rev="${rats-lib.version}"
- conf="releaseaudit->default"/>
- <dependency org="commons-lang"
- name="commons-lang"
- rev="${commons-lang.version}"
- conf="releaseaudit->default"/>
- <dependency org="commons-collections"
- name="commons-collections"
- rev="${commons-collections.version}"
- conf="releaseaudit->default"/>
- <dependency org="hsqldb"
- name="hsqldb"
- rev="${hsqldb.version}"
- conf="common->default"/>
- <dependency org="org.apache.lucene"
- name="lucene-core"
- rev="${lucene-core.version}"
- conf="javadoc->default"/>
- <dependency org="commons-logging"
- name="commons-logging-api"
- rev="${commons-logging-api.version}"
- conf="common->default"/>
- <dependency org="org.slf4j"
- name="slf4j-api"
- rev="${slf4j-api.version}"
- conf="common->master"/>
- <dependency org="org.eclipse.jdt"
- name="core"
- rev="${core.version}"
- conf="common->master"/>
- <dependency org="oro"
- name="oro"
- rev="${oro.version}"
- conf="common->default"/>
- <dependency org="org.slf4j"
- name="slf4j-log4j12"
- rev="${slf4j-log4j12.version}"
- conf="common->master">
- </dependency>
- <dependency org="org.apache.hadoop"
- name="avro"
- rev="${avro.version}"
- conf="common->default"/>
- <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>
+ <dependencies>
+ <dependency org="org.apache.hadoop" name="hadoop-core"
+ rev="${hadoop-core.version}" conf="common->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-core-test"
+ rev="${hadoop-core.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->master"/>
+ <dependency org="log4j" name="log4j" rev="${log4j.version}"
+ conf="common->master"/>
+
+ <dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}"
+ conf="test->master"/>
+ <dependency org="org.slf4j" name="slf4j-log4j12"
+ rev="${slf4j-log4j12.version}" conf="test->master"/>
+ <dependency org="org.apache.hadoop" name="hadoop-core-test"
+ rev="${hadoop-core.version}" conf="test->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-hdfs-test"
+ rev="${hadoop-hdfs.version}" conf="test->default"/>
+
+ <dependency org="checkstyle" name="checkstyle" rev="${checkstyle.version}"
+ conf="checkstyle->default"/>
+
+ <dependency org="jdiff" name="jdiff" rev="${jdiff.version}"
+ conf="jdiff->default"/>
+ <dependency org="xerces" name="xerces" rev="${xerces.version}"
+ conf="jdiff->default"/>
+
+ <dependency org="org.apache.rat" name="apache-rat-tasks"
+ rev="${rats-lib.version}" conf="releaseaudit->default"/>
+ <dependency org="commons-lang" name="commons-lang"
+ rev="${commons-lang.version}" conf="releaseaudit->default"/>
+ <dependency org="commons-collections" name="commons-collections"
+ rev="${commons-collections.version}"
+ conf="releaseaudit->default"/>
+
+ <dependency org="org.apache.lucene" name="lucene-core"
+ rev="${lucene-core.version}" conf="javadoc->default"/>
+ <dependency org="org.apache.hadoop" name="avro" rev="${avro.version}"
+ conf="common->default"/>
+ </dependencies>
</ivy-module>
Added: hadoop/mapreduce/trunk/ivy/hadoop-mapred-examples-template.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/ivy/hadoop-mapred-examples-template.xml?rev=883594&view=auto
==============================================================================
--- hadoop/mapreduce/trunk/ivy/hadoop-mapred-examples-template.xml (added)
+++ hadoop/mapreduce/trunk/ivy/hadoop-mapred-examples-template.xml Tue Nov 24 05:52:46 2009
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapred-examples</artifactId>
+ <packaging>jar</packaging>
+ <version>@version</version>
+ <dependencies/>
+</project>
Added: hadoop/mapreduce/trunk/ivy/hadoop-mapred-template.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/ivy/hadoop-mapred-template.xml?rev=883594&view=auto
==============================================================================
--- hadoop/mapreduce/trunk/ivy/hadoop-mapred-template.xml (added)
+++ hadoop/mapreduce/trunk/ivy/hadoop-mapred-template.xml Tue Nov 24 05:52:46 2009
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapred</artifactId>
+ <packaging>jar</packaging>
+ <version>@version</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>0.22.0-dev-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.paranamer</groupId>
+ <artifactId>paranamer</artifactId>
+ <version>1.5</version>
+ </dependency>
+ </dependencies>
+</project>
Added: hadoop/mapreduce/trunk/ivy/hadoop-mapred-test-template.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/ivy/hadoop-mapred-test-template.xml?rev=883594&view=auto
==============================================================================
--- hadoop/mapreduce/trunk/ivy/hadoop-mapred-test-template.xml (added)
+++ hadoop/mapreduce/trunk/ivy/hadoop-mapred-test-template.xml Tue Nov 24 05:52:46 2009
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapred-test</artifactId>
+ <packaging>jar</packaging>
+ <version>@version</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapred</artifactId>
+ <version>@version</version>
+ </dependency>
+ </dependencies>
+</project>
Added: hadoop/mapreduce/trunk/ivy/hadoop-mapred-tools-template.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/ivy/hadoop-mapred-tools-template.xml?rev=883594&view=auto
==============================================================================
--- hadoop/mapreduce/trunk/ivy/hadoop-mapred-tools-template.xml (added)
+++ hadoop/mapreduce/trunk/ivy/hadoop-mapred-tools-template.xml Tue Nov 24 05:52:46 2009
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapred-tools</artifactId>
+ <packaging>jar</packaging>
+ <version>@version</version>
+ <dependencies/>
+</project>
Modified: hadoop/mapreduce/trunk/ivy/ivysettings.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/ivy/ivysettings.xml?rev=883594&r1=883593&r2=883594&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/ivy/ivysettings.xml (original)
+++ hadoop/mapreduce/trunk/ivy/ivysettings.xml Tue Nov 24 05:52:46 2009
@@ -29,53 +29,40 @@
http://ibiblio.lsu.edu/main/pub/packages/maven2
http://www.ibiblio.net/pub/packages/maven2
-->
- <property name="repo.maven.org"
- value="http://repo1.maven.org/maven2/"
- override="false"/>
- <property name="snapshot.apache.org"
- value="http://people.apache.org/repo/m2-snapshot-repository/"
- override="false"/>
- <property name="maven2.pattern"
- value="[organisation]/[module]/[revision]/[module]-[revision]"/>
- <property name="maven2.pattern.ext"
- value="${maven2.pattern}.[ext]"/>
- <!-- pull in the local repository -->
- <include url="${ivy.default.conf.dir}/ivyconf-local.xml"/>
- <settings defaultResolver="default"/>
+ <property name="repo.maven.org" value="http://repo1.maven.org/maven2/" override="false"/>
+ <property name="snapshot.apache.org" value="https://repository.apache.org/content/repositories/snapshots/" override="false"/>
+ <property name="maven2.pattern" value="[organisation]/[module]/[revision]/[module]-[revision]"/>
+ <property name="repo.dir" value="${user.home}/.m2/repository"/>
+ <property name="maven2.pattern.ext" value="${maven2.pattern}.[ext]"/>
+ <property name="resolvers" value="default" override="false"/>
+ <settings defaultResolver="${resolvers}"/>
+
<resolvers>
- <ibiblio name="maven2"
- root="${repo.maven.org}"
- pattern="${maven2.pattern.ext}"
- m2compatible="true"
- />
- <ibiblio name="apache-snapshot"
- root="${snapshot.apache.org}"
- pattern="${maven2.pattern.ext}"
- m2compatible="true"
- />
+ <ibiblio name="maven2" root="${repo.maven.org}" pattern="${maven2.pattern.ext}" m2compatible="true"/>
+ <ibiblio name="apache-snapshot" root="${snapshot.apache.org}" m2compatible="true"/>
+
+ <filesystem name="fs" m2compatible="true" force="true">
+ <artifact pattern="${repo.dir}/org/apache/hadoop/[module]/[revision]/[module]-[revision].[ext]"/>
+ <ivy pattern="${repo.dir}/org/apache/hadoop/[module]/[revision]/[module]-[revision].pom"/>
+ </filesystem>
+
<chain name="default" dual="true">
- <resolver ref="local"/>
+ <resolver ref="apache-snapshot"/>
<resolver ref="maven2"/>
</chain>
- <chain name="internal">
- <resolver ref="local"/>
- </chain>
- <chain name="external">
+
+ <chain name="internal" dual="true">
+ <resolver ref="fs"/>
+ <resolver ref="apache-snapshot"/>
<resolver ref="maven2"/>
</chain>
- <chain name="external-and-snapshots">
+
+ <chain name="external">
<resolver ref="maven2"/>
- <resolver ref="apache-snapshot"/>
</chain>
+
</resolvers>
<modules>
- <!--
- This forces a requirement for other hadoop-artifacts to be built locally
- rather than look for them online.
-
- -->
- <module organisation="org.apache.hadoop" name="hadoop*" resolver="internal"/>
- <!--until commons cli is external, we need to pull it in from the snapshot repository -if present -->
- <module organisation="org.apache.commons" name=".*" resolver="external-and-snapshots"/>
+ <module organisation="org.apache.hadoop" name="hadoop-*" resolver="${resolvers}"/>
</modules>
</ivysettings>
Modified: hadoop/mapreduce/trunk/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/ivy/libraries.properties?rev=883594&r1=883593&r2=883594&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/ivy/libraries.properties (original)
+++ hadoop/mapreduce/trunk/ivy/libraries.properties Tue Nov 24 05:52:46 2009
@@ -14,7 +14,8 @@
#It drives ivy and the generation of a maven POM
#These are the versions of our dependencies (in alphabetical order)
-apacheant.version=1.7.0
+apacheant.version=1.7.1
+ant-task.version=2.0.10
avro.version=1.2.0
@@ -38,6 +39,9 @@
ftpserver-core.version=1.0.0
ftpserver-deprecated.version=1.0.0-M2
+hadoop-core.version=0.22.0-SNAPSHOT
+hadoop-hdfs.version=0.22.0-SNAPSHOT
+
hsqldb.version=1.8.0.10
#ivy.version=2.0.0-beta2
Modified: hadoop/mapreduce/trunk/src/contrib/block_forensics/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/block_forensics/ivy.xml?rev=883594&r1=883593&r2=883594&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/block_forensics/ivy.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/block_forensics/ivy.xml Tue Nov 24 05:52:46 2009
@@ -41,4 +41,8 @@
<!--get the artifact from our module name-->
<artifact conf="master"/>
</publications>
+ <dependencies>
+ <dependency org="org.apache.hadoop" name="hadoop-core"
+ rev="${hadoop-core.version}" conf="common->default"/>
+ </dependencies>
</ivy-module>
Modified: hadoop/mapreduce/trunk/src/contrib/capacity-scheduler/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/capacity-scheduler/ivy.xml?rev=883594&r1=883593&r2=883594&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/capacity-scheduler/ivy.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/capacity-scheduler/ivy.xml Tue Nov 24 05:52:46 2009
@@ -24,65 +24,7 @@
<artifact conf="master"/>
</publications>
<dependencies>
- <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"/>
- <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"/>
- <dependency org="commons-codec"
- name="commons-codec"
- rev="${commons-codec.version}"
- conf="common->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-core"
+ rev="${hadoop-core.version}" conf="common->default"/>
</dependencies>
</ivy-module>
Modified: hadoop/mapreduce/trunk/src/contrib/data_join/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/data_join/ivy.xml?rev=883594&r1=883593&r2=883594&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/data_join/ivy.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/data_join/ivy.xml Tue Nov 24 05:52:46 2009
@@ -24,13 +24,8 @@
<artifact conf="master"/>
</publications>
<dependencies>
- <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>
+ <dependency org="org.apache.hadoop" name="hadoop-core" rev="${hadoop-core.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/trunk/src/contrib/dynamic-scheduler/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/dynamic-scheduler/ivy.xml?rev=883594&r1=883593&r2=883594&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/dynamic-scheduler/ivy.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/dynamic-scheduler/ivy.xml Tue Nov 24 05:52:46 2009
@@ -20,204 +20,36 @@
<info organisation="org.apache.hadoop" module="${ant.project.name}">
<license name="Apache 2.0"/>
<ivyauthor name="Apache Hadoop Team" url="http://hadoop.apache.org"/>
- <description>
- Apache Hadoop contrib
- </description>
+ <description> Apache Hadoop contrib </description>
</info>
<configurations defaultconfmapping="default">
<!--these match the Maven configurations-->
<conf name="default" extends="master,runtime"/>
<conf name="master" description="contains the artifact but no dependencies"/>
- <conf name="runtime" description="runtime but not the artifact"
- extends="client,server,s3-server,kfs"/>
-
- <conf name="mandatory" description="contains the critical dependencies"
- extends="commons-logging,log4j"/>
-
- <!--
- These public configurations contain the core dependencies for running hadoop client or server.
- The server is effectively a superset of the client.
- -->
- <conf name="client" description="client-side dependencies"
- extends="mandatory,httpclient"/>
- <conf name="server" description="server-side dependencies"
- extends="client"/>
- <conf name="s3-client" description="dependencies for working with S3/EC2 infrastructure"
- extends="client"/>
- <conf name="s3-server" description="dependencies for running on S3/EC2 infrastructure"
- extends="s3-client,server"/>
- <conf name="kfs" description="dependencies for KFS file system support"/>
- <conf name="ftp" description="dependencies for workign with FTP filesytems"
- extends="mandatory"/>
- <conf name="jetty" description="Jetty provides the in-VM HTTP daemon" extends="commons-logging"/>
-
- <!--Private configurations. -->
-
- <conf name="common" visibility="private" extends="runtime,mandatory,httpclient,ftp,jetty"
- description="common artifacts"/>
- <conf name="javadoc" visibility="private" description="artiracts required while performing doc generation"
- extends="common,mandatory,jetty,lucene"/>
- <!--Testing pulls in everything-->
- <conf name="test" extends="common,default,s3-server,kfs" visibility="private"
- description="the classpath needed to run tests"/>
- <conf name="releaseaudit" visibility="private"
- description="Artifacts required for releaseaudit target"/>
-
- <conf name="commons-logging" visibility="private"/>
- <conf name="httpclient" visibility="private" extends="commons-logging"/>
- <conf name="log4j" visibility="private"/>
- <conf name="lucene" visibility="private"/>
- <conf name="jdiff" visibility="private" extends="log4j,s3-client,jetty,server"/>
- <conf name="checkstyle" visibility="private"/>
+ <conf name="runtime" description="runtime but not the artifact" />
+ <conf name="common" visibility="private" extends="runtime" description="common artifacts"/>
</configurations>
<publications>
- <!--get the artifact from our module name-->
<artifact conf="master"/>
</publications>
- <dependencies>
-
- <!--used client side-->
-
- <dependency org="checkstyle"
- name="checkstyle"
- rev="${checkstyle.version}"
- conf="checkstyle->default"/>
- <dependency org="jdiff"
- name="jdiff"
- rev="${jdiff.version}"
- conf="jdiff->default"/>
- <dependency org="xerces"
- name="xerces"
- rev="${xerces.version}"
- conf="jdiff->default">
- </dependency>
-
- <dependency org="xmlenc"
- name="xmlenc"
- rev="${xmlenc.version}"
- conf="server->default"/>
-
- <!--Configuration: httpclient-->
-
- <!--
- commons-httpclient asks for too many files.
- All it needs is commons-codec and commons-logging JARs
- -->
- <dependency org="commons-httpclient"
- name="commons-httpclient"
- rev="${commons-httpclient.version}"
- conf="httpclient->master">
- </dependency>
-
- <dependency org="commons-codec"
- name="commons-codec"
- rev="${commons-codec.version}"
- conf="httpclient->default"/>
-
- <dependency org="commons-net"
- name="commons-net"
- rev="${commons-net.version}"
- conf="ftp->default"/>
- <!--Configuration: Jetty -->
-
- <dependency org="org.mortbay.jetty"
- name="jetty"
- rev="${jetty.version}"
- conf="jetty->master"/>
- <dependency org="org.mortbay.jetty"
- name="jetty-util"
- rev="${jetty-util.version}"
- conf="jetty->master"/>
-
- <dependency org="tomcat"
- name="jasper-runtime"
- rev="${jasper.version}"
- conf="jetty->master"/>
- <dependency org="tomcat"
- name="jasper-compiler"
- rev="${jasper.version}"
- conf="jetty->master"/>
- <dependency org="commons-el"
- name="commons-el"
- rev="${commons-el.version}"
- conf="jetty->master"/>
-
-
- <!--Configuration: commons-logging -->
-
- <!--it is essential that only the master JAR of commons logging
- is pulled in, as its dependencies are usually a mess, including things
- like out of date servlet APIs, bits of Avalon, etc.
- -->
- <dependency org="commons-logging"
- name="commons-logging"
- rev="${commons-logging.version}"
- conf="commons-logging->master"/>
-
-
- <!--Configuration: commons-logging -->
-
- <!--log4J is not optional until commons-logging.properties is stripped out of the JAR -->
- <dependency org="log4j"
- name="log4j"
- rev="${log4j.version}"
- conf="log4j->master"/>
-
- <!--Configuration: s3-client -->
- <!--there are two jets3t projects in the repository; this one goes up to 0.6 and
- is assumed to be the live one-->
- <dependency org="net.java.dev.jets3t"
- name="jets3t"
- rev="${jets3t.version}"
- conf="s3-client->master"/>
- <dependency org="commons-net"
- name="commons-net"
- rev="${commons-net.version}"
- conf="s3-client->master"/>
- <dependency org="org.mortbay.jetty"
- name="servlet-api-2.5"
- rev="${servlet-api-2.5.version}"
- conf="s3-client->master"/>
-
- <!--Configuration: test -->
-
- <!--artifacts needed for testing -->
- <dependency org="junit"
- name="junit"
- rev="${junit.version}"
- conf="common->default"/>
- <dependency org="com.google.code.p.arat"
- name="rat-lib"
- rev="${rats-lib.version}"
- conf="releaseaudit->default"/>
- <dependency org="commons-lang"
- name="commons-lang"
- rev="${commons-lang.version}"
- conf="releaseaudit->default"/>
- <dependency org="commons-collections"
- name="commons-collections"
- rev="${commons-collections.version}"
- conf="releaseaudit->default"/>
- <dependency org="org.apache.lucene"
- name="lucene-core"
- rev="${lucene-core.version}"
- conf="javadoc->default"/>
- <dependency org="commons-logging"
- name="commons-logging-api"
- rev="${commons-logging-api.version}"
- conf="common->default"/>
- <dependency org="org.slf4j"
- name="slf4j-api"
- rev="${slf4j-api.version}"
- conf="common->master"/>
- <dependency org="org.slf4j"
- name="slf4j-log4j12"
- rev="${slf4j-log4j12.version}"
- conf="common->master">
- </dependency>
- </dependencies>
-
+ <dependencies>
+ <dependency org="org.apache.hadoop" name="hadoop-core" rev="${hadoop-core.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="commons-logging" name="commons-logging-api" rev="${commons-logging-api.version}" conf="common->default"/>
+ <dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}" conf="common->master"/>
+ <dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j-log4j12.version}" conf="common->master"/>
+ </dependencies>
</ivy-module>
Modified: hadoop/mapreduce/trunk/src/contrib/eclipse-plugin/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/eclipse-plugin/ivy.xml?rev=883594&r1=883593&r2=883594&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/eclipse-plugin/ivy.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/eclipse-plugin/ivy.xml Tue Nov 24 05:52:46 2009
@@ -24,13 +24,7 @@
<artifact conf="master"/>
</publications>
<dependencies>
- <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>
+ <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/trunk/src/contrib/fairscheduler/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/fairscheduler/ivy.xml?rev=883594&r1=883593&r2=883594&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/fairscheduler/ivy.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/fairscheduler/ivy.xml Tue Nov 24 05:52:46 2009
@@ -22,6 +22,8 @@
<artifact conf="master"/>
</publications>
<dependencies>
+ <dependency org="org.apache.hadoop" name="hadoop-core"
+ rev="${hadoop-core.version}" conf="common->default"/>
<dependency org="commons-logging"
name="commons-logging"
rev="${commons-logging.version}"
Modified: hadoop/mapreduce/trunk/src/contrib/gridmix/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/gridmix/ivy.xml?rev=883594&r1=883593&r2=883594&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/gridmix/ivy.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/gridmix/ivy.xml Tue Nov 24 05:52:46 2009
@@ -35,6 +35,10 @@
<artifact conf="master"/>
</publications>
<dependencies>
+ <dependency org="org.apache.hadoop"
+ name="hadoop-core"
+ rev="${hadoop-core.version}"
+ conf="common->default"/>
<dependency org="commons-logging"
name="commons-logging"
rev="${commons-logging.version}"
Modified: hadoop/mapreduce/trunk/src/contrib/index/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/index/ivy.xml?rev=883594&r1=883593&r2=883594&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/index/ivy.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/index/ivy.xml Tue Nov 24 05:52:46 2009
@@ -24,17 +24,9 @@
<artifact conf="master"/>
</publications>
<dependencies>
- <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>
+ <dependency org="org.apache.hadoop" name="hadoop-core" rev="${hadoop-core.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/trunk/src/contrib/mrunit/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/mrunit/ivy.xml?rev=883594&r1=883593&r2=883594&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/mrunit/ivy.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/mrunit/ivy.xml Tue Nov 24 05:52:46 2009
@@ -40,21 +40,11 @@
<artifact conf="master"/>
</publications>
<dependencies>
- <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="junit"
- name="junit"
- rev="${junit.version}"
- conf="common->master"/>
- <dependency org="org.apache.hadoop"
- name="avro"
- rev="${avro.version}"
- conf="common->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-core" rev="${hadoop-core.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"/>
</dependencies>
+
</ivy-module>
Modified: hadoop/mapreduce/trunk/src/contrib/mumak/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/mumak/ivy.xml?rev=883594&r1=883593&r2=883594&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/mumak/ivy.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/mumak/ivy.xml Tue Nov 24 05:52:46 2009
@@ -39,6 +39,10 @@
<artifact conf="master"/>
</publications>
<dependencies>
+ <dependency org="org.apache.hadoop" name="hadoop-core"
+ rev="${hadoop-core.version}" conf="common->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-core-test"
+ rev="${hadoop-core.version}" conf="common->default"/>
<dependency org="commons-logging"
name="commons-logging"
rev="${commons-logging.version}"
Modified: hadoop/mapreduce/trunk/src/contrib/sqoop/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/sqoop/ivy.xml?rev=883594&r1=883593&r2=883594&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/sqoop/ivy.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/sqoop/ivy.xml Tue Nov 24 05:52:46 2009
@@ -40,73 +40,22 @@
<artifact conf="master"/>
</publications>
<dependencies>
- <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-io"
- name="commons-io"
- rev="${commons-io.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"/>
- <dependency org="hsqldb"
- name="hsqldb"
- rev="${hsqldb.version}"
- conf="common->default"/>
- <dependency org="javax.servlet"
- name="servlet-api"
- rev="${servlet-api.version}"
- conf="common->master"/>
- <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.apache.hadoop"
- name="avro"
- rev="${avro.version}"
- conf="common->default"/>
- <dependency org="javax.servlet"
- name="servlet-api"
- rev="${servlet-api.version}"
- conf="common->master"/>
- <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.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>
+ <dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}" conf="common->master"/>
+ <dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j-log4j12.version}" conf="common->master"/>
+ <dependency org="org.apache.hadoop" name="hadoop-core" rev="${hadoop-core.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.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="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="hsqldb" name="hsqldb" rev="${hsqldb.version}" conf="common->default"/>
+ <dependency org="org.apache.hadoop" name="avro" rev="${avro.version}" conf="common->default"/>
+ <dependency org="javax.servlet" name="servlet-api" rev="${servlet-api.version}" conf="common->master"/>
+ <dependency org="org.mortbay.jetty" name="jetty" rev="${jetty.version}" conf="common->master"/>
+ <dependency org="commons-io" name="commons-io" rev="${commons-io.version}" conf="common->default"/>
+ <dependency org="org.mortbay.jetty" name="jetty-util" rev="${jetty-util.version}" conf="common->master"/>
+ </dependencies>
</ivy-module>
Modified: hadoop/mapreduce/trunk/src/contrib/streaming/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/streaming/ivy.xml?rev=883594&r1=883593&r2=883594&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/streaming/ivy.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/streaming/ivy.xml Tue Nov 24 05:52:46 2009
@@ -24,65 +24,7 @@
<artifact conf="master"/>
</publications>
<dependencies>
- <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->master"/>
- <dependency org="log4j"
- name="log4j"
- rev="${log4j.version}"
- conf="common->master"/>
- <dependency org="org.apache.hadoop"
- name="avro"
- rev="${avro.version}"
- conf="common->default"/>
- <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"/>
- <dependency org="commons-codec"
- name="commons-codec"
- rev="${commons-codec.version}"
- conf="common->default"/>
- </dependencies>
+ <dependency org="org.apache.hadoop" name="hadoop-core"
+ rev="${hadoop-core.version}" conf="common->default"/>
+ </dependencies>
</ivy-module>
Modified: hadoop/mapreduce/trunk/src/contrib/vaidya/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/vaidya/ivy.xml?rev=883594&r1=883593&r2=883594&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/vaidya/ivy.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/vaidya/ivy.xml Tue Nov 24 05:52:46 2009
@@ -24,13 +24,8 @@
<artifact conf="master"/>
</publications>
<dependencies>
- <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.hadoop" name="hadoop-core" rev="${hadoop-core.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/trunk/src/contrib/vertica/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/vertica/ivy.xml?rev=883594&r1=883593&r2=883594&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/vertica/ivy.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/vertica/ivy.xml Tue Nov 24 05:52:46 2009
@@ -40,6 +40,10 @@
<artifact conf="master"/>
</publications>
<dependencies>
+ <dependency org="org.apache.hadoop"
+ name="hadoop-core"
+ rev="${hadoop-core.version}"
+ conf="common->default"/>
<dependency org="commons-logging"
name="commons-logging"
rev="${commons-logging.version}"