Skip to content

Commit 53aa9cc

Browse files
committed
Upgrade to Servlet API 4.0.1 (aligned with Tomcat 9 and Undertow 2)
Issue: SPR-16470
1 parent 3917737 commit 53aa9cc

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

spring-messaging/spring-messaging.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626
optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
2727
optional("javax.xml.bind:jaxb-api:2.3.0")
2828
testCompile("javax.inject:javax.inject-tck:1")
29-
testCompile("javax.servlet:javax.servlet-api:3.1.0")
29+
testCompile("javax.servlet:javax.servlet-api:4.0.1")
3030
testCompile("javax.validation:validation-api:1.1.0.Final")
3131
testCompile("com.thoughtworks.xstream:xstream:1.4.10")
3232
testCompile("org.apache.activemq:activemq-broker:5.8.0")

spring-test/spring-test.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ dependencies {
2828
optional("javax.activation:activation:1.1.1")
2929
optional("javax.el:javax.el-api:3.0.1-b04")
3030
optional("javax.inject:javax.inject:1")
31-
optional("javax.servlet:javax.servlet-api:4.0.0")
31+
optional("javax.servlet:javax.servlet-api:4.0.1")
3232
optional("javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02")
3333
optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1")
3434
optional("javax.xml.bind:jaxb-api:2.3.0")

spring-webflux/spring-webflux.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies {
2020
compile("io.projectreactor:reactor-core")
2121
optional(project(":spring-context"))
2222
optional(project(":spring-context-support")) // for FreeMarker support
23-
optional("javax.servlet:javax.servlet-api:3.1.0")
23+
optional("javax.servlet:javax.servlet-api:4.0.1")
2424
optional("javax.websocket:javax.websocket-api:1.1")
2525
optional("org.webjars:webjars-locator-core:0.35")
2626
optional("org.freemarker:freemarker:${freemarkerVersion}")

spring-webmvc/spring-webmvc.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencyManagement {
1313
}
1414

1515
dependencies {
16-
provided("javax.servlet:javax.servlet-api:4.0.0")
16+
provided("javax.servlet:javax.servlet-api:4.0.1")
1717
compile(project(":spring-aop"))
1818
compile(project(":spring-beans"))
1919
compile(project(":spring-context"))
@@ -47,7 +47,7 @@ dependencies {
4747
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
4848
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
4949
optional("org.reactivestreams:reactive-streams")
50-
testCompile("javax.servlet:javax.servlet-api:4.0.0")
50+
testCompile("javax.servlet:javax.servlet-api:4.0.1")
5151
testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}") {
5252
exclude group: "javax.servlet", module: "javax.servlet"
5353
}

spring-websocket/spring-websocket.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies {
1919
compile(project(":spring-web"))
2020
optional(project(":spring-messaging"))
2121
optional(project(":spring-webmvc"))
22-
optional("javax.servlet:javax.servlet-api:3.1.0")
22+
optional("javax.servlet:javax.servlet-api:4.0.1")
2323
optional("javax.websocket:javax.websocket-api:1.1")
2424
optional("org.apache.tomcat:tomcat-websocket:${tomcatVersion}") {
2525
exclude group: "org.apache.tomcat", module: "tomcat-websocket-api"

0 commit comments

Comments
 (0)