Repository: hive Updated Branches: refs/heads/branch-2.0 5fb36dbac -> bdb5c9acd
HIVE-12783. Fix test failure in TestSparkClient. (omalley reviewed by xuefu) Signed-off-by: Owen O'Malley <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/bdb5c9ac Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/bdb5c9ac Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/bdb5c9ac Branch: refs/heads/branch-2.0 Commit: bdb5c9acdce936266dd4ce7519fce5d18d1d31ea Parents: 5fb36db Author: Owen O'Malley <[email protected]> Authored: Thu Jan 7 13:05:02 2016 -0800 Committer: Sergey Shelukhin <[email protected]> Committed: Wed Jan 20 17:17:51 2016 -0800 ---------------------------------------------------------------------- common/pom.xml | 67 +++++++++++++++++++++++++++++++----------------- orc/pom.xml | 22 ++++++++++++++++ pom.xml | 1 + ql/pom.xml | 18 ++++++------- storage-api/pom.xml | 24 +++++++++-------- 5 files changed, 89 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/bdb5c9ac/common/pom.xml ---------------------------------------------------------------------- diff --git a/common/pom.xml b/common/pom.xml index bf24428..87c668f 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -64,6 +64,17 @@ <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-all</artifactId> <version>${jetty.version}</version> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>javax.servlet</artifactId> + <version>${javax-servlet.version}</version> </dependency> <dependency> <groupId>joda-time</groupId> @@ -100,36 +111,44 @@ <artifactId>hadoop-common</artifactId> <version>${hadoop.version}</version> <optional>true</optional> - <exclusions> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>commmons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> + <exclusions> + <exclusion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </exclusion> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>commmons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> <version>${hadoop.version}</version> <optional>true</optional> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>commmons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>commmons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <!-- test inter-project --> <dependency> http://git-wip-us.apache.org/repos/asf/hive/blob/bdb5c9ac/orc/pom.xml ---------------------------------------------------------------------- diff --git a/orc/pom.xml b/orc/pom.xml index 8834bb0..ba2439c 100644 --- a/orc/pom.xml +++ b/orc/pom.xml @@ -48,6 +48,28 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.avro</groupId> + <artifactId>avro</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.iq80.snappy</groupId> http://git-wip-us.apache.org/repos/asf/hive/blob/bdb5c9ac/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1393fba..0b3204c 100644 --- a/pom.xml +++ b/pom.xml @@ -138,6 +138,7 @@ <jackson.new.version>2.4.2</jackson.new.version> <jasper.version>5.5.23</jasper.version> <javaewah.version>0.3.2</javaewah.version> + <javax-servlet.version>3.0.0.v201112011016</javax-servlet.version> <javolution.version>5.5.1</javolution.version> <jdo-api.version>3.0.1</jdo-api.version> <jetty.version>7.6.0.v20120127</jetty.version> http://git-wip-us.apache.org/repos/asf/hive/blob/bdb5c9ac/ql/pom.xml ---------------------------------------------------------------------- diff --git a/ql/pom.xml b/ql/pom.xml index ebcfd0b..0745ff3 100644 --- a/ql/pom.xml +++ b/ql/pom.xml @@ -194,15 +194,15 @@ <artifactId>hadoop-common</artifactId> <version>${hadoop.version}</version> <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>commmons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>commmons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </exclusion> http://git-wip-us.apache.org/repos/asf/hive/blob/bdb5c9ac/storage-api/pom.xml ---------------------------------------------------------------------- diff --git a/storage-api/pom.xml b/storage-api/pom.xml index ae9da60..9ce2c33 100644 --- a/storage-api/pom.xml +++ b/storage-api/pom.xml @@ -38,16 +38,20 @@ <artifactId>hadoop-common</artifactId> <version>${hadoop.version}</version> <optional>true</optional> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>commmons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> + <exclusions> + <exclusion> + <groupId>commmons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>junit</groupId>
