diff options
| author | Patrick Wendell <patrick@databricks.com> | 2015-01-29 17:14:27 -0800 |
|---|---|---|
| committer | Patrick Wendell <patrick@databricks.com> | 2015-01-29 17:14:27 -0800 |
| commit | d2071e8f45e74117f78a42770b0c610cb98e5075 (patch) | |
| tree | 37156e97f71127f1b293f9aa6d6806b6ce51db62 /pom.xml | |
| parent | 5338772f3fe9cfe1f8caee64cce2275457d8f23f (diff) | |
| download | spark-d2071e8f45e74117f78a42770b0c610cb98e5075.tar.gz spark-d2071e8f45e74117f78a42770b0c610cb98e5075.tar.bz2 spark-d2071e8f45e74117f78a42770b0c610cb98e5075.zip | |
Revert "[WIP] [SPARK-3996]: Shade Jetty in Spark deliverables"
This reverts commit f240fe390b46b6e9859ce74108c5a5fba5c5f8b3.
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 32 |
1 files changed, 0 insertions, 32 deletions
@@ -337,39 +337,25 @@ </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> @@ -377,8 +363,6 @@ <version>14.0.1</version> <scope>provided</scope> </dependency> - <!-- End of shaded deps --> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> @@ -1292,27 +1276,11 @@ <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> |