commit 282783481026f1975fa8456d6dc93105af2b9b27 Author: Owen O'Malley Date: Thu Jan 7 13:05:02 2016 -0800 HIVE-12783. Fix test failure in TestSparkClient diff --git common/pom.xml common/pom.xml index 8141f75..cc47257 100644 --- common/pom.xml +++ common/pom.xml @@ -64,6 +64,17 @@ org.eclipse.jetty.aggregate jetty-all ${jetty.version} + + + javax.servlet + servlet-api + + + + + org.eclipse.jetty.orbit + javax.servlet + ${javax-servlet.version} joda-time @@ -100,36 +111,44 @@ hadoop-common ${hadoop.version} true - - - commons-collections - commons-collections - - - org.slf4j - slf4j-log4j12 - - - commmons-logging - commons-logging - - + + + commons-collections + commons-collections + + + javax.servlet + servlet-api + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + org.apache.hadoop hadoop-mapreduce-client-core ${hadoop.version} true - - - org.slf4j - slf4j-log4j12 - - - commmons-logging - commons-logging - - + + + javax.servlet + servlet-api + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + diff --git orc/pom.xml orc/pom.xml index fef23e8..2d80c97 100644 --- orc/pom.xml +++ orc/pom.xml @@ -48,6 +48,28 @@ org.apache.hadoop hadoop-common ${hadoop.version} + + + javax.servlet + servlet-api + + + javax.servlet.jsp + jsp-api + + + org.mortbay.jetty + jetty + + + org.mortbay.jetty + jetty-util + + + org.apache.avro + avro + + org.iq80.snappy diff --git pom.xml pom.xml index f64d363..0febcdd 100644 --- pom.xml +++ pom.xml @@ -138,6 +138,7 @@ 2.4.2 5.5.23 0.3.2 + 3.0.0.v201112011016 5.5.1 3.0.1 7.6.0.v20120127 diff --git ql/pom.xml ql/pom.xml index 5075185..358cd2a 100644 --- ql/pom.xml +++ ql/pom.xml @@ -201,15 +201,15 @@ hadoop-common ${hadoop.version} - - org.slf4j - slf4j-log4j12 - - - commmons-logging - commons-logging - - + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + javax.servlet servlet-api diff --git storage-api/pom.xml storage-api/pom.xml index c9d33a4..f5b326b 100644 --- storage-api/pom.xml +++ storage-api/pom.xml @@ -38,16 +38,20 @@ hadoop-common ${hadoop.version} true - - - org.slf4j - slf4j-log4j12 - - - commmons-logging - commons-logging - - + + + commmons-logging + commons-logging + + + javax.servlet + servlet-api + + + org.slf4j + slf4j-log4j12 + + junit