You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2015/02/03 06:01:40 UTC
spark git commit: SPARK-3996: Add jetty servlet and continuations.
Repository: spark
Updated Branches:
refs/heads/master 0ef38f5fa -> 7930d2bef
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 <pa...@databricks.com>
Closes #4323 from pwendell/jetty and squashes the following commits:
d8669da [Patrick Wendell] SPARK-3996: Add jetty servlet and continuations.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7930d2be
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7930d2be
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7930d2be
Branch: refs/heads/master
Commit: 7930d2bef0e2c7f62456e013124455061dfe6dc8
Parents: 0ef38f5
Author: Patrick Wendell <pa...@databricks.com>
Authored: Mon Feb 2 21:01:36 2015 -0800
Committer: Patrick Wendell <pa...@databricks.com>
Committed: Mon Feb 2 21:01:36 2015 -0800
----------------------------------------------------------------------
core/pom.xml | 12 +++++++++++-
pom.xml | 14 ++++++++++++++
streaming/pom.xml | 4 ++++
yarn/pom.xml | 4 ++++
4 files changed, 33 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/7930d2be/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 4d24ae9..2c11568 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>
http://git-wip-us.apache.org/repos/asf/spark/blob/7930d2be/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 08d1cc3..e25eced 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/spark/blob/7930d2be/streaming/pom.xml
----------------------------------------------------------------------
diff --git a/streaming/pom.xml b/streaming/pom.xml
index 5efed16..1e92ba6 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>
http://git-wip-us.apache.org/repos/asf/spark/blob/7930d2be/yarn/pom.xml
----------------------------------------------------------------------
diff --git a/yarn/pom.xml b/yarn/pom.xml
index 6bdf9d2..65344aa 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>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org