svn commit: r1362132 - in /incubator/oozie/trunk: docs/src/site/twiki/ENG_Building.twiki release-log.txt

[vi...@apache.org]

Author: virag
Date: Mon Jul 16 16:59:35 2012
New Revision: 1362132

URL: http://svn.apache.org/viewvc?rev=1362132&view=rev
Log:
OOZIE-908 Oozie docs build instructions for hadoop versions (mona via virag)

Modified:
    incubator/oozie/trunk/docs/src/site/twiki/ENG_Building.twiki
    incubator/oozie/trunk/release-log.txt

Modified: incubator/oozie/trunk/docs/src/site/twiki/ENG_Building.twiki
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/docs/src/site/twiki/ENG_Building.twiki?rev=1362132&r1=1362131&r2=1362132&view=diff
==============================================================================
--- incubator/oozie/trunk/docs/src/site/twiki/ENG_Building.twiki (original)
+++ incubator/oozie/trunk/docs/src/site/twiki/ENG_Building.twiki Mon Jul 16 16:59:35 2012
@@ -113,6 +113,8 @@ specified in the =test.properties= file 
 *includeHadoopJars* (*): includes Hadoop JARs and its transitive dependencies in the Oozie WAR file, default is
 undefined (Hadoop JARs are not included).
 
+*hadoop.version* =(*)=: indicates the Hadoop version(Hadoop-1 or Hadoop-2) you wish to build Oozie against specifically. It will substitute this value in the Oozie POM properties and pull the corresponding Hadoop artifacts from Maven. Default version is 1.0.1 for Hadoop-1 (the most common case). For Hadoop-2, the version you can pass is *2.0.0-alpha*.
+
 *generateSite* (*): generates Oozie documentation, default is undefined (no documentation is generated)
 
 *skipTests* (*): skips the execution of all testcases, no value required, default is undefined
@@ -233,6 +235,23 @@ The following Maven invocation builds an
 $ mvn clean package assembly:single
 </verbatim>
 
+*Build instructions with Hadoop Yarn (Hadoop-2.x)*
+
+Following values can be passed as maven properties
+   * -Dhadoop.version			: *2.0.0-alpha*
+   * -Dpig.version (optional)	: either *0.9.2* or *0.10.2*
+   
+For e.g.
+<verbatim>
+$ mvn clean package assembly:single -Dhadoop.version=2.0.0-alpha
+</verbatim>
+
+If none of these parameters are specified, the defaults are
+   * -Dhadoop.version			: *1.0.1*
+   * -Dhadoop.auth.version		: *2.0.0-alpha*
+   * -Dpig.version				: *0.9.0*
+
+
 The following properties should be specified when building a release:
 
    * -DgenerateDocs : forces the generation of Oozie documentation

Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1362132&r1=1362131&r2=1362132&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Mon Jul 16 16:59:35 2012
@@ -1,5 +1,6 @@
 -- Oozie 3.3.0 release (trunk - unreleased)
 
+OOZIE-908 Oozie docs build instructions for hadoop versions (mona via virag)
 OOZIE-874 Eliminate redundancies in xml (britt via virag)
 OOZIE-900 Indicate that the exception thrown from the db-cli during an error is for debug purposes (harsh)
 OOZIE-865 ForkJoin validator checks total lengths of forks vs. joins instead of actual paths (rkanter via tucu)