You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by ge...@apache.org on 2017/05/10 22:44:57 UTC
[1/2] oozie git commit: OOZIE-2780 Upgrade minimum Hadoop version to
2.6.0 (dbist13 via rkanter)
Repository: oozie
Updated Branches:
refs/heads/oya 80854d151 -> 0e9e5e380
OOZIE-2780 Upgrade minimum Hadoop version to 2.6.0 (dbist13 via rkanter)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/9d58f9ae
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/9d58f9ae
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/9d58f9ae
Branch: refs/heads/oya
Commit: 9d58f9aebfec3163bd7823e94292fd2f66ca7d18
Parents: 1103882
Author: Robert Kanter <rk...@apache.org>
Authored: Wed May 10 11:20:54 2017 -0700
Committer: Robert Kanter <rk...@apache.org>
Committed: Wed May 10 11:21:27 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, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/9d58f9ae/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 fdc8374..7ea87c7 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 0.20.2+
+ * Hadoop 2.6.0+
* 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.4.0 for hadoop-2 and 3.0.0-SNAPSHOT for hadoop-3
+-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.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.4.0+)
+ * [[http://hadoop.apache.org][Apache Hadoop]] (tested with 1.2.1 & 2.6.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/9d58f9ae/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 019f8f1..535f1b0 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 0.20.2+]]
+ * [[http://hadoop.apache.org/core/releases.html][Hadoop 2.6.0+]]
* [[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.4.0*.
+for Hadoop-1 (the most common case). For Hadoop-2, the version you can pass is *2.6.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.4.0 for hadoop-2 and 3.0.0-SNAPSHOT for hadoop-3
+-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.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/9d58f9ae/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5c6edf1..ebe1d68 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.4.0</hadoop.version>
+ <hadoop.version>2.6.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>2.4.0</version>
+ <version>${hadoop.version}</version>
</dependency>
<!-- client -->
@@ -1957,7 +1957,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<properties>
- <hadoop.version>2.4.0</hadoop.version>
+ <hadoop.version>2.6.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/9d58f9ae/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 0128b3b..5800715 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.4.0 release (trunk - unreleased)
+OOZIE-2780 Upgrade minimum Hadoop version to 2.6.0 (dbist13 via rkanter)
OOZIE-2824 Fix typos in documentation (lzeke via gezapeti)
OOZIE-2874 Make the Launcher Mapper map-only job's InputFormat class pluggable (andras.piros via gezapeti)
OOZIE-2751 LocalOozieClient is missing methods from OozieClient (abhishekbafna via rkanter)
[2/2] oozie git commit: Merge branch 'master' into oya
Posted by ge...@apache.org.
Merge branch 'master' into oya
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/0e9e5e38
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/0e9e5e38
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/0e9e5e38
Branch: refs/heads/oya
Commit: 0e9e5e3801f0d6aaad4a7c6c8a9b74e75296a0b6
Parents: 80854d1 9d58f9a
Author: Gezapeti Cseh <ge...@gmail.com>
Authored: Wed May 10 15:31:45 2017 -0700
Committer: Gezapeti Cseh <ge...@gmail.com>
Committed: Wed May 10 15:31:45 2017 -0700
----------------------------------------------------------------------
docs/src/site/twiki/DG_QuickStart.twiki | 6 ++++--
docs/src/site/twiki/ENG_Building.twiki | 6 ++++--
pom.xml | 2 +-
release-log.txt | 1 +
4 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/0e9e5e38/docs/src/site/twiki/DG_QuickStart.twiki
----------------------------------------------------------------------
diff --cc docs/src/site/twiki/DG_QuickStart.twiki
index 607fd7f,7ea87c7..8c3d664
--- a/docs/src/site/twiki/DG_QuickStart.twiki
+++ b/docs/src/site/twiki/DG_QuickStart.twiki
@@@ -41,7 -41,11 +41,9 @@@ suitable when same oozie package needs
2. Build with -Puber which will bundle the required libraries in the oozie war. Further, the following options are
available to customise the versions of the dependencies:
--P<profile> - default hadoop-2. Valid are hadoop-1, hadoop-2 or hadoop-3. Choose the correct hadoop
-profile depending on the hadoop version used.
+-Dhadoop.version=<version> - default 2.6.0
+ -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.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/0e9e5e38/docs/src/site/twiki/ENG_Building.twiki
----------------------------------------------------------------------
diff --cc docs/src/site/twiki/ENG_Building.twiki
index 67540dd,535f1b0..3d23b26
--- a/docs/src/site/twiki/ENG_Building.twiki
+++ b/docs/src/site/twiki/ENG_Building.twiki
@@@ -211,7 -211,11 +211,9 @@@ $ bin/mkdistro.sh [-DskipTests
Running =mkdistro.sh= will create the binary distribution of Oozie. The following options are available to customise
the versions of the dependencies:
-Puber - Bundle required hadoop and hcatalog libraries in oozie war
- -Dhadoop.version=<version> - default 2.4.0
--P<profile> - default hadoop-2. Valid are hadoop-1, hadoop-2 or hadoop-3. Choose the correct hadoop
-profile depending on the hadoop version used.
++-Dhadoop.version=<version> - default 2.6.0
+ -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.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/0e9e5e38/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/0e9e5e38/release-log.txt
----------------------------------------------------------------------