diff options
| author | Patrick Wendell <patrick@databricks.com> | 2015-02-02 21:01:36 -0800 |
|---|---|---|
| committer | Patrick Wendell <patrick@databricks.com> | 2015-02-02 21:01:36 -0800 |
| commit | 7930d2bef0e2c7f62456e013124455061dfe6dc8 (patch) | |
| tree | 7d40341e774be762afad23f6144ce9c8afeac450 | |
| parent | 0ef38f5fad637fe96464778c1e5ec99cfcc6313c (diff) | |
| download | spark-7930d2bef0e2c7f62456e013124455061dfe6dc8.tar.gz spark-7930d2bef0e2c7f62456e013124455061dfe6dc8.tar.bz2 spark-7930d2bef0e2c7f62456e013124455061dfe6dc8.zip | |
SPARK-3996: Add jetty servlet and continuations.
These are needed transitively from the other Jetty libraries
we include. It was not picked up by unit tests because we
disable the UI.
Author: Patrick Wendell <patrick@databricks.com>
Closes #4323 from pwendell/jetty and squashes the following commits:
d8669da [Patrick Wendell] SPARK-3996: Add jetty servlet and continuations.
| -rw-r--r-- | core/pom.xml | 12 | ||||
| -rw-r--r-- | pom.xml | 14 | ||||
| -rw-r--r-- | streaming/pom.xml | 4 | ||||
| -rw-r--r-- | yarn/pom.xml | 4 |
4 files changed, 33 insertions, 1 deletions
diff --git a/core/pom.xml b/core/pom.xml index 4d24ae93c4..2c115683fc 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -122,6 +122,16 @@ <artifactId>jetty-http</artifactId> <scope>compile</scope> </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-continuation</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <scope>compile</scope> + </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -377,7 +387,7 @@ <overWriteIfNewer>true</overWriteIfNewer> <useSubDirectoryPerType>true</useSubDirectoryPerType> <includeArtifactIds> - guava,jetty-io,jetty-http,jetty-plus,jetty-util,jetty-server + guava,jetty-io,jetty-servlet,jetty-continuation,jetty-http,jetty-plus,jetty-util,jetty-server </includeArtifactIds> <silent>true</silent> </configuration> @@ -349,6 +349,18 @@ </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-continuation</artifactId> + <version>${jetty.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</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> @@ -1297,6 +1309,8 @@ <include>org.eclipse.jetty:jetty-io</include> <include>org.eclipse.jetty:jetty-http</include> + <include>org.eclipse.jetty:jetty-continuation</include> + <include>org.eclipse.jetty:jetty-servlet</include> <include>org.eclipse.jetty:jetty-plus</include> <include>org.eclipse.jetty:jetty-security</include> <include>org.eclipse.jetty:jetty-util</include> diff --git a/streaming/pom.xml b/streaming/pom.xml index 5efed16039..1e92ba686a 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -62,6 +62,10 @@ <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + </dependency> <!-- End of shaded deps. --> <dependency> diff --git a/yarn/pom.xml b/yarn/pom.xml index 6bdf9d2416..65344aa873 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -80,6 +80,10 @@ <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + </dependency> <!-- End of shaded deps. --> <dependency> |