Author: omalley
Date: Tue Mar 8 05:54:55 2011
New Revision: 1079199
URL: http://svn.apache.org/viewvc?rev=1079199&view=rev
Log:
commit 15402d311ebe0094c32e8cea6b3dc4b8fa8bc12c
Author: Giridharan Kesavan <[email protected]>
Date: Thu Dec 2 16:12:41 2010 -0800
. Fix to use the ymaven repo
+++ b/YAHOO-CHANGES.txt
+ . Fix the version strings in the pom file templates and a fix to
+ make use of the build.properties from the hadoop root directory.
+
Modified:
hadoop/mapreduce/branches/yahoo-merge/build.xml
hadoop/mapreduce/branches/yahoo-merge/ivy/hadoop-mapred-instrumented-template.xml
hadoop/mapreduce/branches/yahoo-merge/ivy/hadoop-mapred-template.xml
hadoop/mapreduce/branches/yahoo-merge/src/contrib/build-contrib.xml
hadoop/mapreduce/branches/yahoo-merge/src/contrib/fairscheduler/ivy.xml
Modified: hadoop/mapreduce/branches/yahoo-merge/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/build.xml?rev=1079199&r1=1079198&r2=1079199&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/build.xml (original)
+++ hadoop/mapreduce/branches/yahoo-merge/build.xml Tue Mar 8 05:54:55 2011
@@ -1454,37 +1454,21 @@
<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>
- <replaceregexp byline="true">
- <regexp pattern="@version"/>
- <substitution expression="${version}"/>
- <fileset dir="${basedir}/ivy">
<include name="hadoop-mapred-${herriot.suffix}.xml"/>
<include name="hadoop-mapred-${herriot.suffix}-test.xml"/>
</fileset>
</replaceregexp>
+ <replaceregexp byline="true">
+ <regexp pattern="@hadoop-common.version"/>
+ <substitution expression="${hadoop-common.version}"/>
+ <fileset dir="${basedir}/ivy">
+ <include name="hadoop-mapred.xml"/>
+ <include name="hadoop-mapred-instrumented.xml"/>
+ </fileset>
+ </replaceregexp>
</target>
<!-- ================================================================== -->
Modified:
hadoop/mapreduce/branches/yahoo-merge/ivy/hadoop-mapred-instrumented-template.xml
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/ivy/hadoop-mapred-instrumented-template.xml?rev=1079199&r1=1079198&r2=1079199&view=diff
==============================================================================
---
hadoop/mapreduce/branches/yahoo-merge/ivy/hadoop-mapred-instrumented-template.xml
(original)
+++
hadoop/mapreduce/branches/yahoo-merge/ivy/hadoop-mapred-instrumented-template.xml
Tue Mar 8 05:54:55 2011
@@ -28,7 +28,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>0.22.0-dev-SNAPSHOT</version>
+ <version>@hadoop-common.version</version>
</dependency>
</dependencies>
</project>
Modified: hadoop/mapreduce/branches/yahoo-merge/ivy/hadoop-mapred-template.xml
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/ivy/hadoop-mapred-template.xml?rev=1079199&r1=1079198&r2=1079199&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/ivy/hadoop-mapred-template.xml
(original)
+++ hadoop/mapreduce/branches/yahoo-merge/ivy/hadoop-mapred-template.xml Tue
Mar 8 05:54:55 2011
@@ -28,7 +28,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>0.22.0-dev-SNAPSHOT</version>
+ <version>@hadoop-common.version</version>
</dependency>
</dependencies>
</project>
Modified: hadoop/mapreduce/branches/yahoo-merge/src/contrib/build-contrib.xml
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/contrib/build-contrib.xml?rev=1079199&r1=1079198&r2=1079199&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/src/contrib/build-contrib.xml
(original)
+++ hadoop/mapreduce/branches/yahoo-merge/src/contrib/build-contrib.xml Tue Mar
8 05:54:55 2011
@@ -25,13 +25,13 @@
<property name="name" value="${ant.project.name}"/>
<property name="root" value="${basedir}"/>
+ <property name="hadoop.root" location="${root}/../../../"/>
<!-- Load all the default properties, and any the user wants -->
<!-- to contribute (without having to type -D or edit this file -->
<property file="${user.home}/${name}.build.properties" />
- <property file="${root}/build.properties" />
+ <property file="${hadoop.root}/build.properties" />
- <property name="hadoop.root" location="${root}/../../../"/>
<property name="src.dir" location="${root}/src/java"/>
<property name="src.test" location="${root}/src/test"/>
<property name="src.test.data" location="${root}/src/test/data"/>
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=1079199&r1=1079198&r2=1079199&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:54:55 2011
@@ -45,9 +45,9 @@
<dependency org="org.apache.hadoop" name="hadoop-common-test"
rev="${hadoop-common.version}" conf="test->default"/>
<dependency org="org.apache.hadoop" name="hadoop-hdfs"
- rev="${hadoop-common.version}" conf="common->default"/>
+ rev="${hadoop-hdfs.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-hdfs-test"
- rev="${hadoop-common.version}" conf="test->default"/>
+ rev="${hadoop-hdfs.version}" conf="test->default"/>
<dependency org="commons-logging"
name="commons-logging"
rev="${commons-logging.version}"
