From 22075f62153a02a84aedc3566907cffa34d234f1 Mon Sep 17 00:00:00 2001 From: Clint Wylie Date: Wed, 14 Aug 2019 20:23:45 -0700 Subject: [PATCH 1/5] exclude kerberos extension dependencies that are already included in druid libs --- extensions-core/druid-kerberos/pom.xml | 52 ++++++++++++++------------ 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/extensions-core/druid-kerberos/pom.xml b/extensions-core/druid-kerberos/pom.xml index b1b274e906df..76c1199bffad 100644 --- a/extensions-core/druid-kerberos/pom.xml +++ b/extensions-core/druid-kerberos/pom.xml @@ -47,26 +47,6 @@ ${project.parent.version} provided - - org.eclipse.jetty - jetty-server - - - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-proxy - - - org.eclipse.jetty - jetty-servlet - - - org.eclipse.jetty - jetty-servlets - org.apache.hadoop hadoop-common @@ -81,14 +61,18 @@ commons-httpclient commons-httpclient - - log4j - log4j - commons-codec commons-codec + + commons-collections + commons-collections + + + commons-digester + commons-digester + commons-logging commons-logging @@ -101,6 +85,14 @@ commons-lang commons-lang + + log4j + log4j + + + org.apache.commons + commons-compress + org.apache.httpcomponents httpclient @@ -133,6 +125,10 @@ org.slf4j slf4j-log4j12 + + javax.servlet + servlet-api + javax.ws.rs jsr311-api @@ -181,6 +177,14 @@ com.google.guava guava + + org.mortbay.jetty + jetty + + + org.mortbay.jetty + jetty-sslengine + From 41a1924634049841b42c576f659fbcf74e1f979c Mon Sep 17 00:00:00 2001 From: Clint Wylie Date: Wed, 14 Aug 2019 20:54:28 -0700 Subject: [PATCH 2/5] missing net --- extensions-core/druid-kerberos/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/extensions-core/druid-kerberos/pom.xml b/extensions-core/druid-kerberos/pom.xml index 76c1199bffad..57f915d355d8 100644 --- a/extensions-core/druid-kerberos/pom.xml +++ b/extensions-core/druid-kerberos/pom.xml @@ -85,6 +85,10 @@ commons-lang commons-lang + + commons-net + commons-net + log4j log4j From 7fb5467e21b2af6f4a4db675215bed6307279306 Mon Sep 17 00:00:00 2001 From: Clint Wylie Date: Thu, 15 Aug 2019 01:28:20 -0700 Subject: [PATCH 3/5] exclude json-smart --- extensions-core/druid-kerberos/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/extensions-core/druid-kerberos/pom.xml b/extensions-core/druid-kerberos/pom.xml index 57f915d355d8..83077ad92fcf 100644 --- a/extensions-core/druid-kerberos/pom.xml +++ b/extensions-core/druid-kerberos/pom.xml @@ -189,6 +189,10 @@ org.mortbay.jetty jetty-sslengine + + net.minidev + json-smart + From 79b2a02b3b1aa2e1442b9e68fd68c146b1ab84b3 Mon Sep 17 00:00:00 2001 From: Clint Wylie Date: Thu, 15 Aug 2019 01:39:19 -0700 Subject: [PATCH 4/5] eh might as well go aggro and remove all the ones it looks like we do not need --- extensions-core/druid-kerberos/pom.xml | 32 ++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/extensions-core/druid-kerberos/pom.xml b/extensions-core/druid-kerberos/pom.xml index 83077ad92fcf..1b0254af0e0b 100644 --- a/extensions-core/druid-kerberos/pom.xml +++ b/extensions-core/druid-kerberos/pom.xml @@ -193,6 +193,38 @@ net.minidev json-smart + + com.sun.jersey + jersey-json + + + net.java.dev.jets3t + jets3t + + + org.apache.htrace + htrace-core4 + + + com.google.code.gson + gson + + + com.jcraft + jsch + + + xmlenc + xmlenc + + + commons-configuration + commons-configuration + + + com.nimbusds + nimbus-jose-jwt + From 2516fa150e37b41a5d493b6f184ae126c12d23ce Mon Sep 17 00:00:00 2001 From: Clint Wylie Date: Thu, 15 Aug 2019 19:27:24 -0700 Subject: [PATCH 5/5] guess we actually need this one --- extensions-core/druid-kerberos/pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/extensions-core/druid-kerberos/pom.xml b/extensions-core/druid-kerberos/pom.xml index 1b0254af0e0b..8a449d059d98 100644 --- a/extensions-core/druid-kerberos/pom.xml +++ b/extensions-core/druid-kerberos/pom.xml @@ -217,10 +217,6 @@ xmlenc xmlenc - - commons-configuration - commons-configuration - com.nimbusds nimbus-jose-jwt