MAPREDUCE-2859 - Fix eclipse plugin contrib module compilation. Contributed by Giridharan Kesavan

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1160987 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce/CHANGES.txt

@@ -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
 

hadoop-mapreduce/ivy/ivysettings.xml

@@ -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>
 

hadoop-mapreduce/src/contrib/eclipse-plugin/build.xml

@@ -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

hadoop-mapreduce/src/contrib/eclipse-plugin/ivy.xml

@@ -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"/>