Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Giridharan Kesavan 2011-08-24 06:47:01 +00:00
parent ec559db68e
commit 1eb272051d
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-mapreduce/CHANGES.txt
View File

@ -1133,6 +1133,8 @@ Trunk (unreleased changes)
MAPREDUCE-2838. Fix MapReduce builds to use new hadoop-common test jars. MAPREDUCE-2838. Fix MapReduce builds to use new hadoop-common test jars.
(gkesavan via acmurthy) (gkesavan via acmurthy)
MAPREDUCE-2859 - Fix eclipse plugin contrib module compilation (gkesavan)
Release 0.22.0 - Unreleased Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-mapreduce/ivy/ivysettings.xml
View File

@ -44,7 +44,7 @@
checkmodified="true" changingPattern=".*SNAPSHOT"/> checkmodified="true" changingPattern=".*SNAPSHOT"/>
<filesystem name="fs" m2compatible="true" force="${force-resolve}"> <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"/> <ivy pattern="${repo.dir}/[organisation]/[module]/[revision]/[module]-[revision].pom"/>
</filesystem> </filesystem>

2
hadoop-mapreduce/src/contrib/eclipse-plugin/build.xml
View File

@ -68,7 +68,7 @@
<target name="jar" depends="compile" unless="skip.contrib"> <target name="jar" depends="compile" unless="skip.contrib">
<mkdir dir="${build.dir}/lib"/> <mkdir dir="${build.dir}/lib"/>
<copy tofile="${build.dir}/lib/hadoop-common.jar"> <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>
<copy file="${hadoop.root}/build/ivy/lib/Hadoop/common/commons-cli-${commons-cli.version}.jar" todir="${build.dir}/lib" verbose="true"/> <copy file="${hadoop.root}/build/ivy/lib/Hadoop/common/commons-cli-${commons-cli.version}.jar" todir="${build.dir}/lib" verbose="true"/>
<jar <jar

1
hadoop-mapreduce/src/contrib/eclipse-plugin/ivy.xml
View File

@ -46,6 +46,7 @@
<dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="${hadoop-hdfs.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->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="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 --> <!-- Exclusions for transitive dependencies pulled in by log4j -->
<exclude org="com.sun.jdmk"/> <exclude org="com.sun.jdmk"/>