diff --git a/hcatalog/hcatalog-pig-adapter/pom.xml b/hcatalog/hcatalog-pig-adapter/pom.xml index b08e255..a1c8ddf 100644 --- a/hcatalog/hcatalog-pig-adapter/pom.xml +++ b/hcatalog/hcatalog-pig-adapter/pom.xml @@ -66,16 +66,32 @@ pig ${pig.version} h2 - - - org.mortbay.jetty - jetty-util - + + + org.mortbay.jetty + jetty-util + org.mortbay.jetty jetty - + + org.mortbay.jetty + jsp-api-2.1 + + + org.mortbay.jetty + jsp-2.1 + + + tomcat + jasper-runtime + + + tomcat + jasper-compiler + + org.apache.hadoop diff --git a/llap-common/src/java/org/apache/hadoop/hive/llap/security/LlapTokenSelector.java b/llap-common/src/java/org/apache/hadoop/hive/llap/security/LlapTokenSelector.java index 83b3999..441180f 100644 --- a/llap-common/src/java/org/apache/hadoop/hive/llap/security/LlapTokenSelector.java +++ b/llap-common/src/java/org/apache/hadoop/hive/llap/security/LlapTokenSelector.java @@ -20,15 +20,15 @@ import java.util.Collection; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.io.Text; import org.apache.hadoop.security.token.Token; import org.apache.hadoop.security.token.TokenIdentifier; import org.apache.hadoop.security.token.TokenSelector; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class LlapTokenSelector implements TokenSelector { - private static final Log LOG = LogFactory.getLog(LlapTokenSelector.class); + private static final Logger LOG = LoggerFactory.getLogger(LlapTokenSelector.class); @Override public Token selectToken(Text service, diff --git a/pom.xml b/pom.xml index 4ca963e..a993354 100644 --- a/pom.xml +++ b/pom.xml @@ -161,7 +161,6 @@ 4.4.4 2.4.0 2.9.4 - 5.5.23 2.3.4 2.3.1 0.3.2 diff --git a/service-rpc/pom.xml b/service-rpc/pom.xml index 4b88ad4..d6a07a5 100644 --- a/service-rpc/pom.xml +++ b/service-rpc/pom.xml @@ -44,16 +44,6 @@ ${commons-cli.version} - tomcat - jasper-compiler - ${jasper.version} - - - tomcat - jasper-runtime - ${jasper.version} - - org.apache.thrift libfb303 ${libfb303.version} diff --git a/service/pom.xml b/service/pom.xml index 7ccbdd7..ebe7863 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -128,28 +128,6 @@ ${commons-lang.version} - tomcat - jasper-compiler - ${jasper.version} - - - javax.servlet - servlet-api - - - - - tomcat - jasper-runtime - ${jasper.version} - - - javax.servlet - servlet-api - - - - org.apache.thrift libfb303 ${libfb303.version}