Skip to content

Commit 7930d2b

Browse files
committed
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 <[email protected]> Closes apache#4323 from pwendell/jetty and squashes the following commits: d8669da [Patrick Wendell] SPARK-3996: Add jetty servlet and continuations.
1 parent 0ef38f5 commit 7930d2b

File tree

4 files changed

+33
-1
lines changed

4 files changed

+33
-1
lines changed

core/pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,16 @@
122122
<artifactId>jetty-http</artifactId>
123123
<scope>compile</scope>
124124
</dependency>
125+
<dependency>
126+
<groupId>org.eclipse.jetty</groupId>
127+
<artifactId>jetty-continuation</artifactId>
128+
<scope>compile</scope>
129+
</dependency>
130+
<dependency>
131+
<groupId>org.eclipse.jetty</groupId>
132+
<artifactId>jetty-servlet</artifactId>
133+
<scope>compile</scope>
134+
</dependency>
125135

126136
<dependency>
127137
<groupId>org.apache.commons</groupId>
@@ -377,7 +387,7 @@
377387
<overWriteIfNewer>true</overWriteIfNewer>
378388
<useSubDirectoryPerType>true</useSubDirectoryPerType>
379389
<includeArtifactIds>
380-
guava,jetty-io,jetty-http,jetty-plus,jetty-util,jetty-server
390+
guava,jetty-io,jetty-servlet,jetty-continuation,jetty-http,jetty-plus,jetty-util,jetty-server
381391
</includeArtifactIds>
382392
<silent>true</silent>
383393
</configuration>

pom.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,18 @@
347347
<version>${jetty.version}</version>
348348
<scope>provided</scope>
349349
</dependency>
350+
<dependency>
351+
<groupId>org.eclipse.jetty</groupId>
352+
<artifactId>jetty-continuation</artifactId>
353+
<version>${jetty.version}</version>
354+
<scope>provided</scope>
355+
</dependency>
356+
<dependency>
357+
<groupId>org.eclipse.jetty</groupId>
358+
<artifactId>jetty-servlet</artifactId>
359+
<version>${jetty.version}</version>
360+
<scope>provided</scope>
361+
</dependency>
350362
<dependency>
351363
<groupId>org.eclipse.jetty</groupId>
352364
<artifactId>jetty-util</artifactId>
@@ -1297,6 +1309,8 @@
12971309

12981310
<include>org.eclipse.jetty:jetty-io</include>
12991311
<include>org.eclipse.jetty:jetty-http</include>
1312+
<include>org.eclipse.jetty:jetty-continuation</include>
1313+
<include>org.eclipse.jetty:jetty-servlet</include>
13001314
<include>org.eclipse.jetty:jetty-plus</include>
13011315
<include>org.eclipse.jetty:jetty-security</include>
13021316
<include>org.eclipse.jetty:jetty-util</include>

streaming/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@
6262
<groupId>org.eclipse.jetty</groupId>
6363
<artifactId>jetty-http</artifactId>
6464
</dependency>
65+
<dependency>
66+
<groupId>org.eclipse.jetty</groupId>
67+
<artifactId>jetty-servlet</artifactId>
68+
</dependency>
6569
<!-- End of shaded deps. -->
6670

6771
<dependency>

yarn/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@
8080
<groupId>org.eclipse.jetty</groupId>
8181
<artifactId>jetty-http</artifactId>
8282
</dependency>
83+
<dependency>
84+
<groupId>org.eclipse.jetty</groupId>
85+
<artifactId>jetty-servlet</artifactId>
86+
</dependency>
8387
<!-- End of shaded deps. -->
8488

8589
<dependency>

0 commit comments

Comments
 (0)