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/06/27 20:34:14 UTC

oozie git commit: OOZIE-2884 consolidate hadoop versions in pomfiles (Artem Ervits via gezapeti)

Repository: oozie
Updated Branches:
  refs/heads/master 4a666110f -> 5778c6f56


OOZIE-2884 consolidate hadoop versions in pomfiles (Artem Ervits via gezapeti)


Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/5778c6f5
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/5778c6f5
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/5778c6f5

Branch: refs/heads/master
Commit: 5778c6f5625747d92e25b2aff22bd20369c3d18b
Parents: 4a66611
Author: Gezapeti Cseh <ge...@gmail.com>
Authored: Tue Jun 27 22:33:36 2017 +0200
Committer: Gezapeti Cseh <ge...@gmail.com>
Committed: Tue Jun 27 22:33:36 2017 +0200

----------------------------------------------------------------------
 docs/src/site/twiki/DG_QuickStart.twiki | 2 --
 docs/src/site/twiki/ENG_Building.twiki  | 2 --
 pom.xml                                 | 8 +++-----
 release-log.txt                         | 1 +
 4 files changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oozie/blob/5778c6f5/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 8c3d664..9cd8a9e 100644
--- a/docs/src/site/twiki/DG_QuickStart.twiki
+++ b/docs/src/site/twiki/DG_QuickStart.twiki
@@ -44,8 +44,6 @@ available to customise the versions of the dependencies:
 -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.auth.version=<version> - defaults to hadoop version
--Ddistcp.version=<version> - defaults to hadoop version
 -Dpig.version=<version> - default 0.16.0
 -Dpig.classifier=<classifier> - default h2
 -Dsqoop.version=<version> - default 1.4.3

http://git-wip-us.apache.org/repos/asf/oozie/blob/5778c6f5/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 36d77b2..56e191d 100644
--- a/docs/src/site/twiki/ENG_Building.twiki
+++ b/docs/src/site/twiki/ENG_Building.twiki
@@ -214,8 +214,6 @@ the versions of the dependencies:
 -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.auth.version=<version> - defaults to hadoop version
--Ddistcp.version=<version> - defaults to hadoop version
 -Dpig.version=<version> - default 0.16.0
 -Dpig.classifier=<classifier> - default h2
 -Dsqoop.version=<version> - default 1.4.3

http://git-wip-us.apache.org/repos/asf/oozie/blob/5778c6f5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bfe3b01..16c5137 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,8 +101,6 @@
          <spark.guava.version>14.0.1</spark.guava.version>
          <spark.scala.binary.version>2.10</spark.scala.binary.version>
          <sqoop.classifier>hadoop200</sqoop.classifier>
-         <streaming.version>${hadoop.version}</streaming.version>
-         <hadoop.auth.version>${hadoop.version}</hadoop.auth.version>
          <tez.version>0.8.4</tez.version>
 
          <jetty.version>9.2.19.v20160908</jetty.version>
@@ -323,7 +321,7 @@
             <dependency>
                 <groupId>org.apache.hadoop</groupId>
                 <artifactId>hadoop-auth</artifactId>
-                <version>${hadoop.auth.version}</version>
+                <version>${hadoop.version}</version>
                 <scope>compile</scope>
                 <exclusions>
                     <exclusion>
@@ -340,7 +338,7 @@
             <dependency>
                 <groupId>org.apache.hadoop</groupId>
                 <artifactId>hadoop-core</artifactId>
-                <version>${hadoop.auth.version}</version>
+                <version>${hadoop.version}</version>
                 <scope>compile</scope>
                 <exclusions>
                     <exclusion>
@@ -790,7 +788,7 @@
             <dependency>
                 <groupId>org.apache.hadoop</groupId>
                 <artifactId>hadoop-streaming</artifactId>
-                <version>${streaming.version}</version>
+                <version>${hadoop.version}</version>
             </dependency>
 
             <dependency>

http://git-wip-us.apache.org/repos/asf/oozie/blob/5778c6f5/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 6bded55..8f97085 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.0.0 release (trunk - unreleased)
 
+OOZIE-2884 consolidate hadoop versions in pomfiles (Artem Ervits via gezapeti)
 OOZIE-2794 Hive and Pig tests failing when multiple pre-commit jobs are running (gezapeti)
 OOZIE-2849 Fix build warnings when assembling directories (asasvari via gezapeti)
 OOZIE-2848 Override sharelib.tgz in distro when rebuilding Oozie (asasvari via gezapeti)