big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MAPREDUCE-3814. Fixed MRV1 compilation. (Arun C Murthy via vinodkv)

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1241177 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Vinod Kumar Vavilapalli 2012-02-06 21:04:30 +00:00
parent 2a9e430ff9
commit 3f02d8dd5c
2 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-mapreduce-project/CHANGES.txt
View File

@ -708,6 +708,8 @@ Release 0.23.1 - Unreleased
MAPREDUCE-3747. Initialize queue metrics upfront and added start/finish MAPREDUCE-3747. Initialize queue metrics upfront and added start/finish
time to RM Web-UI. (acmurthy) time to RM Web-UI. (acmurthy)
MAPREDUCE-3814. Fixed MRV1 compilation. (Arun C Murthy via vinodkv)
Release 0.23.0 - 2011-11-01 Release 0.23.0 - 2011-11-01
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

34
hadoop-mapreduce-project/build.xml
View File

@ -525,43 +525,11 @@
dest.dir="${test.mapred.build.classes}" dest.dir="${test.mapred.build.classes}"
classpath="test.classpath"/> classpath="test.classpath"/>
<javac
encoding="${build.encoding}"
srcdir="${test.src.dir}/mapred/testjar"
includes="*.java"
destdir="${test.mapred.build.testjar}"
debug="${javac.debug}"
optimize="${javac.optimize}"
target="${javac.version}"
source="${javac.version}"
deprecation="${javac.deprecation}">
<compilerarg line="${javac.args} ${javac.args.warnings}" />
<classpath refid="test.classpath"/>
</javac>
<delete file="${test.mapred.build.testjar}/testjob.jar"/> <delete file="${test.mapred.build.testjar}/testjob.jar"/>
<jar jarfile="${test.mapred.build.testjar}/testjob.jar" <jar jarfile="${test.mapred.build.testjar}/testjob.jar"
basedir="${test.mapred.build.testjar}"> basedir="${test.mapred.build.testjar}">
</jar> </jar>
<javac
encoding="${build.encoding}"
srcdir="${test.src.dir}/mapred/testshell"
includes="*.java"
destdir="${test.mapred.build.testshell}"
debug="${javac.debug}"
optimize="${javac.optimize}"
target="${javac.version}"
source="${javac.version}"
deprecation="${javac.deprecation}">
<compilerarg line="${javac.args} ${javac.args.warnings}"/>
<classpath refid="test.classpath"/>
</javac>
<delete file="${test.mapred.build.testshell}/testshell.jar"/>
<jar jarfile="${test.mapred.build.testshell}/testshell.jar"
basedir="${test.mapred.build.testshell}">
</jar>
<delete dir="${test.cache.data}"/> <delete dir="${test.cache.data}"/>
<mkdir dir="${test.cache.data}"/> <mkdir dir="${test.cache.data}"/>
<delete dir="${test.concat.data}"/> <delete dir="${test.concat.data}"/>
@ -618,8 +586,6 @@
<jar jarfile="${hadoop-mapred-test-sources.jar}"> <jar jarfile="${hadoop-mapred-test-sources.jar}">
<fileset dir="${test.src.dir}/mapred" includes="org/apache/hadoop/**/*.java" /> <fileset dir="${test.src.dir}/mapred" includes="org/apache/hadoop/**/*.java" />
<fileset dir="${test.src.dir}/unit" includes="org/apache/hadoop/**/*.java" /> <fileset dir="${test.src.dir}/unit" includes="org/apache/hadoop/**/*.java" />
<fileset dir="${test.src.dir}/mapred/testjar" includes="*.java" />
<fileset dir="${test.src.dir}/mapred/testshell" includes="*.java" />
</jar> </jar>
</target> </target>