svn commit: r1054873 - in /hadoop/mapreduce/trunk: CHANGES.txt build-utils.xml build.xml src/docs/forrest.properties

[co...@apache.org]

Author: cos
Date: Tue Jan  4 02:51:39 2011
New Revision: 1054873

URL: http://svn.apache.org/viewvc?rev=1054873&view=rev
Log:
MAPREDUCE-2228. Remove java5 dependencies from build. Contributed by Konstantin Boudnik.

Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/build-utils.xml
    hadoop/mapreduce/trunk/build.xml
    hadoop/mapreduce/trunk/src/docs/forrest.properties

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=1054873&r1=1054872&r2=1054873&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Tue Jan  4 02:51:39 2011
@@ -488,6 +488,8 @@ Release 0.21.1 - Unreleased
     MAPREDUCE-2223. TestMRCLI might fail on Ubuntu with default /etc/hosts
     (cos)
 
+    MAPREDUCE-2228. Remove java5 dependencies from build. (cos)
+
 Release 0.21.0 - 2010-08-13
 
   INCOMPATIBLE CHANGES

Modified: hadoop/mapreduce/trunk/build-utils.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/build-utils.xml?rev=1054873&r1=1054872&r2=1054873&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/build-utils.xml (original)
+++ hadoop/mapreduce/trunk/build-utils.xml Tue Jan  4 02:51:39 2011
@@ -26,11 +26,7 @@ Contains utilities that are common for t
   <dirname property="build-utils.basedir" file="${ant.file.build-utils}"/>
   <property file="${build-utils.basedir}/build.properties"/>
 
-  <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, or set java5.home in build properties file." />
-  </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 -Dforrest.home=&lt;base of Apache Forrest installation&gt; to Ant on the command-line, or set forest.home in build properties file." />
   </target>
   

Modified: hadoop/mapreduce/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/build.xml?rev=1054873&r1=1054872&r2=1054873&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/build.xml (original)
+++ hadoop/mapreduce/trunk/build.xml Tue Jan  4 02:51:39 2011
@@ -925,7 +925,6 @@
   	      tofile="${build.docs}/mapred-queues.xml" failonerror="false"/>
     <exec dir="${docs.src}" executable="${forrest.home}/bin/forrest"
 	  failonerror="true">
-      <env key="JAVA_HOME" value="${java5.home}"/>
     </exec>
     <copy todir="${build.docs}">
       <fileset dir="${docs.src}/build/site/" />
@@ -1759,7 +1758,6 @@
     <arg value="${findbugs.home}"/>
     <arg value="${forrest.home}"/>
     <arg value="${basedir}"/>
-    <arg value="${java5.home}"/>
   </exec>
 </target>
 
@@ -1781,7 +1779,6 @@
     <arg value="${python.home}"/>
     <arg value="${basedir}"/>
     <arg value="${jira.passwd}"/>
-    <arg value="${java5.home}"/>
     <arg value="${curl.cmd}"/>
     <arg value="${defect}"/>
   </exec>

Modified: hadoop/mapreduce/trunk/src/docs/forrest.properties
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/docs/forrest.properties?rev=1054873&r1=1054872&r2=1054873&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/docs/forrest.properties (original)
+++ hadoop/mapreduce/trunk/src/docs/forrest.properties Tue Jan  4 02:51:39 2011
@@ -71,10 +71,13 @@
 #forrest.validate=true
 #forrest.validate.xdocs=${forrest.validate}
 #forrest.validate.skinconf=${forrest.validate}
-#forrest.validate.sitemap=${forrest.validate}
-#forrest.validate.stylesheets=${forrest.validate}
+# Workaround (HADOOP-7072) for http://issues.apache.org/jira/browse/FOR-984
+# 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.stylesheets=${forrest.validate.skins}
+forrest.validate.skins.stylesheets=false
 
 # *.failonerror=(true|false) - stop when an XML file is invalid
 #forrest.validate.failonerror=true