Repository: oozie Updated Branches: refs/heads/master 87b3d0fff -> 09e053264
OOZIE-3278 Oozie fails to start with Hadoop 2.6.0 (kmarton via andras.piros) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/09e05326 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/09e05326 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/09e05326 Branch: refs/heads/master Commit: 09e053264b78787aa79ff0fc81da5f8d4fa09124 Parents: 87b3d0f Author: Andras Piros <andras.pi...@cloudera.com> Authored: Thu Jun 14 12:36:55 2018 +0200 Committer: Andras Piros <andras.pi...@cloudera.com> Committed: Thu Jun 14 12:36:55 2018 +0200 ---------------------------------------------------------------------- docs/src/site/twiki/DG_QuickStart.twiki | 2 ++ docs/src/site/twiki/ENG_Building.twiki | 2 ++ examples/pom.xml | 19 +++++++++++++------ release-log.txt | 1 + sharelib/pig/pom.xml | 18 +++++++++++++----- webapp/pom.xml | 18 ++++++++++++------ 6 files changed, 43 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/09e05326/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 cc1bb6d..65c59a4 100644 --- a/docs/src/site/twiki/DG_QuickStart.twiki +++ b/docs/src/site/twiki/DG_QuickStart.twiki @@ -55,6 +55,8 @@ available to customise the versions of the dependencies: -Dhive.version=<version - default 1.2.0 -Dhbase.version=<version> - default 1.2.3 -Dtez.version=<version> - default 0.8.4 + +*IMPORTANT:* Profile hadoop-3 must be activated if building against Hadoop 3 </verbatim> More details on building Oozie can be found on the [[ENG_Building][Building Oozie]] page. http://git-wip-us.apache.org/repos/asf/oozie/blob/09e05326/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 79a7726..1f32de1 100644 --- a/docs/src/site/twiki/ENG_Building.twiki +++ b/docs/src/site/twiki/ENG_Building.twiki @@ -227,6 +227,8 @@ as the execution engine for those applications. -Dtez.version=<version> - default 0.8.4 </verbatim> +*IMPORTANT:* Profile hadoop-3 must be activated if building against Hadoop 3 + The following properties should be specified when building a release: * -DgenerateDocs : forces the generation of Oozie documentation http://git-wip-us.apache.org/repos/asf/oozie/blob/09e05326/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index c13febc..420b4f8 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -40,12 +40,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> </dependency> @@ -195,6 +189,19 @@ </plugins> </build> </profile> + <profile> + <id>hadoop-3</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> </profiles> </project> http://git-wip-us.apache.org/repos/asf/oozie/blob/09e05326/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index a93be9d..7d53bb3 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.1.0 release (trunk - unreleased) +OOZIE-3278 Oozie fails to start with Hadoop 2.6.0 (kmarton via andras.piros) OOZIE-3260 [sla] Remove stale item above max retries on JPA related errors from in-memory SLA map (andras.piros) OOZIE-3233 Remove DST shift from the coordinator job's end time (kmarton via andras.piros) OOZIE-1393 Allow sending emails via TLS (mbalakrishnan, dionusos via andras.piros) http://git-wip-us.apache.org/repos/asf/oozie/blob/09e05326/sharelib/pig/pom.xml ---------------------------------------------------------------------- diff --git a/sharelib/pig/pom.xml b/sharelib/pig/pom.xml index 6619a0a..e548247 100644 --- a/sharelib/pig/pom.xml +++ b/sharelib/pig/pom.xml @@ -108,11 +108,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>dk.brics.automaton</groupId> <artifactId>automaton</artifactId> <scope>compile</scope> @@ -265,6 +260,19 @@ </dependency> </dependencies> </profile> + <profile> + <id>hadoop-3</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> </profiles> </project> http://git-wip-us.apache.org/repos/asf/oozie/blob/09e05326/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/webapp/pom.xml b/webapp/pom.xml index 67526d9..4a32b54 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -148,12 +148,6 @@ <artifactId>hadoop-client</artifactId> <scope>provided</scope> </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <scope>provided</scope> - </dependency> </dependencies> <build> @@ -309,6 +303,18 @@ </dependency> </dependencies> </profile> + <profile> + <id>hadoop-3</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + </dependency> + </dependencies> + </profile> </profiles> </project>
