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 gk...@apache.org on 2011/08/24 08:47:01 UTC
svn commit: r1160987 - in /hadoop/common/trunk/hadoop-mapreduce: CHANGES.txt
ivy/ivysettings.xml src/contrib/eclipse-plugin/build.xml
src/contrib/eclipse-plugin/ivy.xml
Author: gkesavan
Date: Wed Aug 24 06:47:01 2011
New Revision: 1160987
URL: http://svn.apache.org/viewvc?rev=1160987&view=rev
Log:
MAPREDUCE-2859 - Fix eclipse plugin contrib module compilation. Contributed by Giridharan Kesavan
Modified:
hadoop/common/trunk/hadoop-mapreduce/CHANGES.txt
hadoop/common/trunk/hadoop-mapreduce/ivy/ivysettings.xml
hadoop/common/trunk/hadoop-mapreduce/src/contrib/eclipse-plugin/build.xml
hadoop/common/trunk/hadoop-mapreduce/src/contrib/eclipse-plugin/ivy.xml
Modified: hadoop/common/trunk/hadoop-mapreduce/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce/CHANGES.txt?rev=1160987&r1=1160986&r2=1160987&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce/CHANGES.txt Wed Aug 24 06:47:01 2011
@@ -1132,6 +1132,8 @@ Trunk (unreleased changes)
MAPREDUCE-2838. Fix MapReduce builds to use new hadoop-common test jars.
(gkesavan via acmurthy)
+
+ MAPREDUCE-2859 - Fix eclipse plugin contrib module compilation (gkesavan)
Release 0.22.0 - Unreleased
Modified: hadoop/common/trunk/hadoop-mapreduce/ivy/ivysettings.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce/ivy/ivysettings.xml?rev=1160987&r1=1160986&r2=1160987&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce/ivy/ivysettings.xml (original)
+++ hadoop/common/trunk/hadoop-mapreduce/ivy/ivysettings.xml Wed Aug 24 06:47:01 2011
@@ -44,7 +44,7 @@
checkmodified="true" changingPattern=".*SNAPSHOT"/>
<filesystem name="fs" m2compatible="true" force="${force-resolve}">
- <artifact pattern="${repo.dir}/[organisation]/[module]/[revision]/[module]-[revision].[ext]"/>
+ <artifact pattern="${repo.dir}/${maven2.pattern.ext}"/>
<ivy pattern="${repo.dir}/[organisation]/[module]/[revision]/[module]-[revision].pom"/>
</filesystem>
Modified: hadoop/common/trunk/hadoop-mapreduce/src/contrib/eclipse-plugin/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce/src/contrib/eclipse-plugin/build.xml?rev=1160987&r1=1160986&r2=1160987&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce/src/contrib/eclipse-plugin/build.xml (original)
+++ hadoop/common/trunk/hadoop-mapreduce/src/contrib/eclipse-plugin/build.xml Wed Aug 24 06:47:01 2011
@@ -68,7 +68,7 @@
<target name="jar" depends="compile" unless="skip.contrib">
<mkdir dir="${build.dir}/lib"/>
<copy tofile="${build.dir}/lib/hadoop-common.jar">
- <fileset dir="${hadoop.root}/build/ivy/lib/Hadoop/common" includes="hadoop-common-*.jar" excludes="hadoop-common-test-*.jar"/>
+ <fileset dir="${hadoop.root}/build/ivy/lib/Hadoop/common" includes="hadoop-common-*.jar" excludes="hadoop-common-*tests.jar"/>
</copy>
<copy file="${hadoop.root}/build/ivy/lib/Hadoop/common/commons-cli-${commons-cli.version}.jar" todir="${build.dir}/lib" verbose="true"/>
<jar
Modified: hadoop/common/trunk/hadoop-mapreduce/src/contrib/eclipse-plugin/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce/src/contrib/eclipse-plugin/ivy.xml?rev=1160987&r1=1160986&r2=1160987&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce/src/contrib/eclipse-plugin/ivy.xml (original)
+++ hadoop/common/trunk/hadoop-mapreduce/src/contrib/eclipse-plugin/ivy.xml Wed Aug 24 06:47:01 2011
@@ -46,6 +46,7 @@
<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"/>
+ <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core" rev="${yarn.version}" conf="common->default"/>
<!-- Exclusions for transitive dependencies pulled in by log4j -->
<exclude org="com.sun.jdmk"/>