You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by rk...@apache.org on 2016/10/20 00:23:09 UTC
oozie git commit: OOZIE-2621 Use hive-exec--core instead of
hive-exec in oozie-core (gezapeti via rkanter)
Repository: oozie
Updated Branches:
refs/heads/master 149500bf9 -> c5f2b7d26
OOZIE-2621 Use hive-exec-<version>-core instead of hive-exec in oozie-core (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/c5f2b7d2
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/c5f2b7d2
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/c5f2b7d2
Branch: refs/heads/master
Commit: c5f2b7d2628f49511701510900b04e7298c79362
Parents: 149500b
Author: Robert Kanter <rk...@cloudera.com>
Authored: Wed Oct 19 17:22:16 2016 -0700
Committer: Robert Kanter <rk...@cloudera.com>
Committed: Wed Oct 19 17:22:16 2016 -0700
----------------------------------------------------------------------
core/pom.xml | 36 ++++++++++++++++++++++++++++++++++--
pom.xml | 41 +++++++++++++++++++++++++++++++++++++++++
release-log.txt | 1 +
sharelib/hive2/pom.xml | 4 ++++
4 files changed, 80 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/c5f2b7d2/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 4e6ef84..163bb3b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -36,6 +36,18 @@
<dependencies>
<dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-client</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-framework</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<exclusions>
@@ -88,13 +100,33 @@
<artifactId>hbase</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.hive.hcatalog</groupId>
<artifactId>hive-webhcat-java-client</artifactId>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-exec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.esotericsoftware.kryo</groupId>
+ <artifactId>kryo</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-exec</artifactId>
+ <scope>compile</scope>
+ <classifier>${hive.classifier}</classifier>
</dependency>
-
<dependency>
<groupId>org.apache.hive.hcatalog</groupId>
<artifactId>hive-hcatalog-server-extensions</artifactId>
http://git-wip-us.apache.org/repos/asf/oozie/blob/c5f2b7d2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fcd023c..ade1f25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,6 +91,7 @@
<!-- Sharelib component versions -->
<hive.version>1.2.0</hive.version>
<hive.jline.version>2.12</hive.jline.version>
+ <hive.classifier>core</hive.classifier>
<pig.version>0.16.0</pig.version>
<pig.classifier></pig.classifier>
<sqoop.version>1.4.3</sqoop.version>
@@ -115,6 +116,8 @@
<activemq.version>5.13.3</activemq.version>
<httpcore.version>4.3.3</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
+ <kyro.version>2.22</kyro.version>
+ <json.version>20090211</json.version>
</properties>
<modules>
@@ -1279,6 +1282,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.3.2</version>
+ </dependency>
+
+ <dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4</version>
@@ -1372,6 +1381,37 @@
<version>${curator.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-framework</artifactId>
+ <version>${curator.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-client</artifactId>
+ <version>${curator.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.esotericsoftware.kryo</groupId>
+ <artifactId>kryo</artifactId>
+ <version>${kyro.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>${json.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-exec</artifactId>
+ <version>${hive.version}</version>
+ <classifier>${hive.classifier}</classifier>
+ </dependency>
+
<!-- examples -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -1858,6 +1898,7 @@
<pig.classifier></pig.classifier>
<sqoop.classifier>hadoop100</sqoop.classifier>
<hive.version>0.13.1</hive.version>
+ <hive.classifier></hive.classifier>
<hive.jline.version>0.9.94</hive.jline.version>
</properties>
</profile>
http://git-wip-us.apache.org/repos/asf/oozie/blob/c5f2b7d2/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 855c01d..e1d3d2f 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -6,6 +6,7 @@ OOZIE-2634 Queue dump command message is confusing when the queue is empty (andr
-- Oozie 4.3.0 release
+OOZIE-2621 Use hive-exec-<version>-core instead of hive-exec in oozie-core (gezapeti via rkanter)
OOZIE-2613 Upgrade hive version from 0.13.1 to 1.2.0 (abhishekbafna via rkanter)
OOZIE-2658 --driver-class-path can overwrite the classpath in SparkMain (gezapeti via rkanter)
OOZIE-1814 Oozie should mask any passwords in logs and REST interfaces (andras.piros via rkanter)
http://git-wip-us.apache.org/repos/asf/oozie/blob/c5f2b7d2/sharelib/hive2/pom.xml
----------------------------------------------------------------------
diff --git a/sharelib/hive2/pom.xml b/sharelib/hive2/pom.xml
index 3dd9a4d..e81bfbe 100644
--- a/sharelib/hive2/pom.xml
+++ b/sharelib/hive2/pom.xml
@@ -188,6 +188,10 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
<version>${hive.jline.version}</version>