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

HADOOP-7072. Remove java5 dependencies from build. Contributed by Konstantin Boudnik. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1054848 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Konstantin Boudnik 2011-01-04 01:05:00 +00:00
parent 38ab39aa61
commit 17b01dcc58
5 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -2049,6 +2049,8 @@ Release 0.20.3 - Unreleased
comparators in initializers, which are no longer automatically run comparators in initializers, which are no longer automatically run
in Java 6 when a class is referenced. (cutting via omalley) in Java 6 when a class is referenced. (cutting via omalley)
HADOOP-7072. Remove java5 dependencies from build. (cos)
Release 0.20.2 - 2010-2-16 Release 0.20.2 - 2010-2-16
NEW FEATURES NEW FEATURES

11
build.xml
View File

@ -886,7 +886,6 @@
To use, specify -Dforrest.home=<base of Apache Forrest installation> on the command line." if="forrest.home"> To use, specify -Dforrest.home=<base of Apache Forrest installation> on the command line." if="forrest.home">
<exec dir="${docs.src}" executable="${forrest.home}/bin/forrest" <exec dir="${docs.src}" executable="${forrest.home}/bin/forrest"
failonerror="true"> failonerror="true">
<env key="JAVA_HOME" value="${java5.home}"/>
</exec> </exec>
<copy todir="${build.docs}"> <copy todir="${build.docs}">
<fileset dir="${docs.src}/build/site/" /> <fileset dir="${docs.src}/build/site/" />
@ -903,7 +902,6 @@
if="forrest.home"> if="forrest.home">
<exec dir="${src.docs.cn}" executable="${forrest.home}/bin/forrest" failonerror="true"> <exec dir="${src.docs.cn}" executable="${forrest.home}/bin/forrest" failonerror="true">
<env key="LANG" value="en_US.utf8"/> <env key="LANG" value="en_US.utf8"/>
<env key="JAVA_HOME" value="${java5.home}"/>
</exec> </exec>
<copy todir="${build.docs.cn}"> <copy todir="${build.docs.cn}">
<fileset dir="${src.docs.cn}/build/site/" /> <fileset dir="${src.docs.cn}/build/site/" />
@ -913,16 +911,11 @@
<antcall target="changes-to-html"/> <antcall target="changes-to-html"/>
</target> </target>
<target name="forrest.check" unless="forrest.home" depends="java5.check"> <target name="forrest.check" unless="forrest.home">
<fail message="'forrest.home' is not defined. Please pass <fail message="'forrest.home' is not defined. Please pass
-Dforrest.home=&lt;base of Apache Forrest installation&gt; to Ant on the command-line." /> -Dforrest.home=&lt;base of Apache Forrest installation&gt; to Ant on the command-line." />
</target> </target>
<target name="java5.check" unless="java5.home">
<fail message="'java5.home' is not defined. Forrest requires Java 5.
Please pass -Djava5.home=&lt;base of Java 5 distribution&gt; to Ant on the command-line." />
</target>
<target name="javadoc-dev" depends="compile, ivy-retrieve-javadoc" description="Generate javadoc for hadoop developers"> <target name="javadoc-dev" depends="compile, ivy-retrieve-javadoc" description="Generate javadoc for hadoop developers">
<mkdir dir="${build.javadoc.dev}"/> <mkdir dir="${build.javadoc.dev}"/>
<javadoc <javadoc
@ -1527,7 +1520,6 @@
<arg value="${findbugs.home}"/> <arg value="${findbugs.home}"/>
<arg value="${forrest.home}"/> <arg value="${forrest.home}"/>
<arg value="${basedir}"/> <arg value="${basedir}"/>
<arg value="${java5.home}"/>
</exec> </exec>
</target> </target>
@ -1549,7 +1541,6 @@
<arg value="${python.home}"/> <arg value="${python.home}"/>
<arg value="${basedir}"/> <arg value="${basedir}"/>
<arg value="${jira.passwd}"/> <arg value="${jira.passwd}"/>
<arg value="${java5.home}"/>
<arg value="${curl.cmd}"/> <arg value="${curl.cmd}"/>
<arg value="${defect}"/> <arg value="${defect}"/>
</exec> </exec>

9
src/docs/cn/forrest.properties
View File

@ -71,10 +71,13 @@
#forrest.validate=true #forrest.validate=true
#forrest.validate.xdocs=${forrest.validate} #forrest.validate.xdocs=${forrest.validate}
#forrest.validate.skinconf=${forrest.validate} #forrest.validate.skinconf=${forrest.validate}
#forrest.validate.sitemap=${forrest.validate} # Workaround (HADOOP-7072) for http://issues.apache.org/jira/browse/FOR-984
#forrest.validate.stylesheets=${forrest.validate} # Remove when forrest-0.9 is available
forrest.validate.sitemap=false
forrest.validate.stylesheets=false
forrest.validate.skins.stylesheets=false
# End of forrest-0.8 + JDK6 workaround
#forrest.validate.skins=${forrest.validate} #forrest.validate.skins=${forrest.validate}
#forrest.validate.skins.stylesheets=${forrest.validate.skins}
# *.failonerror=(true|false) - stop when an XML file is invalid # *.failonerror=(true|false) - stop when an XML file is invalid
#forrest.validate.failonerror=true #forrest.validate.failonerror=true

9
src/docs/forrest.properties
View File

@ -71,10 +71,13 @@
#forrest.validate=true #forrest.validate=true
#forrest.validate.xdocs=${forrest.validate} #forrest.validate.xdocs=${forrest.validate}
#forrest.validate.skinconf=${forrest.validate} #forrest.validate.skinconf=${forrest.validate}
#forrest.validate.sitemap=${forrest.validate} # Workaround (HADOOP-7072) for http://issues.apache.org/jira/browse/FOR-984
#forrest.validate.stylesheets=${forrest.validate} # Remove when forrest-0.9 is available
forrest.validate.sitemap=false
forrest.validate.stylesheets=false
# End of forrest-0.8 + JDK6 workaround
#forrest.validate.skins=${forrest.validate} #forrest.validate.skins=${forrest.validate}
#forrest.validate.skins.stylesheets=${forrest.validate.skins} forrest.validate.skins.stylesheets=false
# *.failonerror=(true|false) - stop when an XML file is invalid # *.failonerror=(true|false) - stop when an XML file is invalid
#forrest.validate.failonerror=true #forrest.validate.failonerror=true

30
src/test/bin/test-patch.sh
View File

@ -27,7 +27,7 @@ parseArgs() {
### Set HUDSON to true to indicate that this script is being run by Hudson ### Set HUDSON to true to indicate that this script is being run by Hudson
HUDSON=true HUDSON=true
if [[ $# != 18 ]] ; then if [[ $# != 18 ]] ; then
echo "ERROR: usage $0 HUDSON <PATCH_DIR> <SUPPORT_DIR> <PS_CMD> <WGET_CMD> <JIRACLI> <SVN_CMD> <GREP_CMD> <PATCH_CMD> <FINDBUGS_HOME> <FORREST_HOME> <ECLIPSE_HOME> <PYTHON_HOME> <WORKSPACE_BASEDIR> <JIRA_PASSWD> <JAVA5_HOME> <CURL_CMD> <DEFECT> " echo "ERROR: usage $0 HUDSON <PATCH_DIR> <SUPPORT_DIR> <PS_CMD> <WGET_CMD> <JIRACLI> <SVN_CMD> <GREP_CMD> <PATCH_CMD> <FINDBUGS_HOME> <FORREST_HOME> <ECLIPSE_HOME> <PYTHON_HOME> <WORKSPACE_BASEDIR> <JIRA_PASSWD> <CURL_CMD> <DEFECT> "
cleanupAndExit 0 cleanupAndExit 0
fi fi
PATCH_DIR=$2 PATCH_DIR=$2
@ -44,7 +44,6 @@ parseArgs() {
PYTHON_HOME=${13} PYTHON_HOME=${13}
BASEDIR=${14} BASEDIR=${14}
JIRA_PASSWD=${15} JIRA_PASSWD=${15}
JAVA5_HOME=${16}
CURL=${17} CURL=${17}
defect=${18} defect=${18}
@ -65,7 +64,7 @@ parseArgs() {
### Set HUDSON to false to indicate that this script is being run by a developer ### Set HUDSON to false to indicate that this script is being run by a developer
HUDSON=false HUDSON=false
if [[ $# != 10 ]] ; then if [[ $# != 10 ]] ; then
echo "ERROR: usage $0 DEVELOPER <PATCH_FILE> <SCRATCH_DIR> <SVN_CMD> <GREP_CMD> <PATCH_CMD> <FINDBUGS_HOME> <FORREST_HOME> <WORKSPACE_BASEDIR> <JAVA5_HOME>" echo "ERROR: usage $0 DEVELOPER <PATCH_FILE> <SCRATCH_DIR> <SVN_CMD> <GREP_CMD> <PATCH_CMD> <FINDBUGS_HOME> <FORREST_HOME> <WORKSPACE_BASEDIR>"
cleanupAndExit 0 cleanupAndExit 0
fi fi
### PATCH_FILE contains the location of the patchfile ### PATCH_FILE contains the location of the patchfile
@ -91,7 +90,6 @@ parseArgs() {
FINDBUGS_HOME=$7 FINDBUGS_HOME=$7
FORREST_HOME=$8 FORREST_HOME=$8
BASEDIR=$9 BASEDIR=$9
JAVA5_HOME=${10}
### Obtain the patch filename to append it to the version number ### Obtain the patch filename to append it to the version number
defect=`basename $PATCH_FILE` defect=`basename $PATCH_FILE`
;; ;;
@ -181,8 +179,8 @@ setup () {
echo "======================================================================" echo "======================================================================"
echo "" echo ""
echo "" echo ""
echo "$ANT_HOME/bin/ant -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess= clean tar > $PATCH_DIR/trunkJavacWarnings.txt 2>&1" echo "$ANT_HOME/bin/ant -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY -Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess= clean tar > $PATCH_DIR/trunkJavacWarnings.txt 2>&1"
$ANT_HOME/bin/ant -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess= clean tar > $PATCH_DIR/trunkJavacWarnings.txt 2>&1 $ANT_HOME/bin/ant -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY -Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess= clean tar > $PATCH_DIR/trunkJavacWarnings.txt 2>&1
if [[ $? != 0 ]] ; then if [[ $? != 0 ]] ; then
echo "Trunk compilation is broken?" echo "Trunk compilation is broken?"
cleanupAndExit 1 cleanupAndExit 1
@ -329,8 +327,8 @@ checkJavacWarnings () {
echo "======================================================================" echo "======================================================================"
echo "" echo ""
echo "" echo ""
echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= clean tar > $PATCH_DIR/patchJavacWarnings.txt 2>&1" echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= clean tar > $PATCH_DIR/patchJavacWarnings.txt 2>&1"
$ANT_HOME/bin/ant -Dversion="${VERSION}" -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= clean tar > $PATCH_DIR/patchJavacWarnings.txt 2>&1 $ANT_HOME/bin/ant -Dversion="${VERSION}" -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= clean tar > $PATCH_DIR/patchJavacWarnings.txt 2>&1
if [[ $? != 0 ]] ; then if [[ $? != 0 ]] ; then
JIRA_COMMENT="$JIRA_COMMENT JIRA_COMMENT="$JIRA_COMMENT
@ -369,8 +367,8 @@ checkReleaseAuditWarnings () {
echo "======================================================================" echo "======================================================================"
echo "" echo ""
echo "" echo ""
echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= releaseaudit > $PATCH_DIR/patchReleaseAuditWarnings.txt 2>&1" echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= releaseaudit > $PATCH_DIR/patchReleaseAuditWarnings.txt 2>&1"
$ANT_HOME/bin/ant -Dversion="${VERSION}" -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= releaseaudit > $PATCH_DIR/patchReleaseAuditWarnings.txt 2>&1 $ANT_HOME/bin/ant -Dversion="${VERSION}" -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= releaseaudit > $PATCH_DIR/patchReleaseAuditWarnings.txt 2>&1
### Compare trunk and patch release audit warning numbers ### Compare trunk and patch release audit warning numbers
if [[ -f $PATCH_DIR/patchReleaseAuditWarnings.txt ]] ; then if [[ -f $PATCH_DIR/patchReleaseAuditWarnings.txt ]] ; then
@ -443,8 +441,8 @@ checkFindbugsWarnings () {
echo "======================================================================" echo "======================================================================"
echo "" echo ""
echo "" echo ""
echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -Dfindbugs.home=$FINDBUGS_HOME -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= findbugs" echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -Dfindbugs.home=$FINDBUGS_HOME -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= findbugs"
$ANT_HOME/bin/ant -Dversion="${VERSION}" -Dfindbugs.home=$FINDBUGS_HOME -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= findbugs $ANT_HOME/bin/ant -Dversion="${VERSION}" -Dfindbugs.home=$FINDBUGS_HOME} -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= findbugs
if [ $? != 0 ] ; then if [ $? != 0 ] ; then
JIRA_COMMENT="$JIRA_COMMENT JIRA_COMMENT="$JIRA_COMMENT
@ -498,8 +496,8 @@ runCoreTests () {
PreTestTarget="create-c++-configure" PreTestTarget="create-c++-configure"
fi fi
echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=no -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME $PreTestTarget test-core" echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=no -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME $PreTestTarget test-core"
$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=no -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME $PreTestTarget test-core $ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=no -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME $PreTestTarget test-core
if [[ $? != 0 ]] ; then if [[ $? != 0 ]] ; then
### Find and format names of failed tests ### Find and format names of failed tests
failed_tests=`grep -l -E "<failure|<error" $WORKSPACE/trunk/build/test/*.xml | sed -e "s|.*build/test/TEST-| |g" | sed -e "s|\.xml||g"` failed_tests=`grep -l -E "<failure|<error" $WORKSPACE/trunk/build/test/*.xml | sed -e "s|.*build/test/TEST-| |g" | sed -e "s|\.xml||g"`
@ -561,8 +559,8 @@ checkInjectSystemFaults () {
### Kill any rogue build processes from the last attempt ### Kill any rogue build processes from the last attempt
$PS auxwww | $GREP HadoopPatchProcess | /usr/bin/nawk '{print $2}' | /usr/bin/xargs -t -I {} /bin/kill -9 {} > /dev/null $PS auxwww | $GREP HadoopPatchProcess | /usr/bin/nawk '{print $2}' | /usr/bin/xargs -t -I {} /bin/kill -9 {} > /dev/null
echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=no -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME inject-system-faults" echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=no -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME inject-system-faults"
$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=no -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME inject-system-faults $ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=no -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME inject-system-faults
if [[ $? != 0 ]] ; then if [[ $? != 0 ]] ; then
JIRA_COMMENT="$JIRA_COMMENT JIRA_COMMENT="$JIRA_COMMENT