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 /core | |
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 'core')
-rw-r--r-- | core/pom.xml | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/core/pom.xml b/core/pom.xml index 6fce10a0ae..4d24ae93c4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -94,23 +94,36 @@ <groupId>org.apache.curator</groupId> <artifactId>curator-recipes</artifactId> </dependency> + + <!-- Jetty dependencies promoted to compile here so they are shaded + and inlined into spark-core jar --> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-plus</artifactId> + <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> + <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> + <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> + <scope>compile</scope> </dependency> <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> @@ -348,19 +361,24 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> + <!-- When using SPARK_PREPEND_CLASSES Spark classes compiled locally don't use + shaded deps. So here we store jars in their original form which are added + when the classpath is computed. --> <execution> <id>copy-dependencies</id> <phase>package</phase> <goals> <goal>copy-dependencies</goal> </goals> - <configuration> + <configuration> <outputDirectory>${project.build.directory}</outputDirectory> <overWriteReleases>false</overWriteReleases> <overWriteSnapshots>false</overWriteSnapshots> <overWriteIfNewer>true</overWriteIfNewer> <useSubDirectoryPerType>true</useSubDirectoryPerType> - <includeArtifactIds>guava</includeArtifactIds> + <includeArtifactIds> + guava,jetty-io,jetty-http,jetty-plus,jetty-util,jetty-server + </includeArtifactIds> <silent>true</silent> </configuration> </execution> |