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 2016/10/10 11:52:28 UTC
[29/50] [abbrv] oozie git commit: OOZIE-2676 Make hadoop-2 as the
default profile (gezapeti via rkanter)
OOZIE-2676 Make hadoop-2 as the default profile (gezapeti via rkanter)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/9827036d
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/9827036d
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/9827036d
Branch: refs/heads/oya
Commit: 9827036d7cecf9726ea31ee513895c81c988e22f
Parents: a1d2687
Author: Robert Kanter <rk...@cloudera.com>
Authored: Thu Sep 22 13:28:55 2016 -0700
Committer: Robert Kanter <rk...@cloudera.com>
Committed: Thu Sep 22 13:28:55 2016 -0700
----------------------------------------------------------------------
docs/src/site/twiki/DG_QuickStart.twiki | 4 ++--
docs/src/site/twiki/ENG_Building.twiki | 6 +++---
hadooplibs/pom.xml | 4 ++--
pom.xml | 8 ++++----
release-log.txt | 1 +
5 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/9827036d/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 0653f08..b1dea12 100644
--- a/docs/src/site/twiki/DG_QuickStart.twiki
+++ b/docs/src/site/twiki/DG_QuickStart.twiki
@@ -41,9 +41,9 @@ suitable when same oozie package needs to be used in multiple set-ups with diffe
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-1. Valid are hadoop-1, hadoop-2 or hadoop-3. Choose the correct hadoop
+-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 1.2.1 for hadoop-1, 2.3.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/9827036d/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 9864098..f6c88d6 100644
--- a/docs/src/site/twiki/ENG_Building.twiki
+++ b/docs/src/site/twiki/ENG_Building.twiki
@@ -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.3.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)
@@ -212,9 +212,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
--P<profile> - default hadoop-1. Valid are hadoop-1, hadoop-2 or hadoop-3. Choose the correct hadoop
+-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 1.2.1 for hadoop-1, 2.3.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/9827036d/hadooplibs/pom.xml
----------------------------------------------------------------------
diff --git a/hadooplibs/pom.xml b/hadooplibs/pom.xml
index cd0f478..53844cc 100644
--- a/hadooplibs/pom.xml
+++ b/hadooplibs/pom.xml
@@ -47,7 +47,7 @@
<profile>
<id>hadoop-1</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <activeByDefault>false</activeByDefault>
</activation>
<modules>
<module>hadoop-utils-1</module>
@@ -58,7 +58,7 @@
<profile>
<id>hadoop-2</id>
<activation>
- <activeByDefault>false</activeByDefault>
+ <activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>hadoop-utils-2</module>
http://git-wip-us.apache.org/repos/asf/oozie/blob/9827036d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7ac9eae..c710468 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,8 +78,8 @@
</oozie.test.default.config.file>
<oozie.test.config.file>${oozie.test.default.config.file}</oozie.test.config.file>
- <hadoop.version>1.2.1</hadoop.version>
- <hadoop.majorversion>1</hadoop.majorversion>
+ <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>
<hbase.version>0.94.27</hbase.version>
@@ -1851,7 +1851,7 @@
<profile>
<id>hadoop-1</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <activeByDefault>false</activeByDefault>
</activation>
<properties>
<hadoop.version>1.2.1</hadoop.version>
@@ -1863,7 +1863,7 @@
<profile>
<id>hadoop-2</id>
<activation>
- <activeByDefault>false</activeByDefault>
+ <activeByDefault>true</activeByDefault>
</activation>
<properties>
<hadoop.version>2.4.0</hadoop.version>
http://git-wip-us.apache.org/repos/asf/oozie/blob/9827036d/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index dbfbafe..58e91ff 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.3.0 release (trunk - unreleased)
+OOZIE-2676 Make hadoop-2 as the default profile (gezapeti via rkanter)
OOZIE-2487 Temporary workaround for Java 8 Javadoc errors (abhishekbafna via rkanter)
OOZIE-1978 Forkjoin validation code is ridiculously slow in some cases (pbacsko via rkanter)
OOZIE-2682 Oozie test-patch script is not updating Jira with jenkins test report (abhishekbafna via rkanter)