Repository: hive Updated Branches: refs/heads/branch-3 9ac67e325 -> 02f4931c0
HIVE-19799: remove jasper dependency (Prasanth Jayachandran reviewed by Thejas M Nair) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/02f4931c Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/02f4931c Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/02f4931c Branch: refs/heads/branch-3 Commit: 02f4931c00631722ede27fae67808950f2ff7ac2 Parents: 9ac67e3 Author: Prasanth Jayachandran <[email protected]> Authored: Thu Jun 7 13:33:56 2018 -0700 Committer: Prasanth Jayachandran <[email protected]> Committed: Thu Jun 7 13:34:15 2018 -0700 ---------------------------------------------------------------------- hcatalog/hcatalog-pig-adapter/pom.xml | 28 +++++++++++++++----- .../hive/llap/security/LlapTokenSelector.java | 6 ++--- pom.xml | 1 - service-rpc/pom.xml | 10 ------- service/pom.xml | 22 --------------- 5 files changed, 25 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/02f4931c/hcatalog/hcatalog-pig-adapter/pom.xml ---------------------------------------------------------------------- diff --git a/hcatalog/hcatalog-pig-adapter/pom.xml b/hcatalog/hcatalog-pig-adapter/pom.xml index bacec1f..fae50ce 100644 --- a/hcatalog/hcatalog-pig-adapter/pom.xml +++ b/hcatalog/hcatalog-pig-adapter/pom.xml @@ -66,16 +66,32 @@ <artifactId>pig</artifactId> <version>${pig.version}</version> <classifier>h2</classifier> - <exclusions> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> + <exclusions> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> + </exclusion> <exclusion> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> </exclusion> - </exclusions> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jsp-api-2.1</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jsp-2.1</artifactId> + </exclusion> + <exclusion> + <groupId>tomcat</groupId> + <artifactId>jasper-runtime</artifactId> + </exclusion> + <exclusion> + <groupId>tomcat</groupId> + <artifactId>jasper-compiler</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/hive/blob/02f4931c/llap-common/src/java/org/apache/hadoop/hive/llap/security/LlapTokenSelector.java ---------------------------------------------------------------------- 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 @@ package org.apache.hadoop.hive.llap.security; 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<LlapTokenIdentifier> { - private static final Log LOG = LogFactory.getLog(LlapTokenSelector.class); + private static final Logger LOG = LoggerFactory.getLogger(LlapTokenSelector.class); @Override public Token<LlapTokenIdentifier> selectToken(Text service, http://git-wip-us.apache.org/repos/asf/hive/blob/02f4931c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d6f1e9e..0f4979d 100644 --- a/pom.xml +++ b/pom.xml @@ -162,7 +162,6 @@ <httpcomponents.core.version>4.4.4</httpcomponents.core.version> <ivy.version>2.4.0</ivy.version> <jackson.version>2.9.4</jackson.version> - <jasper.version>5.5.23</jasper.version> <jamon.plugin.version>2.3.4</jamon.plugin.version> <jamon-runtime.version>2.3.1</jamon-runtime.version> <javaewah.version>0.3.2</javaewah.version> http://git-wip-us.apache.org/repos/asf/hive/blob/02f4931c/service-rpc/pom.xml ---------------------------------------------------------------------- diff --git a/service-rpc/pom.xml b/service-rpc/pom.xml index bd500ce..11a53d3 100644 --- a/service-rpc/pom.xml +++ b/service-rpc/pom.xml @@ -44,16 +44,6 @@ <version>${commons-cli.version}</version> </dependency> <dependency> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - <version>${jasper.version}</version> - </dependency> - <dependency> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - <version>${jasper.version}</version> - </dependency> - <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libfb303</artifactId> <version>${libfb303.version}</version> http://git-wip-us.apache.org/repos/asf/hive/blob/02f4931c/service/pom.xml ---------------------------------------------------------------------- diff --git a/service/pom.xml b/service/pom.xml index fcc9183..652e582 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -128,28 +128,6 @@ <version>${commons-lang.version}</version> </dependency> <dependency> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - <version>${jasper.version}</version> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - <version>${jasper.version}</version> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libfb303</artifactId> <version>${libfb303.version}</version>
