Repository: oozie Updated Branches: refs/heads/master 30e673e60 -> f5554dd31
Revert "OOZIE-2751 LocalOozieClient is missing methods from OozieClient (abhishekbafna via rkanter)" This reverts commit 30e673e60a746f855f50bf03b74810e19130e422. Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/ffd9951f Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/ffd9951f Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/ffd9951f Branch: refs/heads/master Commit: ffd9951f30a66ae08a59943c2db62ad6d482f437 Parents: 30e673e Author: Robert Kanter <rkan...@apache.org> Authored: Mon May 8 15:41:30 2017 -0700 Committer: Robert Kanter <rkan...@apache.org> Committed: Mon May 8 15:41:30 2017 -0700 ---------------------------------------------------------------------- docs/src/site/twiki/DG_QuickStart.twiki | 6 +++--- docs/src/site/twiki/ENG_Building.twiki | 6 +++--- pom.xml | 6 +++--- release-log.txt | 1 - 4 files changed, 9 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/ffd9951f/docs/src/site/twiki/DG_QuickStart.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/DG_QuickStart.twiki b/docs/src/site/twiki/DG_QuickStart.twiki index 7ea87c7..fdc8374 100644 --- a/docs/src/site/twiki/DG_QuickStart.twiki +++ b/docs/src/site/twiki/DG_QuickStart.twiki @@ -16,7 +16,7 @@ For detailed install and configuration instructions refer to [[AG_Install][Oozie * Unix box (tested on Mac OS X and Linux) * Java JDK 1.7+ * Maven 3.0.1+ - * Hadoop 2.6.0+ + * Hadoop 0.20.2+ * Pig 0.7+ JDK commands (java, javac) must be in the command path. @@ -45,7 +45,7 @@ available to customise the versions of the dependencies: profile depending on the hadoop version used. -Ptez - Bundle tez jars in hive and pig sharelibs. Useful if you want to use tez +as the execution engine for those applications. --Dhadoop.version=<version> - default 1.2.1 for hadoop-1, 2.6.0 for hadoop-2 and 3.0.0-SNAPSHOT for hadoop-3 +-Dhadoop.version=<version> - default 1.2.1 for hadoop-1, 2.4.0 for hadoop-2 and 3.0.0-SNAPSHOT for hadoop-3 -Dhadoop.auth.version=<version> - defaults to hadoop version -Ddistcp.version=<version> - defaults to hadoop version -Dpig.version=<version> - default 0.16.0 @@ -70,7 +70,7 @@ More details on building Oozie can be found on the [[ENG_Building][Building Oozi * Unix (tested in Linux and Mac OS X) * Java 1.7+ * Hadoop - * [[http://hadoop.apache.org][Apache Hadoop]] (tested with 1.2.1 & 2.6.0+) + * [[http://hadoop.apache.org][Apache Hadoop]] (tested with 1.2.1 & 2.4.0+) * ExtJS library (optional, to enable Oozie webconsole) * [[http://archive.cloudera.com/gplextras/misc/ext-2.2.zip][ExtJS 2.2]] http://git-wip-us.apache.org/repos/asf/oozie/blob/ffd9951f/docs/src/site/twiki/ENG_Building.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/ENG_Building.twiki b/docs/src/site/twiki/ENG_Building.twiki index 535f1b0..019f8f1 100644 --- a/docs/src/site/twiki/ENG_Building.twiki +++ b/docs/src/site/twiki/ENG_Building.twiki @@ -11,7 +11,7 @@ * Unix box (tested on Mac OS X and Linux) * Java JDK 1.7+ * [[http://maven.apache.org/][Maven 3.0.1+]] - * [[http://hadoop.apache.org/core/releases.html][Hadoop 2.6.0+]] + * [[http://hadoop.apache.org/core/releases.html][Hadoop 0.20.2+]] * [[http://hadoop.apache.org/pig/releases.html][Pig 0.7+]] JDK commands (java, javac) must be in the command path. @@ -114,7 +114,7 @@ specified in the =test.properties= file (which is loaded by the =XTestCase= clas *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.2.1 -for Hadoop-1 (the most common case). For Hadoop-2, the version you can pass is *2.6.0*. +for Hadoop-1 (the most common case). For Hadoop-2, the version you can pass is *2.4.0*. *generateSite* (*): generates Oozie documentation, default is undefined (no documentation is generated) @@ -215,7 +215,7 @@ the versions of the dependencies: profile depending on the hadoop version used. -Ptez - Bundle tez jars in hive and pig sharelibs. Useful if you want to use tez as the execution engine for those applications. --Dhadoop.version=<version> - default 1.2.1 for hadoop-1, 2.6.0 for hadoop-2 and 3.0.0-SNAPSHOT for hadoop-3 +-Dhadoop.version=<version> - default 1.2.1 for hadoop-1, 2.4.0 for hadoop-2 and 3.0.0-SNAPSHOT for hadoop-3 -Dhadoop.auth.version=<version> - defaults to hadoop version -Ddistcp.version=<version> - defaults to hadoop version -Dpig.version=<version> - default 0.16.0 http://git-wip-us.apache.org/repos/asf/oozie/blob/ffd9951f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ebe1d68..5c6edf1 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ </oozie.test.default.config.file> <oozie.test.config.file>${oozie.test.default.config.file}</oozie.test.config.file> - <hadoop.version>2.6.0</hadoop.version> + <hadoop.version>2.4.0</hadoop.version> <hadoop.majorversion>2</hadoop.majorversion> <hadooplib.version>hadoop-${hadoop.majorversion}-${project.version}</hadooplib.version> <oozie.hadoop-utils.version>hadoop-${hadoop.majorversion}-${project.version}</oozie.hadoop-utils.version> @@ -261,7 +261,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minikdc</artifactId> - <version>${hadoop.version}</version> + <version>2.4.0</version> </dependency> <!-- client --> @@ -1957,7 +1957,7 @@ <activeByDefault>true</activeByDefault> </activation> <properties> - <hadoop.version>2.6.0</hadoop.version> + <hadoop.version>2.4.0</hadoop.version> <hadoop.majorversion>2</hadoop.majorversion> <pig.classifier>h2</pig.classifier> <sqoop.classifier>hadoop200</sqoop.classifier> http://git-wip-us.apache.org/repos/asf/oozie/blob/ffd9951f/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index cb141cb..d998b2d 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,6 +1,5 @@ -- Oozie 4.4.0 release (trunk - unreleased) -OOZIE-2751 LocalOozieClient is missing methods from OozieClient (abhishekbafna via rkanter) OOZIE-2870 non working examples in oozie documentation coordinator spec (andras.piros via pbacsko) OOZIE-2827 amend More directly view of the coordinatorâs history from perspective of workflow action. (Alonzo Zhou via pbacsko) OOZIE-2851 spelling mistakes in examples (Artem Ervits via gezapeti)