diff --git llap-server/pom.xml llap-server/pom.xml index 61ccbd4..eabe1a8 100644 --- llap-server/pom.xml +++ llap-server/pom.xml @@ -86,6 +86,11 @@ ${netty.version} + io.netty + netty + ${netty3.version} + + org.apache.avro avro ${avro.version} @@ -133,6 +138,11 @@ io.netty netty-all + + + io.netty + netty + diff --git llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java index 32682ae..23531a3 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java +++ llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java @@ -399,7 +399,9 @@ public Void call() throws Exception { 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)); diff --git pom.xml pom.xml index 8218bcd..d2882c0 100644 --- pom.xml +++ pom.xml @@ -186,6 +186,7 @@ 1.10.19 2.0.0-M5 4.0.52.Final + 3.10.5.Final 1.9.0 0.16.0 1.5.6