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 /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 'pom.xml')
-rw-r--r-- | pom.xml | 32 |
1 files changed, 32 insertions, 0 deletions
@@ -337,25 +337,39 @@ </exclusion> </exclusions> </dependency> + + <!-- Shaded deps marked as provided. These are promoted to compile scope + in the modules where we want the shaded classes to appear in the + associated jar. --> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>${jetty.version}</version> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> <version>${jetty.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> <version>${jetty.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-plus</artifactId> <version>${jetty.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> <version>${jetty.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.google.guava</groupId> @@ -363,6 +377,8 @@ <version>14.0.1</version> <scope>provided</scope> </dependency> + <!-- End of shaded deps --> + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> @@ -1276,11 +1292,27 @@ <shadedArtifactAttached>false</shadedArtifactAttached> <artifactSet> <includes> + <!-- At a minimum we must include this to force effective pom generation --> <include>org.spark-project.spark:unused</include> + + <include>org.eclipse.jetty:jetty-io</include> + <include>org.eclipse.jetty:jetty-http</include> + <include>org.eclipse.jetty:jetty-plus</include> + <include>org.eclipse.jetty:jetty-security</include> + <include>org.eclipse.jetty:jetty-util</include> + <include>org.eclipse.jetty:jetty-server</include> + <include>com.google.guava:guava</include> </includes> </artifactSet> <relocations> <relocation> + <pattern>org.eclipse.jetty</pattern> + <shadedPattern>org.spark-project.jetty</shadedPattern> + <includes> + <include>org.eclipse.jetty.**</include> + </includes> + </relocation> + <relocation> <pattern>com.google.common</pattern> <shadedPattern>org.spark-project.guava</shadedPattern> <excludes> |