diff options
| author | Patrick Wendell <patrick@databricks.com> | 2015-02-01 21:13:57 -0800 |
|---|---|---|
| committer | Patrick Wendell <patrick@databricks.com> | 2015-02-01 21:13:57 -0800 |
| commit | a15f6e31fc216d0d39bc1578e0da11b068b7821c (patch) | |
| tree | 96080098c1501be5092ca3fdbf024bce38fa5b55 /repl/pom.xml | |
| parent | 859f7249a614c86fc1691cc3116463f85f33f153 (diff) | |
| download | spark-a15f6e31fc216d0d39bc1578e0da11b068b7821c.tar.gz spark-a15f6e31fc216d0d39bc1578e0da11b068b7821c.tar.bz2 spark-a15f6e31fc216d0d39bc1578e0da11b068b7821c.zip | |
[SPARK-3996]: Shade Jetty in Spark deliverables
(v2 of this patch with a fix that was only relevant for the maven build).
This patch piggy-back's on vanzin's work to simplify the Guava shading,
and adds Jetty as a shaded library in Spark. Other than adding Jetty,
it consilidates the <artifactSet>'s into the root pom. I found it was
a bit easier to follow that way, since you don't need to look into
child pom's to find out specific artifact sets included in shading.
Author: Patrick Wendell <patrick@databricks.com>
Closes #4285 from pwendell/jetty and squashes the following commits:
d3e7f4e [Patrick Wendell] Fix for shaded deps causing compile errors
19f0710 [Patrick Wendell] More code review feedback
961452d [Patrick Wendell] Responding to feedback from Marcello
6df25ca [Patrick Wendell] [WIP] [SPARK-3996]: Shade Jetty in Spark deliverables
Diffstat (limited to 'repl/pom.xml')
| -rw-r--r-- | repl/pom.xml | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/repl/pom.xml b/repl/pom.xml index ae7c31aef4..bd39b90fd8 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -87,6 +87,30 @@ <artifactId>scalacheck_${scala.binary.version}</artifactId> <scope>test</scope> </dependency> + + <!-- Explicit listing of transitive deps that are shaded. Otherwise, odd compiler crashes. --> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-plus</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + </dependency> + <!-- End of shaded deps. --> + + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + </dependency> </dependencies> <build> <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> |