From 012a5e939d64ccc6fd0c328c1060d6f6bcf5ef17 Mon Sep 17 00:00:00 2001 From: Ashutosh Chauhan Date: Wed, 14 Feb 2018 17:51:03 -0800 Subject: [PATCH] HIVE-18717 : Avoid transitive dependency on jetty 6.x --- hcatalog/core/pom.xml | 12 +++++++++++- hcatalog/hcatalog-pig-adapter/pom.xml | 12 +++++++++++- llap-server/pom.xml | 8 ++++++++ llap-tez/pom.xml | 8 ++++++++ pom.xml | 30 +++++++++++++++++++++++++++--- ql/pom.xml | 8 ++++++++ storage-api/pom.xml | 2 +- 7 files changed, 74 insertions(+), 6 deletions(-) diff --git a/hcatalog/core/pom.xml b/hcatalog/core/pom.xml index 560e438c26..b0269cd65b 100644 --- a/hcatalog/core/pom.xml +++ b/hcatalog/core/pom.xml @@ -235,7 +235,17 @@ ${pig.version} h2 test - + + + org.mortbay.jetty + jetty-util + + + org.mortbay.jetty + jetty + + + diff --git a/hcatalog/hcatalog-pig-adapter/pom.xml b/hcatalog/hcatalog-pig-adapter/pom.xml index c50a4d5b09..4a2075f670 100644 --- a/hcatalog/hcatalog-pig-adapter/pom.xml +++ b/hcatalog/hcatalog-pig-adapter/pom.xml @@ -66,7 +66,17 @@ pig ${pig.version} h2 - + + + org.mortbay.jetty + jetty-util + + + org.mortbay.jetty + jetty + + + org.apache.hadoop hadoop-hdfs diff --git a/llap-server/pom.xml b/llap-server/pom.xml index eabe1a8673..65cb78f070 100644 --- a/llap-server/pom.xml +++ b/llap-server/pom.xml @@ -206,7 +206,15 @@ slider-core ${slider.version} + + org.mortbay.jetty + jetty + + org.mortbay.jetty + jetty-util + + asm asm diff --git a/llap-tez/pom.xml b/llap-tez/pom.xml index 69fbea3ccc..50865ad899 100644 --- a/llap-tez/pom.xml +++ b/llap-tez/pom.xml @@ -154,7 +154,15 @@ ${tez.version} true + + org.mortbay.jetty + jetty-util + + org.mortbay.jetty + jetty + + org.slf4j slf4j-log4j12 diff --git a/pom.xml b/pom.xml index e220891fdb..a242fbf203 100644 --- a/pom.xml +++ b/pom.xml @@ -488,7 +488,17 @@ avro-mapred hadoop2 ${avro.version} - + + + org.mortbay.jetty + jetty-util + + + org.mortbay.jetty + jetty + + + org.apache.derby derby @@ -538,7 +548,17 @@ org.apache.pig pig ${pig.version} - + + + org.mortbay.jetty + jetty-util + + + org.mortbay.jetty + jetty + + + org.apache.thrift libfb303 @@ -719,7 +739,11 @@ hadoop-common ${hadoop.version} - + + org.mortbay.jetty + jetty-sslengine + + org.slf4j slf4j-log4j12 diff --git a/ql/pom.xml b/ql/pom.xml index 2d1034cfed..5f917c1ebf 100644 --- a/ql/pom.xml +++ b/ql/pom.xml @@ -655,7 +655,15 @@ true test + + org.mortbay.jetty + jetty-util + + org.mortbay.jetty + jetty + + org.slf4j slf4j-log4j12 diff --git a/storage-api/pom.xml b/storage-api/pom.xml index 770dff50ce..3f148cf11f 100644 --- a/storage-api/pom.xml +++ b/storage-api/pom.xml @@ -33,7 +33,7 @@ 2.6 1.1.3 14.0.1 - 2.8.1 + 3.0.0-beta1 4.11 1.7.10 2.17 -- 2.14.3 (Apple Git-98)