Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #3162 - Use Jetty specific Servlet API jar. 

Updated to jetty-servlet-api:4.0.1, based on javax.servlet 4.0.1.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2019-02-04 18:46:53 +01:00
parent 72ad74866c
commit 33f314e9f5
10 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-home/pom.xml
View File

@ -302,7 +302,7 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>javax.servlet</includeGroupIds>
<includeGroupIds>org.eclipse.jetty.toolchain</includeGroupIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/servlet-api</outputDirectory>

4
jetty-maven-plugin/src/it/javax-annotation-api/pom.xml
View File

@ -24,8 +24,8 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
<version>@servlet.api.version@</version>
<scope>provided</scope>
</dependency>

1
jetty-websocket/javax-websocket-client/pom.xml
View File

@ -85,6 +85,7 @@
<include>org.eclipse.jetty.orbit:javax.servlet</include>
<include>org.mortbay.jetty:servlet-api</include>
<include>jetty:servlet-api</include>
<include>jetty-servlet-api</include>
</includes>
</bannedDependencies>
</rules>

1
jetty-websocket/javax-websocket-common/pom.xml
View File

@ -56,6 +56,7 @@
<include>org.eclipse.jetty.orbit:javax.servlet</include>
<include>org.mortbay.jetty:servlet-api</include>
<include>jetty:servlet-api</include>
<include>jetty-servlet-api</include>
</includes>
</bannedDependencies>
</rules>

1
jetty-websocket/jetty-websocket-api/pom.xml
View File

@ -44,6 +44,7 @@
<include>org.eclipse.jetty.orbit:javax.servlet</include>
<include>org.mortbay.jetty:servlet-api</include>
<include>jetty:servlet-api</include>
<include>jetty-servlet-api</include>
</includes>
</bannedDependencies>
</rules>

1
jetty-websocket/jetty-websocket-client/pom.xml
View File

@ -72,6 +72,7 @@
<include>org.eclipse.jetty.orbit:javax.servlet</include>
<include>org.mortbay.jetty:servlet-api</include>
<include>jetty:servlet-api</include>
<include>jetty-servlet-api</include>
</includes>
</bannedDependencies>
</rules>

1
jetty-websocket/jetty-websocket-common/pom.xml
View File

@ -35,6 +35,7 @@
<include>org.eclipse.jetty.orbit:javax.servlet</include>
<include>org.mortbay.jetty:servlet-api</include>
<include>jetty:servlet-api</include>
<include>jetty-servlet-api</include>
</includes>
</bannedDependencies>
</rules>

1
jetty-websocket/jetty-websocket-tests/pom.xml
View File

@ -59,6 +59,7 @@
<include>org.eclipse.jetty.orbit:javax.servlet</include>
<include>org.mortbay.jetty:servlet-api</include>
<include>jetty:servlet-api</include>
<include>jetty-servlet-api</include>
</includes>
</bannedDependencies>
</rules>

1
jetty-websocket/websocket-servlet/pom.xml
View File

@ -87,6 +87,7 @@
<include>org.eclipse.jetty.orbit:javax.servlet</include>
<include>org.mortbay.jetty:servlet-api</include>
<include>jetty:servlet-api</include>
<include>jetty-servlet-api</include>
</includes>
</bannedDependencies>
</rules>

8
tests/test-webapps/test-proxy-webapp/pom.xml
View File

@ -45,14 +45,6 @@
<artifactId>jetty-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<!--
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet</artifactId>
<scope>provided</scope>
</dependency>
-->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>