From 553d96ba253fa98a97c61a38a33d5990a9f46d63 Mon Sep 17 00:00:00 2001 From: Prashant Sharma Date: Mon, 6 Oct 2014 15:52:25 +0530 Subject: [PATCH 1/4] Shaded some unused class of an unused dep, to generate effective pom(s) --- bagel/pom.xml | 28 ++++++++++++++++++++++++++++ external/flume-sink/pom.xml | 28 ++++++++++++++++++++++++++++ external/flume/pom.xml | 28 ++++++++++++++++++++++++++++ external/kafka/pom.xml | 28 ++++++++++++++++++++++++++++ external/mqtt/pom.xml | 28 ++++++++++++++++++++++++++++ external/twitter/pom.xml | 28 ++++++++++++++++++++++++++++ external/zeromq/pom.xml | 28 ++++++++++++++++++++++++++++ graphx/pom.xml | 28 ++++++++++++++++++++++++++++ mllib/pom.xml | 28 ++++++++++++++++++++++++++++ pom.xml | 13 ++++++++++++- sql/catalyst/pom.xml | 28 ++++++++++++++++++++++++++++ sql/core/pom.xml | 28 ++++++++++++++++++++++++++++ sql/hive/pom.xml | 28 ++++++++++++++++++++++++++++ streaming/pom.xml | 28 ++++++++++++++++++++++++++++ 14 files changed, 376 insertions(+), 1 deletion(-) diff --git a/bagel/pom.xml b/bagel/pom.xml index 93db0d5efda5f..723dedfb78319 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -59,6 +59,34 @@ target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + false + + + org.eclipse.jetty:jetty-util + + + + + org.eclipse.jetty:jetty-util + + org/eclipse/jetty/util/Utf8StringBuilder* + + + + + + + org.scalatest scalatest-maven-plugin diff --git a/external/flume-sink/pom.xml b/external/flume-sink/pom.xml index ac291bd4fde20..57f9bf922177b 100644 --- a/external/flume-sink/pom.xml +++ b/external/flume-sink/pom.xml @@ -91,6 +91,34 @@ target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + false + + + org.eclipse.jetty:jetty-util + + + + + org.eclipse.jetty:jetty-util + + org/eclipse/jetty/util/Utf8StringBuilder* + + + + + + + org.scalatest scalatest-maven-plugin diff --git a/external/flume/pom.xml b/external/flume/pom.xml index 7d31e32283d88..7abfcca19e2f6 100644 --- a/external/flume/pom.xml +++ b/external/flume/pom.xml @@ -92,6 +92,34 @@ target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + false + + + org.eclipse.jetty:jetty-util + + + + + org.eclipse.jetty:jetty-util + + org/eclipse/jetty/util/Utf8StringBuilder* + + + + + + + org.scalatest scalatest-maven-plugin diff --git a/external/kafka/pom.xml b/external/kafka/pom.xml index 2067c473f0e3f..320053ab2db16 100644 --- a/external/kafka/pom.xml +++ b/external/kafka/pom.xml @@ -105,6 +105,34 @@ target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + false + + + org.eclipse.jetty:jetty-util + + + + + org.eclipse.jetty:jetty-util + + org/eclipse/jetty/util/Utf8StringBuilder* + + + + + + + org.scalatest scalatest-maven-plugin diff --git a/external/mqtt/pom.xml b/external/mqtt/pom.xml index 371f1f1e9d39a..6dc62234f9157 100644 --- a/external/mqtt/pom.xml +++ b/external/mqtt/pom.xml @@ -82,6 +82,34 @@ target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + false + + + org.eclipse.jetty:jetty-util + + + + + org.eclipse.jetty:jetty-util + + org/eclipse/jetty/util/Utf8StringBuilder* + + + + + + + org.scalatest scalatest-maven-plugin diff --git a/external/twitter/pom.xml b/external/twitter/pom.xml index 1d7dd49d15c22..8a0bf887a5e3c 100644 --- a/external/twitter/pom.xml +++ b/external/twitter/pom.xml @@ -77,6 +77,34 @@ target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + false + + + org.eclipse.jetty:jetty-util + + + + + org.eclipse.jetty:jetty-util + + org/eclipse/jetty/util/Utf8StringBuilder* + + + + + + + org.scalatest scalatest-maven-plugin diff --git a/external/zeromq/pom.xml b/external/zeromq/pom.xml index 7e48968feb3bc..bb024b44d6c62 100644 --- a/external/zeromq/pom.xml +++ b/external/zeromq/pom.xml @@ -77,6 +77,34 @@ target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + false + + + org.eclipse.jetty:jetty-util + + + + + org.eclipse.jetty:jetty-util + + org/eclipse/jetty/util/Utf8StringBuilder* + + + + + + + org.scalatest scalatest-maven-plugin diff --git a/graphx/pom.xml b/graphx/pom.xml index 3f49b1d63b6e1..ba4d69b7a2c77 100644 --- a/graphx/pom.xml +++ b/graphx/pom.xml @@ -64,6 +64,34 @@ target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + false + + + org.eclipse.jetty:jetty-util + + + + + org.eclipse.jetty:jetty-util + + org/eclipse/jetty/util/Utf8StringBuilder* + + + + + + + org.scalatest scalatest-maven-plugin diff --git a/mllib/pom.xml b/mllib/pom.xml index 696e9396f627c..b5c82aedcd87e 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -116,6 +116,34 @@ target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + false + + + org.eclipse.jetty:jetty-util + + + + + org.eclipse.jetty:jetty-util + + org/eclipse/jetty/util/Utf8StringBuilder* + + + + + + + org.scalatest scalatest-maven-plugin diff --git a/pom.xml b/pom.xml index 288bbf1114bea..93f417533cc30 100644 --- a/pom.xml +++ b/pom.xml @@ -248,7 +248,18 @@ - + + + + org.eclipse.jetty + jetty-util + + diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index 0d756f873e486..f71e8432d6673 100644 --- a/sql/catalyst/pom.xml +++ b/sql/catalyst/pom.xml @@ -69,6 +69,34 @@ target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + false + + + org.eclipse.jetty:jetty-util + + + + + org.eclipse.jetty:jetty-util + + org/eclipse/jetty/util/Utf8StringBuilder* + + + + + + + org.scalatest scalatest-maven-plugin diff --git a/sql/core/pom.xml b/sql/core/pom.xml index bd110218d34f7..79cde09d5c2f6 100644 --- a/sql/core/pom.xml +++ b/sql/core/pom.xml @@ -88,6 +88,34 @@ target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + false + + + org.eclipse.jetty:jetty-util + + + + + org.eclipse.jetty:jetty-util + + org/eclipse/jetty/util/Utf8StringBuilder* + + + + + + + org.scalatest scalatest-maven-plugin diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index 9d7a02bf7b0b7..6d6e85203ce85 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -150,6 +150,34 @@ target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + false + + + org.eclipse.jetty:jetty-util + + + + + org.eclipse.jetty:jetty-util + + org/eclipse/jetty/util/Utf8StringBuilder* + + + + + + + org.scalatest scalatest-maven-plugin diff --git a/streaming/pom.xml b/streaming/pom.xml index 12f900c91eb98..dc57cd0c878c4 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -73,6 +73,34 @@ target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + false + + + org.eclipse.jetty:jetty-util + + + + + org.eclipse.jetty:jetty-util + + org/eclipse/jetty/util/Utf8StringBuilder* + + + + + + + org.scalatest scalatest-maven-plugin From 28f891ef216c0a3e99bc12649fe7f2c6b12751bf Mon Sep 17 00:00:00 2001 From: Prashant Sharma Date: Tue, 21 Oct 2014 12:54:04 +0530 Subject: [PATCH 2/4] Added a useless dependency, so that we can shade it. And realized fake shading works for us. --- bagel/pom.xml | 28 -------------------------- external/flume-sink/pom.xml | 28 -------------------------- external/flume/pom.xml | 28 -------------------------- external/kafka/pom.xml | 28 -------------------------- external/mqtt/pom.xml | 28 -------------------------- external/twitter/pom.xml | 28 -------------------------- external/zeromq/pom.xml | 28 -------------------------- graphx/pom.xml | 28 -------------------------- mllib/pom.xml | 28 -------------------------- pom.xml | 39 ++++++++++++++++++++++++++++++++----- sql/catalyst/pom.xml | 28 -------------------------- sql/core/pom.xml | 28 -------------------------- sql/hive/pom.xml | 28 -------------------------- streaming/pom.xml | 28 -------------------------- 14 files changed, 34 insertions(+), 369 deletions(-) diff --git a/bagel/pom.xml b/bagel/pom.xml index 723dedfb78319..93db0d5efda5f 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -59,34 +59,6 @@ target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes - - org.apache.maven.plugins - maven-shade-plugin - - - package - - shade - - - false - - - org.eclipse.jetty:jetty-util - - - - - org.eclipse.jetty:jetty-util - - org/eclipse/jetty/util/Utf8StringBuilder* - - - - - - - org.scalatest scalatest-maven-plugin diff --git a/external/flume-sink/pom.xml b/external/flume-sink/pom.xml index 57f9bf922177b..ac291bd4fde20 100644 --- a/external/flume-sink/pom.xml +++ b/external/flume-sink/pom.xml @@ -91,34 +91,6 @@ target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes - - org.apache.maven.plugins - maven-shade-plugin - - - package - - shade - - - false - - - org.eclipse.jetty:jetty-util - - - - - org.eclipse.jetty:jetty-util - - org/eclipse/jetty/util/Utf8StringBuilder* - - - - - - - org.scalatest scalatest-maven-plugin diff --git a/external/flume/pom.xml b/external/flume/pom.xml index 7abfcca19e2f6..7d31e32283d88 100644 --- a/external/flume/pom.xml +++ b/external/flume/pom.xml @@ -92,34 +92,6 @@ target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes - - org.apache.maven.plugins - maven-shade-plugin - - - package - - shade - - - false - - - org.eclipse.jetty:jetty-util - - - - - org.eclipse.jetty:jetty-util - - org/eclipse/jetty/util/Utf8StringBuilder* - - - - - - - org.scalatest scalatest-maven-plugin diff --git a/external/kafka/pom.xml b/external/kafka/pom.xml index 320053ab2db16..2067c473f0e3f 100644 --- a/external/kafka/pom.xml +++ b/external/kafka/pom.xml @@ -105,34 +105,6 @@ target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes - - org.apache.maven.plugins - maven-shade-plugin - - - package - - shade - - - false - - - org.eclipse.jetty:jetty-util - - - - - org.eclipse.jetty:jetty-util - - org/eclipse/jetty/util/Utf8StringBuilder* - - - - - - - org.scalatest scalatest-maven-plugin diff --git a/external/mqtt/pom.xml b/external/mqtt/pom.xml index 6dc62234f9157..371f1f1e9d39a 100644 --- a/external/mqtt/pom.xml +++ b/external/mqtt/pom.xml @@ -82,34 +82,6 @@ target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes - - org.apache.maven.plugins - maven-shade-plugin - - - package - - shade - - - false - - - org.eclipse.jetty:jetty-util - - - - - org.eclipse.jetty:jetty-util - - org/eclipse/jetty/util/Utf8StringBuilder* - - - - - - - org.scalatest scalatest-maven-plugin diff --git a/external/twitter/pom.xml b/external/twitter/pom.xml index 8a0bf887a5e3c..1d7dd49d15c22 100644 --- a/external/twitter/pom.xml +++ b/external/twitter/pom.xml @@ -77,34 +77,6 @@ target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes - - org.apache.maven.plugins - maven-shade-plugin - - - package - - shade - - - false - - - org.eclipse.jetty:jetty-util - - - - - org.eclipse.jetty:jetty-util - - org/eclipse/jetty/util/Utf8StringBuilder* - - - - - - - org.scalatest scalatest-maven-plugin diff --git a/external/zeromq/pom.xml b/external/zeromq/pom.xml index bb024b44d6c62..7e48968feb3bc 100644 --- a/external/zeromq/pom.xml +++ b/external/zeromq/pom.xml @@ -77,34 +77,6 @@ target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes - - org.apache.maven.plugins - maven-shade-plugin - - - package - - shade - - - false - - - org.eclipse.jetty:jetty-util - - - - - org.eclipse.jetty:jetty-util - - org/eclipse/jetty/util/Utf8StringBuilder* - - - - - - - org.scalatest scalatest-maven-plugin diff --git a/graphx/pom.xml b/graphx/pom.xml index ba4d69b7a2c77..3f49b1d63b6e1 100644 --- a/graphx/pom.xml +++ b/graphx/pom.xml @@ -64,34 +64,6 @@ target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes - - org.apache.maven.plugins - maven-shade-plugin - - - package - - shade - - - false - - - org.eclipse.jetty:jetty-util - - - - - org.eclipse.jetty:jetty-util - - org/eclipse/jetty/util/Utf8StringBuilder* - - - - - - - org.scalatest scalatest-maven-plugin diff --git a/mllib/pom.xml b/mllib/pom.xml index b5c82aedcd87e..696e9396f627c 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -116,34 +116,6 @@ target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes - - org.apache.maven.plugins - maven-shade-plugin - - - package - - shade - - - false - - - org.eclipse.jetty:jetty-util - - - - - org.eclipse.jetty:jetty-util - - org/eclipse/jetty/util/Utf8StringBuilder* - - - - - - - org.scalatest scalatest-maven-plugin diff --git a/pom.xml b/pom.xml index 93f417533cc30..a745e6e650c9c 100644 --- a/pom.xml +++ b/pom.xml @@ -249,15 +249,16 @@ - org.eclipse.jetty - jetty-util + aelfred + aelfred + 1.2 @@ -1003,6 +1004,34 @@ + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + false + + + aelfred:aelfred + + + + + aelfred:aelfred + + Inexistent/So/It/Shades/Nothing + + + + + + + org.apache.maven.plugins maven-enforcer-plugin diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index f71e8432d6673..0d756f873e486 100644 --- a/sql/catalyst/pom.xml +++ b/sql/catalyst/pom.xml @@ -69,34 +69,6 @@ target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes - - org.apache.maven.plugins - maven-shade-plugin - - - package - - shade - - - false - - - org.eclipse.jetty:jetty-util - - - - - org.eclipse.jetty:jetty-util - - org/eclipse/jetty/util/Utf8StringBuilder* - - - - - - - org.scalatest scalatest-maven-plugin diff --git a/sql/core/pom.xml b/sql/core/pom.xml index 79cde09d5c2f6..bd110218d34f7 100644 --- a/sql/core/pom.xml +++ b/sql/core/pom.xml @@ -88,34 +88,6 @@ target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes - - org.apache.maven.plugins - maven-shade-plugin - - - package - - shade - - - false - - - org.eclipse.jetty:jetty-util - - - - - org.eclipse.jetty:jetty-util - - org/eclipse/jetty/util/Utf8StringBuilder* - - - - - - - org.scalatest scalatest-maven-plugin diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index 6d6e85203ce85..9d7a02bf7b0b7 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -150,34 +150,6 @@ target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes - - org.apache.maven.plugins - maven-shade-plugin - - - package - - shade - - - false - - - org.eclipse.jetty:jetty-util - - - - - org.eclipse.jetty:jetty-util - - org/eclipse/jetty/util/Utf8StringBuilder* - - - - - - - org.scalatest scalatest-maven-plugin diff --git a/streaming/pom.xml b/streaming/pom.xml index dc57cd0c878c4..12f900c91eb98 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -73,34 +73,6 @@ target/scala-${scala.binary.version}/classes target/scala-${scala.binary.version}/test-classes - - org.apache.maven.plugins - maven-shade-plugin - - - package - - shade - - - false - - - org.eclipse.jetty:jetty-util - - - - - org.eclipse.jetty:jetty-util - - org/eclipse/jetty/util/Utf8StringBuilder* - - - - - - - org.scalatest scalatest-maven-plugin From 0300dac5d891a5313c25d73400ccb019dd0f5a19 Mon Sep 17 00:00:00 2001 From: Prashant Sharma Date: Tue, 21 Oct 2014 14:49:02 +0530 Subject: [PATCH 3/4] improved comment messages.. --- pom.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index a745e6e650c9c..b9c3a81eef161 100644 --- a/pom.xml +++ b/pom.xml @@ -249,10 +249,8 @@ @@ -1004,6 +1002,7 @@ + org.apache.maven.plugins maven-shade-plugin @@ -1031,7 +1030,7 @@ - + org.apache.maven.plugins maven-enforcer-plugin From aa7b91d30f2c9e6b8475466381a3e4dd0b8b2dd2 Mon Sep 17 00:00:00 2001 From: Prashant Sharma Date: Wed, 22 Oct 2014 14:34:55 +0530 Subject: [PATCH 4/4] used an unused dep. --- pom.xml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index b9c3a81eef161..687cc6352d5c1 100644 --- a/pom.xml +++ b/pom.xml @@ -254,9 +254,9 @@ --> - aelfred - aelfred - 1.2 + org.spark-project.spark + unused + 1.0.0 @@ -1016,17 +1016,9 @@ false - aelfred:aelfred + org.spark-project.spark:unused - - - aelfred:aelfred - - Inexistent/So/It/Shades/Nothing - - -