From 9f04e67224ec129d4f9ff1778ac5881e7d513c58 Mon Sep 17 00:00:00 2001 From: Hari Shreedharan Date: Wed, 7 Dec 2016 22:43:55 -0800 Subject: [PATCH] SDC-4710. Multiple conflicting dependencies Change-Id: Ia0ac4ccc5e8813611a6535683fbea643ffa81218 Reviewed-on: https://review.streamsets.net/5597 Tested-by: StreamSets CI Reviewed-by: Jarcec Cecho --- cdh_5_2-lib/pom.xml | 17 +++++++++++++ cdh_5_3-lib/pom.xml | 17 +++++++++++++ cdh_5_4-lib/pom.xml | 17 +++++++++++++ cdh_5_5-lib/pom.xml | 17 +++++++++++++ cdh_5_7-lib/pom.xml | 47 +++++++++++++++++++++++++++++++++++ cdh_5_8-lib/pom.xml | 43 ++++++++++++++++++++++++++++++++ cdh_5_9-lib/pom.xml | 43 ++++++++++++++++++++++++++++++++ cluster-bootstrap-api/pom.xml | 10 ++++++++ cluster-hdfs-protolib/pom.xml | 13 +++++++++- commonlib/pom.xml | 9 +++++++ flume-protolib/pom.xml | 10 ++++++++ hadoop-common/pom.xml | 6 +++++ hbase-protolib/pom.xml | 34 +++++++++++++++++++++++++ hdfs-protolib/pom.xml | 11 ++++++++ hdp_2_2-lib/pom.xml | 29 +++++++++++++++++++++ hdp_2_3-lib/pom.xml | 27 ++++++++++++++++++-- hdp_2_4-lib/pom.xml | 27 ++++++++++++++++++-- hdp_2_5-lib/pom.xml | 27 ++++++++++++++++++-- hive-protolib/pom.xml | 21 ++++++++++++++++ mapr-common/pom.xml | 6 +++++ mapr_5_0-lib/pom.xml | 14 +++++++++++ mapr_5_1-lib/pom.xml | 14 +++++++++++ mapr_5_2-lib/pom.xml | 19 ++++++++++++++ maprdb-protolib/pom.xml | 9 +++++++ mapreduce-protolib/pom.xml | 15 +++++++++++ maprfs-protolib/pom.xml | 15 +++++++++++ mesos-bootstrap/pom.xml | 10 ++++++++ pom.xml | 10 ++++++++ 28 files changed, 530 insertions(+), 7 deletions(-) diff --git a/cdh_5_2-lib/pom.xml b/cdh_5_2-lib/pom.xml index 44ef0ee5499..f677a5bce50 100644 --- a/cdh_5_2-lib/pom.xml +++ b/cdh_5_2-lib/pom.xml @@ -198,6 +198,12 @@ ${avro.version} compile hadoop2 + + + org.mortbay.jetty + servlet-api + + @@ -389,6 +395,17 @@ flume-ng-core ${flume.version} test + + + org.mortbay.jetty + servlet-api + + + + + + javax.servlet + javax.servlet-api diff --git a/cdh_5_3-lib/pom.xml b/cdh_5_3-lib/pom.xml index 5c5592a3363..6c8b78c5197 100644 --- a/cdh_5_3-lib/pom.xml +++ b/cdh_5_3-lib/pom.xml @@ -185,6 +185,12 @@ ${avro.version} compile hadoop2 + + + org.mortbay.jetty + servlet-api + + @@ -388,6 +394,17 @@ flume-ng-core ${flume.version} test + + + org.mortbay.jetty + servlet-api + + + + + + javax.servlet + javax.servlet-api diff --git a/cdh_5_4-lib/pom.xml b/cdh_5_4-lib/pom.xml index 304c99a9576..6c3c6bfb76c 100644 --- a/cdh_5_4-lib/pom.xml +++ b/cdh_5_4-lib/pom.xml @@ -154,6 +154,12 @@ ${avro.version} compile hadoop2 + + + org.mortbay.jetty + servlet-api + + @@ -471,6 +477,17 @@ flume-ng-core ${flume.version} test + + + org.mortbay.jetty + servlet-api + + + + + + javax.servlet + javax.servlet-api diff --git a/cdh_5_5-lib/pom.xml b/cdh_5_5-lib/pom.xml index 95140c2aa83..77f75e0b04b 100644 --- a/cdh_5_5-lib/pom.xml +++ b/cdh_5_5-lib/pom.xml @@ -146,6 +146,12 @@ ${avro.version} compile hadoop2 + + + org.mortbay.jetty + servlet-api + + @@ -465,6 +471,17 @@ flume-ng-core ${flume.version} test + + + org.mortbay.jetty + servlet-api + + + + + + javax.servlet + javax.servlet-api diff --git a/cdh_5_7-lib/pom.xml b/cdh_5_7-lib/pom.xml index befef5dfe11..1e4b2006409 100644 --- a/cdh_5_7-lib/pom.xml +++ b/cdh_5_7-lib/pom.xml @@ -146,6 +146,12 @@ ${avro.version} compile hadoop2 + + + org.mortbay.jetty + servlet-api + + @@ -215,6 +221,12 @@ hive-jdbc ${hive.version} runtime + + + javax.servlet + servlet-api + + @@ -238,6 +250,10 @@ org.codehaus.jettison jettison + + javax.servlet + servlet-api + @@ -263,14 +279,29 @@ io.dropwizard.metrics metrics-core + + javax.servlet + servlet-api + + + javax.servlet + javax.servlet-api + + org.apache.hadoop hadoop-minicluster ${hadoop.version} test + + + javax.servlet + servlet-api + + @@ -295,6 +326,12 @@ hbase-testing-util ${hbase.version} test + + + javax.servlet + servlet-api + + @@ -461,8 +498,18 @@ flume-ng-core ${flume.version} test + + + org.mortbay.jetty + servlet-api + + + + javax.servlet + javax.servlet-api + org.apache.flume flume-ng-configuration diff --git a/cdh_5_8-lib/pom.xml b/cdh_5_8-lib/pom.xml index 94b350ede8e..e01a74b5d93 100644 --- a/cdh_5_8-lib/pom.xml +++ b/cdh_5_8-lib/pom.xml @@ -157,6 +157,12 @@ ${avro.version} compile hadoop2 + + + org.mortbay.jetty + servlet-api + + @@ -226,6 +232,12 @@ hive-jdbc ${hive.version} runtime + + + javax.servlet + servlet-api + + @@ -249,6 +261,10 @@ org.codehaus.jettison jettison + + javax.servlet + servlet-api + @@ -274,6 +290,10 @@ io.dropwizard.metrics metrics-core + + javax.servlet + servlet-api + @@ -282,6 +302,12 @@ hadoop-minicluster ${hadoop.version} test + + + javax.servlet + servlet-api + + @@ -306,6 +332,12 @@ hbase-testing-util ${hbase.version} test + + + javax.servlet + servlet-api + + @@ -472,6 +504,17 @@ flume-ng-core ${flume.version} test + + + org.mortbay.jetty + servlet-api + + + + + + javax.servlet + javax.servlet-api diff --git a/cdh_5_9-lib/pom.xml b/cdh_5_9-lib/pom.xml index aff95845089..32b23c7cc4f 100644 --- a/cdh_5_9-lib/pom.xml +++ b/cdh_5_9-lib/pom.xml @@ -157,6 +157,12 @@ ${avro.version} compile hadoop2 + + + org.mortbay.jetty + servlet-api + + @@ -226,6 +232,12 @@ hive-jdbc ${hive.version} runtime + + + javax.servlet + servlet-api + + @@ -249,9 +261,18 @@ org.codehaus.jettison jettison + + javax.servlet + servlet-api + + + javax.servlet + javax.servlet-api + + org.apache.hadoop hadoop-client @@ -274,6 +295,10 @@ io.dropwizard.metrics metrics-core + + javax.servlet + servlet-api + @@ -282,6 +307,12 @@ hadoop-minicluster ${hadoop.version} test + + + javax.servlet + servlet-api + + @@ -306,6 +337,12 @@ hbase-testing-util ${hbase.version} test + + + javax.servlet + servlet-api + + @@ -472,6 +509,12 @@ flume-ng-core ${flume.version} test + + + org.mortbay.jetty + servlet-api + + diff --git a/cluster-bootstrap-api/pom.xml b/cluster-bootstrap-api/pom.xml index e7cf9f88659..c3d3ac576fc 100644 --- a/cluster-bootstrap-api/pom.xml +++ b/cluster-bootstrap-api/pom.xml @@ -59,6 +59,16 @@ ${avro.version} hadoop2 provided + + + org.mortbay.jetty + servlet-api + + + + + javax.servlet + javax.servlet-api org.apache.avro diff --git a/cluster-hdfs-protolib/pom.xml b/cluster-hdfs-protolib/pom.xml index 776801a1c07..33524727b6c 100644 --- a/cluster-hdfs-protolib/pom.xml +++ b/cluster-hdfs-protolib/pom.xml @@ -108,9 +108,20 @@ hadoop-minicluster ${hadoop.version} test + + + javax.servlet + servlet-api + + - + + javax.servlet + javax.servlet-api + + + org.apache.hadoop hadoop-client ${hadoop.version} diff --git a/commonlib/pom.xml b/commonlib/pom.xml index a4d74345c3b..af634dfe31a 100644 --- a/commonlib/pom.xml +++ b/commonlib/pom.xml @@ -128,6 +128,10 @@ io.netty netty + + org.mortbay.jetty + servlet-api + @@ -186,6 +190,11 @@ ${netty.version} + + javax.servlet + javax.servlet-api + + com.streamsets diff --git a/flume-protolib/pom.xml b/flume-protolib/pom.xml index 0e49f0c57c5..d5a557dc604 100644 --- a/flume-protolib/pom.xml +++ b/flume-protolib/pom.xml @@ -106,8 +106,18 @@ flume-ng-core ${flume.version} test + + + org.mortbay.jetty + servlet-api + + + + javax.servlet + javax.servlet-api + org.apache.flume flume-ng-configuration diff --git a/hadoop-common/pom.xml b/hadoop-common/pom.xml index affc7f1122d..00192d15d3c 100644 --- a/hadoop-common/pom.xml +++ b/hadoop-common/pom.xml @@ -61,6 +61,12 @@ hadoop-common ${hadoop.version} provided + + + javax.servlet + servlet-api + + junit diff --git a/hbase-protolib/pom.xml b/hbase-protolib/pom.xml index f5e40eda1bd..2598060694c 100644 --- a/hbase-protolib/pom.xml +++ b/hbase-protolib/pom.xml @@ -54,17 +54,39 @@ hadoop-client ${hadoop.version} provided + + + javax.servlet + servlet-api + + org.apache.hadoop hadoop-common ${hadoop.version} provided + + + javax.servlet + servlet-api + + + + + javax.servlet + javax.servlet-api org.apache.hadoop hadoop-hdfs ${hadoop.version} + + + javax.servlet + servlet-api + + provided @@ -73,12 +95,24 @@ ${hadoop.version} test-jar provided + + + javax.servlet + servlet-api + + org.apache.hadoop hadoop-minicluster ${hadoop.version} provided + + + javax.servlet + servlet-api + + org.apache.hadoop diff --git a/hdfs-protolib/pom.xml b/hdfs-protolib/pom.xml index c0ccabf6055..5829924e600 100644 --- a/hdfs-protolib/pom.xml +++ b/hdfs-protolib/pom.xml @@ -194,9 +194,20 @@ org.apache.hadoop hadoop-minicluster ${hadoop.version} + + + javax.servlet + servlet-api + + test + + javax.servlet + javax.servlet-api + + org.apache.hadoop hadoop-minikdc diff --git a/hdp_2_2-lib/pom.xml b/hdp_2_2-lib/pom.xml index b9b8001c285..2c3583f3409 100644 --- a/hdp_2_2-lib/pom.xml +++ b/hdp_2_2-lib/pom.xml @@ -141,6 +141,12 @@ ${avro.version} compile hadoop2 + + + org.mortbay.jetty + servlet-api + + @@ -203,6 +209,17 @@ hadoop-minicluster ${hadoop.version} test + + + javax.servlet + servlet-api + + + + + + javax.servlet + javax.servlet-api @@ -238,6 +255,12 @@ hive-jdbc ${hive.version} runtime + + + javax.servlet + servlet-api + + @@ -394,6 +417,12 @@ flume-ng-core ${flume.version} test + + + org.mortbay.jetty + servlet-api + + diff --git a/hdp_2_3-lib/pom.xml b/hdp_2_3-lib/pom.xml index 9b279a4e614..cf39fd786df 100644 --- a/hdp_2_3-lib/pom.xml +++ b/hdp_2_3-lib/pom.xml @@ -142,6 +142,12 @@ ${avro.version} compile hadoop2 + + + org.mortbay.jetty + servlet-api + + @@ -159,8 +165,7 @@ javax.servlet - servlet-api - 2.5 + javax.servlet-api @@ -209,6 +214,12 @@ hadoop-minicluster ${hadoop.version} test + + + javax.servlet + servlet-api + + @@ -244,6 +255,12 @@ hive-jdbc ${hive.version} runtime + + + javax.servlet + servlet-api + + @@ -406,6 +423,12 @@ flume-ng-core ${flume.version} test + + + org.mortbay.jetty + servlet-api + + diff --git a/hdp_2_4-lib/pom.xml b/hdp_2_4-lib/pom.xml index 6e6b1392775..665c5c1fc09 100644 --- a/hdp_2_4-lib/pom.xml +++ b/hdp_2_4-lib/pom.xml @@ -138,6 +138,12 @@ ${avro.version} compile hadoop2 + + + org.mortbay.jetty + servlet-api + + org.apache.avro @@ -147,8 +153,7 @@ javax.servlet - servlet-api - 2.5 + javax.servlet-api org.apache.hadoop @@ -263,6 +268,12 @@ hive-jdbc ${hive.version} runtime + + + javax.servlet + servlet-api + + @@ -435,6 +446,12 @@ flume-ng-core ${flume.version} test + + + org.mortbay.jetty + servlet-api + + org.apache.flume @@ -472,6 +489,12 @@ hadoop-minicluster ${hadoop.version} test + + + javax.servlet + servlet-api + + junit diff --git a/hdp_2_5-lib/pom.xml b/hdp_2_5-lib/pom.xml index f954122bdbd..5a024eeaa8e 100644 --- a/hdp_2_5-lib/pom.xml +++ b/hdp_2_5-lib/pom.xml @@ -138,6 +138,12 @@ ${avro.version} compile hadoop2 + + + org.mortbay.jetty + servlet-api + + org.apache.avro @@ -147,8 +153,7 @@ javax.servlet - servlet-api - 2.5 + javax.servlet-api org.apache.hadoop @@ -263,6 +268,12 @@ hive-jdbc ${hive.version} runtime + + + javax.servlet + servlet-api + + @@ -435,6 +446,12 @@ flume-ng-core ${flume.version} test + + + org.mortbay.jetty + servlet-api + + org.apache.flume @@ -472,6 +489,12 @@ hadoop-minicluster ${hadoop.version} test + + + javax.servlet + servlet-api + + junit diff --git a/hive-protolib/pom.xml b/hive-protolib/pom.xml index 74f46a9d89a..288f12339eb 100644 --- a/hive-protolib/pom.xml +++ b/hive-protolib/pom.xml @@ -212,14 +212,29 @@ org.apache.hadoop hadoop-mapreduce-client-app + + javax.servlet + servlet-api + + + javax.servlet + javax.servlet-api + + org.apache.hive hive-jdbc ${hive.version} provided + + + javax.servlet + servlet-api + + @@ -291,6 +306,12 @@ hadoop-minicluster ${hadoop.version} test + + + javax.servlet + servlet-api + + diff --git a/mapr-common/pom.xml b/mapr-common/pom.xml index beef8fc1c64..8ae1ee60dc2 100644 --- a/mapr-common/pom.xml +++ b/mapr-common/pom.xml @@ -62,6 +62,12 @@ hadoop-common ${hadoop.version} provided + + + javax.servlet + servlet-api + + diff --git a/mapr_5_0-lib/pom.xml b/mapr_5_0-lib/pom.xml index 881162b2c66..ef6bf75e74a 100644 --- a/mapr_5_0-lib/pom.xml +++ b/mapr_5_0-lib/pom.xml @@ -61,9 +61,17 @@ io.dropwizard.metrics metrics-core + + javax.servlet + servlet-api + + + javax.servlet + javax.servlet-api + com.streamsets @@ -87,6 +95,12 @@ ${avro.version} compile hadoop2 + + + org.mortbay.jetty + servlet-api + + diff --git a/mapr_5_1-lib/pom.xml b/mapr_5_1-lib/pom.xml index 875d52b0f7e..0d0295e0c12 100644 --- a/mapr_5_1-lib/pom.xml +++ b/mapr_5_1-lib/pom.xml @@ -63,6 +63,10 @@ io.dropwizard.metrics metrics-core + + javax.servlet + servlet-api + @@ -73,6 +77,12 @@ ${avro.version} compile hadoop2 + + + org.mortbay.jetty + servlet-api + + @@ -141,6 +151,10 @@ org.apache.calcite calcite-avatica + + javax.servlet + servlet-api + diff --git a/mapr_5_2-lib/pom.xml b/mapr_5_2-lib/pom.xml index 016bafbb19b..6237018a85f 100644 --- a/mapr_5_2-lib/pom.xml +++ b/mapr_5_2-lib/pom.xml @@ -63,9 +63,18 @@ io.dropwizard.metrics metrics-core + + javax.servlet + servlet-api + + + javax.servlet + javax.servlet-api + + org.apache.avro @@ -73,6 +82,12 @@ ${avro.version} compile hadoop2 + + + org.mortbay.jetty + servlet-api + + @@ -141,6 +156,10 @@ org.apache.calcite calcite-avatica + + javax.servlet + servlet-api + diff --git a/maprdb-protolib/pom.xml b/maprdb-protolib/pom.xml index 08470cd1f51..24cf51256bf 100644 --- a/maprdb-protolib/pom.xml +++ b/maprdb-protolib/pom.xml @@ -61,9 +61,18 @@ io.dropwizard.metrics metrics-core + + javax.servlet + servlet-api + + + javax.servlet + javax.servlet-api + + org.apache.hbase diff --git a/mapreduce-protolib/pom.xml b/mapreduce-protolib/pom.xml index e691f1c05b7..fb9c3f15f0d 100644 --- a/mapreduce-protolib/pom.xml +++ b/mapreduce-protolib/pom.xml @@ -166,6 +166,10 @@ io.dropwizard.metrics metrics-core + + javax.servlet + servlet-api + @@ -174,6 +178,17 @@ hadoop-minicluster ${hadoop.version} test + + + javax.servlet + servlet-api + + + + + + javax.servlet + javax.servlet-api diff --git a/maprfs-protolib/pom.xml b/maprfs-protolib/pom.xml index 3ba038a8009..c8ca1c4f1b6 100644 --- a/maprfs-protolib/pom.xml +++ b/maprfs-protolib/pom.xml @@ -61,6 +61,10 @@ io.dropwizard.metrics metrics-core + + javax.servlet + servlet-api + @@ -77,6 +81,17 @@ ${avro.version} compile hadoop2 + + + org.mortbay.jetty + servlet-api + + + + + + javax.servlet + javax.servlet-api diff --git a/mesos-bootstrap/pom.xml b/mesos-bootstrap/pom.xml index 887809d84b3..a35ade01851 100644 --- a/mesos-bootstrap/pom.xml +++ b/mesos-bootstrap/pom.xml @@ -67,6 +67,16 @@ org.apache.hadoop hadoop-aws ${hadoop.version} + + + javax.servlet + servlet-api + + + + + javax.servlet + javax.servlet-api diff --git a/pom.xml b/pom.xml index 49604fd18dc..fe12ea2f531 100644 --- a/pom.xml +++ b/pom.xml @@ -86,6 +86,16 @@ streamsets-datacollector-api 2.3.0.0-SNAPSHOT + + javax.servlet + javax.servlet-api + 3.1.0 + + + io.netty + netty-all + 4.0.41.Final +