Repository: hive Updated Branches: refs/heads/master b9d65f159 -> c8f15f7b8
HIVE-12783. Fix test failure in TestSparkClient. (omalley reviewed by xuefu) Signed-off-by: Owen O'Malley <omal...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/c8f15f7b Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/c8f15f7b Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/c8f15f7b Branch: refs/heads/master Commit: c8f15f7b802fa0c2f2426a3b29093aba4aebc57f Parents: b9d65f1 Author: Owen O'Malley <omal...@apache.org> Authored: Thu Jan 7 13:05:02 2016 -0800 Committer: Owen O'Malley <omal...@apache.org> Committed: Tue Jan 19 13:23:59 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/c8f15f7b/common/pom.xml ---------------------------------------------------------------------- diff --git a/common/pom.xml b/common/pom.xml index 8141f75..cc47257 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/c8f15f7b/orc/pom.xml ---------------------------------------------------------------------- diff --git a/orc/pom.xml b/orc/pom.xml index fef23e8..2d80c97 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/c8f15f7b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 848432c..5ea236f 100644 --- a/pom.xml +++ b/pom.xml @@ -139,6 +139,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/c8f15f7b/ql/pom.xml ---------------------------------------------------------------------- diff --git a/ql/pom.xml b/ql/pom.xml index 5075185..358cd2a 100644 --- a/ql/pom.xml +++ b/ql/pom.xml @@ -201,15 +201,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/c8f15f7b/storage-api/pom.xml ---------------------------------------------------------------------- diff --git a/storage-api/pom.xml b/storage-api/pom.xml index c9d33a4..f5b326b 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>
