Author: gkesavan
Date: Mon Aug 8 23:09:02 2011
New Revision: 1155143
URL: http://svn.apache.org/viewvc?rev=1155143&view=rev
Log:
Fix ivy conf to work with the hadoop common trunk maven build changes. Contributed by Giridharan
Kesavan
Modified:
hadoop/common/branches/MR-279/mapreduce/CHANGES.txt
hadoop/common/branches/MR-279/mapreduce/build.xml
hadoop/common/branches/MR-279/mapreduce/ivy.xml
hadoop/common/branches/MR-279/mapreduce/ivy/ivysettings.xml
hadoop/common/branches/MR-279/mapreduce/src/contrib/gridmix/ivy.xml
hadoop/common/branches/MR-279/mapreduce/src/contrib/streaming/ivy.xml
Modified: hadoop/common/branches/MR-279/mapreduce/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/CHANGES.txt?rev=1155143&r1=1155142&r2=1155143&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/CHANGES.txt (original)
+++ hadoop/common/branches/MR-279/mapreduce/CHANGES.txt Mon Aug 8 23:09:02 2011
@@ -2455,4 +2455,7 @@ Release 0.21.0 - 2010-08-13
(Amar Kamat via amareshwari)
MAPREDUCE-1856. Extract a subset of tests for smoke (DOA) validation (cos)
+
+ Fix ivy conf to work with the hadoop common trunk maven build changes.
+ (Giridharan Kesavan)
Modified: hadoop/common/branches/MR-279/mapreduce/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/build.xml?rev=1155143&r1=1155142&r2=1155143&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/build.xml (original)
+++ hadoop/common/branches/MR-279/mapreduce/build.xml Mon Aug 8 23:09:02 2011
@@ -204,7 +204,7 @@
<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]"/>
+ <property name="ivy.artifact.retrieve.pattern" value="${ant.project.name}/[conf]/[artifact]-[revision](-[classifier]).[ext]"/>
<!--this is how artifacts that get built are named-->
<property name="ivy.publish.pattern" value="hadoop-[revision]-core.[ext]"/>
Modified: hadoop/common/branches/MR-279/mapreduce/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/ivy.xml?rev=1155143&r1=1155142&r2=1155143&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/ivy.xml (original)
+++ hadoop/common/branches/MR-279/mapreduce/ivy.xml Mon Aug 8 23:09:02 2011
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<ivy-module version="1.0">
+<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven">
<info organisation="org.apache.hadoop" module="${ant.project.name}" revision="${version}">
<license name="Apache 2.0"/>
<ivyauthor name="Apache Hadoop Team" url="http://hadoop.apache.org"/>
@@ -57,16 +57,20 @@
<dependencies>
<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-common"
+ rev="${hadoop-common.version}" conf="common->default">
+ <artifact name="hadoop-common" type="tests" ext="jar" m:classifier="tests"/>
+ </dependency>
<dependency org="org.apache.hadoop" name="hadoop-hdfs"
rev="${hadoop-hdfs.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common-instrumented"
rev="${hadoop-common.version}" conf="system->default"/>
<dependency org="org.apache.hadoop" name="hadoop-hdfs-instrumented"
rev="${hadoop-common.version}" conf="system->default"/>
- <dependency org="org.apache.hadoop" name="hadoop-common-test"
- rev="${hadoop-common.version}" conf="test->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-common"
+ rev="${hadoop-common.version}" conf="test->default">
+ <artifact name="hadoop-common" type="tests" ext="jar" m:classifier="tests"/>
+ </dependency>
<dependency org="org.apache.hadoop" name="hadoop-hdfs-test"
rev="${hadoop-hdfs.version}" conf="test->default"/>
<dependency org="checkstyle" name="checkstyle" rev="${checkstyle.version}"
Modified: hadoop/common/branches/MR-279/mapreduce/ivy/ivysettings.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/ivy/ivysettings.xml?rev=1155143&r1=1155142&r2=1155143&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/ivy/ivysettings.xml (original)
+++ hadoop/common/branches/MR-279/mapreduce/ivy/ivysettings.xml Mon Aug 8 23:09:02 2011
@@ -31,7 +31,7 @@
-->
<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="maven2.pattern" value="[organisation]/[module]/[revision]/[module]-[revision](-[classifier])"/>
<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"/>
Modified: hadoop/common/branches/MR-279/mapreduce/src/contrib/gridmix/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/src/contrib/gridmix/ivy.xml?rev=1155143&r1=1155142&r2=1155143&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/src/contrib/gridmix/ivy.xml (original)
+++ hadoop/common/branches/MR-279/mapreduce/src/contrib/gridmix/ivy.xml Mon Aug 8 23:09:02
2011
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="1.0">
+<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven">
<info organisation="org.apache.hadoop" module="${ant.project.name}">
<license name="Apache 2.0"/>
<description>Rumen</description>
@@ -40,10 +40,9 @@
name="hadoop-common"
rev="${hadoop-common.version}"
conf="common->default"/>
- <dependency org="org.apache.hadoop"
- name="hadoop-common-test"
- rev="${hadoop-common.version}"
- conf="test->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}"
conf="test->default">
+ <artifact name="hadoop-common" type="tests" ext="jar" m:classifier="tests"/>
+ </dependency>
<dependency org="org.apache.hadoop"
name="hadoop-hdfs"
rev="${hadoop-hdfs.version}"
Modified: hadoop/common/branches/MR-279/mapreduce/src/contrib/streaming/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/src/contrib/streaming/ivy.xml?rev=1155143&r1=1155142&r2=1155143&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/src/contrib/streaming/ivy.xml (original)
+++ hadoop/common/branches/MR-279/mapreduce/src/contrib/streaming/ivy.xml Mon Aug 8 23:09:02
2011
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="1.0">
+<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven">
<info organisation="org.apache.hadoop" module="${ant.project.name}">
<license name="Apache 2.0"/>
<ivyauthor name="Apache Hadoop Team" url="http://hadoop.apache.org"/>
@@ -42,8 +42,9 @@
<dependencies>
<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="test->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}"
conf="test->default">
+ <artifact name="hadoop-common" type="tests" ext="jar" m:classifier="tests"/>
+ </dependency>
<dependency org="org.apache.hadoop" name="hadoop-hdfs"
rev="${hadoop-hdfs.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-hdfs-test"
|