diff options
Diffstat (limited to 'core/pom.xml')
| -rw-r--r-- | core/pom.xml | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/core/pom.xml b/core/pom.xml index 07b5896376..8584b62c0e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -125,12 +125,15 @@ <artifactId>jetty-servlet</artifactId> <scope>compile</scope> </dependency> - <!-- Because we mark jetty as provided and shade it, its dependency - orbit is ignored, so we explicitly list it here (see SPARK-5557).--> <dependency> - <groupId>org.eclipse.jetty.orbit</groupId> - <artifactId>javax.servlet</artifactId> - <version>${orbit.version}</version> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlets</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>${javaxservlet.version}</version> </dependency> <dependency> @@ -356,7 +359,7 @@ <overWriteIfNewer>true</overWriteIfNewer> <useSubDirectoryPerType>true</useSubDirectoryPerType> <includeArtifactIds> - guava,jetty-io,jetty-servlet,jetty-continuation,jetty-http,jetty-plus,jetty-util,jetty-server,jetty-security + guava,jetty-io,jetty-servlet,jetty-servlets,jetty-continuation,jetty-http,jetty-plus,jetty-util,jetty-server,jetty-security </includeArtifactIds> <silent>true</silent> </configuration> |