You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2018/01/30 07:41:46 UTC
hive git commit: HIVE-18574 : LLAP: Ship netty3 as part of LLAP
install tarball (Gopal V via Ashutosh Chauhan)
Repository: hive
Updated Branches:
refs/heads/master be8a451d5 -> 7a04dd626
HIVE-18574 : LLAP: Ship netty3 as part of LLAP install tarball (Gopal V via Ashutosh Chauhan)
Signed-off-by: Ashutosh Chauhan <ha...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/7a04dd62
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/7a04dd62
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/7a04dd62
Branch: refs/heads/master
Commit: 7a04dd6269e0e26f8bddafd97d5a887ba0881e0c
Parents: be8a451
Author: Gopal V <go...@apache.org>
Authored: Mon Jan 29 23:41:26 2018 -0800
Committer: Ashutosh Chauhan <ha...@apache.org>
Committed: Mon Jan 29 23:41:26 2018 -0800
----------------------------------------------------------------------
llap-server/pom.xml | 10 ++++++++++
.../apache/hadoop/hive/llap/cli/LlapServiceDriver.java | 4 +++-
pom.xml | 1 +
3 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/7a04dd62/llap-server/pom.xml
----------------------------------------------------------------------
diff --git a/llap-server/pom.xml b/llap-server/pom.xml
index 61ccbd4..eabe1a8 100644
--- a/llap-server/pom.xml
+++ b/llap-server/pom.xml
@@ -86,6 +86,11 @@
<version>${netty.version}</version>
</dependency>
<dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>${netty3.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>${avro.version}</version>
@@ -133,6 +138,11 @@
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
</exclusion>
+ <!-- netty 3 too -->
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/hive/blob/7a04dd62/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java b/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java
index 32682ae..23531a3 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java
@@ -399,7 +399,9 @@ public class LlapServiceDriver {
org.apache.logging.slf4j.Log4jLogger.class, // log4j-slf4j
// log4j-1.2-API needed for NDC
org.apache.log4j.NDC.class,
- io.netty.util.NetUtil.class };
+ io.netty.util.NetUtil.class, // netty4
+ org.jboss.netty.util.NetUtil.class //netty3
+ };
for (Class<?> c : dependencies) {
Path jarPath = new Path(Utilities.jarFinderGetJar(c));
http://git-wip-us.apache.org/repos/asf/hive/blob/7a04dd62/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f1a50a7..fdc331b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -186,6 +186,7 @@
<mockito-all.version>1.10.19</mockito-all.version>
<mina.version>2.0.0-M5</mina.version>
<netty.version>4.0.52.Final</netty.version>
+ <netty3.version>3.10.5.Final</netty3.version>
<parquet.version>1.9.0</parquet.version>
<pig.version>0.16.0</pig.version>
<plexus.version>1.5.6</plexus.version>